[Yanel-commits] rev 23924 - in public/yanel/trunk/src/core/java/org/wyona/yanel/core: attributes/translatable map

[josias at wyona.com]

Author: josias
Date: 2007-04-20 16:14:18 +0200 (Fri, 20 Apr 2007)
New Revision: 23924

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/attributes/translatable/AbstractPathTranslationManager.java
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/Realm.java
Log:
refactoring: changed type of language collection from ArrayList to String[] for simplicity and consistency reasons

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/attributes/translatable/AbstractPathTranslationManager.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/attributes/translatable/AbstractPathTranslationManager.java	2007-04-20 14:09:11 UTC (rev 23923)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/attributes/translatable/AbstractPathTranslationManager.java	2007-04-20 14:14:18 UTC (rev 23924)
@@ -107,11 +107,10 @@
         Page page = getPage(resource);
         if (page == null) {
             try {
-                ArrayList realmLanguages = resource.getRealm().getLanguages();
+                String[] realmLanguages = resource.getRealm().getLanguages();
                 ArrayList existingLanguages = new ArrayList();
-                Iterator iter = realmLanguages.iterator();
-                while (iter.hasNext()) {
-                    String possibleLanguage = (String)iter.next();
+                for (int i = 0; i < realmLanguages.length; i++) {
+                    String possibleLanguage = realmLanguages[i];
                     Resource possibleResource = getResource(resource, possibleLanguage);
                     if (possibleResource != null) {
                         existingLanguages.add(possibleLanguage);

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/Realm.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/Realm.java	2007-04-20 14:09:11 UTC (rev 23923)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/Realm.java	2007-04-20 14:14:18 UTC (rev 23924)
@@ -57,7 +57,7 @@
     private TranslationManager translationManager;
     private File configFile;
     private File rootDir;
-    private ArrayList languages;
+    private String[] languages;
 
     private String proxyHostName;
     private String proxyPort;
@@ -144,7 +144,7 @@
                 languages.add(language);
             }
         }
-        setLanguages(languages);
+        setLanguages((String[])languages.toArray(new String[languages.size()]));
         
         configElement = config.getChild("translation-manager", false);
         TranslationManager translationManager = null;
@@ -316,12 +316,12 @@
      * Gets a list of all languages supported by this realm.
      * @return list of languages. may be empty.
      */
-    public ArrayList getLanguages() {
+    public String[] getLanguages() {
         return languages;
     }
 
-    public void setLanguages(ArrayList languages) {
-        this.languages = languages;
+    public void setLanguages(String[] languages) {
+        this.languages = (String[])languages.clone();
     }
 
     public TranslationManager getTranslationManager() {