[jboss-cvs] jboss-seam/src/main/org/jboss/seam/international ...
Gavin King
gavin.king at jboss.com
Wed Jun 20 13:45:56 EDT 2007
User: gavin
Date: 07/06/20 13:45:56
Modified: src/main/org/jboss/seam/international Locale.java
LocaleSelector.java Messages.java
ResourceBundle.java TimeZone.java
TimeZoneSelector.java
Log:
refactored interception annotations
Revision Changes Path
1.4 +2 -3 jboss-seam/src/main/org/jboss/seam/international/Locale.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Locale.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/Locale.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Locale.java 19 Jun 2007 19:41:44 -0000 1.3
+++ Locale.java 20 Jun 2007 17:45:56 -0000 1.4
@@ -1,15 +1,14 @@
package org.jboss.seam.international;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
/**
@@ -20,7 +19,7 @@
@Scope(ScopeType.STATELESS)
@Name("org.jboss.seam.international.locale")
@Install(precedence=BUILT_IN, dependencies="org.jboss.seam.international.localeSelector")
- at Intercept(NEVER)
+ at BypassInterceptors
public class Locale
{
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/international/LocaleSelector.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LocaleSelector.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/LocaleSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- LocaleSelector.java 19 Jun 2007 19:41:44 -0000 1.2
+++ LocaleSelector.java 20 Jun 2007 17:45:56 -0000 1.3
@@ -1,6 +1,5 @@
package org.jboss.seam.international;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.util.ArrayList;
@@ -20,9 +19,9 @@
import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
import org.jboss.seam.faces.Selector;
@@ -36,7 +35,7 @@
*/
@Scope(ScopeType.SESSION)
@Name("org.jboss.seam.international.localeSelector")
- at Intercept(NEVER)
+ at BypassInterceptors
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
public class LocaleSelector extends Selector
{
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/international/Messages.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Messages.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/Messages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Messages.java 19 Jun 2007 19:41:44 -0000 1.2
+++ Messages.java 20 Jun 2007 17:45:56 -0000 1.3
@@ -1,6 +1,5 @@
package org.jboss.seam.international;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
@@ -14,10 +13,10 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.core.Interpolator;
/**
@@ -26,7 +25,7 @@
* @author Gavin King
*/
@Scope(ScopeType.SESSION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.international.messages")
@Install(precedence=BUILT_IN)
public class Messages implements Serializable
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/international/ResourceBundle.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ResourceBundle.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/ResourceBundle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ResourceBundle.java 19 Jun 2007 19:41:44 -0000 1.2
+++ ResourceBundle.java 20 Jun 2007 17:45:56 -0000 1.3
@@ -1,13 +1,12 @@
package org.jboss.seam.international;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.FRAMEWORK;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
/**
* Support for an application-global resource bundle
@@ -15,7 +14,7 @@
* @author Gavin King
*/
@Scope(ScopeType.SESSION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.core.resourceBundle")
@Install(precedence=FRAMEWORK, dependencies="org.jboss.seam.international.locale")
public class ResourceBundle extends org.jboss.seam.core.ResourceBundle
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/international/TimeZone.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TimeZone.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/TimeZone.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TimeZone.java 19 Jun 2007 19:41:44 -0000 1.2
+++ TimeZone.java 20 Jun 2007 17:45:56 -0000 1.3
@@ -1,15 +1,14 @@
package org.jboss.seam.international;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
/**
* Manager component for the current user's locale
@@ -18,7 +17,7 @@
*/
@Scope(ScopeType.STATELESS)
@Name("org.jboss.seam.international.timeZone")
- at Intercept(NEVER)
+ at BypassInterceptors
@Install(precedence=BUILT_IN, dependencies="org.jboss.seam.international.timeZoneSelector")
public class TimeZone
{
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/international/TimeZoneSelector.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TimeZoneSelector.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/TimeZoneSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TimeZoneSelector.java 19 Jun 2007 19:41:44 -0000 1.2
+++ TimeZoneSelector.java 20 Jun 2007 17:45:56 -0000 1.3
@@ -1,6 +1,5 @@
package org.jboss.seam.international;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import javax.faces.event.ValueChangeEvent;
@@ -9,9 +8,9 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
import org.jboss.seam.faces.Selector;
@@ -24,7 +23,7 @@
*/
@Scope(ScopeType.SESSION)
@Name("org.jboss.seam.international.timeZoneSelector")
- at Intercept(NEVER)
+ at BypassInterceptors
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
public class TimeZoneSelector extends Selector
{
More information about the jboss-cvs-commits
mailing list