From 73897182c9c787e41cb37192b41dc2bc268cdeae Mon Sep 17 00:00:00 2001 From: buczekp <buczekp> Date: Fri, 14 Jan 2011 14:38:56 +0000 Subject: [PATCH] [LMS-1949] introduced basic.dto.api and moved interfaces used by managed properties there SVN: 19430 --- .../generic/shared/basic/dto/ManagedEntityProperty.java | 3 +++ .../shared/basic/dto/ManagedInputWidgetDescription.java | 2 ++ .../shared/basic/dto/ManagedTableWidgetDescription.java | 2 ++ .../generic/shared/basic/dto/ManagedUiDescription.java | 2 ++ .../shared/basic/dto/{ => api}/IManagedEntityProperty.java | 2 +- .../basic/dto/{ => api}/IManagedInputWidgetDescription.java | 4 +++- .../shared/basic/dto/{ => api}/IManagedUiDescription.java | 4 +++- .../shared/basic/dto/{ => api}/IManagedWidgetDescription.java | 3 ++- 8 files changed, 18 insertions(+), 4 deletions(-) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/{ => api}/IManagedEntityProperty.java (92%) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/{ => api}/IManagedInputWidgetDescription.java (87%) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/{ => api}/IManagedUiDescription.java (88%) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/{ => api}/IManagedWidgetDescription.java (86%) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedEntityProperty.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedEntityProperty.java index a94fa8942d1..a7ae2885644 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedEntityProperty.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedEntityProperty.java @@ -16,6 +16,9 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto; +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedEntityProperty; +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedUiDescription; + /** * An {@link IEntityProperty} implementation for managed properties. * diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedInputWidgetDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedInputWidgetDescription.java index 62814f5ad4a..49141761c8d 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedInputWidgetDescription.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedInputWidgetDescription.java @@ -16,6 +16,8 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto; +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedInputWidgetDescription; + /** * @author Chandrasekhar Ramakrishnan */ diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTableWidgetDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTableWidgetDescription.java index 95c44ad4749..3dfe4bda458 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTableWidgetDescription.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTableWidgetDescription.java @@ -16,6 +16,8 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto; +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedWidgetDescription; + /** * {@link IManagedWidgetDescription} implementation for tables * diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java index a91b0342caa..36284f9385b 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java @@ -20,6 +20,8 @@ import java.util.Arrays; import java.util.List; import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable; +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedUiDescription; +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedWidgetDescription; /** * Object that declaratively describes a UI (labels, fields, their ordering, table content). diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedEntityProperty.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedEntityProperty.java similarity index 92% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedEntityProperty.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedEntityProperty.java index d581e5f5a66..adc13ffe23c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedEntityProperty.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedEntityProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.generic.shared.basic.dto; +package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api; /** * Interface implemented by managed property. diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedInputWidgetDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java similarity index 87% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedInputWidgetDescription.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java index 382919fc047..8fbfd31c7fc 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedInputWidgetDescription.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.generic.shared.basic.dto; +package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api; + +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ManagedInputFieldType; /** * Interface implemented by objects describing an input UI element (text field, combo box) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedUiDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java similarity index 88% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedUiDescription.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java index d523f544cb4..9b7beff0932 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedUiDescription.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.generic.shared.basic.dto; +package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api; + +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedWidgetDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedWidgetDescription.java similarity index 86% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedWidgetDescription.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedWidgetDescription.java index f983a1380c1..849d393eccd 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IManagedWidgetDescription.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedWidgetDescription.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.generic.shared.basic.dto; +package ch.systemsx.cisd.openbis.generic.shared.basic.dto.api; import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable; +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ManagedWidgetType; /** * Interface implemented by objects describing a UI element (label, field, table) -- GitLab