diff options
| author | Paul Buetow <paul@buetow.org> | 2008-05-24 23:11:37 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2008-05-24 23:11:37 +0000 |
| commit | c4ad328e63067bc290c52a92c602220007729a9c (patch) | |
| tree | ebc9e58c72167949ad00352fdcb455f72e7f778b /sources/prefs | |
| parent | 7015fbd868d211e5688723e0de9efe933fcb5596 (diff) | |
Cleanup.
Diffstat (limited to 'sources/prefs')
| -rw-r--r-- | sources/prefs/VSDefaultPrefs.java | 17 | ||||
| -rw-r--r-- | sources/prefs/VSPrefs.java | 11 |
2 files changed, 8 insertions, 20 deletions
diff --git a/sources/prefs/VSDefaultPrefs.java b/sources/prefs/VSDefaultPrefs.java index 3446184..f8dbb2a 100644 --- a/sources/prefs/VSDefaultPrefs.java +++ b/sources/prefs/VSDefaultPrefs.java @@ -10,24 +10,11 @@ public class VSDefaultPrefs extends VSPrefs { } public static VSPrefs init(String fileName) { - File file = new File(fileName); - VSPrefs prefs = null; - - if (file.exists()) { - prefs = openFile(fileName); - - } else { - prefs = new VSDefaultPrefs(); - prefs.fillWithDefaults(); - } - + VSPrefs prefs = new VSDefaultPrefs(); + prefs.fillWithDefaults(); return prefs; } - public void saveFile() { - super.saveFile(VSPrefs.PREFERENCES_FILENAME); - } - public void fillWithDefaults() { super.clear(); fillDefaultBooleans(); diff --git a/sources/prefs/VSPrefs.java b/sources/prefs/VSPrefs.java index 5b2cc9c..4ba0208 100644 --- a/sources/prefs/VSPrefs.java +++ b/sources/prefs/VSPrefs.java @@ -438,7 +438,8 @@ public abstract class VSPrefs implements Serializable { objectOutputStream.writeObject(units); } - public synchronized void readObject(ObjectInputStream objectInputStream) + @SuppressWarnings("unchecked") + public synchronized void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException { booleanPrefs = (HashMap<String,Boolean>) objectInputStream.readObject(); colorPrefs = (HashMap<String,Color>) objectInputStream.readObject(); @@ -451,8 +452,8 @@ public abstract class VSPrefs implements Serializable { units = (HashMap<String,String>) objectInputStream.readObject(); } + /* public void saveFile(String filename) { - //System.out.println("SAVE FILE " + filename); try { FileOutputStream fileOutputStream = new FileOutputStream(filename); ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream); @@ -462,12 +463,11 @@ public abstract class VSPrefs implements Serializable { e.printStackTrace(); } } + */ - public void saveFile() { }; - + /* public static VSPrefs openFile(String filename) { VSPrefs prefs = null; - //System.out.println("OPEN FILE " + filename); try { FileInputStream fileInputStream = new FileInputStream(filename); @@ -485,6 +485,7 @@ public abstract class VSPrefs implements Serializable { return prefs; } + */ public void copyIntegers(VSPrefs copyInto, String[] keys) { for (String key : keys) |
