Some more generic fixes

geoserver · Jan 21, 2016 · 41e7ef0 · 41e7ef0
1 parent 64c2339
commit 41e7ef0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 30 deletions.
diff --git a/...gregate/src/main/java/org/geoserver/web/data/store/aggregate/AggregateStoreEditPanel.java b/...gregate/src/main/java/org/geoserver/web/data/store/aggregate/AggregateStoreEditPanel.java
@@ -57,13 +57,13 @@ public AggregateStoreEditPanel(final String componentId, final Form<?> storeEdit
         final IModel<?> model = storeEditForm.getModel();
         setDefaultModel(model);
 
-        final IModel<Map<String, Object>> paramsModel = new PropertyModel<Map<String, Object>>(model, "connectionParameters");
-        new MapModel<Object>(paramsModel, CONFIGURATION.key).setObject(null);
+        final IModel<Map<String, String>> paramsModel = new PropertyModel<Map<String, String>>(model, "connectionParameters");
+        new MapModel<String>(paramsModel, CONFIGURATION.key).setObject(null);
 
-        add(new TextParamPanel("parallelism", new MapModel<Object>(paramsModel, PARALLELISM.key),
+        add(new TextParamPanel("parallelism", new MapModel<String>(paramsModel, PARALLELISM.key),
                 new ParamResourceModel("parallelism", this), true));
 
-        add(new CheckBoxParamPanel("tolerateErrors", new MapModel<Object>(paramsModel,
+        add(new CheckBoxParamPanel("tolerateErrors", new MapModel<String>(paramsModel,
                 TOLERATE_CONNECTION_FAILURE.key), new ParamResourceModel("tolerateErrors", this)));
 
         configModel = new ConfigModel(new MapModel<String>(paramsModel, CONFIGURATION_XML.key));

diff --git a/src/community/geofence/src/main/java/org/geoserver/geofence/web/GeofencePage.java b/src/community/geofence/src/main/java/org/geoserver/geofence/web/GeofencePage.java
@@ -50,6 +50,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import org.geoserver.web.util.MapModel;
 
 /**
@@ -194,17 +195,14 @@ public void onSubmit() {
         updateStatsValues(cacheRuleReader);
 
         for (String key : statsValues.keySet()) {
-            Label label = new Label(key, new MapModel(statsValues, key));
+            Label label = new Label(key, new MapModel<String>(statsValues, key));
             label.setOutputMarkupId(true);
             form.add(label);
             statsLabels.add(label);
         }
 
         form.add(new AjaxSubmitLink("invalidate") {
 
-            /**
-			 * 
-			 */
 			private static final long serialVersionUID = 3847903240475052867L;
 
 			@Override

diff --git a/...rcsde/src/main/java/org/geoserver/web/data/store/arcsde/ArcSDECoverageStoreEditPanel.java b/...rcsde/src/main/java/org/geoserver/web/data/store/arcsde/ArcSDECoverageStoreEditPanel.java
@@ -94,7 +94,7 @@ public ArcSDECoverageStoreEditPanel(final String componentId, final Form<?> stor
             connectionParameters.putAll(existingParameters);
         }
 
-        final IModel<Map<String, Object>> paramsModel = new PropertyModel<Map<String, Object>>(model, "connectionParameters");
+        final IModel<Map<String, String>> paramsModel = new PropertyModel<Map<String, String>>(model, "connectionParameters");
 
         addConnectionPrototypePanel(storeInfo);
 
@@ -148,7 +148,7 @@ public void validate(final Form<?> form) {
         });
     }
 
-    private FormComponent<String> addRasterTable(final CoverageStoreInfo storeInfo, final IModel<Map<String, Object>> paramsModel) {
+    private FormComponent<String> addRasterTable(final CoverageStoreInfo storeInfo, final IModel<Map<String, String>> paramsModel) {
 
         //final String resourceKey = RESOURCE_KEY_PREFIX + "." + TABLE_NAME;
 
@@ -164,7 +164,7 @@ private FormComponent<String> addRasterTable(final CoverageStoreInfo storeInfo,
      * @return a combobox set up to display the list of available raster tables if the StoreInfo is
      *         new, or a non editable text box if we're editing an existing StoreInfo
      */
-    private FormComponent<String> addTableNameComponent(final IModel<Map<String, Object>> paramsModel, final boolean isNew) {
+    private FormComponent<String> addTableNameComponent(final IModel<Map<String, String>> paramsModel, final boolean isNew) {
 
         final FormComponent<String> tableNameComponent;
         final String panelId = "tableNamePanel";
@@ -204,12 +204,12 @@ private FormComponent<String> addTableNameComponent(final IModel<Map<String, Obj
         return tableNameComponent;
     }
 
-    private FormComponent<String> addPasswordPanel(final IModel<Map<String, Object>> paramsModel) {
+    private FormComponent<String> addPasswordPanel(final IModel<Map<String, String>> paramsModel) {
 
         final String paramName = PASSWORD_PARAM.key;
         final String resourceKey = RESOURCE_KEY_PREFIX + "." + paramName;
 
-        final PasswordParamPanel pwdPanel = new PasswordParamPanel(paramName, new MapModel<Object>(
+        final PasswordParamPanel pwdPanel = new PasswordParamPanel(paramName, new MapModel<String>(
                 paramsModel, paramName), new ResourceModel(resourceKey, paramName), true);
         add(pwdPanel);
 
@@ -223,7 +223,7 @@ private FormComponent<String> addPasswordPanel(final IModel<Map<String, Object>>
         return pwdPanel.getFormComponent();
     }
 
-    private FormComponent<String> addTextPanel(final IModel<Map<String, Object>> paramsModel, final Param param) {
+    private FormComponent<String> addTextPanel(final IModel<Map<String, String>> paramsModel, final Param param) {
 
         final String paramName = param.key;
         final String resourceKey = getClass().getSimpleName() + "." + paramName;

diff --git a/...n/arcsde/src/main/java/org/geoserver/web/data/store/arcsde/RasterTableSelectionPanel.java b/...n/arcsde/src/main/java/org/geoserver/web/data/store/arcsde/RasterTableSelectionPanel.java
@@ -75,7 +75,7 @@ public class RasterTableSelectionPanel extends Panel {
 
     private FormComponent<?> passwordComponent;
 
-    public RasterTableSelectionPanel(final String id, final IModel<Map<String, Object>> paramsModel,
+    public RasterTableSelectionPanel(final String id, final IModel<Map<String, String>> paramsModel,
             final Form<?> storeEditForm, FormComponent<?> server, FormComponent<?> port,
             FormComponent<?> instance, FormComponent<?> user, FormComponent<?> password) {
 

diff --git a/src/web/core/src/main/java/org/geoserver/web/util/MapModel.java b/src/web/core/src/main/java/org/geoserver/web/util/MapModel.java
@@ -21,24 +21,22 @@
  */
 public class MapModel<T> implements IModel<T>, IChainingModel<T> {
     private static final long serialVersionUID = 3122822158252376260L;
-    IModel<Map<String,Object>> model;
+    IModel<Map<String,T>> model;
     String expression;
 
-    public MapModel( Map<String,Object> map, String expression ) {
-        this(new MapWrappingModel(map), expression);
+    public MapModel( Map<String,T> map, String expression ) {
+        this(new MapWrappingModel<T>(map), expression);
     }
 
-    public MapModel(IModel<Map<String,Object>> model, String expression){
+    public MapModel(IModel<Map<String,T>> model, String expression){
         this.model = model;
         this.expression = expression;
     }
 
-    @SuppressWarnings("unchecked")
     public T getObject() {
-        return (T) model.getObject().get( expression );
+        return model.getObject().get(expression);
     }
 
-    @SuppressWarnings("unchecked")
     public void setObject(T val) {
         model.getObject().put(expression, val);
     }
@@ -47,23 +45,23 @@ public void detach() {
         model.detach();
     }
 
-    private static class MapWrappingModel implements IModel<Map<String,Object>>{
+    private static class MapWrappingModel<T> implements IModel<Map<String,T>>{
         /**
          * 
          */
         private static final long serialVersionUID = -1474150801738143281L;
 
-        private Map<String,Object> myMap;
+        private Map<String,T> myMap;
 
-        public MapWrappingModel(Map<String,Object> m){
+        public MapWrappingModel(Map<String,T> m){
             myMap = m;
         }
 
-        public Map<String, Object> getObject() {
+        public Map<String, T> getObject() {
             return myMap;
         }
 
-        public void setObject(Map<String,Object> arg0) {
+        public void setObject(Map<String,T> arg0) {
         }
 
         public void detach() {

diff --git a/...eb/security/ldap/src/main/java/org/geoserver/web/security/ldap/LDAPAuthProviderPanel.java b/...eb/security/ldap/src/main/java/org/geoserver/web/security/ldap/LDAPAuthProviderPanel.java
@@ -132,14 +132,14 @@ public void resetModel() {
         }
     }
 
-    class TestLDAPConnectionPanel extends FormComponentPanel<HashMap<String, Object>> {
+    class TestLDAPConnectionPanel extends FormComponentPanel<HashMap<String, String>> {
 
         private static final long serialVersionUID = 5433983389877706266L;
 
         public TestLDAPConnectionPanel(String id) {
-            super(id, new Model<HashMap<String, Object>>(new HashMap<String, Object>()));
+            super(id, new Model<HashMap<String, String>>(new HashMap<String, String>()));
 
-            add(new TextField<HashMap<String, Object>>("username", new MapModel<HashMap<String, Object>>(getModel().getObject(), "username")));
+            add(new TextField<String>("username", new MapModel<String>(getModel().getObject(), "username")));
             add(new PasswordTextField("password", new MapModel<String>(getModel().getObject(), "password")).setRequired(false));
             add(new AjaxSubmitLink("test") {