svn commit: r13967 - trunk/src_new/org/argouml/util/ConfigLoader.java

Author: mvw
Date: 2007-12-21 05:42:11-0800
New Revision: 13967

Modified:
   trunk/src_new/org/argouml/util/ConfigLoader.java

Log:
Fixed the package dependency cycle mentioned at: 

http://argouml.tigris.org/servlets/ReadMsg?list=dev&msgNo=21624.

Modified: trunk/src_new/org/argouml/util/ConfigLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/util/ConfigLoader.java?view=diff&rev=13967&p1=trunk/src_new/org/argouml/util/ConfigLoader.java&p2=trunk/src_new/org/argouml/util/ConfigLoader.java&r1=13966&r2=13967
==============================================================================
--- trunk/src_new/org/argouml/util/ConfigLoader.java	(original)
+++ trunk/src_new/org/argouml/util/ConfigLoader.java	2007-12-21 05:42:11-0800
@@ -38,7 +38,6 @@
 import javax.swing.JPanel;
 
 import org.apache.log4j.Logger;
-import org.argouml.application.api.Argo;
 import org.argouml.configuration.Configuration;
 import org.argouml.configuration.ConfigurationKey;
 import org.tigris.swidgets.Horizontal;
@@ -149,8 +148,12 @@
             return null;
         }
         try {
-            lnr = new LineNumberReader(new InputStreamReader(is, 
-                    Argo.getEncoding()));
+            lnr = new LineNumberReader(new InputStreamReader(is,
+                    /* Hardcoded the encoding here, instead of using the 
+                     * function: Argo.getEncoding(), to prevent an unwanted 
+                     * dependency between packages. 
+                     * This code is only used by a deprecated method! */
+                    "UTF-8"));
         } catch (UnsupportedEncodingException ueExc) {
             lnr = new LineNumberReader(new InputStreamReader(is));
         }