From 9ed9f9c9ae29f605fff48e0f0f8fcedbe45eae93 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Mon, 6 Jul 2015 16:09:05 +0000
Subject: [PATCH] Cleaned up DataTableController
---
.../AllowedPolicyValueController.java | 7 +++-
.../controllers/DataTableController.java | 41 ++-----------------
.../controllers/ExperimentController.java | 13 ++++--
.../controllers/PolicyPropertyController.java | 7 +++-
.../controllers/UserInfoController.java | 2 +-
.../controllers/UserSystemRoleController.java | 14 ++++++-
6 files changed, 37 insertions(+), 47 deletions(-)
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/AllowedPolicyValueController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/AllowedPolicyValueController.java
index c3b20088..106c1093 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/AllowedPolicyValueController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/AllowedPolicyValueController.java
@@ -55,7 +55,7 @@ public class AllowedPolicyValueController extends CrudEntityController<AllowedPo
class AllowedPolicyValueInfoTable extends DataTableController<AllowedPolicyValue> {
@Override
- public String getClassName() {
+ public String getEntityName() {
return "AllowedPolicyValue";
}
@@ -63,6 +63,11 @@ public class AllowedPolicyValueController extends CrudEntityController<AllowedPo
public List<AllowedPolicyValue> findAll() {
return allowedPolicyValueFacade.findByPolicyPropertyId(getPolicyProperty().getId());
}
+
+ @Override
+ public String getTableName() {
+ return "allowedPolicyValueInfoTable";
+ }
}
private AllowedPolicyValueInfoTable allowedPolicyValueInfoTable = new AllowedPolicyValueInfoTable();
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/DataTableController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/DataTableController.java
index ac019ebf..7312ab3a 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/DataTableController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/DataTableController.java
@@ -3,8 +3,6 @@ package gov.anl.aps.dm.portal.controllers;
import gov.anl.aps.dm.portal.model.entities.CloneableEntity;
import java.io.Serializable;
import java.util.List;
-import java.util.Map;
-import javax.annotation.PostConstruct;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import org.apache.log4j.Logger;
@@ -20,19 +18,14 @@ public abstract class DataTableController<EntityType extends CloneableEntity> im
private DataModel listDataModel = null;
private DataTable listDataTable = null;
- private boolean listDataModelReset = true;
private List<EntityType> filteredObjectList = null;
private List<EntityType> selectedObjectList = null;
+ public abstract List<EntityType> findAll();
- public DataTableController() {
- }
+ public abstract String getTableName();
- @PostConstruct
- public void initialize() {
- }
-
- public abstract String getClassName();
+ public abstract String getEntityName();
public EntityType getCurrentObject() {
return currentObject;
@@ -53,17 +46,10 @@ public abstract class DataTableController<EntityType extends CloneableEntity> im
return listDataModel;
}
- public abstract List<EntityType> findAll();
-
- public String getTableName() {
- return "deafault";
- }
-
public void resetList() {
logger.debug("Resetting list"+" "+getTableName());
listDataModel = null;
listDataTable = null;
- listDataModelReset = true;
filteredObjectList = null;
selectedObjectList = null;
currentObject = null;
@@ -81,19 +67,6 @@ public abstract class DataTableController<EntityType extends CloneableEntity> im
this.listDataTable = listDataTable;
}
- public boolean isAnyListFilterSet() {
- if (listDataTable == null) {
- return false;
- }
- Map<String, Object> filterMap = listDataTable.getFilters();
- for (Object filter : filterMap.values()) {
- if ((String)filter != null && !((String)filter).isEmpty()) {
- return true;
- }
- }
- return false;
- }
-
public List<EntityType> getFilteredObjectList() {
return filteredObjectList;
}
@@ -114,14 +87,6 @@ public abstract class DataTableController<EntityType extends CloneableEntity> im
filteredObjectList = null;
}
- public boolean isListDataModelReset() {
- if (listDataModelReset) {
- listDataModelReset = false;
- return true;
- }
- return false;
- }
-
public List<EntityType> getSelectedObjectList() {
return selectedObjectList;
}
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java
index 873bebb9..41ab4c54 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java
@@ -158,7 +158,7 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
class ExperimentUsersTable extends DataTableController<ExperimentUser> {
@Override
- public String getClassName() {
+ public String getEntityName() {
return "ExperimentUser";
}
@@ -198,7 +198,7 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
class NoExperimentUsersTypeTable extends DataTableController<UserInfo> {
@Override
- public String getClassName() {
+ public String getEntityName() {
return "UserInfo";
}
@@ -224,7 +224,7 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
}
@Override
- public String getClassName() {
+ public String getEntityName() {
return "ExperimentPolicy";
}
@@ -322,7 +322,7 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
}
@Override
- public String getClassName() {
+ public String getEntityName() {
return "PolicyPropertyValue";
}
@@ -335,6 +335,11 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
}
return missingProperties;
}
+
+ @Override
+ public String getTableName() {
+ return "noPolicyValueTable";
+ }
}
private final int rows = 25;
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/PolicyPropertyController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/PolicyPropertyController.java
index 5712fe97..acfc7716 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/PolicyPropertyController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/PolicyPropertyController.java
@@ -44,7 +44,7 @@ public class PolicyPropertyController extends CrudEntityController<PolicyPropert
class PolicyPropertyInfoTable extends DataTableController<PolicyProperty> {
@Override
- public String getClassName() {
+ public String getEntityName() {
return "PolicyProperty";
}
@@ -52,6 +52,11 @@ public class PolicyPropertyController extends CrudEntityController<PolicyPropert
public List<PolicyProperty> findAll() {
return policyPropertyFacade.findByPolicyTypeId(policyType.getId());
}
+
+ @Override
+ public String getTableName() {
+ return "policyPropertyInfoTable";
+ }
}
private PolicyPropertyInfoTable policyPropertyInfoTable = new PolicyPropertyInfoTable();
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserInfoController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserInfoController.java
index cd52d501..703cb02e 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserInfoController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserInfoController.java
@@ -110,7 +110,7 @@ public class UserInfoController extends CrudEntityController<UserInfo, UserInfoF
class UserExperimentsTable extends DataTableController<ExperimentUser> {
@Override
- public String getClassName() {
+ public String getEntityName() {
return "UserExperiments";
}
diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserSystemRoleController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserSystemRoleController.java
index 04baac2e..0a331fc2 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserSystemRoleController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserSystemRoleController.java
@@ -33,7 +33,7 @@ public class UserSystemRoleController implements Serializable
class SystemRoleTypeTable extends DataTableController<UserInfo> {
@Override
- public String getClassName() {
+ public String getEntityName() {
return "UserInfo";
}
@@ -41,12 +41,17 @@ public class UserSystemRoleController implements Serializable
public List<UserInfo> findAll() {
return userInfoFacade.findSystemRoleUsers(systemRole.getId());
}
+
+ @Override
+ public String getTableName() {
+ return "systemRoleTable";
+ }
}
class NoSystemRoleTypeTable extends DataTableController<UserInfo> {
@Override
- public String getClassName() {
+ public String getEntityName() {
return "UserInfo";
}
@@ -54,6 +59,11 @@ public class UserSystemRoleController implements Serializable
public List<UserInfo> findAll() {
return userInfoFacade.findNoSystemRoleUsers(systemRole.getId());
}
+
+ @Override
+ public String getTableName() {
+ return "noSystemRoleTable";
+ }
}
--
GitLab