From dd0cd6f96b546ff78fd5f02d56ab8fb39d0e9ef1 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 15 Dec 2010 21:49:40 +0000
Subject: [PATCH] [LMS-1921] moved PermId to different package to be able to
reuse it in screening api
SVN: 19179
---
.../server/authorization/PredicateExecutor.java | 2 +-
.../authorization/IAuthorizationDataProvider.java | 2 +-
.../authorization/predicate/SamplePermIdPredicate.java | 2 +-
.../openbis/generic/shared/{basic => dto}/PermId.java | 10 ++++------
4 files changed, 7 insertions(+), 9 deletions(-)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/{basic => dto}/PermId.java (88%)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java
index fe59196d639..17527f8f14a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java
@@ -38,7 +38,6 @@ import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.ShouldFl
import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.ArrayPredicate;
import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.CollectionPredicate;
import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.IPredicate;
-import ch.systemsx.cisd.openbis.generic.shared.basic.PermId;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetAccessPE;
@@ -47,6 +46,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.GridCustomColumnPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.GridCustomFilterPE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PermId;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.QueryPE;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationDataProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationDataProvider.java
index c8e319bffc7..3f252852d87 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationDataProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationDataProvider.java
@@ -20,13 +20,13 @@ import java.util.List;
import java.util.Set;
import ch.systemsx.cisd.openbis.generic.shared.IDatabaseInstanceFinder;
-import ch.systemsx.cisd.openbis.generic.shared.basic.PermId;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetAccessPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.GridCustomColumnPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.GridCustomFilterPE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PermId;
import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.QueryPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.SampleAccessPE;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SamplePermIdPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SamplePermIdPredicate.java
index bd47ea49879..efc82cf5984 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SamplePermIdPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SamplePermIdPredicate.java
@@ -21,7 +21,7 @@ import java.util.List;
import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.openbis.generic.shared.authorization.IAuthorizationDataProvider;
import ch.systemsx.cisd.openbis.generic.shared.authorization.RoleWithIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.basic.PermId;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PermId;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PermId.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java
similarity index 88%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PermId.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java
index ee8a21427f4..9f81370c037 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PermId.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java
@@ -14,12 +14,10 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.shared.basic;
-
-import java.io.Serializable;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
+package ch.systemsx.cisd.openbis.generic.shared.dto;
+import ch.systemsx.cisd.openbis.generic.shared.basic.IPermIdHolder;
+import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
@@ -27,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
*
* @author Izabela Adamczyk
*/
-public class PermId implements IsSerializable, Serializable
+public class PermId implements ISerializable
{
private static final long serialVersionUID = ServiceVersionHolder.VERSION;
--
GitLab