You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/11/16 23:44:03 UTC
svn commit: r1202913 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/
wicket-core/src/main/java/org/apache/wicket/markup/html/form/
wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/
wicket-core/src/main/java/org/a...
Author: ivaynberg
Date: Wed Nov 16 22:44:02 2011
New Revision: 1202913
URL: http://svn.apache.org/viewvc?rev=1202913&view=rev
Log:
remove Classes.simpleName() because its part of the jdk now
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java Wed Nov 16 22:44:02 2011
@@ -68,7 +68,6 @@ import org.apache.wicket.settings.IDebug
import org.apache.wicket.util.IHierarchical;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.string.ComponentStrings;
import org.apache.wicket.util.string.PrependingStringBuffer;
@@ -3220,7 +3219,7 @@ public abstract class Component
buffer.append(", page = <No Page>, path = ")
.append(getPath())
.append('.')
- .append(Classes.simpleName(getClass()));
+ .append(getClass().getSimpleName());
}
else
{
@@ -3229,7 +3228,7 @@ public abstract class Component
.append(", path = ")
.append(getPath())
.append('.')
- .append(Classes.simpleName(getClass()))
+ .append(getClass().getSimpleName())
.append(", isVisible = ")
.append((determineVisibility()))
.append(", isVersioned = ")
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java Wed Nov 16 22:44:02 2011
@@ -38,7 +38,6 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.settings.IDebugSettings;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.string.StringValue;
@@ -419,7 +418,7 @@ public abstract class Page extends Marku
buffer.append(StringValue.repeat(levels, " "))
.append(component.getPageRelativePath())
.append(":")
- .append(Classes.simpleName(component.getClass()));
+ .append(component.getClass().getSimpleName());
}
});
return buffer.toString();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java Wed Nov 16 22:44:02 2011
@@ -28,7 +28,6 @@ import org.apache.wicket.behavior.Behavi
import org.apache.wicket.request.RequestHandlerStack.ReplaceHandlerException;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.handler.ListenerInvocationNotAllowedException;
-import org.apache.wicket.util.lang.Classes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,7 +120,7 @@ public class RequestListenerInterface
}
// Save short class name
- name = Classes.simpleName(listenerInterfaceClass);
+ name = listenerInterfaceClass.getSimpleName();
// Register this listener
register();
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java Wed Nov 16 22:44:02 2011
@@ -42,7 +42,6 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.string.StringList;
import org.apache.wicket.util.string.StringValue;
@@ -626,7 +625,7 @@ public abstract class FormComponent<T> e
{
StringBuilder buffer = new StringBuilder();
buffer.append("Could not locate error message for component: ");
- buffer.append(Classes.simpleName(getClass()));
+ buffer.append(getClass().getSimpleName());
buffer.append("@");
buffer.append(getPageRelativePath());
buffer.append(" and error: ");
@@ -1126,7 +1125,7 @@ public abstract class FormComponent<T> e
}
if (e.getTargetType() != null)
{
- error.addMessageKey("ConversionError." + Classes.simpleName(e.getTargetType()));
+ error.addMessageKey("ConversionError." + e.getTargetType().getSimpleName());
}
error.addMessageKey("ConversionError");
reportValidationError(e, error);
@@ -1147,7 +1146,7 @@ public abstract class FormComponent<T> e
{
error.addMessageKey(e.getResourceKey());
}
- String simpleName = Classes.simpleName(getType());
+ String simpleName = getType().getSimpleName();
error.addMessageKey("IConverter." + simpleName);
error.addMessageKey("IConverter");
error.setVariable("type", simpleName);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java Wed Nov 16 22:44:02 2011
@@ -22,8 +22,6 @@ import java.util.Map;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.util.lang.Classes;
-import org.apache.wicket.validation.IValidationError;
import org.apache.wicket.validation.ValidationError;
@@ -111,14 +109,14 @@ public abstract class AbstractFormValida
ValidationError error = new ValidationError().addMessageKey(resourceKey);
- final String defaultKey = Classes.simpleName(getClass());
+ final String defaultKey = getClass().getSimpleName();
if (!resourceKey.equals(defaultKey))
{
error.addMessageKey(defaultKey);
}
error.setVariables(vars);
- fc.error((IValidationError)error);
+ fc.error(error);
}
/**
@@ -175,6 +173,6 @@ public abstract class AbstractFormValida
*/
protected String resourceKey()
{
- return Classes.simpleName(getClass());
+ return getClass().getSimpleName();
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java Wed Nov 16 22:44:02 2011
@@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.Hea
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.lang.Classes;
/**
* Boilerplate for a markup sourcing strategy which retrieves the markup from associated markup
@@ -292,7 +291,7 @@ public abstract class AssociatedMarkupSo
// create a unique id for the HtmlHeaderContainer
StringBuilder builder = new StringBuilder(100);
builder.append("_");
- builder.append(Classes.simpleName(markupClass));
+ builder.append(markupClass.getSimpleName());
if (container.getVariation() != null)
{
builder.append(container.getVariation());
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Wed Nov 16 22:44:02 2011
@@ -124,7 +124,6 @@ import org.apache.wicket.request.resourc
import org.apache.wicket.session.ISessionStore.UnboundListener;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.resource.StringResourceStream;
@@ -1471,7 +1470,7 @@ public class BaseWicketTester
if (component == null)
{
fail("path: '" + path + "' does not exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
+ getLastRenderedPage().getClass().getSimpleName());
return null;
}
@@ -1533,8 +1532,8 @@ public class BaseWicketTester
return Result.fail("Component not found: " + path);
}
- return isTrue("component '" + Classes.simpleName(component.getClass()) + "' is not type:" +
- Classes.simpleName(expectedComponentClass),
+ return isTrue("component '" + component.getClass().getSimpleName() + "' is not type:" +
+ expectedComponentClass.getSimpleName(),
expectedComponentClass.isAssignableFrom(component.getClass()));
}
@@ -1553,7 +1552,7 @@ public class BaseWicketTester
if (component == null)
{
result = Result.fail("path: '" + path + "' does no exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
+ getLastRenderedPage().getClass().getSimpleName());
}
else
{
@@ -1579,7 +1578,7 @@ public class BaseWicketTester
if (component == null)
{
result = Result.fail("path: '" + path + "' does no exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
+ getLastRenderedPage().getClass().getSimpleName());
}
else
{
@@ -1603,7 +1602,7 @@ public class BaseWicketTester
if (component == null)
{
fail("path: '" + path + "' does no exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
+ getLastRenderedPage().getClass().getSimpleName());
}
return isTrue("component '" + path + "' is disabled", component.isEnabledInHierarchy());
@@ -1622,7 +1621,7 @@ public class BaseWicketTester
if (component == null)
{
fail("path: '" + path + "' does no exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
+ getLastRenderedPage().getClass().getSimpleName());
}
return isFalse("component '" + path + "' is enabled", component.isEnabledInHierarchy());
@@ -1641,7 +1640,7 @@ public class BaseWicketTester
if (component == null)
{
fail("path: '" + path + "' does no exist for page: " +
- Classes.simpleName(getLastRenderedPage().getClass()));
+ getLastRenderedPage().getClass().getSimpleName());
}
else if (component instanceof FormComponent == false)
{
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java Wed Nov 16 22:44:02 2011
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.lang.Classes;
/**
* A versatile implementation of {@link IValidationError} that supports message resolution from
@@ -221,7 +220,7 @@ public class ValidationError implements
public String toString()
{
StringBuilder tostring = new StringBuilder();
- tostring.append("[").append(Classes.simpleName(getClass()));
+ tostring.append("[").append(getClass().getSimpleName());
tostring.append(" message=[").append(message);
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java Wed Nov 16 22:44:02 2011
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.wicket.IClusterable;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.validation.INullAcceptingValidator;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
@@ -167,7 +166,7 @@ public abstract class AbstractValidator<
ValidationError error = new ValidationError().addMessageKey(resourceKey);
- final String defaultKey = Classes.simpleName(getClass());
+ final String defaultKey = getClass().getSimpleName();
if (!resourceKey.equals(defaultKey))
{
error.addMessageKey(defaultKey);
@@ -187,7 +186,7 @@ public abstract class AbstractValidator<
*/
protected String resourceKey()
{
- return Classes.simpleName(getClass());
+ return getClass().getSimpleName();
}
/**
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java Wed Nov 16 22:44:02 2011
@@ -19,7 +19,6 @@ package org.apache.wicket.validation.val
import java.io.Serializable;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
@@ -85,7 +84,7 @@ public class MaximumValidator<Z extends
// TODO Wicket 1.6 - remove that method and make this class extending AbstractValidator
protected String resourceKey()
{
- return Classes.simpleName(getClass());
+ return getClass().getSimpleName();
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java Wed Nov 16 22:44:02 2011
@@ -19,7 +19,6 @@ package org.apache.wicket.validation.val
import java.io.Serializable;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
@@ -81,7 +80,7 @@ public class MinimumValidator<Z extends
// TODO Wicket 1.6 - remove that method and make this class extending AbstractValidator
protected String resourceKey()
{
- return Classes.simpleName(getClass());
+ return getClass().getSimpleName();
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java Wed Nov 16 22:44:02 2011
@@ -19,7 +19,6 @@ package org.apache.wicket.validation.val
import java.io.Serializable;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
@@ -118,7 +117,7 @@ public class RangeValidator<Z extends Co
// TODO Wicket 1.6 - remove that method and make this class extending AbstractValidator
protected String resourceKey()
{
- return Classes.simpleName(getClass());
+ return getClass().getSimpleName();
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java?rev=1202913&r1=1202912&r2=1202913&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java Wed Nov 16 22:44:02 2011
@@ -17,7 +17,6 @@
package org.apache.wicket.util.lang;
-import org.apache.wicket.util.string.Strings;
/**
@@ -58,21 +57,6 @@ public final class Classes
return Class.forName(Packages.absolutePath(scope, path).replace('/', '.'));
}
-
- /**
- * Gets the name of a given class without the prefixed package path
- *
- * @param <C>
- *
- * @param c
- * The class
- * @return The class name
- */
- public static <C> String simpleName(final Class<C> c)
- {
- return Strings.lastPathComponent(c.getName(), '.');
- }
-
/**
* Instantiation not allowed
*/