svn commit: [fix_create] r2 - /trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyController.java

[rfelden]

Author: rfelden
Date: Wed Jun 20 14:09:05 2007
New Revision: 2

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D2&repname=3Df=
ix_create
Log:
settings management bug fix

Modified:
    trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyContro=
ller.java

Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/My=
Controller.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/controller/MyController.java&rev=3D2&repname=
=3Dfix_create
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyContro=
ller.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyContro=
ller.java Wed Jun 20 14:09:05 2007
@@ -119,8 +119,9 @@
     public void loadSettings(String project) {
         assert(MyHTMLTrace.channel(Application.TRACE_CHANNEL).enterMethod(=
getClass(), "loadSettings", project)) ;
         try {
+            File dir =3D new File(Application.APP_DIR, getProperty("app.co=
nfigDirectory")) ;
             m_settings.loadSettings(project);
-            File xmlfile =3D new File(getProperty("app.configDirectory")+F=
ile.separator+project+".xml") ;
+            File xmlfile =3D new File(dir, File.separator+project+".xml") ;
             setConfiguration(xmlfile);
         } catch (IOException e) {
             e.printStackTrace();
@@ -333,7 +334,7 @@
      */
     public void saveConfiguration() {
         assert(MyHTMLTrace.channel(Application.TRACE_CHANNEL).enterMethod(=
getClass(), "saveConfiguration")) ;
-        File configDir =3D new File(m_settings.getProperty("app.configDire=
ctory")) ;
+        File configDir =3D new File(Application.APP_DIR, getProperty("app.=
configDirectory")) ;
         if (!configDir.exists()) {
             configDir.mkdirs() ;
         }

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list