Changeset 636:1c091100f74b

Timestamp:

10/02/09 16:59:55 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@637

Message:

default language properties moved in a separate variable

Location:

src/org/w3c/unicorn

Files:

• Framework.java (modified) (2 diffs)
• action/LanguageAction.java (modified) (3 diffs)

src/org/w3c/unicorn/Framework.java

@@ -1 @@
-// $Id: Framework.java,v 1.17 2009-10-02 16:52:10 tgambet Exp $
+// $Id: Framework.java,v 1.18 2009-10-02 16:59:55 tgambet Exp $
 // Author: Damien LEROY & Thomas GAMBET.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -427 +427 @@
                         logger.debug("> Found language (default): " + defaultProps.getProperty("lang") + " - " + defaultProps.getProperty("language"));
                         defaultProps.put("complete", "true");
-                        LanguageAction.addLanguageProperties(defaultProps);
+                        LanguageAction.setDefaultProperties(defaultProps);
                         languageProperties.put(Property.get("DEFAULT_LANGUAGE"), defaultProps);
                 } catch (IllegalArgumentException e) {

src/org/w3c/unicorn/action/LanguageAction.java

@@ -27 +27 @@
         
         private static TreeMap<String, Properties> languageProperties;
+        
+        private static Properties defaultProperties;
 
         /**
@@ -55 +57 @@
                 
                 
-                languages.put(defaultLang, languageProperties.get(defaultLang).getProperty("language"));
+                languages.put(defaultLang, defaultProperties.getProperty("language"));
                 velocityContext.put("languages", languages);
+                languageProperties.remove(defaultLang);
                 velocityContext.put("languageProps", languageProperties);
-                velocityContext.put("defaultProps", languageProperties.get(defaultLang));
+                velocityContext.put("defaultProps", defaultProperties);
                 
                 PrintWriter writer = resp.getWriter();
@@ -86 +89 @@
         }
 
+        public static Properties getDefaultProperties() {
+                return defaultProperties;
+        }
+
+        public static void setDefaultProperties(Properties defaultProperties) {
+                LanguageAction.defaultProperties = defaultProperties;
+        }
+        
+        
+
 }