From 2f34ca3bfbaacbab3a3653b830890c400cca5e1c Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Fri, 13 Nov 2009 09:14:20 +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: 13376
---
.../application/ui/experiment/ProjectSelectionTreeWidget.java | 4 ++--
.../application/ui/experiment/ProjectSelectionWidget.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeWidget.java
index a1c5dc7f181..89c25fdff6b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeWidget.java
@@ -22,7 +22,6 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.event.SelectionChangedListener;
import com.extjs.gxt.ui.client.util.TreeBuilder;
import com.extjs.gxt.ui.client.widget.tree.Tree;
@@ -32,6 +31,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAs
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.IDatabaseModificationObserver;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.CISDBaseModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.TreeItemWithModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
@@ -224,7 +224,7 @@ public final class ProjectSelectionTreeWidget extends Tree implements IDatabaseM
}
}
- private static class BaseModelDataWithCode extends BaseModelData
+ private static class BaseModelDataWithCode extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionWidget.java
index 8dd9b20f4c2..dda5c6aa292 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionWidget.java
@@ -19,13 +19,13 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experi
import java.util.ArrayList;
import java.util.List;
-import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.store.ListStore;
import com.extjs.gxt.ui.client.widget.form.ComboBox;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.CISDBaseModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.DropDownList;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
@@ -51,7 +51,7 @@ public final class ProjectSelectionWidget extends
// @Private
static final String DISPLAY_COLUMN_ID = "id";
- static class ProjectComboModel extends BaseModelData
+ static class ProjectComboModel extends CISDBaseModelData
{
private static final long serialVersionUID = 1L;
--
GitLab