inspire fixes

geoserver · Jan 18, 2016 · 71c14c9 · 71c14c9
1 parent 6090434
commit 71c14c9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/extension/inspire/src/main/java/org/geoserver/inspire/web/InspireAdminPanel.java b/src/extension/inspire/src/main/java/org/geoserver/inspire/web/InspireAdminPanel.java
@@ -21,6 +21,7 @@
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.markup.html.form.TextField;
@@ -31,11 +32,11 @@
 import org.geoserver.catalog.MetadataMap;
 import org.geoserver.config.ServiceInfo;
 import org.geoserver.inspire.UniqueResourceIdentifiers;
+import org.geoserver.wcs.WCSInfo;
 import org.geoserver.web.services.AdminPagePanel;
 import org.geoserver.web.util.MapModel;
 import org.geoserver.web.util.MetadataMapModel;
 import org.geoserver.wfs.WFSInfo;
-import org.geoserver.wcs.WCSInfo;
 
 /**
  * Panel for the service admin page to set the service INSPIRE extension
@@ -118,7 +119,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 
         IModel<String> urlTypeModel = new MapModel(metadata, SERVICE_METADATA_TYPE.key);
 
-        IChoiceRenderer<String> urlTypeChoiceRenderer = new IChoiceRenderer<String>() {
+        IChoiceRenderer<String> urlTypeChoiceRenderer = new ChoiceRenderer<String>() {
             private static final long serialVersionUID = 1L;
 
             @Override

diff --git a/...sion/inspire/src/main/java/org/geoserver/inspire/web/UniqueResourceIdentifiersEditor.java b/...sion/inspire/src/main/java/org/geoserver/inspire/web/UniqueResourceIdentifiersEditor.java
@@ -66,7 +66,8 @@ public UniqueResourceIdentifiersEditor(String id,
                 new UniqueResourceIdentifiersProvider(identifiersModel), false) {
 
             @Override
-            protected Component getComponentForProperty(String id, final IModel itemModel,
+            protected Component getComponentForProperty(String id,
+                    IModel<UniqueResourceIdentifier> itemModel,
                     Property<UniqueResourceIdentifier> property) {
                 String name = property.getName();
                 if ("code".equals(name)) {
@@ -129,7 +130,7 @@ protected void onClick(AjaxRequestTarget target, Form form) {
         identifiers.setSortable(false);
         identifiers.setFilterable(false);
         container.add(identifiers);
-
+        
         // add new link button
         button = new AjaxButton("addIdentifier") {
 
@@ -144,7 +145,7 @@ protected void onSubmit(AjaxRequestTarget target, Form form) {
             @Override
             protected void onError(AjaxRequestTarget target, Form<?> form) {
                 // the form validator triggered, but we don't want the msg to display
-                Session.get().cleanupFeedbackMessages();
+                Session.get().getFeedbackMessages().clear(); // formally cleanupFeedbackMessages()
                 Session.get().dirty();
                 onSubmit(target, form);
             }

diff --git a/src/extension/inspire/src/test/java/org/geoserver/inspire/web/InspirePanelTest.java b/src/extension/inspire/src/test/java/org/geoserver/inspire/web/InspirePanelTest.java
@@ -486,7 +486,8 @@ public void testSubmitWithoutRequiredWMS() {
 
         List<Serializable> messages = tester.getMessages(FeedbackMessage.ERROR);
         assertEquals(1, messages.size());
-        assertTrue(((ValidationErrorFeedback) messages.get(0)).getMessage().contains("Service Metadata URL"));
+        String message = (String) ((ValidationErrorFeedback) messages.get(0)).getMessage();
+        assertTrue(message.contains("Service Metadata URL"));
 
     }
 

diff --git a/.../inspire/src/test/java/org/geoserver/inspire/web/UniqueResourceIdentifiersEditorTest.java b/.../inspire/src/test/java/org/geoserver/inspire/web/UniqueResourceIdentifiersEditorTest.java
@@ -95,7 +95,8 @@ public void testAddIdentifiers() {
         ft.submit();
         List<Serializable> messages = tester.getMessages(FeedbackMessage.ERROR);
         assertEquals(1, messages.size());
-        assertTrue(((ValidationErrorFeedback) messages.get(0)).getMessage().contains("Code"));
+        String message = (String) ((ValidationErrorFeedback) messages.get(0)).getMessage();
+        assertTrue(message.contains("Code"));
 
         // print(tester.getLastRenderedPage(), true, true);