cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r349897 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Date Wed, 30 Nov 2005 06:34:36 GMT
Author: joerg
Date: Tue Nov 29 22:34:32 2005
New Revision: 349897

URL: http://svn.apache.org/viewcvs?rev=349897&view=rev
Log:
minor code style issues

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/I18nTransformer.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/I18nTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/I18nTransformer.java?rev=349897&r1=349896&r2=349897&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/I18nTransformer.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Tue Nov 29 22:34:32 2005
@@ -271,6 +271,18 @@
                              implements CacheableProcessingComponent,
                                         Serviceable, Configurable, Disposable {
 
+    /**
+     * The namespace for i18n is "http://apache.org/cocoon/i18n/2.1".
+     */
+    public static final String I18N_NAMESPACE_URI =
+            "http://apache.org/cocoon/i18n/2.1";
+
+    /**
+     * The old namespace for i18n is "http://apache.org/cocoon/i18n/2.0".
+     */
+    public static final String I18N_OLD_NAMESPACE_URI =
+            "http://apache.org/cocoon/i18n/2.0";
+
     //
     // i18n elements
     //
@@ -893,19 +905,6 @@
     private HashMap formattingParams;
 
     /**
-     * The namespace for i18n is "http://apache.org/cocoon/i18n/2.1".
-     */
-    public static final String I18N_NAMESPACE_URI =
-            "http://apache.org/cocoon/i18n/2.1";
-
-    /**
-     * The old namespace for i18n is "http://apache.org/cocoon/i18n/2.0".
-     */
-    public static final String I18N_OLD_NAMESPACE_URI =
-            "http://apache.org/cocoon/i18n/2.0";
-
-
-    /**
      * Returns the current locale setting of this transformer instance.
      * @return current Locale object
      */
@@ -1207,17 +1206,17 @@
             currentKey = attr.getValue("", I18N_KEY_ATTRIBUTE);
             if (currentKey == null) {
                 // Try the namespaced attribute
-                currentKey = attr.getValue(I18nTransformer.I18N_NAMESPACE_URI, I18N_KEY_ATTRIBUTE);
+                currentKey = attr.getValue(I18N_NAMESPACE_URI, I18N_KEY_ATTRIBUTE);
                 if (currentKey == null) {
                     // Try the old namespace
-                    currentKey = attr.getValue(I18nTransformer.I18N_OLD_NAMESPACE_URI, I18N_KEY_ATTRIBUTE);
+                    currentKey = attr.getValue(I18N_OLD_NAMESPACE_URI, I18N_KEY_ATTRIBUTE);
                 }
             }
 
             currentCatalogueId = attr.getValue("", I18N_CATALOGUE_ATTRIBUTE);
             if (currentCatalogueId == null) {
                 // Try the namespaced attribute
-                currentCatalogueId = attr.getValue(I18nTransformer.I18N_NAMESPACE_URI, I18N_CATALOGUE_ATTRIBUTE);
+                currentCatalogueId = attr.getValue(I18N_NAMESPACE_URI, I18N_CATALOGUE_ATTRIBUTE);
             }
 
             if (prev_state != STATE_INSIDE_PARAM) {
@@ -1531,10 +1530,10 @@
 
         // Translate all attributes from i18n:attr="name1 name2 ..."
         // using their values as keys.
-        int attrIndex = attr.getIndex(I18nTransformer.I18N_NAMESPACE_URI, I18N_ATTR_ATTRIBUTE);
+        int attrIndex = attr.getIndex(I18N_NAMESPACE_URI, I18N_ATTR_ATTRIBUTE);
         if (attrIndex == -1) {
             // Try the old namespace
-            attrIndex = attr.getIndex(I18nTransformer.I18N_OLD_NAMESPACE_URI, I18N_ATTR_ATTRIBUTE);
+            attrIndex = attr.getIndex(I18N_OLD_NAMESPACE_URI, I18N_ATTR_ATTRIBUTE);
         }
 
         if (attrIndex != -1) {
@@ -1568,7 +1567,7 @@
 
         // Translate all attributes from i18n:expr="name1 name2 ..."
         // using their values as keys.
-        attrIndex = attr.getIndex(I18nTransformer.I18N_NAMESPACE_URI, I18N_EXPR_ATTRIBUTE);
+        attrIndex = attr.getIndex(I18N_NAMESPACE_URI, I18N_EXPR_ATTRIBUTE);
         if (attrIndex != -1) {
             StringTokenizer st = new StringTokenizer(attr.getValue(attrIndex));
 



Mime
View raw message