diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnFilter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnFilter.java
index 9c3546bc61b7ead641fdcff0023b71aa7ed4b950..d5c7ae89a0cbef4bbb0520bf4ca94d18cb981743 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnFilter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnFilter.java
@@ -30,9 +30,9 @@ public class ColumnFilter<T extends ModelData> extends StoreFilterField<T>
private final String column;
- public ColumnFilter(Store<T> store, String col, String label)
+ public ColumnFilter(Store<T> store, String columnName, String label)
{
- this.column = col;
+ this.column = columnName;
setWidth(100);
setEmptyText(label + "...");
bind(store);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/GroupModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/GroupModel.java
similarity index 66%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/GroupModel.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/GroupModel.java
index 9fe7729a23ac76397b7f9078735b245fe1d5af70..597f029e44c0b7f909c6b613d8fcdd09f21a0966 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/GroupModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/GroupModel.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.amc;
+package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui;
import com.extjs.gxt.ui.client.data.BaseModelData;
import com.extjs.gxt.ui.client.data.ModelData;
@@ -28,8 +28,17 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Group;
*/
public class GroupModel extends BaseModelData
{
+ public static final String OBJECT = "object";
- static final String CODE = "code";
+ public static final String REGISTRATION_DATE = "registrationDate";
+
+ public static final String REGISTRATOR = "registrator";
+
+ public static final String LEADER = "leader";
+
+ public static final String DESCRIPTION = "description";
+
+ public static final String CODE = "code";
private static final long serialVersionUID = 1L;
@@ -40,11 +49,11 @@ public class GroupModel extends BaseModelData
public GroupModel(Group g)
{
set(CODE, g.getCode());
- set("description", g.getDescription());
- set("leader", g.getLeader());
- set("registrator", g.getRegistrator());
- set("registrationDate", g.getRegistrationDate());
- set("object", g);
+ set(DESCRIPTION, g.getDescription());
+ set(LEADER, g.getLeader());
+ set(REGISTRATOR, g.getRegistrator());
+ set(REGISTRATION_DATE, g.getRegistrationDate());
+ set(OBJECT, g);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/GroupsView.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/GroupsView.java
index f653da1925a1e44d6c920c2b1b646811e377aac9..9f939b25f700067afc48923709c0ad037282f594 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/GroupsView.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/GroupsView.java
@@ -48,6 +48,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.GenericViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnFilter;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.GroupModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.PersonRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Group;
@@ -98,27 +99,27 @@ public class GroupsView extends LayoutContainer
configs.add(expander);
ColumnConfig codeColumnConfig = new ColumnConfig();
- codeColumnConfig.setId("code");
+ codeColumnConfig.setId(GroupModel.CODE);
codeColumnConfig.setHeader("Code");
codeColumnConfig.setWidth(COL_GROUP);
configs.add(codeColumnConfig);
ColumnConfig leaderColumnConfig = new ColumnConfig();
- leaderColumnConfig.setId("leader");
+ leaderColumnConfig.setId(GroupModel.LEADER);
leaderColumnConfig.setHeader("Leader");
leaderColumnConfig.setWidth(COL_PERSON);
leaderColumnConfig.setRenderer(new PersonRenderer());
configs.add(leaderColumnConfig);
ColumnConfig registratorColumnConfig = new ColumnConfig();
- registratorColumnConfig.setId("registrator");
+ registratorColumnConfig.setId(GroupModel.REGISTRATOR);
registratorColumnConfig.setHeader("Registrator");
registratorColumnConfig.setWidth(COL_PERSON);
registratorColumnConfig.setRenderer(new PersonRenderer());
configs.add(registratorColumnConfig);
ColumnConfig registrationDateColumnConfig = new ColumnConfig();
- registrationDateColumnConfig.setId("registrationDate");
+ registrationDateColumnConfig.setId(GroupModel.REGISTRATION_DATE);
registrationDateColumnConfig.setHeader("Registration Date");
registrationDateColumnConfig.setWidth(COL_DATE);
registrationDateColumnConfig.setDateTimeFormat(DateTimeFormat.getShortDateFormat());
@@ -158,7 +159,8 @@ public class GroupsView extends LayoutContainer
ToolBar toolBar = new ToolBar();
toolBar.add(new LabelToolItem("Filter:"));
- toolBar.add(new AdapterToolItem(new ColumnFilter<GroupModel>(store, "code", "code")));
+ toolBar.add(new AdapterToolItem(
+ new ColumnFilter<GroupModel>(store, GroupModel.CODE, "code")));
toolBar.add(new SeparatorToolItem());
toolBar.add(new AdapterToolItem(addGroupButton));
cp.setBottomComponent(toolBar);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/PersonModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/PersonModel.java
index 1ec248379e815b69fd9c04b22b042414e3637a45..b97c2ade813c6fdb74446bc2ec150928b3fe5a1c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/PersonModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/PersonModel.java
@@ -32,7 +32,21 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.RoleAssignment;
public class PersonModel extends BaseModelData
{
- private static final long serialVersionUID = 1L;
+ static final String ROLES = "roles";
+
+ static final String EMAIL = "email";
+
+ static final String LAST_NAME = "lastName";
+
+ static final String FIRST_NAME = "firstName";
+
+ static final String REGISTRATION_DATE = "registrationDate";
+
+ static final String REGISTRATOR = "registrator";
+
+ static final String USER_ID = "userId";
+
+ static final long serialVersionUID = 1L;
public PersonModel()
{
@@ -40,12 +54,12 @@ public class PersonModel extends BaseModelData
public PersonModel(Person p)
{
- set("userId", p.getUserId());
- set("registrator", p.getRegistrator());
- set("registrationDate", p.getRegistrationDate());
- set("firstName", p.getFirstName());
- set("lastName", p.getLastName());
- set("email", p.getEMail());
- set("roles", new ArrayList<RoleAssignment>());
+ set(USER_ID, p.getUserId());
+ set(REGISTRATOR, p.getRegistrator());
+ set(REGISTRATION_DATE, p.getRegistrationDate());
+ set(FIRST_NAME, p.getFirstName());
+ set(LAST_NAME, p.getLastName());
+ set(EMAIL, p.getEMail());
+ set(ROLES, new ArrayList<RoleAssignment>());
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/PersonsView.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/PersonsView.java
index 776a016f40a4ab777ecdcebdf2ff0a58237b14f1..c6c7d43878ea4d9747823a69c741565f6521b771 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/PersonsView.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/PersonsView.java
@@ -79,38 +79,38 @@ public class PersonsView extends LayoutContainer
List<ColumnConfig> configs = new ArrayList<ColumnConfig>();
ColumnConfig codeColumnConfig = new ColumnConfig();
- codeColumnConfig.setId("userId");
+ codeColumnConfig.setId(PersonModel.USER_ID);
codeColumnConfig.setHeader("User ID");
codeColumnConfig.setWidth(COL_PERSON_ID);
configs.add(codeColumnConfig);
ColumnConfig firstNameColumnConfig = new ColumnConfig();
- firstNameColumnConfig.setId("firstName");
+ firstNameColumnConfig.setId(PersonModel.FIRST_NAME);
firstNameColumnConfig.setHeader("First Name");
firstNameColumnConfig.setWidth(COL_FIRST_NAME);
configs.add(firstNameColumnConfig);
ColumnConfig lastNameColumnConfig = new ColumnConfig();
- lastNameColumnConfig.setId("lastName");
+ lastNameColumnConfig.setId(PersonModel.LAST_NAME);
lastNameColumnConfig.setHeader("Last Name");
lastNameColumnConfig.setWidth(COL_LAST_NAME);
configs.add(lastNameColumnConfig);
ColumnConfig emailNameColumnConfig = new ColumnConfig();
- emailNameColumnConfig.setId("email");
+ emailNameColumnConfig.setId(PersonModel.EMAIL);
emailNameColumnConfig.setHeader("Email");
emailNameColumnConfig.setWidth(COL_EMAIL);
configs.add(emailNameColumnConfig);
ColumnConfig registratorColumnConfig = new ColumnConfig();
- registratorColumnConfig.setId("registrator");
+ registratorColumnConfig.setId(PersonModel.REGISTRATOR);
registratorColumnConfig.setHeader("Registrator");
registratorColumnConfig.setWidth(COL_PERSON);
registratorColumnConfig.setRenderer(new PersonRenderer());
configs.add(registratorColumnConfig);
ColumnConfig registrationDateColumnConfig = new ColumnConfig();
- registrationDateColumnConfig.setId("registrationDate");
+ registrationDateColumnConfig.setId(PersonModel.REGISTRATION_DATE);
registrationDateColumnConfig.setHeader("Registration Date");
registrationDateColumnConfig.setWidth(COL_DATE);
registrationDateColumnConfig.setDateTimeFormat(DateTimeFormat.getShortDateFormat());
@@ -148,7 +148,8 @@ public class PersonsView extends LayoutContainer
ToolBar toolBar = new ToolBar();
toolBar.add(new LabelToolItem("Filter:"));
- toolBar.add(new AdapterToolItem(new ColumnFilter<PersonModel>(store, "userId", "user id")));
+ toolBar.add(new AdapterToolItem(new ColumnFilter<PersonModel>(store, PersonModel.USER_ID,
+ "user id")));
toolBar.add(new SeparatorToolItem());
toolBar.add(new AdapterToolItem(addPersonButton));
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleModel.java
index 7de31f2dfd4db343995640c396c2c28b26260dcd..28834e85f5602f5203627f99069ddf623cb43a0b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleModel.java
@@ -28,14 +28,22 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.RoleAssignment;
*/
public class RoleModel extends BaseModelData
{
- private static final long serialVersionUID = 1L;
+ static final String GROUP = "group";
+
+ static final String PERSON = "person";
+
+ static final String ROLE = "role";
+
+ static final String INSTANCE = "instance";
+
+ static final long serialVersionUID = 1L;
public RoleModel(RoleAssignment role)
{
- set("group", role.getGroup() != null ? role.getGroup().getCode() : "");
- set("person", role.getPerson().getUserId());
- set("role", role.getCode());
- set("instance", role.getInstance() != null ? role.getInstance().getCode() : "");
+ set(GROUP, role.getGroup() != null ? role.getGroup().getCode() : "");
+ set(PERSON, role.getPerson().getUserId());
+ set(ROLE, role.getCode());
+ set(INSTANCE, role.getInstance() != null ? role.getInstance().getCode() : "");
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RolesView.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RolesView.java
index c5a82d691b6704ea732bafd8165b3e43935c11b3..2e60978b3a20bb31944369604bc69d835c0fee77 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RolesView.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RolesView.java
@@ -72,25 +72,25 @@ public class RolesView extends LayoutContainer
List<ColumnConfig> configs = new ArrayList<ColumnConfig>();
ColumnConfig userIdColumnConfig = new ColumnConfig();
- userIdColumnConfig.setId("person");
+ userIdColumnConfig.setId(RoleModel.PERSON);
userIdColumnConfig.setHeader("Person");
userIdColumnConfig.setWidth(COL_PERSON);
configs.add(userIdColumnConfig);
ColumnConfig groupColumnConfig = new ColumnConfig();
- groupColumnConfig.setId("group");
+ groupColumnConfig.setId(RoleModel.GROUP);
groupColumnConfig.setHeader("Group");
groupColumnConfig.setWidth(COL_GROUP);
configs.add(groupColumnConfig);
ColumnConfig instanceColumnConfig = new ColumnConfig();
- instanceColumnConfig.setId("instance");
+ instanceColumnConfig.setId(RoleModel.INSTANCE);
instanceColumnConfig.setHeader("Database Instance");
instanceColumnConfig.setWidth(COL_DB_INSTANCE);
configs.add(instanceColumnConfig);
ColumnConfig roleColumnConfig = new ColumnConfig();
- roleColumnConfig.setId("role");
+ roleColumnConfig.setId(RoleModel.ROLE);
roleColumnConfig.setHeader("Role");
roleColumnConfig.setWidth(COL_ROLE);
configs.add(roleColumnConfig);
@@ -139,26 +139,30 @@ public class RolesView extends LayoutContainer
roleList.refresh();
}
};
- if (StringUtils.isBlank((String) rm.get("group")))
+ if (StringUtils.isBlank((String) rm.get(RoleModel.GROUP)))
{
- viewContext.getService().deleteInstanceRole((String) rm.get("role"),
- (String) rm.get("person"), roleListRefreshCallback);
+ viewContext.getService().deleteInstanceRole(
+ (String) rm.get(RoleModel.ROLE), (String) rm.get(RoleModel.PERSON),
+ roleListRefreshCallback);
} else
{
- viewContext.getService().deleteGroupRole((String) rm.get("role"),
- (String) rm.get("group"), (String) rm.get("person"),
- roleListRefreshCallback);
+ viewContext.getService().deleteGroupRole((String) rm.get(RoleModel.ROLE),
+ (String) rm.get(RoleModel.GROUP),
+ (String) rm.get(RoleModel.PERSON), roleListRefreshCallback);
}
}
});
ToolBar toolBar = new ToolBar();
toolBar.add(new LabelToolItem("Filter:"));
- toolBar.add(new AdapterToolItem(new ColumnFilter<RoleModel>(store, "person", "person")));
- toolBar.add(new AdapterToolItem(new ColumnFilter<RoleModel>(store, "group", "group")));
+ toolBar.add(new AdapterToolItem(new ColumnFilter<RoleModel>(store, RoleModel.PERSON,
+ "person")));
+ toolBar.add(new AdapterToolItem(
+ new ColumnFilter<RoleModel>(store, RoleModel.GROUP, "group")));
+ toolBar.add(new AdapterToolItem(new ColumnFilter<RoleModel>(store, RoleModel.INSTANCE,
+ "instance")));
toolBar
- .add(new AdapterToolItem(new ColumnFilter<RoleModel>(store, "instance", "instance")));
- toolBar.add(new AdapterToolItem(new ColumnFilter<RoleModel>(store, "role", "role")));
+ .add(new AdapterToolItem(new ColumnFilter<RoleModel>(store, RoleModel.ROLE, "role")));
toolBar.add(new SeparatorToolItem());
toolBar.add(new AdapterToolItem(addRoleButton));
toolBar.add(new SeparatorToolItem());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/GroupSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/GroupSelectionWidget.java
index 9ad317d9da45e8a5ab4dbfc685a9029737e288db..e2f7f103c334f5432ff80613ca8341223ee112df 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/GroupSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/GroupSelectionWidget.java
@@ -24,7 +24,7 @@ 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.GenericViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.amc.GroupModel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.GroupModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Group;
class GroupSelectionWidget extends ComboBox<GroupModel>
@@ -39,7 +39,7 @@ class GroupSelectionWidget extends ComboBox<GroupModel>
this.viewContext = viewContext;
setEmptyText("Select a group...");
- setDisplayField("code");
+ setDisplayField(GroupModel.CODE);
setAllowBlank(false);
setEditable(false);
groupStore = new ListStore<GroupModel>();
@@ -52,7 +52,7 @@ class GroupSelectionWidget extends ComboBox<GroupModel>
final List<GroupModel> selection = getSelection();
if (selection.size() > 0)
{
- return selection.get(0).get("object");
+ return selection.get(0).get(GroupModel.OBJECT);
} else
{
return null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleTypeModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleTypeModel.java
index 05444b70c79a3b71dd09e4674df6ceb3dfc69bff..1609b28ba6eb6ce75ac1f899c8e6000eaed2c9a8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleTypeModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleTypeModel.java
@@ -26,12 +26,16 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleType;
public class SampleTypeModel extends BaseModelData
{
- private static final long serialVersionUID = 1L;
+ static final String OBJECT = "object";
+
+ static final String CODE = "code";
+
+ static final long serialVersionUID = 1L;
public SampleTypeModel(SampleType sampleType)
{
- set("code", sampleType.getCode());
- set("object", sampleType);
+ set(CODE, sampleType.getCode());
+ set(OBJECT, sampleType);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleTypeSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleTypeSelectionWidget.java
index f32dae19faffd638dcce380d7aaaa95aa5950ff3..ee9e087ae19cbf0318f107f09102c855d0298e50 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleTypeSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleTypeSelectionWidget.java
@@ -38,7 +38,7 @@ class SampleTypeSelectionWidget extends ComboBox<SampleTypeModel>
this.viewContext = viewContext;
setEmptyText("Select a sample type...");
- setDisplayField("code");
+ setDisplayField(SampleTypeModel.CODE);
setAllowBlank(false);
setEditable(false);
sampleTypeStore = new ListStore<SampleTypeModel>();
@@ -51,7 +51,7 @@ class SampleTypeSelectionWidget extends ComboBox<SampleTypeModel>
final List<SampleTypeModel> selection = getSelection();
if (selection.size() > 0)
{
- return selection.get(0).get("object");
+ return selection.get(0).get(SampleTypeModel.OBJECT);
} else
{
return null;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckGroup.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckGroup.java
index dbc00e105edbdacf05d4813ec64aff73f7461402..5436884470fbffc865c417333e8b4c1d0575c4a6 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckGroup.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckGroup.java
@@ -22,6 +22,7 @@ import com.extjs.gxt.ui.client.store.ListStore;
import com.extjs.gxt.ui.client.widget.grid.Grid;
import com.google.gwt.user.client.ui.Widget;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.GroupModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.GWTTestUtil;