From 8794bc9f7d835ef40738c343c0f54b78c1144e18 Mon Sep 17 00:00:00 2001 From: Jim Hughes Date: Mon, 18 Jan 2016 15:37:01 -0500 Subject: [PATCH] IChoiceRenderer change to ChoiceRenderer. --- .../java/org/geoserver/web/admin/CoverageAccessPage.java | 4 ++-- .../java/org/geoserver/web/admin/GlobalSettingsPage.java | 4 ++-- .../main/java/org/geoserver/web/admin/JAIEXTPanel.java | 4 ++-- .../src/main/java/org/geoserver/web/admin/JAIPage.java | 4 ++-- .../org/geoserver/web/data/layer/AttributeEditPage.java | 4 ++-- .../data/layer/CascadedWFSStoredQueryAbstractPage.java | 4 ++-- .../web/data/layer/CascadedWFSStoredQueryNewPage.java | 4 ++-- .../web/data/layer/CoverageViewAbstractPage.java | 4 ++-- .../org/geoserver/web/data/layer/CoverageViewEditor.java | 4 ++-- .../org/geoserver/web/data/layer/SQLViewAbstractPage.java | 4 ++-- .../web/data/namespace/NamespaceChoiceRenderer.java | 2 +- .../org/geoserver/web/data/resource/DimensionEditor.java | 2 +- .../org/geoserver/web/data/store/StoreChoiceRenderer.java | 4 ++-- .../geoserver/web/data/store/StoreListChoiceRenderer.java | 4 ++-- .../web/wicket/browser/GeoServerFileChooser.java | 4 ++-- .../java/org/geoserver/web/demo/DemoRequestsPage.java | 4 ++-- .../org/geoserver/gwc/web/InMemoryBlobStorePanel.java | 8 ++++---- .../geoserver/gwc/web/layer/CaseNormalizerSubform.java | 6 +++--- .../geoserver/gwc/web/layer/GeoServerTileLayerEditor.java | 4 ++-- .../geoserver/gwc/web/layer/ParameterFilterEditor.java | 4 ++-- .../security/web/auth/RoleSourceChoiceRenderer.java | 4 ++-- .../security/web/data/AbstractDataAccessRulePage.java | 4 ++-- .../geoserver/security/web/data/DataAccessRulePage.java | 4 ++-- .../org/geoserver/security/web/data/DataSecurityPage.java | 4 ++-- .../src/main/java/org/geoserver/wcs/web/WCSAdminPage.java | 4 ++-- .../geoserver/wcs/web/demo/WCSRequestBuilderPanel.java | 4 ++-- .../src/main/java/org/geoserver/wms/web/WMSAdminPage.java | 8 ++++---- .../geoserver/wms/web/publish/StyleChoiceRenderer.java | 4 ++-- .../org/geoserver/wms/web/publish/StyleNameRenderer.java | 4 ++-- .../wms/web/publish/StyleTypeChoiceRenderer.java | 4 ++-- 30 files changed, 63 insertions(+), 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 index 5b22a2b5e85..e93f9c6eae4 100644 --- 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 - private class QueueTypeRenderer implements IChoiceRenderer { + private class QueueTypeRenderer extends ChoiceRenderer { 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 index 73d37e16e34..cc0fc397b35 100644 --- 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(loggingInfoModel, "level"), logProfiles)); } - class ResourceErrorHandlingRenderer implements IChoiceRenderer { + class ResourceErrorHandlingRenderer extends ChoiceRenderer { 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 index 9b78a5d360a..3f9ca1da310 100644 --- 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 model) { Palette jaiextSelector = new Palette("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 { + static class JAChoiceRenderer extends ChoiceRenderer { 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 index 34ca09d5a91..6dc155d6fd9 100644 --- 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 editor = new DropDownChoice( - "pngEncoderType", encoders, new IChoiceRenderer() { + "pngEncoderType", encoders, new ChoiceRenderer() { 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 index 24513c280b4..ace6101d4be 100644 --- 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/src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryAbstractPage.java b/src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryAbstractPage.java index 92b554c606c..fdd125cdc72 100644 --- a/src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryAbstractPage.java +++ b/src/web/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 { + public class ParameterMappingTypeRenderer extends ChoiceRenderer { @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 index 19e8716c545..03e7b48abae 100644 --- 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 load() { } } - private class StoredQueryListRenderer implements IChoiceRenderer { + private class StoredQueryListRenderer extends ChoiceRenderer { @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 index 4cb216e11cf..96d599e2b1e 100644 --- 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 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 index e79f091a812..ea2c3771725 100644 --- 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 index 6b30af72da5..db5c4fbb729 100644 --- 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 index 5c0ba727d60..41bb1a0d3c5 100644 --- 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 index f3c8a8b3108..1dc156291bb 100644 --- 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 index b742a28c9f3..5ac1cdddaaa 100644 --- 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 index bf11927033e..7ba51c9a963 100644 --- 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 { +public class StoreListChoiceRenderer extends ChoiceRenderer { 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 index 869d46108e9..026657d0125 100644 --- 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 index 5f56422b42e..3f156b98fa8 100644 --- 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 index c72bd61ae01..ee6e4251c6a 100644 --- 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 gwcConfigModel) final Map cacheProviders = store.getCacheProvidersNames(); final IModel providerClass = new PropertyModel(gwcConfigModel, "cacheProviderClass"); - IChoiceRenderer renderer = new CacheProviderRenderer(cacheProviders); + ChoiceRenderer renderer = new CacheProviderRenderer(cacheProviders); choice = new DropDownChoice("caches", providerClass, new ArrayList( cacheProviders.keySet()), renderer); choice.add(new AjaxFormComponentUpdatingBehavior("onChange") { @@ -295,11 +295,11 @@ public void validate(IValidatable 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 { + static class CacheProviderRenderer extends ChoiceRenderer { private Map 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 index 315658b98cb..1601ade986a 100644 --- 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 model final IModel caseModel = new PropertyModel(model, "case"); final IModel localeModel = new PropertyModel(model, "configuredLocale"); - localeEntry = new DropDownChoice<>("locale", localeModel, getLocales(), new IChoiceRenderer(){ + localeEntry = new DropDownChoice<>("locale", localeModel, getLocales(), new ChoiceRenderer(){ @Override public Object getDisplayValue(Locale object) { @@ -64,7 +64,7 @@ public String getIdValue(Locale object, int index) { }); localeEntry.setNullValid(true); - caseEntry = new DropDownChoice("case", caseModel, Arrays.asList(Case.values()), new IChoiceRenderer(){ + caseEntry = new DropDownChoice("case", caseModel, Arrays.asList(Case.values()), new ChoiceRenderer(){ /** 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 index c37c5673690..d272352a626 100644 --- 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 blobStoreRenderer = new IChoiceRenderer() { + ChoiceRenderer blobStoreRenderer = new ChoiceRenderer() { 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 index bf70c1a7c8d..d887ab2e0e6 100644 --- 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>(), new Model>>(filterTypes), - new IChoiceRenderer>() { + new ChoiceRenderer>() { /** serialVersionUID */ private static final long serialVersionUID = 1L; diff --git a/src/web/security/core/src/main/java/org/geoserver/security/web/auth/RoleSourceChoiceRenderer.java b/src/web/security/core/src/main/java/org/geoserver/security/web/auth/RoleSourceChoiceRenderer.java index 75aff12eefa..95aed05e5b9 100644 --- a/src/web/security/core/src/main/java/org/geoserver/security/web/auth/RoleSourceChoiceRenderer.java +++ b/src/web/security/core/src/main/java/org/geoserver/security/web/auth/RoleSourceChoiceRenderer.java @@ -6,7 +6,7 @@ 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; /** @@ -14,7 +14,7 @@ * * @author Mauro Bartolomeoli (mauro.bartolomeoli@geo-solutions.it) */ -public class RoleSourceChoiceRenderer implements IChoiceRenderer { +public class RoleSourceChoiceRenderer extends ChoiceRenderer { /** serialVersionUID */ private static final long serialVersionUID = 1L; diff --git a/src/web/security/core/src/main/java/org/geoserver/security/web/data/AbstractDataAccessRulePage.java b/src/web/security/core/src/main/java/org/geoserver/security/web/data/AbstractDataAccessRulePage.java index a257612dda8..8eaf1b56f7d 100644 --- a/src/web/security/core/src/main/java/org/geoserver/security/web/data/AbstractDataAccessRulePage.java +++ b/src/web/security/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 getLayerNames(String workspaceName) { /** * Makes sure we see translated text, by the raw name is used for the model */ - class AccessModeRenderer implements IChoiceRenderer { + class AccessModeRenderer extends ChoiceRenderer { public Object getDisplayValue(AccessMode object) { return (String) new ParamResourceModel( object.name(), getPage()) diff --git a/src/web/security/core/src/main/java/org/geoserver/security/web/data/DataAccessRulePage.java b/src/web/security/core/src/main/java/org/geoserver/security/web/data/DataAccessRulePage.java index 5e6bc940d43..ed0f0aecc79 100644 --- a/src/web/security/core/src/main/java/org/geoserver/security/web/data/DataAccessRulePage.java +++ b/src/web/security/core/src/main/java/org/geoserver/security/web/data/DataAccessRulePage.java @@ -14,7 +14,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.basic.Label; 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.RadioChoice; import org.apache.wicket.markup.html.form.SubmitLink; import org.apache.wicket.markup.html.link.BookmarkablePageLink; @@ -136,7 +136,7 @@ protected Component headerPanel() { return header; } - class CatalogModeRenderer implements IChoiceRenderer { + class CatalogModeRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { return (String) new ParamResourceModel(((CatalogMode) object).name(), getPage()) diff --git a/src/web/security/core/src/main/java/org/geoserver/security/web/data/DataSecurityPage.java b/src/web/security/core/src/main/java/org/geoserver/security/web/data/DataSecurityPage.java index 227214e2fbd..101060b2a0b 100644 --- a/src/web/security/core/src/main/java/org/geoserver/security/web/data/DataSecurityPage.java +++ b/src/web/security/core/src/main/java/org/geoserver/security/web/data/DataSecurityPage.java @@ -14,7 +14,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.basic.Label; 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.RadioChoice; import org.apache.wicket.markup.html.form.SubmitLink; import org.apache.wicket.markup.html.link.BookmarkablePageLink; @@ -128,7 +128,7 @@ protected Component headerPanel() { return header; } - class CatalogModeRenderer implements IChoiceRenderer { + class CatalogModeRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { return (String) new ParamResourceModel(((CatalogMode) object).name(), getPage()) diff --git a/src/web/wcs/src/main/java/org/geoserver/wcs/web/WCSAdminPage.java b/src/web/wcs/src/main/java/org/geoserver/wcs/web/WCSAdminPage.java index 9a4cbb284d1..991d4e916b1 100644 --- a/src/web/wcs/src/main/java/org/geoserver/wcs/web/WCSAdminPage.java +++ b/src/web/wcs/src/main/java/org/geoserver/wcs/web/WCSAdminPage.java @@ -10,7 +10,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.TextArea; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.IModel; @@ -68,7 +68,7 @@ protected String getServiceName(){ return "WCS"; } - private class OverviewPolicyRenderer implements IChoiceRenderer { + private class OverviewPolicyRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { return new StringResourceModel(((OverviewPolicy) object).name(), WCSAdminPage.this, null).getString(); diff --git a/src/web/wcs/src/main/java/org/geoserver/wcs/web/demo/WCSRequestBuilderPanel.java b/src/web/wcs/src/main/java/org/geoserver/wcs/web/demo/WCSRequestBuilderPanel.java index e7b23a7408c..b77d2f37a4f 100644 --- a/src/web/wcs/src/main/java/org/geoserver/wcs/web/demo/WCSRequestBuilderPanel.java +++ b/src/web/wcs/src/main/java/org/geoserver/wcs/web/demo/WCSRequestBuilderPanel.java @@ -23,7 +23,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.panel.FeedbackPanel; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; @@ -419,7 +419,7 @@ AffineTransform guessGridToWorld(boolean resolutionMode) { } } - class TargetLayoutRenderer implements IChoiceRenderer { + class TargetLayoutRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { final String name = ((TargetLayout) object).name(); diff --git a/src/web/wms/src/main/java/org/geoserver/wms/web/WMSAdminPage.java b/src/web/wms/src/main/java/org/geoserver/wms/web/WMSAdminPage.java index 8e155e381e7..9b8dadd62af 100644 --- a/src/web/wms/src/main/java/org/geoserver/wms/web/WMSAdminPage.java +++ b/src/web/wms/src/main/java/org/geoserver/wms/web/WMSAdminPage.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.TextArea; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.IModel; @@ -294,7 +294,7 @@ protected String getServiceName(){ return "WMS"; } - private class WatermarkPositionRenderer implements IChoiceRenderer { + private class WatermarkPositionRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { return new StringResourceModel(((Position) object).name(), WMSAdminPage.this, null).getString(); @@ -306,7 +306,7 @@ public String getIdValue(Object object, int index) { } - private class InterpolationRenderer implements IChoiceRenderer { + private class InterpolationRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { return new StringResourceModel(((WMSInterpolation) object).name(), WMSAdminPage.this, null).getString(); @@ -318,7 +318,7 @@ public String getIdValue(Object object, int index) { } - private class SVGMethodRenderer implements IChoiceRenderer { + private class SVGMethodRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { return new StringResourceModel("svg." + object, WMSAdminPage.this, null).getString(); diff --git a/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleChoiceRenderer.java b/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleChoiceRenderer.java index c27210febfe..8f45d210b06 100644 --- a/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleChoiceRenderer.java +++ b/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleChoiceRenderer.java @@ -5,11 +5,11 @@ */ package org.geoserver.wms.web.publish; -import org.apache.wicket.markup.html.form.IChoiceRenderer; +import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.geoserver.catalog.StyleInfo; @SuppressWarnings("serial") -public class StyleChoiceRenderer implements IChoiceRenderer { +public class StyleChoiceRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { return ((StyleInfo) object).prefixedName(); diff --git a/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleNameRenderer.java b/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleNameRenderer.java index 857f31ed768..318e32754de 100644 --- a/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleNameRenderer.java +++ b/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleNameRenderer.java @@ -5,14 +5,14 @@ */ package org.geoserver.wms.web.publish; -import org.apache.wicket.markup.html.form.IChoiceRenderer; +import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.geoserver.catalog.StyleInfo; /** * Style name rendered, displays the style, uses the id as the select id */ @SuppressWarnings("serial") -public class StyleNameRenderer implements IChoiceRenderer { +public class StyleNameRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { return ((StyleInfo) object).prefixedName(); diff --git a/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleTypeChoiceRenderer.java b/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleTypeChoiceRenderer.java index 2502af82d50..3c7458bc413 100644 --- a/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleTypeChoiceRenderer.java +++ b/src/web/wms/src/main/java/org/geoserver/wms/web/publish/StyleTypeChoiceRenderer.java @@ -4,11 +4,11 @@ */ package org.geoserver.wms.web.publish; -import org.apache.wicket.markup.html.form.IChoiceRenderer; +import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.geoserver.catalog.StyleType; @SuppressWarnings("serial") -public class StyleTypeChoiceRenderer implements IChoiceRenderer { +public class StyleTypeChoiceRenderer extends ChoiceRenderer { public Object getDisplayValue(Object object) { return object.toString();