IChoiceRenderer change to ChoiceRenderer.

geoserver · Jan 18, 2016 · 8794bc9 · 8794bc9
1 parent f84f659
commit 8794bc9
Show file tree

Hide file tree

Showing 30 changed files with 63 additions and 63 deletions.
diff --git a/src/web/core/src/main/java/org/geoserver/web/admin/CoverageAccessPage.java b/src/web/core/src/main/java/org/geoserver/web/admin/CoverageAccessPage.java
@@ -12,7 +12,7 @@
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.NumberTextField;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.form.validation.AbstractFormValidator;
@@ -140,7 +140,7 @@ public void onSubmit() {
      * Display and ID mapping adapter for QueueType.
      */
     // TODO: consider use of EnumChoiceRenderer<QueueType>
-    private class QueueTypeRenderer implements  IChoiceRenderer<QueueType> {
+    private class QueueTypeRenderer extends ChoiceRenderer<QueueType> {
         private static final long serialVersionUID = -702911785346928083L;
         public String getDisplayValue(QueueType type) {
             return new StringResourceModel(type.name(), CoverageAccessPage.this, null).getString();

diff --git a/src/web/core/src/main/java/org/geoserver/web/admin/GlobalSettingsPage.java b/src/web/core/src/main/java/org/geoserver/web/admin/GlobalSettingsPage.java
@@ -19,7 +19,7 @@
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.ListChoice;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -160,7 +160,7 @@ public boolean accept(Resource obj) {
                 new PropertyModel<String>(loggingInfoModel, "level"), logProfiles));
     }
 
-    class ResourceErrorHandlingRenderer implements IChoiceRenderer<ResourceErrorHandling> {
+    class ResourceErrorHandlingRenderer extends ChoiceRenderer<ResourceErrorHandling> {
         private static final long serialVersionUID = 4183327535180465575L;
 
         @Override

diff --git a/src/web/core/src/main/java/org/geoserver/web/admin/JAIEXTPanel.java b/src/web/core/src/main/java/org/geoserver/web/admin/JAIEXTPanel.java
@@ -30,7 +30,7 @@ public JAIEXTPanel(String id, IModel<JAIInfo> model) {
         Palette jaiextSelector = new Palette<String>("jaiextOps",
                 LiveCollectionModel.set(new PropertyModel(jaiextModel, "JAIOperations")),
                 LiveCollectionModel.set(new PropertyModel(jaiextModel, "JAIEXTOperations")),
-                new JAIChoiceRenderer(), 7, false) {
+                new JAChoiceRenderer(), 7, false) {
                     private static final long serialVersionUID = -4665147378650094510L;
 
             /**
@@ -53,7 +53,7 @@ public Component newAvailableHeader(final String componentId) {
     }
 
 
-    static class JAIChoiceRenderer extends ChoiceRenderer<String> {
+    static class JAChoiceRenderer extends ChoiceRenderer<String> {
         private static final long serialVersionUID = -1978519626641784908L;
 
         private static final String ALGEBRIC = "algebric";

diff --git a/src/web/core/src/main/java/org/geoserver/web/admin/JAIPage.java b/src/web/core/src/main/java/org/geoserver/web/admin/JAIPage.java
@@ -13,7 +13,7 @@
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
@@ -114,7 +114,7 @@ private void addPngEncoderEditor(Form form) {
         }
         // create the editor, eventually set a default value
         DropDownChoice<JAIInfo.PngEncoderType> editor = new DropDownChoice<JAIInfo.PngEncoderType>(
-                "pngEncoderType", encoders, new IChoiceRenderer<JAIInfo.PngEncoderType>() {
+                "pngEncoderType", encoders, new ChoiceRenderer<JAIInfo.PngEncoderType>() {
                     private static final long serialVersionUID = 1L;
 
                     @Override

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/AttributeEditPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/AttributeEditPage.java
@@ -11,7 +11,7 @@
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.SubmitLink;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
@@ -157,7 +157,7 @@ protected boolean validate() {
         return valid;
     }
 
-    static class BindingChoiceRenderer implements IChoiceRenderer {
+    static class BindingChoiceRenderer extends ChoiceRenderer {
 
         public Object getDisplayValue(Object object) {
             return AttributeDescription.getLocalizedName((Class) object);

diff --git a/...b/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryAbstractPage.java b/...b/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryAbstractPage.java
@@ -17,7 +17,7 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.SubmitLink;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
@@ -358,7 +358,7 @@ public enum ParameterMappingType {
         BLOCKED
     }
 
-    public class ParameterMappingTypeRenderer implements IChoiceRenderer<ParameterMappingType> {
+    public class ParameterMappingTypeRenderer extends ChoiceRenderer<ParameterMappingType> {
         @Override
         public Object getDisplayValue(ParameterMappingType object) {
             return new StringResourceModel("ParameterMappingType."+object.toString(), CascadedWFSStoredQueryAbstractPage.this, null).getString();

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryNewPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryNewPage.java
@@ -18,7 +18,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.LoadableDetachableModel;
@@ -157,7 +157,7 @@ protected List<StoredQuery> load() {
         }
     }
 
-    private class StoredQueryListRenderer implements IChoiceRenderer<StoredQuery> {
+    private class StoredQueryListRenderer extends ChoiceRenderer<StoredQuery> {
         @Override
         public Object getDisplayValue(StoredQuery object) {
             return object.getTitle();

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewAbstractPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewAbstractPage.java
@@ -17,7 +17,7 @@
 import javax.media.jai.ImageLayout;
 
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.SubmitLink;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
@@ -228,7 +228,7 @@ public void setSelectedCoverages(List<String> selectedCoverages) {
         this.selectedCoverages = selectedCoverages;
     }
 
-    private class CompositionTypeRenderer implements IChoiceRenderer {
+    private class CompositionTypeRenderer extends ChoiceRenderer {
 
         public CompositionTypeRenderer() {
         }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditor.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditor.java
@@ -18,7 +18,7 @@
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.ListMultipleChoice;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.IModel;
@@ -198,7 +198,7 @@ public void onSubmit(AjaxRequestTarget target, Form form) {
         return button;
     }
 
-    private class CompositionTypeRenderer implements IChoiceRenderer {
+    private class CompositionTypeRenderer extends ChoiceRenderer {
 
         public CompositionTypeRenderer() {
         }

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/layer/SQLViewAbstractPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/SQLViewAbstractPage.java
@@ -22,7 +22,7 @@
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.SubmitLink;
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.markup.html.form.TextField;
@@ -516,7 +516,7 @@ protected String getFirstErrorMessage(Throwable t) {
      * Displays the geometry type in the geom type drop down
      * @author Andrea Aime - OpenGeo
      */
-    static class GeometryTypeRenderer implements IChoiceRenderer {
+    static class GeometryTypeRenderer extends ChoiceRenderer {
 
         public Object getDisplayValue(Object object) {
             return ((Class) object).getSimpleName();

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/namespace/NamespaceChoiceRenderer.java b/src/web/core/src/main/java/org/geoserver/web/data/namespace/NamespaceChoiceRenderer.java
@@ -6,7 +6,7 @@
 package org.geoserver.web.data.namespace;
 
 import org.apache.wicket.markup.html.form.ChoiceRenderer;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.geoserver.catalog.NamespaceInfo;
 
 /**

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/resource/DimensionEditor.java b/src/web/core/src/main/java/org/geoserver/web/data/resource/DimensionEditor.java
@@ -24,7 +24,7 @@
 import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/store/StoreChoiceRenderer.java b/src/web/core/src/main/java/org/geoserver/web/data/store/StoreChoiceRenderer.java
@@ -5,14 +5,14 @@
  */
 package org.geoserver.web.data.store;
 
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.geoserver.catalog.StoreInfo;
 
 /**
  * Simple choice renderer for {@link StoreInfo}
  */
 @SuppressWarnings("serial")
-public class StoreChoiceRenderer implements IChoiceRenderer {
+public class StoreChoiceRenderer extends ChoiceRenderer {
 
     public Object getDisplayValue(Object object) {
         return ((StoreInfo) object).getName();

diff --git a/src/web/core/src/main/java/org/geoserver/web/data/store/StoreListChoiceRenderer.java b/src/web/core/src/main/java/org/geoserver/web/data/store/StoreListChoiceRenderer.java
@@ -5,7 +5,7 @@
  */
 package org.geoserver.web.data.store;
 
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.geoserver.catalog.StoreInfo;
 
 /**
@@ -14,7 +14,7 @@
  * @author Andrea Aime - GeoSolutions
  * 
  */
-public class StoreListChoiceRenderer implements IChoiceRenderer<StoreInfo> {
+public class StoreListChoiceRenderer extends ChoiceRenderer<StoreInfo> {
 
     public Object getDisplayValue(StoreInfo info) {
         return new StringBuilder(info.getWorkspace().getName()).append(':').append(info.getName());

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/browser/GeoServerFileChooser.java b/src/web/core/src/main/java/org/geoserver/web/wicket/browser/GeoServerFileChooser.java
@@ -17,7 +17,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -255,7 +255,7 @@ public void setFileTableHeight(String height) {
 //        return "file://" + file.getAbsolutePath();
 //    }
 //    
-    class FileRootsRenderer implements IChoiceRenderer {
+    class FileRootsRenderer extends ChoiceRenderer {
 
 		public Object getDisplayValue(Object o) {
 			File f = (File) o;

diff --git a/src/web/demo/src/main/java/org/geoserver/web/demo/DemoRequestsPage.java b/src/web/demo/src/main/java/org/geoserver/web/demo/DemoRequestsPage.java
@@ -29,7 +29,7 @@
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.PasswordTextField;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.IModel;
@@ -133,7 +133,7 @@ private void setUpDemoRequestsForm(final Resource demoDir) {
         final DropDownChoice demoRequestsList;
         final IModel reqFileNameModel = new PropertyModel(requestModel, "requestFileName");
         demoRequestsList = new DropDownChoice("demoRequestsList", reqFileNameModel, demoList,
-                new IChoiceRenderer() {
+                new ChoiceRenderer() {
                     public String getIdValue(Object obj, int index) {
                         return String.valueOf(obj);
                     }

diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/InMemoryBlobStorePanel.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/InMemoryBlobStorePanel.java
@@ -20,7 +20,7 @@
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
@@ -114,7 +114,7 @@ public InMemoryBlobStorePanel(String id, final IModel<GWCConfig> gwcConfigModel)
             final Map<String, String> cacheProviders = store.getCacheProvidersNames();
             final IModel<String> providerClass = new PropertyModel<String>(gwcConfigModel,
                     "cacheProviderClass");
-            IChoiceRenderer<String> renderer = new CacheProviderRenderer(cacheProviders);
+            ChoiceRenderer<String> renderer = new CacheProviderRenderer(cacheProviders);
             choice = new DropDownChoice<String>("caches", providerClass, new ArrayList<String>(
                     cacheProviders.keySet()), renderer);
             choice.add(new AjaxFormComponentUpdatingBehavior("onChange") {
@@ -295,11 +295,11 @@ public void validate(IValidatable<Integer> iv) {
     }
 
     /**
-     * {@link IChoiceRenderer} implementation mapping available {@link CacheProvider} names with the {@link CacheProvider} class names.
+     * {@link ChoiceRenderer} implementation mapping available {@link CacheProvider} names with the {@link CacheProvider} class names.
      * 
      * @author Nicola Lagomarsini Geosolutions
      */
-    static class CacheProviderRenderer implements IChoiceRenderer<String> {
+    static class CacheProviderRenderer extends ChoiceRenderer<String> {
 
         private Map<String, String> map;
 

diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/CaseNormalizerSubform.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/CaseNormalizerSubform.java
@@ -12,7 +12,7 @@
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
 import org.geowebcache.filter.parameters.CaseNormalizer;
@@ -49,7 +49,7 @@ public CaseNormalizerSubform(final String id, final IModel<CaseNormalizer> model
         final IModel<Case> caseModel = new PropertyModel<Case>(model, "case");
         final IModel<Locale> localeModel = new PropertyModel<Locale>(model, "configuredLocale");
 
-        localeEntry = new DropDownChoice<>("locale", localeModel, getLocales(), new IChoiceRenderer<Locale>(){
+        localeEntry = new DropDownChoice<>("locale", localeModel, getLocales(), new ChoiceRenderer<Locale>(){
 
             @Override
             public Object getDisplayValue(Locale object) {
@@ -64,7 +64,7 @@ public String getIdValue(Locale object, int index) {
         });
         localeEntry.setNullValid(true);
 
-        caseEntry = new DropDownChoice<Case>("case", caseModel, Arrays.asList(Case.values()), new IChoiceRenderer<Case>(){
+        caseEntry = new DropDownChoice<Case>("case", caseModel, Arrays.asList(Case.values()), new ChoiceRenderer<Case>(){
 
             /** serialVersionUID */
             private static final long serialVersionUID = 1L;

diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/GeoServerTileLayerEditor.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/GeoServerTileLayerEditor.java
@@ -29,7 +29,7 @@
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
@@ -232,7 +232,7 @@ public GeoServerTileLayerEditor(final String id,
         enabled.add(new AttributeModifier("title", new ResourceModel("enabled.title")));
         configs.add(enabled);
 
-        IChoiceRenderer<String> blobStoreRenderer = new IChoiceRenderer<String>() {
+        ChoiceRenderer<String> blobStoreRenderer = new ChoiceRenderer<String>() {
             private static final long serialVersionUID = 1L;
 
             final String defaultStore = getDefaultBlobStoreId();

diff --git a/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/ParameterFilterEditor.java b/src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/ParameterFilterEditor.java
@@ -28,7 +28,7 @@
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
@@ -250,7 +250,7 @@ protected void onClick(AjaxRequestTarget target, Form form) {
             (       "availableFilterTypes", 
                     new Model<Class<? extends ParameterFilter>>(),
                     new Model<ArrayList<Class<? extends ParameterFilter>>>(filterTypes), 
-                    new IChoiceRenderer<Class<? extends ParameterFilter>>() {
+                    new ChoiceRenderer<Class<? extends ParameterFilter>>() {
 
                         /** serialVersionUID */
                         private static final long serialVersionUID = 1L;

diff --git a/...security/core/src/main/java/org/geoserver/security/web/auth/RoleSourceChoiceRenderer.java b/...security/core/src/main/java/org/geoserver/security/web/auth/RoleSourceChoiceRenderer.java
@@ -6,15 +6,15 @@
 package org.geoserver.security.web.auth;
 
 import org.apache.wicket.Application;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.geoserver.security.config.RoleSource;
 
 /**
  * ChoiceRenderer for RoleSource enums
  * 
  * @author Mauro Bartolomeoli (mauro.bartolomeoli@geo-solutions.it)
  */
-public class RoleSourceChoiceRenderer implements IChoiceRenderer<RoleSource> {
+public class RoleSourceChoiceRenderer extends ChoiceRenderer<RoleSource> {
 
     /** serialVersionUID */
     private static final long serialVersionUID = 1L;

diff --git a/...curity/core/src/main/java/org/geoserver/security/web/data/AbstractDataAccessRulePage.java b/...curity/core/src/main/java/org/geoserver/security/web/data/AbstractDataAccessRulePage.java
@@ -15,7 +15,7 @@
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.SubmitLink;
 import org.apache.wicket.markup.html.form.validation.AbstractFormValidator;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -125,7 +125,7 @@ ArrayList<String> getLayerNames(String workspaceName) {
     /**
      * Makes sure we see translated text, by the raw name is used for the model
      */
-    class AccessModeRenderer implements IChoiceRenderer<AccessMode> {
+    class AccessModeRenderer extends ChoiceRenderer<AccessMode> {
 
         public Object getDisplayValue(AccessMode object) {
             return (String) new ParamResourceModel( object.name(), getPage())