Changeset 31 for trunk/de.ugoe.cs.swe.exercises/src/de/ugoe

Timestamp:

10/20/09 13:46:39 (15 years ago)

Author:

zeiss

Message:

settings stored with xml serializer.

Location:

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises

Files:

• Application.java (modified) (1 diff)
• misc/FileUtils.java (modified) (3 diffs)
• settings/Settings.java (modified) (13 diffs)
• settings/SettingsDialog.java (modified) (4 diffs)
• settings/SettingsDialog2.java (modified) (1 diff)

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/Application.java

@@ -37 +37 @@
         public Object start(IApplicationContext context) {
                 Display display = PlatformUI.createDisplay();
+                Settings.getInstance().load();
                 SettingsDialog settingsDialog = new SettingsDialog(new Shell());
-                /* try{ */
-                if (!Settings.getInstance().isInitialized())
+                if (!Settings.getInstance().isInitialized()) {
                         settingsDialog.open();
-                /*
-                 * } catch (NullPointerException ex){ settingsDialog.open(); } catch
-                 * (IllegalArgumentException ex) { settingsDialog.open(); } catch
-                 * (Exception ex) { settingsDialog.open(); }
-                 */
+                }
+
                 try {
                         DAVRepositoryFactory.setup();

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/misc/FileUtils.java

@@ -1 +1 @@
 package de.ugoe.cs.swe.exercises.misc;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.channels.FileChannel;
 
@@ -27 +31 @@
 
         public static void renameFile(String oldName, String newName) {
-                
-                File oldFile = new File(ExerciseSVN.SVNpath + "exercisesheets/" + oldName);
-                File newFile = new File(ExerciseSVN.SVNpath + "exercisesheets/" + newName);
-                
+
+                File oldFile = new File(ExerciseSVN.SVNpath + "exercisesheets/"
+                                + oldName);
+                File newFile = new File(ExerciseSVN.SVNpath + "exercisesheets/"
+                                + newName);
+
                 try {
                         copyFile(oldFile, newFile);
@@ -40 +46 @@
         }
 
+        public static String readFileAsString(String filePath) throws IOException {
+                BufferedReader br = new BufferedReader(new InputStreamReader(
+                                new FileInputStream(filePath)));
+                StringBuffer contentOfFile = new StringBuffer();
+                String line;
+                while ((line = br.readLine()) != null) {
+                        contentOfFile.append(line);
+                }
+                return contentOfFile.toString();
+        }
+
+        public static void writeStringAsFile(String filePath, String content)
+                        throws IOException {
+                try {
+                        BufferedWriter out = new BufferedWriter(new FileWriter(filePath));
+                        out.write(content);
+                        out.close();
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+        }
+
 }

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/Settings.java

@@ -1 +1 @@
 package de.ugoe.cs.swe.exercises.settings;
+
+import java.io.File;
+import java.io.IOException;
+import com.thoughtworks.xstream.XStream;
+import de.ugoe.cs.swe.exercises.misc.FileUtils;
 
 public class Settings {
@@ -37 +42 @@
         }
 
+        private String nullCheck(String str) {
+                if (str == null)
+                        return "";
+                else
+                        return str;
+                        
+        }
+        
         public String getSvnLocation() {
-                return svnLocation;
+                return nullCheck(svnLocation);
         }
 
@@ -46 +59 @@
 
         public String getWorkingDirectory() {
-                return workingDirectory;
+                return nullCheck(workingDirectory);
         }
 
@@ -54 +67 @@
 
         public String getSvnUsername() {
-                return svnUsername;
+                return nullCheck(svnUsername);
         }
 
@@ -62 +75 @@
 
         public String getSvnPassword() {
-                return svnPassword;
+                return nullCheck(svnPassword);
         }
 
@@ -70 +83 @@
 
         public String getMysqlHost() {
-                return mysqlHost;
+                return nullCheck(mysqlHost);
         }
 
@@ -78 +91 @@
 
         public String getMysqlDb() {
-                return mysqlDb;
+                return nullCheck(mysqlDb);
         }
 
@@ -86 +99 @@
 
         public String getMysqlUsername() {
-                return mysqlUsername;
+                return nullCheck(mysqlUsername);
         }
 
@@ -94 +107 @@
 
         public String getMysqlPassword() {
-                return mysqlPassword;
+                return nullCheck(mysqlPassword);
         }
 
@@ -102 +115 @@
 
         public String getPdfLatexPath() {
-                return pdfLatexPath;
+                return nullCheck(pdfLatexPath);
         }
 
@@ -110 +123 @@
 
         public String getResearchGroup() {
-                return researchGroup;
+                return nullCheck(researchGroup);
         }
 
@@ -118 +131 @@
 
         public String getResearchGroupUrl() {
-                return researchGroupUrl;
+                return nullCheck(researchGroupUrl);
         }
 
@@ -133 +146 @@
         }
 
+        public void load() {
+                File file = new File(System.getProperty("user.home")
+                                + "/exercises_settings.xml");
+                if (file.exists()) {
+                        try {
+                                String content = FileUtils.readFileAsString(file.getAbsolutePath());
+                                XStream xstream = new XStream();
+                                xstream.alias("ExercisesSettings", Settings.class);
+                                settings = (Settings) xstream.fromXML(content);
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                        }
+                }
+        }
+
+        public void save() {
+                File file = new File(System.getProperty("user.home")
+                                + "/exercises_settings.xml");
+
+                XStream xstream = new XStream();
+                xstream.alias("ExercisesSettings", Settings.class);
+                String xml = xstream.toXML(settings);
+                try {
+                        FileUtils.writeStringAsFile(file.getAbsolutePath(), xml);
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+        }
+
+        @Override
+        public String toString() {
+                StringBuilder builder = new StringBuilder();
+                builder.append("Settings [mysqlDb=");
+                builder.append(mysqlDb);
+                builder.append(", mysqlHost=");
+                builder.append(mysqlHost);
+                builder.append(", mysqlPassword=");
+                builder.append(mysqlPassword);
+                builder.append(", mysqlSSL=");
+                builder.append(mysqlSSL);
+                builder.append(", mysqlUsername=");
+                builder.append(mysqlUsername);
+                builder.append(", pdfLatexPath=");
+                builder.append(pdfLatexPath);
+                builder.append(", researchGroup=");
+                builder.append(researchGroup);
+                builder.append(", researchGroupUrl=");
+                builder.append(researchGroupUrl);
+                builder.append(", svnLocation=");
+                builder.append(svnLocation);
+                builder.append(", svnPassword=");
+                builder.append(svnPassword);
+                builder.append(", svnUsername=");
+                builder.append(svnUsername);
+                builder.append(", workingDirectory=");
+                builder.append(workingDirectory);
+                builder.append("]");
+                return builder.toString();
+        }
+
+        
+        
 }

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog.java

@@ -1 +1 @@
 package de.ugoe.cs.swe.exercises.settings;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.util.Properties;
 
 import org.eclipse.jface.dialogs.IMessageProvider;
@@ -52 +46 @@
         public SettingsDialog(Shell parentShell) {
                 super(parentShell);
-                this.getFileContents();
-                setTitle("Settings");
+                Settings.getInstance().load();
         }
 
@@ -259 +252 @@
                                                 return;
                                         }
-                                        setFileContents();
+                                        Settings.getInstance().save();
                                         close();
 
@@ -278 +271 @@
         }
 
-        private void getFileContents() {
-                Properties properties = new Properties();
-                File file = new File(System.getProperty("user.home")
-                                + "/.exerciseSettings");
-                if (file.exists()) {
-                        try {
-                                properties.load(new FileInputStream(file));
-                        } catch (FileNotFoundException e) {
-                                e.printStackTrace();
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
-                        try {
-                                Settings settings = Settings.getInstance();
-                                settings.setSvnLocation(properties.getProperty("svnLocation"));
-                                settings.setWorkingDirectory(properties.getProperty("workingDirectory"));
-                                settings.setSvnUsername(properties.getProperty("svnUsername"));
-                                settings.setSvnPassword(properties.getProperty("svnPassword"));
-                                settings.setMysqlHost(properties.getProperty("mySQLHost"));
-                                settings.setMysqlDb(properties.getProperty("mySQLDb"));
-                                settings.setMysqlUsername(properties.getProperty("mySQLUsername"));
-                                settings.setMysqlPassword(properties.getProperty("mySQLPassword"));
-                                settings.setMysqlSSL(Boolean.parseBoolean(properties
-                                                .getProperty("mySQLcheckSSL")));
-                                settings.setPdfLatexPath(properties.getProperty("pdfLatexPath"));
-                                settings.setResearchGroup(properties.getProperty("researchGroup"));
-                                settings.setResearchGroupUrl(properties.getProperty("researchGroupUrl"));
-                        } catch (Exception ex) {
-                        }
-                }
-        }
-
-        private void setFileContents() {
-                Properties properties = new Properties();
-                File file = new File(System.getProperty("user.home")
-                                + "/.exerciseSettings");
-                if (!file.exists()) {
-                        try {
-                                file.createNewFile();
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                                return;
-                        }
-                }
-                Settings settings = Settings.getInstance();
-
-                properties.setProperty("svnLocation", settings.getSvnLocation());
-                properties.setProperty("workingDirectory", settings.getWorkingDirectory());
-                properties.setProperty("svnUsername", settings.getSvnUsername());
-                properties.setProperty("svnPassword", settings.getSvnPassword());
-                properties.setProperty("mySQLHost", settings.getMysqlHost());
-                properties.setProperty("mySQLDb", settings.getMysqlDb());
-                properties.setProperty("mySQLUsername", settings.getMysqlUsername());
-                properties.setProperty("mySQLPassword", settings.getMysqlPassword());
-                properties.setProperty("mySQLcheckSSL", String.valueOf(settings.isMysqlSSL()));
-                properties.setProperty("pdfLatexPath", settings.getPdfLatexPath());
-                properties.setProperty("researchGroup", settings.getResearchGroup());
-                properties.setProperty("researchGroupUrl", settings.getResearchGroupUrl());
-
-                try {
-                        properties.store(new FileOutputStream(file),
-                                        "SVN and other Settings included");
-                } catch (FileNotFoundException e) {
-                        e.printStackTrace();
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
-        }
-
 }

trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/settings/SettingsDialog2.java

@@ -16 +16 @@
         public SettingsDialog2(Shell parentShell) {
                 super(parentShell);
+                Settings.getInstance().load();
         }