Fix compiler errors/warnings in o.g.w.d.l.AttributeEditPage and Attri…

…buteDescription

src/web/core/src/main/java/org/geoserver/web/data/layer/AttributeDescription.java

@@ -28,7 +28,7 @@
 @SuppressWarnings("serial")
 class AttributeDescription implements Serializable {
 
-    static final List BINDINGS = Arrays.asList(String.class, Boolean.class, Integer.class,
+    static final List<Class<?>> BINDINGS = Arrays.asList(String.class, Boolean.class, Integer.class,
             Long.class, Float.class, Double.class, Date.class, Time.class, Timestamp.class,
             Geometry.class, Point.class, LineString.class, Polygon.class, MultiPoint.class,
             MultiLineString.class, MultiPolygon.class, GeometryCollection.class);
@@ -45,7 +45,7 @@ class AttributeDescription implements Serializable {
 
     String name;
 
-    Class binding = String.class;
+    Class<?> binding = String.class;
 
     boolean nullable = true;
 
@@ -59,7 +59,7 @@ class AttributeDescription implements Serializable {
      * @param binding
      * @return
      */
-    static String getLocalizedName(Class binding) {
+    static String getLocalizedName(Class<?> binding) {
         if (binding == null) {
             return "-";
         } else if (BINDINGS.contains(binding)) {
@@ -78,11 +78,11 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public Class getBinding() {
+    public Class<?> getBinding() {
         return binding;
     }
 
-    public void setBinding(Class binding) {
+    public void setBinding(Class<?> binding) {
         this.binding = binding;
     }
 

src/web/core/src/main/java/org/geoserver/web/data/layer/AttributeEditPage.java

@@ -38,11 +38,11 @@ public class AttributeEditPage extends GeoServerSecuredPage {
 
     boolean newAttribute;
 
-    private TextField nameField;
+    private TextField<String> nameField;
 
     String size;
 
-    private TextField sizeField;
+    private TextField<String> sizeField;
 
     private CRSPanel crsField;
 
@@ -58,12 +58,12 @@ public AttributeEditPage(final AttributeDescription attribute,
         this.attribute = attribute;
         this.size = String.valueOf(attribute.getSize());
 
-        final Form form = new Form("form", new CompoundPropertyModel(attribute));
+        final Form<AttributeDescription> form = new Form<>("form", new CompoundPropertyModel<>(attribute));
         form.setOutputMarkupId(true);
         add(form);
 
-        form.add(nameField = new TextField("name"));
-        DropDownChoice binding = new DropDownChoice("binding", AttributeDescription.BINDINGS,
+        form.add(nameField = new TextField<>("name"));
+        DropDownChoice<Class<?>> binding = new DropDownChoice<>("binding", AttributeDescription.BINDINGS,
                 new BindingChoiceRenderer());
         binding.add(new AjaxFormSubmitBehavior("onchange") {
 
@@ -92,7 +92,7 @@ protected void onSubmit(AjaxRequestTarget target) {
         sizeContainer = new WebMarkupContainer("sizeContainer");
         sizeContainer.setOutputMarkupId(true);
         form.add(sizeContainer);
-        sizeContainer.add(sizeField = new TextField("size", new PropertyModel(this, "size")));
+        sizeContainer.add(sizeField = new TextField<>("size", new PropertyModel<>(this, "size")));
         sizeContainer.setVisible(String.class.equals(attribute.getBinding()));
 
         crsContainer = new WebMarkupContainer("crsContainer");
@@ -116,7 +116,7 @@ public void onSubmit() {
         };
         form.setDefaultButton(submit);
         form.add(submit);
-        form.add(new Link("cancel") {
+        form.add(new Link<Void>("cancel") {
 
             @Override
             public void onClick() {
@@ -157,14 +157,14 @@ protected boolean validate() {
         return valid;
     }
 
-    static class BindingChoiceRenderer extends ChoiceRenderer {
+    static class BindingChoiceRenderer extends ChoiceRenderer<Class<?>> {
 
-        public Object getDisplayValue(Object object) {
-            return AttributeDescription.getLocalizedName((Class) object);
+        public Object getDisplayValue(Class<?> object) {
+            return AttributeDescription.getLocalizedName((Class<?>) object);
         }
 
-        public String getIdValue(Object object, int index) {
-            return ((Class) object).getName();
+        public String getIdValue(Class<?> object, int index) {
+            return object.getName();
         }
 
     }