From eaef45b9adf8961eda8f539e285324c2c615949d Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Fri, 13 Nov 2009 09:13:52 +0000
Subject: [PATCH] LMS-1274 The fix for this issue is to turn off nested value
support in the GXT widgets. We have implemented this by refactoring all the
BaseModelData subclasses into two hierarchies with CISD{BaseModel,
BaseModelData} at the respective roots.
SVN: 13375
---
.../web/client/application/model/AttachmentVersionModel.java | 5 ++---
.../client/application/model/AuthorizationGroupModel.java | 3 +--
.../client/web/client/application/model/BaseEntityModel.java | 4 +---
.../web/client/application/model/DataSetTypeModel.java | 3 +--
.../client/web/client/application/model/DataTypeModel.java | 2 +-
.../application/model/DetailedSearchFieldComboModel.java | 4 +---
.../web/client/application/model/ExperimentTypeModel.java | 3 +--
.../client/web/client/application/model/GroupModel.java | 3 +--
.../web/client/application/model/MaterialTypeModel.java | 3 +--
.../client/web/client/application/model/PersonModel.java | 3 +--
.../client/application/model/PluginTaskDescriptionModel.java | 3 +--
.../client/web/client/application/model/SampleTypeModel.java | 3 +--
.../web/client/application/model/SearchableEntityModel.java | 3 +--
.../web/client/application/model/VocabularyTermModel.java | 3 +--
14 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AttachmentVersionModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AttachmentVersionModel.java
index 7568818b434..9219f773b31 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AttachmentVersionModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AttachmentVersionModel.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.PersonRenderer;
@@ -30,12 +29,12 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Attachment;
*
* @author Izabela Adamczyk
*/
-public class AttachmentVersionModel extends BaseModelData
+public class AttachmentVersionModel extends CISDBaseModelData
{
public static final String VERSION = "version";
public static final String VERSION_FILE_NAME = "versionsFileName";
-
+
private static final long serialVersionUID = 1L;
public AttachmentVersionModel()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AuthorizationGroupModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AuthorizationGroupModel.java
index 563e073434e..15231e6b9a6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AuthorizationGroupModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AuthorizationGroupModel.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModel;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AuthorizationGroup;
@@ -29,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AuthorizationGroup;
*
* @author Izabela Adamczyk
*/
-public class AuthorizationGroupModel extends BaseModel
+public class AuthorizationGroupModel extends CISDBaseModel
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java
index c0c9dffb070..f259e775dcf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java
@@ -20,8 +20,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModelData;
-
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.InvalidableWithCodeRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.LinkRenderer;
@@ -46,7 +44,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
* @author Franz-Josef Elmer
* @author Tomasz Pylak
*/
-public class BaseEntityModel<T> extends BaseModelData
+public class BaseEntityModel<T> extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetTypeModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetTypeModel.java
index a229c728982..4ae75b77377 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetTypeModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetTypeModel.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.TooltipRenderer;
@@ -30,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
*
* @author Izabela Adamczyk
*/
-public class DataSetTypeModel extends BaseModelData
+public class DataSetTypeModel extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataTypeModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataTypeModel.java
index 0b64edefac7..db35ac49b94 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataTypeModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataTypeModel.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataType;
*
* @author Christian Ribeaud
*/
-public final class DataTypeModel extends BaseModelData
+public final class DataTypeModel extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DetailedSearchFieldComboModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DetailedSearchFieldComboModel.java
index b1e22935e24..33e1c552da8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DetailedSearchFieldComboModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DetailedSearchFieldComboModel.java
@@ -16,12 +16,10 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
-import com.extjs.gxt.ui.client.data.BaseModelData;
-
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DetailedSearchField;
/** Model of combo box used in detailed entity search. */
-public class DetailedSearchFieldComboModel extends BaseModelData
+public class DetailedSearchFieldComboModel extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ExperimentTypeModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ExperimentTypeModel.java
index aca9e8a075f..d853667b4c8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ExperimentTypeModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ExperimentTypeModel.java
@@ -21,7 +21,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.TooltipRenderer;
@@ -34,7 +33,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentTypePropertyT
*
* @author Izabela Adamczyk
*/
-public class ExperimentTypeModel extends BaseModelData
+public class ExperimentTypeModel extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/GroupModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/GroupModel.java
index 63e3728ee1f..d194562da61 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/GroupModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/GroupModel.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Group;
@@ -29,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Group;
*
* @author Izabela Adamczyk
*/
-public class GroupModel extends BaseModelData
+public class GroupModel extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/MaterialTypeModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/MaterialTypeModel.java
index f92a173bd9e..bd03c6117ef 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/MaterialTypeModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/MaterialTypeModel.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.TooltipRenderer;
@@ -30,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialType;
*
* @author Izabela Adamczyk
*/
-public class MaterialTypeModel extends BaseModelData
+public class MaterialTypeModel extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PersonModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PersonModel.java
index 17f7faa782d..a90cbf01cd8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PersonModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PersonModel.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModel;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
@@ -29,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
*
* @author Izabela Adamczyk
*/
-public class PersonModel extends BaseModel
+public class PersonModel extends CISDBaseModel
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PluginTaskDescriptionModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PluginTaskDescriptionModel.java
index fa63a08fa82..05fb4d6db5a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PluginTaskDescriptionModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PluginTaskDescriptionModel.java
@@ -16,7 +16,6 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.StringUtils;
@@ -27,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatastoreServiceDescrip
*
* @author Piotr Buczek
*/
-public class PluginTaskDescriptionModel extends BaseModelData
+public class PluginTaskDescriptionModel extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleTypeModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleTypeModel.java
index 9177862191d..a0eb830b424 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleTypeModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleTypeModel.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.TooltipRenderer;
@@ -30,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
*
* @author Izabela Adamczyk
*/
-public class SampleTypeModel extends BaseModelData
+public class SampleTypeModel extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SearchableEntityModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SearchableEntityModel.java
index 1aa57c8eca2..981b844f8ff 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SearchableEntityModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SearchableEntityModel.java
@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SearchableEntity;
@@ -29,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SearchableEntity;
*
* @author Christian Ribeaud
*/
-public final class SearchableEntityModel extends BaseModelData
+public final class SearchableEntityModel extends CISDBaseModelData
{
public final static SearchableEntityModel NULL_SEARCHABLE_ENTITY_MODEL =
createNullSearchableEntityModel();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
index f5201bd8615..59380a0949d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModel;
import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.VocabularyPropertyColRenderer;
@@ -31,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.VocabularyTerm;
*
* @author Izabela Adamczyk
*/
-public class VocabularyTermModel extends BaseModel implements Comparable<VocabularyTermModel>
+public class VocabularyTermModel extends CISDBaseModel implements Comparable<VocabularyTermModel>
{
private static final String ORDINAL = "ordinal";
--
GitLab