GEOS-8216 Fix MenuPageInfo Generics

geoserver · Jul 8, 2017 · e2d905b · e2d905b
1 parent 4f5a5ec
commit e2d905b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/web/core/src/main/java/org/geoserver/web/MenuPageInfo.java b/src/web/core/src/main/java/org/geoserver/web/MenuPageInfo.java
@@ -22,7 +22,7 @@
  * @author David Winslow <dwinslow@opengeo.org>
  */
 @SuppressWarnings("serial")
-public class MenuPageInfo extends ComponentInfo<GeoServerBasePage> implements Comparable<MenuPageInfo> {
+public class MenuPageInfo<T extends GeoServerBasePage> extends ComponentInfo<T> implements Comparable<MenuPageInfo<T>> {
     Category category;
     int order;
     String icon;
@@ -62,7 +62,7 @@ public int getOrder(){
         return order;
     }
 
-    public int compareTo(MenuPageInfo other){
+    public int compareTo(MenuPageInfo<T> other){
         return getOrder() - other.getOrder();
     }
 }
diff --git a/src/web/core/src/main/java/org/geoserver/web/data/workspace/WorkspaceEditPage.java b/src/web/core/src/main/java/org/geoserver/web/data/workspace/WorkspaceEditPage.java
@@ -362,7 +362,7 @@ static class Service implements Serializable {
         Boolean enabled;
 
         /** the admin page for the service */ 
-        ServiceMenuPageInfo adminPage;
+        ServiceMenuPageInfo<?> adminPage;
 
         /** created service, not yet added to configuration */
         IModel<ServiceInfo> model;

diff --git a/src/web/core/src/main/java/org/geoserver/web/services/ServiceMenuPageInfo.java b/src/web/core/src/main/java/org/geoserver/web/services/ServiceMenuPageInfo.java
@@ -6,6 +6,7 @@
 package org.geoserver.web.services;
 
 import org.geoserver.config.ServiceInfo;
+import org.geoserver.web.GeoServerBasePage;
 import org.geoserver.web.MenuPageInfo;
 
 /**
@@ -14,7 +15,7 @@
  * @author David Winslow <dwinslow@opengeo.org>
  */
 @SuppressWarnings("serial")
-public class ServiceMenuPageInfo extends MenuPageInfo {
+public class ServiceMenuPageInfo<T extends GeoServerBasePage> extends MenuPageInfo<T> {
 
     Class<? extends ServiceInfo> serviceClass;