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 7568818b4349bdf337bae98924c8af3c0bf2e46d..9219f773b314b5f029e31fcfa73cb1683b0d8e61 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 563e073434e38c894cb4c06e7b21a995910b89f8..15231e6b9a651df4568aaac90491de1b865280a2 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 c0c9dffb070b0bbc08976b4547c5581185a8f81c..f259e775dcf159382d363f9c7b6f544ac70fb9e8 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 a229c72898233e3470430f6ec9aa5bbdf99abc20..4ae75b7737751e04541ddbfa84d260b593dcf6b9 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 0b64edefac7b1b1de5baf1f0101ddbd04a0d761b..db35ac49b94c8b21c8fa6ca7b9a83092c0a85ace 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 b1e22935e2465a27c852c4734a8647403b829afa..33e1c552da8113fd67d2de6c8253f5a63e0035e4 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 aca9e8a075fba4056927a08b23634c8ea3872b53..d853667b4c86cff1470f49dfccbd6d804fb10876 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 63e3728ee1fbd04a637dc5ccbd2ef7d3a8b43b21..d194562da61dfa9fc9baabac642c50d4c55793ae 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 f92a173bd9e6b5b5d0772e326a30db3bb8c12cb5..bd03c6117ef1957b23bf78105358937824a723a6 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 17f7faa782d3578dcc54f0204e42f966b025f2f6..a90cbf01cd8331d68060596a43bf6cf847ae7774 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 fa63a08fa8256bf344533c231ce6a2ffd620cbe0..05fb4d6db5a4c5c7605d036de47cd377caf43464 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 9177862191d5c51bb812a0851f71a68c3ed7fb85..a0eb830b424830490fb31fab5cdff7b88bc81807 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 1aa57c8eca28c19061228f7eb2240031b6a8b26e..981b844f8ffc7f56980cddf12f4f0fa0b6372b7c 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 f5201bd86151a0ffb8cc7585b236fb11e07569b6..59380a0949d3fc51851fc1e7b02c3918409a8cd2 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";