Author: jbq
Date: Wed Sep 5 09:55:49 2007
New Revision: 572992
URL: http://svn.apache.org/viewvc?rev=572992&view=rev
Log:
Adding reportValidationError() to avoid copy/paste
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=572992&r1=572991&r2=572992&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Wed Sep 5 09:55:49 2007
@@ -1120,20 +1120,7 @@
error.addMessageKey("ConversionError."
+ Classes.simpleName(e.getTargetType()));
}
error.addMessageKey("ConversionError");
-
- final Locale locale = e.getLocale();
- if (locale != null)
- {
- error.setVariable("locale", locale);
- }
- error.setVariable("exception", e);
- Format format = e.getFormat();
- if (format instanceof SimpleDateFormat)
- {
- error.setVariable("format",
((SimpleDateFormat)format).toLocalizedPattern());
- }
-
- error((IValidationError)error);
+ reportValidationError(e, error);
}
}
else
@@ -1153,24 +1140,27 @@
String simpleName =
Classes.simpleName(getType());
error.addMessageKey("IConverter." + simpleName);
error.addMessageKey("IConverter");
-
-
error.setVariable("type", simpleName);
- final Locale locale = e.getLocale();
- if (locale != null)
- {
- error.setVariable("locale", locale);
- }
- error.setVariable("exception", e);
- Format format = e.getFormat();
- if (format instanceof SimpleDateFormat)
- {
- error.setVariable("format",
((SimpleDateFormat)format).toLocalizedPattern());
- }
-
- error((IValidationError)error);
+ reportValidationError(e, error);
}
}
+ }
+
+ private void reportValidationError(ConversionException e,
ValidationError error)
+ {
+ final Locale locale = e.getLocale();
+ if (locale != null)
+ {
+ error.setVariable("locale", locale);
+ }
+ error.setVariable("exception", e);
+ Format format = e.getFormat();
+ if (format instanceof SimpleDateFormat)
+ {
+ error.setVariable("format",
((SimpleDateFormat)format).toLocalizedPattern());
+ }
+
+ error((IValidationError)error);
}
/**
