Mass migrate ResourceReference to PackageResourceReference

geoserver · Dec 29, 2015 · d3ef331 · d3ef331
1 parent 2baebcf
commit d3ef331
Show file tree

Hide file tree

Showing 35 changed files with 180 additions and 180 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
@@ -1,11 +1,14 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2015 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
 package org.geoserver.web.data.store.aggregate;
 
-import static org.geotools.data.aggregate.AggregatingDataStoreFactory.*;
+import static org.geotools.data.aggregate.AggregatingDataStoreFactory.CONFIGURATION;
+import static org.geotools.data.aggregate.AggregatingDataStoreFactory.CONFIGURATION_XML;
+import static org.geotools.data.aggregate.AggregatingDataStoreFactory.PARALLELISM;
+import static org.geotools.data.aggregate.AggregatingDataStoreFactory.TOLERATE_CONNECTION_FAILURE;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -15,15 +18,13 @@
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
-import org.apache.wicket.ResourceReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.IAjaxCallDecorator;
-import org.apache.wicket.ajax.calldecorator.AjaxPreprocessingCallDecorator;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.geoserver.web.GeoServerApplication;
 import org.geoserver.web.data.store.StoreEditPanel;
 import org.geoserver.web.data.store.panel.CheckBoxParamPanel;
@@ -121,7 +122,7 @@ protected void onClick(AjaxRequestTarget target) {
 
     Component removeLink(String id, IModel itemModel) {
         final AggregateTypeConfiguration entry = (AggregateTypeConfiguration) itemModel.getObject();
-        ImageAjaxLink link = new ImageAjaxLink( id, new ResourceReference( GeoServerApplication.class, "img/icons/silk/delete.png") ) {
+        ImageAjaxLink link = new ImageAjaxLink( id, new PackageResourceReference( GeoServerApplication.class, "img/icons/silk/delete.png") ) {
             @Override
             protected void onClick(AjaxRequestTarget target) {
 

diff --git a/...ity/geofence-server/src/main/java/org/geoserver/geofence/web/GeofenceServerAdminPage.java b/...ity/geofence-server/src/main/java/org/geoserver/geofence/web/GeofenceServerAdminPage.java
@@ -6,7 +6,7 @@
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.ComponentTag;
@@ -100,7 +100,7 @@ public ButtonPanel(String id, final ShortAdminRule rule) {
             super(id);
             this.setOutputMarkupId(true);
 
-            upLink = new ImageAjaxLink("up", new ResourceReference(getClass(), "img/arrow_up.png")) {
+            upLink = new ImageAjaxLink("up", new PackageResourceReference(getClass(), "img/arrow_up.png")) {
                 private static final long serialVersionUID = -8179503447106596760L;
 
                 @Override
@@ -122,7 +122,7 @@ protected void onComponentTag(ComponentTag tag) {
             upLink.setOutputMarkupId(true);
             add(upLink);
 
-            downLink = new ImageAjaxLink("down", new ResourceReference(getClass(), "img/arrow_down.png")) {
+            downLink = new ImageAjaxLink("down", new PackageResourceReference(getClass(), "img/arrow_down.png")) {
                 private static final long serialVersionUID = 4640187752303674221L;
 
                 @Override
@@ -144,7 +144,7 @@ protected void onComponentTag(ComponentTag tag) {
             downLink.setOutputMarkupId(true);
             add(downLink);
 
-            ImageAjaxLink editLink = new ImageAjaxLink("edit", new ResourceReference(getClass(), "img/edit.png")) {
+            ImageAjaxLink editLink = new ImageAjaxLink("edit", new PackageResourceReference(getClass(), "img/edit.png")) {
                 private static final long serialVersionUID = 4640187752303674221L;
 
                 @Override

diff --git a/...ommunity/geofence-server/src/main/java/org/geoserver/geofence/web/GeofenceServerPage.java b/...ommunity/geofence-server/src/main/java/org/geoserver/geofence/web/GeofenceServerPage.java
@@ -6,7 +6,7 @@
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.markup.ComponentTag;
@@ -116,7 +116,7 @@ public ButtonPanel( String id, final ShortRule rule ) {
             super( id );
             this.setOutputMarkupId(true);
 
-            upLink = new ImageAjaxLink( "up", new ResourceReference( getClass(), "img/arrow_up.png") ) {                                                                                       
+            upLink = new ImageAjaxLink( "up", new PackageResourceReference( getClass(), "img/arrow_up.png") ) {                                                                                       
                 private static final long serialVersionUID = -8179503447106596760L;
 
                 @Override
@@ -138,7 +138,7 @@ protected void onComponentTag(ComponentTag tag) {
             upLink.setOutputMarkupId(true);
             add(upLink);            
 
-            downLink = new ImageAjaxLink( "down", new ResourceReference( getClass(), "img/arrow_down.png") ) {
+            downLink = new ImageAjaxLink( "down", new PackageResourceReference( getClass(), "img/arrow_down.png") ) {
                 private static final long serialVersionUID = 4640187752303674221L;
 
                 @Override
@@ -160,7 +160,7 @@ protected void onComponentTag(ComponentTag tag) {
             downLink.setOutputMarkupId(true);
             add(downLink);
 
-            ImageAjaxLink editLink = new ImageAjaxLink( "edit", new ResourceReference( getClass(), "img/edit.png") ) {
+            ImageAjaxLink editLink = new ImageAjaxLink( "edit", new PackageResourceReference( getClass(), "img/edit.png") ) {
                 private static final long serialVersionUID = 4640187752303674221L;
 
                 @Override

diff --git a/src/community/wms-eo/src/main/java/org/geoserver/wms/eo/web/EoLayerGroupEntryPanel.java b/src/community/wms-eo/src/main/java/org/geoserver/wms/eo/web/EoLayerGroupEntryPanel.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2015 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -11,7 +11,7 @@
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.markup.ComponentTag;
@@ -156,7 +156,7 @@ protected void handleStyle(StyleInfo style, AjaxRequestTarget target) {
 
     Component removeLink(String id, IModel itemModel) {
         final EoLayerGroupEntry entry = (EoLayerGroupEntry) itemModel.getObject();
-        ImageAjaxLink link = new ImageAjaxLink( id, new ResourceReference( LayerGroupEntryPanel.class, "../../img/icons/silk/delete.png") ) {
+        ImageAjaxLink link = new ImageAjaxLink( id, new PackageResourceReference( LayerGroupEntryPanel.class, "../../img/icons/silk/delete.png") ) {
             @Override
             protected void onClick(AjaxRequestTarget target) {
 
@@ -225,7 +225,7 @@ public PositionPanel( String id, final EoLayerGroupEntry entry ) {
             this.entry = entry;
             this.setOutputMarkupId(true);
 
-            upLink = new ImageAjaxLink( "up", new ResourceReference( LayerGroupEntryPanel.class, "../../img/icons/silk/arrow_up.png") ) {
+            upLink = new ImageAjaxLink( "up", new PackageResourceReference( LayerGroupEntryPanel.class, "../../img/icons/silk/arrow_up.png") ) {
                 @Override
                 protected void onClick(AjaxRequestTarget target) {
                     int index = items.indexOf( PositionPanel.this.entry );
@@ -250,7 +250,7 @@ protected void onComponentTag(ComponentTag tag) {
             upLink.setOutputMarkupId(true);
             add( upLink);            
 
-            downLink = new ImageAjaxLink( "down", new ResourceReference( LayerGroupEntryPanel.class, "../../img/icons/silk/arrow_down.png") ) {
+            downLink = new ImageAjaxLink( "down", new PackageResourceReference( LayerGroupEntryPanel.class, "../../img/icons/silk/arrow_down.png") ) {
                 @Override
                 protected void onClick(AjaxRequestTarget target) {
                     int index = items.indexOf( PositionPanel.this.entry );

diff --git a/src/extension/importer/web/src/main/java/org/geoserver/importer/web/DataIcon.java b/src/extension/importer/web/src/main/java/org/geoserver/importer/web/DataIcon.java
@@ -1,11 +1,11 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2015 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
 package org.geoserver.importer.web;
 
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.geoserver.web.GeoServerApplication;
 
 public enum DataIcon {
@@ -18,13 +18,13 @@ public enum DataIcon {
     DATABASE("img/icons/geosilk/database_vector.png"),
     POSTGIS("img/icons/geosilk/postgis.png");
 
-    ResourceReference icon;
+    PackageResourceReference icon;
 
     DataIcon(String iconPath) {
-        this.icon = new ResourceReference(GeoServerApplication.class, iconPath);
+        this.icon = new PackageResourceReference(GeoServerApplication.class, iconPath);
     }
 
-    public ResourceReference getIcon() {
+    public PackageResourceReference getIcon() {
         return icon;
     }
 }
diff --git a/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportDataPage.java b/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportDataPage.java
@@ -496,18 +496,18 @@ boolean isAvailable() {
             }
         };
 
-//        directory(new ResourceReference(GeoServerApplication.class, "img/icons/silk/folder.png"),
+//        directory(new PackageResourceReference(GeoServerApplication.class, "img/icons/silk/folder.png"),
 //                DirectoryPage.class, "org.geotools.data.shapefile.ShapefileDataStoreFactory"), // 
-//        postgis(new ResourceReference(GeoServerApplication.class,
+//        postgis(new PackageResourceReference(GeoServerApplication.class,
 //                "img/icons/geosilk/database_vector.png"), PostGISPage.class,
 //                "org.geotools.data.postgis.PostgisNGDataStoreFactory"), //
-//        oracle(new ResourceReference(GeoServerApplication.class,
+//        oracle(new PackageResourceReference(GeoServerApplication.class,
 //                "img/icons/geosilk/database_vector.png"), OraclePage.class,
 //                "org.geotools.data.oracle.OracleNGDataStoreFactory"), //
-//        sqlserver(new ResourceReference(GeoServerApplication.class,
+//        sqlserver(new PackageResourceReference(GeoServerApplication.class,
 //                "img/icons/geosilk/database_vector.png"), SQLServerPage.class,
 //                "org.geotools.data.sqlserver.SQLServerDataStoreFactory"), //
-//        arcsde(new ResourceReference(GeoServerApplication.class,
+//        arcsde(new PackageResourceReference(GeoServerApplication.class,
 //                "img/icons/geosilk/database_vector.png"), ArcSDEPage.class,
 //                "org.geotools.arcsde.ArcSDEDataStoreFactory");
 
@@ -529,7 +529,7 @@ IModel getHelpLink(Component component) {
             return new ParamResourceModel(this.name().toLowerCase() + "_helpLink", component);
         }
 
-        ResourceReference getIcon() {
+        PackageResourceReference getIcon() {
             return icon.getIcon();
         }
 

diff --git a/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportPage.java b/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportPage.java
@@ -324,7 +324,7 @@ public String getAjaxIndicatorMarkupId() {
         return null;
     }
 
-    static class DataIconModel extends LoadableDetachableModel<ResourceReference> {
+    static class DataIconModel extends LoadableDetachableModel<PackageResourceReference> {
 
         ImportData data;
 
@@ -333,7 +333,7 @@ public DataIconModel(ImportData data) {
         }
 
         @Override
-        protected ResourceReference load() {
+        protected PackageResourceReference load() {
             DataIcon icon = null;
             if (data instanceof FileData) {
                 FileData df = (FileData) data;

diff --git a/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportTaskTable.java b/src/extension/importer/web/src/main/java/org/geoserver/importer/web/ImportTaskTable.java
@@ -189,28 +189,28 @@ public IModel<?> getChainedModel() {
             return chained;
         }
     }
-    static class StatusIconModel extends StatusModel<ResourceReference> {
+    static class StatusIconModel extends StatusModel<PackageResourceReference> {
 
         StatusIconModel(IModel model) {
             super(model);
         }
 
-        public ResourceReference getObject() {
+        public PackageResourceReference getObject() {
             ImportTask.State state = (ImportTask.State) chained.getObject();
             switch(state) {
             case READY:
-                return new ResourceReference(GeoServerApplication.class, "img/icons/silk/bullet_go.png");
+                return new PackageResourceReference(GeoServerApplication.class, "img/icons/silk/bullet_go.png");
             case RUNNING:
-                return new ResourceReference(ImportTaskTable.class, "indicator.gif");
+                return new PackageResourceReference(ImportTaskTable.class, "indicator.gif");
             case COMPLETE:
-                return new ResourceReference(GeoServerApplication.class, "img/icons/silk/accept.png");
+                return new PackageResourceReference(GeoServerApplication.class, "img/icons/silk/accept.png");
             case NO_BOUNDS:
             case NO_CRS:
             case NO_FORMAT:
             case BAD_FORMAT:
-                return new ResourceReference(GeoServerApplication.class, "img/icons/silk/error.png");
+                return new PackageResourceReference(GeoServerApplication.class, "img/icons/silk/error.png");
             case ERROR:
-                return new ResourceReference(GeoServerApplication.class, "img/icons/silk/delete.png");
+                return new PackageResourceReference(GeoServerApplication.class, "img/icons/silk/delete.png");
             }
             return null;
         }

diff --git a/...xtension/monitor/core/src/main/java/org/geoserver/monitor/web/ActivityChartBasePanel.java b/...xtension/monitor/core/src/main/java/org/geoserver/monitor/web/ActivityChartBasePanel.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2015 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -14,7 +14,7 @@
 import java.util.Map;
 
 import org.apache.wicket.Resource;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;

diff --git a/src/extension/printing/src/main/java/org/geoserver/printing/PrintDemoPage.java b/src/extension/printing/src/main/java/org/geoserver/printing/PrintDemoPage.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2015 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -7,7 +7,7 @@
 
 import org.apache.wicket.markup.html.IHeaderContributor;
 import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
+import org.apache.wicket.markup.html.resources.JavascriptPackageResourceReference;
 
 import org.geoserver.web.GeoServerBasePage;
 
@@ -23,13 +23,13 @@ public void renderHead(IHeaderResponse response) {
     response.renderJavascriptReference("http://openlayers.org/api/2.8/OpenLayers.js");
 
     response.renderJavascriptReference(
-    	new JavascriptResourceReference(PrintDemoPage.class, "GeoExt.js")
+    	new JavascriptPackageResourceReference(PrintDemoPage.class, "GeoExt.js")
     );
     response.renderJavascriptReference(
-        new JavascriptResourceReference(PrintDemoPage.class, "GeoExtPrinting.js")
+        new JavascriptPackageResourceReference(PrintDemoPage.class, "GeoExtPrinting.js")
     );
     response.renderJavascriptReference(
-        new JavascriptResourceReference(PrintDemoPage.class, "Printing.js")
+        new JavascriptPackageResourceReference(PrintDemoPage.class, "Printing.js")
     );
   }
 }