org.geoserver.gwc.web.blob Compiling

geoserver · Jan 18, 2016 · eef93f8 · eef93f8
1 parent f08bfa1
commit eef93f8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/blob/BlobStorePage.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/blob/BlobStorePage.java
@@ -44,7 +44,10 @@
  */
 public class BlobStorePage extends GeoServerSecuredPage {
 
-    private DropDownChoice<BlobStoreType> typeOfBlobStore;
+	private static final long serialVersionUID = -59024268194792891L;
+
+	@SuppressWarnings("rawtypes")
+	private DropDownChoice<BlobStoreType> typeOfBlobStore;
 
     private WebMarkupContainer blobConfigContainer;
 
@@ -60,7 +63,8 @@ public BlobStorePage() {
         this(null);
     }
 
-    public BlobStorePage(final BlobStoreConfig originalStore) {
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+	public BlobStorePage(final BlobStoreConfig originalStore) {
 
         final List<String> assignedLayers = new ArrayList<String>();
 
@@ -74,7 +78,7 @@ public BlobStorePage(final BlobStoreConfig originalStore) {
         typeOfBlobStore.add(new AjaxFormComponentUpdatingBehavior("onchange") {
             private static final long serialVersionUID = 359589121400814043L;
 
-            @Override
+			@Override
             protected void onUpdate(AjaxRequestTarget target) {
                 blobStoreForm.setVisible(typeOfBlobStore.getModelObject() != null);
                 if (typeOfBlobStore.getModelObject() != null) {
@@ -91,7 +95,7 @@ protected void onUpdate(AjaxRequestTarget target) {
         typeOfBlobStore.add(new AttributeModifier("title", new ResourceModel(
                 "typeOfBlobStore.title")));
 
-        Form selector = new Form("selector");
+        Form<BlobStoreType<?>> selector = new Form<BlobStoreType<?>>("selector");
         selector.add(typeOfBlobStore);
         add(selector);
 
@@ -101,7 +105,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 
         blobStoreForm = new Form<BlobStoreConfig>("blobStoreForm",
                 new CompoundPropertyModel<BlobStoreConfig>(originalStore == null ? null
-                        : originalStore.clone()));
+                        : (BlobStoreConfig) originalStore.clone()));
         blobConfigContainer.add(blobStoreForm);
         blobStoreForm.setVisible(originalStore != null);
 

diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/blob/BlobStoreTypes.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/blob/BlobStoreTypes.java
@@ -26,21 +26,21 @@ private BlobStoreTypes() {}
     /**
      * Lazy loaded map of blob store types
      */
-    private static Map<Class<? extends BlobStoreConfig>, BlobStoreType> TYPES;
+    private static Map<Class<? extends BlobStoreConfig>, BlobStoreType<?>> TYPES;
 
 
-    private static Map<Class<? extends BlobStoreConfig>, BlobStoreType> getTypes() {
+    private static Map<Class<? extends BlobStoreConfig>, BlobStoreType<?>> getTypes() {
         if (TYPES == null) {
             //the treemap with comparator makes sure that the types are always displayed in the
             //same order, alphabetically sorted on name
-            TYPES = new TreeMap<Class<? extends BlobStoreConfig>, BlobStoreType>(
+            TYPES = new TreeMap<Class<? extends BlobStoreConfig>, BlobStoreType<?>>(
-                    new Comparator<Class>() {
+                    new Comparator<Class<?>>() {
                         @Override
-                        public int compare(Class o1, Class o2) {
+                        public int compare(Class<?> o1, Class<?> o2) {
                             return o1.toString().compareTo(o2.toString());
                         }
                     });
-            for (BlobStoreType type : GeoWebCacheExtensions.extensions(BlobStoreType.class)) {
+            for (BlobStoreType<?> type : GeoWebCacheExtensions.extensions(BlobStoreType.class)) {
                 TYPES.put(type.getConfigClass(), type);
             }
         }
@@ -54,7 +54,7 @@ public int compare(Class o1, Class o2) {
      * @param clazz 
      * @return
      */
-    public static BlobStoreType getFromClass(Class<? extends BlobStoreConfig> clazz) {
+    public static BlobStoreType<?> getFromClass(Class<? extends BlobStoreConfig> clazz) {
         return getTypes().get(clazz);
     }
 
@@ -63,8 +63,8 @@ public static BlobStoreType getFromClass(Class<? extends BlobStoreConfig> clazz)
      * 
      * @return
      */
-    public static List<BlobStoreType> getAll() {
+    public static List<BlobStoreType<?>> getAll() {
-        return new ArrayList<BlobStoreType>(getTypes().values());
+        return new ArrayList<BlobStoreType<?>>(getTypes().values());
     }
 
 }
diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/blob/BlobStoresPage.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/blob/BlobStoresPage.java
@@ -40,7 +40,9 @@
  */
 public class BlobStoresPage extends GeoServerSecuredPage {
 
-    private AjaxLink<Object> remove;
+	private static final long serialVersionUID = 6076989713813458347L;
+
+	private AjaxLink<Object> remove;
 
     private GeoServerTablePanel<BlobStoreConfig> blobStoresPanel;
 
@@ -157,11 +159,11 @@ public void onClose(AjaxRequestTarget target) {
             private static final long serialVersionUID = -5380703588873422601L;
 
             @Override
-            protected Component getComponentForProperty(String id, IModel itemModel,
+            protected Component getComponentForProperty(String id, IModel<BlobStoreConfig> itemModel,
                     Property<BlobStoreConfig> property) {
                 final BlobStoreConfig blobStore = (BlobStoreConfig) itemModel.getObject();
                 if (property == BlobStoresProvider.ID) {
-                    return new SimpleAjaxLink(id, itemModel, property.getModel(itemModel)) {
+                    return new SimpleAjaxLink<BlobStoreConfig>(id, itemModel, property.getModel(itemModel)) {
                         private static final long serialVersionUID = 1L;
 
                         @Override

diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/blob/BlobStoresProvider.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/blob/BlobStoresProvider.java
@@ -40,7 +40,7 @@ protected List<org.geoserver.web.wicket.GeoServerDataProvider.Property<BlobStore
     }
 
     @Override
-    protected Comparator<BlobStoreConfig> getComparator(final SortParam sort) {
+    protected Comparator<BlobStoreConfig> getComparator(final SortParam<?> sort) {
         if (sort != null && sort.getProperty().equals(TYPE.getName())) {
 
             return new Comparator<BlobStoreConfig>() {