Skip to content
Snippets Groups Projects
Commit eaef45b9 authored by cramakri's avatar cramakri
Browse files

LMS-1274 The fix for this issue is to turn off nested value support in the GXT...

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
parent f9227ce0
No related branches found
No related tags found
No related merge requests found
Showing
with 15 additions and 30 deletions
...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; ...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.PersonRenderer; 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; ...@@ -30,12 +29,12 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Attachment;
* *
* @author Izabela Adamczyk * @author Izabela Adamczyk
*/ */
public class AttachmentVersionModel extends BaseModelData public class AttachmentVersionModel extends CISDBaseModelData
{ {
public static final String VERSION = "version"; public static final String VERSION = "version";
public static final String VERSION_FILE_NAME = "versionsFileName"; public static final String VERSION_FILE_NAME = "versionsFileName";
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public AttachmentVersionModel() public AttachmentVersionModel()
......
...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; ...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModel;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AuthorizationGroup; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AuthorizationGroup;
...@@ -29,7 +28,7 @@ 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 * @author Izabela Adamczyk
*/ */
public class AuthorizationGroupModel extends BaseModel public class AuthorizationGroupModel extends CISDBaseModel
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -20,8 +20,6 @@ import java.util.ArrayList; ...@@ -20,8 +20,6 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; 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.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.InvalidableWithCodeRenderer; import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.InvalidableWithCodeRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.LinkRenderer; 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; ...@@ -46,7 +44,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
* @author Franz-Josef Elmer * @author Franz-Josef Elmer
* @author Tomasz Pylak * @author Tomasz Pylak
*/ */
public class BaseEntityModel<T> extends BaseModelData public class BaseEntityModel<T> extends CISDBaseModelData
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; ...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.TooltipRenderer; 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; ...@@ -30,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
* *
* @author Izabela Adamczyk * @author Izabela Adamczyk
*/ */
public class DataSetTypeModel extends BaseModelData public class DataSetTypeModel extends CISDBaseModelData
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataType; ...@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataType;
* *
* @author Christian Ribeaud * @author Christian Ribeaud
*/ */
public final class DataTypeModel extends BaseModelData public final class DataTypeModel extends CISDBaseModelData
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -16,12 +16,10 @@ ...@@ -16,12 +16,10 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; 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; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DetailedSearchField;
/** Model of combo box used in detailed entity search. */ /** 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; private static final long serialVersionUID = 1L;
......
...@@ -21,7 +21,6 @@ import java.util.HashSet; ...@@ -21,7 +21,6 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.TooltipRenderer; 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 ...@@ -34,7 +33,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentTypePropertyT
* *
* @author Izabela Adamczyk * @author Izabela Adamczyk
*/ */
public class ExperimentTypeModel extends BaseModelData public class ExperimentTypeModel extends CISDBaseModelData
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; ...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Group; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Group;
...@@ -29,7 +28,7 @@ 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 * @author Izabela Adamczyk
*/ */
public class GroupModel extends BaseModelData public class GroupModel extends CISDBaseModelData
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; ...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.TooltipRenderer; 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; ...@@ -30,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialType;
* *
* @author Izabela Adamczyk * @author Izabela Adamczyk
*/ */
public class MaterialTypeModel extends BaseModelData public class MaterialTypeModel extends CISDBaseModelData
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; ...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModel;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
...@@ -29,7 +28,7 @@ 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 * @author Izabela Adamczyk
*/ */
public class PersonModel extends BaseModel public class PersonModel extends CISDBaseModel
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; 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 com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.StringUtils; 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 ...@@ -27,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatastoreServiceDescrip
* *
* @author Piotr Buczek * @author Piotr Buczek
*/ */
public class PluginTaskDescriptionModel extends BaseModelData public class PluginTaskDescriptionModel extends CISDBaseModelData
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; ...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.TooltipRenderer; 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; ...@@ -30,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
* *
* @author Izabela Adamczyk * @author Izabela Adamczyk
*/ */
public class SampleTypeModel extends BaseModelData public class SampleTypeModel extends CISDBaseModelData
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model; ...@@ -19,7 +19,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SearchableEntity; 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; ...@@ -29,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SearchableEntity;
* *
* @author Christian Ribeaud * @author Christian Ribeaud
*/ */
public final class SearchableEntityModel extends BaseModelData public final class SearchableEntityModel extends CISDBaseModelData
{ {
public final static SearchableEntityModel NULL_SEARCHABLE_ENTITY_MODEL = public final static SearchableEntityModel NULL_SEARCHABLE_ENTITY_MODEL =
createNullSearchableEntityModel(); createNullSearchableEntityModel();
......
...@@ -20,7 +20,6 @@ import java.util.ArrayList; ...@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.data.BaseModel;
import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.data.ModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.renderer.VocabularyPropertyColRenderer; 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; ...@@ -31,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.VocabularyTerm;
* *
* @author Izabela Adamczyk * @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"; private static final String ORDINAL = "ordinal";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment