Fix netcdf-out layer panel

src/extension/netcdf-out/src/main/java/org/geoserver/web/netcdf/layer/NetCDFOutEditTabPanelInfo.java

@@ -9,7 +9,7 @@
 import org.geoserver.catalog.CoverageInfo;
 import org.geoserver.catalog.LayerInfo;
 import org.geoserver.catalog.MetadataMap;
-import org.geoserver.catalog.ResourceInfo;
+import org.geoserver.catalog.PublishedInfo;
 import org.geoserver.config.GeoServer;
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.web.netcdf.NetCDFSettingsContainer;
@@ -23,35 +23,35 @@ public class NetCDFOutEditTabPanelInfo extends LayerEditTabPanelInfo {
 
     /** serialVersionUID */
     private static final long serialVersionUID = 1L;
+
+    public boolean supports(PublishedInfo pi) {
+        return super.supports(pi) && ((LayerInfo) pi).getResource() instanceof CoverageInfo;
+    }
 
-    public IModel<ResourceInfo> createOwnModel(IModel<? extends ResourceInfo> resourceModel,
-            IModel<LayerInfo> layerModel, boolean isNew) {
-        // Check if the input model is an instance of CoverageInfo model
-        if (resourceModel.getObject() instanceof CoverageInfo) {
-            // If so return the ResourceInfo object
-            ResourceInfo info = resourceModel.getObject();
-            // Check if the MetadataMap already contains the NetCDF Settings
-            MetadataMap map = info.getMetadata();
-            NetCDFLayerSettingsContainer container = map.get(NetCDFSettingsContainer.NETCDFOUT_KEY,
-                    NetCDFLayerSettingsContainer.class);
-            // If not present, add it to the map
-            if (isNew || container == null) {
-                //container = new NetCDFLayerSettingsContainer();
-                // Getting NetCDF Settings from the Global ones
-                GeoServer gs = GeoServerExtensions.bean(GeoServer.class);
-                MetadataMap globalMap = gs.getGlobal().getSettings().getMetadata();
-                NetCDFSettingsContainer globalContainer = globalMap.get(NetCDFSettingsContainer.NETCDFOUT_KEY,
+    @Override
+    public IModel<CoverageInfo> createOwnModel(IModel<? extends LayerInfo> layerModel, boolean isNew) {        
+        CoverageInfo info = (CoverageInfo) layerModel.getObject().getResource();
+        // Check if the MetadataMap already contains the NetCDF Settings
+        MetadataMap map = info.getMetadata();
+        NetCDFLayerSettingsContainer container = map.get(NetCDFSettingsContainer.NETCDFOUT_KEY,
+                NetCDFLayerSettingsContainer.class);
+        // If not present, add it to the map
+        if (isNew || container == null) {
+            // container = new NetCDFLayerSettingsContainer();
+            // Getting NetCDF Settings from the Global ones
+            GeoServer gs = GeoServerExtensions.bean(GeoServer.class);
+            MetadataMap globalMap = gs.getGlobal().getSettings().getMetadata();
+            NetCDFSettingsContainer globalContainer = globalMap.get(
+                    NetCDFSettingsContainer.NETCDFOUT_KEY,
                     NetCDFSettingsContainer.class);
-                // If not present, create a new container
-                if(globalContainer == null){
-                    globalContainer = new NetCDFSettingsContainer();
-                }
-                container = new NetCDFLayerSettingsContainer(globalContainer);
-                map.put(NetCDFSettingsContainer.NETCDFOUT_KEY, container);
+            // If not present, create a new container
+            if (globalContainer == null) {
+                globalContainer = new NetCDFSettingsContainer();
             }
-            return (IModel<ResourceInfo>) resourceModel;
+            container = new NetCDFLayerSettingsContainer(globalContainer);
+            map.put(NetCDFSettingsContainer.NETCDFOUT_KEY, container);
         }
-        // Otherwise return an empty model
-        return new Model<ResourceInfo>();
+
+        return new Model<>(info);
     }
 }

src/extension/netcdf-out/src/main/java/org/geoserver/web/netcdf/layer/NetCDFOutTabPanel.java

@@ -4,15 +4,12 @@
  */
 package org.geoserver.web.netcdf.layer;
 
-import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.ResourceModel;
 import org.geoserver.catalog.CoverageInfo;
 import org.geoserver.catalog.LayerInfo;
 import org.geoserver.catalog.MetadataMap;
-import org.geoserver.catalog.ResourceInfo;
 import org.geoserver.web.netcdf.NetCDFSettingsContainer;
 import org.geoserver.web.publish.PublishedEditTabPanel;
 import org.geoserver.web.util.MetadataMapModel;
@@ -25,30 +22,25 @@ public class NetCDFOutTabPanel extends PublishedEditTabPanel<LayerInfo> {
     /** serialVersionUID */
     private static final long serialVersionUID = 1L;
 
-    public NetCDFOutTabPanel(String id, IModel<LayerInfo> model, IModel<ResourceInfo> resourceModel) {
+    public NetCDFOutTabPanel(String id, IModel<LayerInfo> model, IModel<CoverageInfo> resourceModel) {
         super(id, model);
 
-        if (resourceModel.getObject() != null) {
-            // Selection of the IModel associated to the metadata map
-            final PropertyModel<MetadataMap> metadata = new PropertyModel<MetadataMap>(
+        // Selection of the IModel associated to the metadata map
+        final PropertyModel<MetadataMap> metadata = new PropertyModel<MetadataMap>(
                     resourceModel, "metadata");
-            // Selection of the CoverageInfo model
-            IModel<CoverageInfo> cmodel = null;
-            if (resourceModel.getObject() instanceof CoverageInfo) {
-                CoverageInfo cinfo = (CoverageInfo) resourceModel.getObject();
-                cmodel = new Model<CoverageInfo>(cinfo);
-            }
+        // Selection of the CoverageInfo model
+        IModel<CoverageInfo> cmodel = null;
+        if (resourceModel.getObject() instanceof CoverageInfo) {
+            CoverageInfo cinfo = (CoverageInfo) resourceModel.getObject();
+            cmodel = new Model<CoverageInfo>(cinfo);
+        }
 
-            // Getting the NetcdfSettingsContainer model from MetadataMap
-            IModel<NetCDFLayerSettingsContainer> netcdfModel = new MetadataMapModel(metadata,
+        // Getting the NetcdfSettingsContainer model from MetadataMap
+        IModel<NetCDFLayerSettingsContainer> netcdfModel = new MetadataMapModel<NetCDFLayerSettingsContainer>(metadata,
                     NetCDFSettingsContainer.NETCDFOUT_KEY, NetCDFLayerSettingsContainer.class);
-            NetCDFOutSettingsEditor editor = new NetCDFOutSettingsEditor("netcdfeditor",
+        NetCDFOutSettingsEditor editor = new NetCDFOutSettingsEditor("netcdfeditor",    
                     netcdfModel, cmodel);
-            add(editor);
-            setVisible(true);
-        } else {
-            add(new Label("netcdfeditor", new ResourceModel("NetCDFOutTabPanel.invalid")));
-            setVisible(false);
-        }
+        add(editor);
+
     }
 }

src/extension/netcdf-out/src/test/java/org/geoserver/web/netcdf/layer/NetCDFOutTabPanelTest.java

@@ -13,6 +13,7 @@
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.util.tester.FormTester;
+import org.geoserver.catalog.CoverageInfo;
 import org.geoserver.catalog.LayerInfo;
 import org.geoserver.catalog.MetadataMap;
 import org.geoserver.catalog.ResourceInfo;
@@ -35,7 +36,7 @@ public class NetCDFOutTabPanelTest extends GeoServerWicketTestSupport {
     private Model<LayerInfo> layerModel;
 
     /** CoverageInfo model */
-    private Model<ResourceInfo> resourceModel;
+    private Model<CoverageInfo> resourceModel;
 
     @Override
     protected void setUpTestData(SystemTestData testData) throws Exception {
@@ -49,7 +50,7 @@ public void setUpInternal() throws Exception {
         LayerInfo layerInfo = getCatalog().getLayerByName(getLayerId(MockData.TASMANIA_DEM));
         layerModel = new Model<LayerInfo>(layerInfo);
         ResourceInfo resource = layerInfo.getResource();
-        resourceModel = new Model<ResourceInfo>(resource);
+        resourceModel = new Model<CoverageInfo>((CoverageInfo) resource);
         // Add Element to MetadataMap
         MetadataMap metadata = resource.getMetadata();
         if (!metadata.containsKey(NetCDFSettingsContainer.NETCDFOUT_KEY)) {