Skip to content

Commit

Permalink
IChoiceRenderer change to ChoiceRenderer.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jnh5y
jnh5y committed Jan 18, 2016
1 parent f84f659 commit 8794bc9
Show file tree
Hide file tree
Showing 30 changed files with 63 additions and 63 deletions.
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/admin/CoverageAccessPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/admin/GlobalSettingsPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/admin/JAIEXTPanel.java
View file
Expand Up @@ -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;

/**
Expand All @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/admin/JAIPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/data/layer/AttributeEditPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...b/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryAbstractPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/data/layer/CascadedWFSStoredQueryNewPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewAbstractPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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() {
}
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/data/layer/CoverageViewEditor.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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() {
}
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/data/layer/SQLViewAbstractPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/web/core/src/main/java/org/geoserver/web/data/namespace/NamespaceChoiceRenderer.java
View file
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/web/core/src/main/java/org/geoserver/web/data/resource/DimensionEditor.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/data/store/StoreChoiceRenderer.java
View file
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/data/store/StoreListChoiceRenderer.java
View file
Expand Up @@ -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;

/**
Expand All @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions src/web/core/src/main/java/org/geoserver/web/wicket/browser/GeoServerFileChooser.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/web/demo/src/main/java/org/geoserver/web/demo/DemoRequestsPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions src/web/gwc/src/main/java/org/geoserver/gwc/web/InMemoryBlobStorePanel.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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") {
Expand Down Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/CaseNormalizerSubform.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/GeoServerTileLayerEditor.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/web/gwc/src/main/java/org/geoserver/gwc/web/layer/ParameterFilterEditor.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...security/core/src/main/java/org/geoserver/security/web/auth/RoleSourceChoiceRenderer.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...curity/core/src/main/java/org/geoserver/security/web/data/AbstractDataAccessRulePage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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())
Expand Down

0 comments on commit 8794bc9

Please sign in to comment.