[seam-commits] Seam SVN: r10656 - in modules/trunk/international: src/main/java/org/jboss/seam/international and 1 other directory.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Apr 27 11:48:54 EDT 2009
Author: dan.j.allen
Date: 2009-04-27 11:48:54 -0400 (Mon, 27 Apr 2009)
New Revision: 10656
Modified:
modules/trunk/international/pom.xml
modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleConfig.java
modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
modules/trunk/international/src/main/java/org/jboss/seam/international/TimeZones.java
modules/trunk/international/src/main/java/org/jboss/seam/international/TimeZonesProducer.java
Log:
get us closer to compiling
Modified: modules/trunk/international/pom.xml
===================================================================
--- modules/trunk/international/pom.xml 2009-04-27 15:34:36 UTC (rev 10655)
+++ modules/trunk/international/pom.xml 2009-04-27 15:48:54 UTC (rev 10656)
@@ -24,6 +24,10 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>jsr299-api</artifactId>
</dependency>
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleConfig.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleConfig.java 2009-04-27 15:34:36 UTC (rev 10655)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleConfig.java 2009-04-27 15:48:54 UTC (rev 10656)
@@ -10,6 +10,7 @@
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
import javax.inject.Initializer;
+import org.jboss.seam.international.util.Strings;
/**
* Configures the JSF locale support from the Seam container.
@@ -94,11 +95,11 @@
String language = tokens.hasMoreTokens() ? tokens.nextToken() : null;
String country = tokens.hasMoreTokens() ? tokens.nextToken() : null;
String variant = tokens.hasMoreTokens() ? tokens.nextToken() : null;
- if (!Strings.isEmpty(variant))
+ if (Strings.isEmpty(variant))
{
return new java.util.Locale(language, country, variant);
}
- else if (!Strings.isEmpty(country))
+ else if (Strings.isEmpty(country))
{
return new java.util.Locale(language, country);
}
@@ -123,4 +124,5 @@
return null;
}
}
+
}
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-04-27 15:34:36 UTC (rev 10655)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-04-27 15:48:54 UTC (rev 10656)
@@ -9,7 +9,7 @@
import java.util.List;
import java.util.Map;
-import org.hibernate.validator.InvalidValue;
+import javax.validation.ConstraintViolation;
import org.jboss.seam.international.StatusMessage.Severity;
/**
@@ -301,60 +301,61 @@
}
/**
- * Add an array of InvalidValues from Hibernate Validator. Each message will
+ * Add an array of {@link ConstraintViolation} objects from Bean Validation. Each message will
* be added with a severity of WARN.
*/
- public void add(InvalidValue[] ivs)
+ public void add(ConstraintViolation[] cvs)
{
- for (InvalidValue iv: ivs)
+ for (ConstraintViolation cv: cvs)
{
- add(iv);
+ add(cv);
}
}
/**
- * Add an array of InvalidValues from Hibernate Validator. Each message will
+ * Add an array of {@link ConstraintViolation} objects from Bean Validation. Each message will
* be added with a severity of WARN.
*
* The name of the property that was validated will be used as the widget ID
*/
- public void addToControls(InvalidValue[] ivs)
+ public void addToControls(ConstraintViolation[] cvs)
{
- for (InvalidValue iv: ivs)
+ for (ConstraintViolation cv: cvs)
{
- addToControl(iv);
+ addToControl(cv);
}
}
/**
- * Add an InvalidValue from Hibernate Validator. The message will
+ * Add a {@link ConstraintViolation} from Bean Validation. The message will
* be added with a severity of WARN.
*/
- public void add(InvalidValue iv)
+ public void add(ConstraintViolation cv)
{
- add( WARN, iv.getMessage() );
+ add( WARN, cv.getMessage() );
}
/**
- * Add an InvalidValue from Hibernate Validator. The message will
+ * Add a {@link ConstraintViolation} from Bean Validation. The message will
* be added with a severity of WARN.
*
* The name of the property that was validated will be used as the widget ID
*/
- public void addToControl(InvalidValue iv)
+ public void addToControl(ConstraintViolation cv)
{
- addToControl( iv.getPropertyName(), iv );
+ String propertyName = cv.getPropertyPath().substring(cv.getPropertyPath().lastIndexOf(".") + 1);
+ addToControl( propertyName, cv );
}
/**
- * Add an InvalidValue from Hibernate Validator. The message will
+ * Add a {@link ConstraintViolation} from Bean Validation. The message will
* be added with a severity of WARN.
*
* You can also specify the id of the widget to add the message to
*/
- public void addToControl(String id, InvalidValue iv)
+ public void addToControl(String id, ConstraintViolation cv)
{
- addToControl( id, WARN, iv.getMessage() );
+ addToControl( id, WARN, cv.getMessage() );
}
private List<Runnable> getTasks()
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/TimeZones.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/TimeZones.java 2009-04-27 15:34:36 UTC (rev 10655)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/TimeZones.java 2009-04-27 15:48:54 UTC (rev 10656)
@@ -23,7 +23,6 @@
@Documented
@BindingType
@Inherited
-public @interface Timezones
+public @interface TimeZones
{
-
}
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/TimeZonesProducer.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/TimeZonesProducer.java 2009-04-27 15:34:36 UTC (rev 10655)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/TimeZonesProducer.java 2009-04-27 15:48:54 UTC (rev 10656)
@@ -52,7 +52,7 @@
});
}
- @Produces @ApplicationScoped @Timezones public List<TimeZone> getTimeZones() {
+ @Produces @ApplicationScoped @TimeZones public List<TimeZone> getTimeZones() {
return timeZones;
}
More information about the seam-commits
mailing list