Changeset 1952

Timestamp:

12/03/07 11:54:52 (12 months ago)

Author:

jmoore

Message:

OmeroPrefs? #800 : Now handling system preferences as well

Files:

• trunk/components/common/src/prefs.java (modified) (7 diffs)

trunk/components/common/src/prefs.java

@@ -15 +15 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Properties;
+import java.util.Set;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
@@ -73 +76 @@
      * Cache the root node at start up
      */
-    private final static Preferences prefs = Preferences.userRoot().node(ROOT);
+    private static Preferences prefs = Preferences.userRoot().node(ROOT);
 
     /**
@@ -128 +131 @@
                 "  load_nowarn [FILE...] :  read current profile from a file or standard in",
                 "  set KEY=VALUE         :  set value on current profile",
+                "  sys COMMANDS          :  applies commands as above to system preferences",
                 "                                                                  ",
                 "Note: profiles are created on demand. Later properties override earlier ones." };
@@ -152 +156 @@
     public static String[] print(String[] args) {
         for (String string : args) {
-            System.out.println(string);
+            if (string != null) {
+                System.out.println(string);
+            }
         }
         return new String[] {};
@@ -162 +168 @@
     public static String[] printErr(String[] args) {
         for (String string : args) {
-            System.err.println(string);
+            if (string != null) {
+                System.err.println(string);
+            }
         }
         return args;
@@ -216 +224 @@
         }
 
+    }
+
+    /**
+     * Replaces the user {@link Preferences} instance with the system
+     * {@link Preferences} and continues dispatching.
+     */
+    public static String[] sys(String[] args) throws Throwable {
+        prefs = Preferences.systemRoot().node(ROOT);
+        return dispatch(args);
     }
 
@@ -288 +305 @@
         args = notNull(args);
 
+        String[] keys = _node().keys();
         if (args.length == 0) {
-            String[] keys = _node().keys();
             if (keys.length == 0) {
                 return args;
-            }
-            return get(keys);
-        }
-
+            } else if (keys.length == 1) {
+                return get(args(keys[0], "UNKNOWNKEYJUSTTOFORCELENGTH2"));
+            } else {
+                return get(keys);
+            }
+        } else if (args.length == 1) {
+            String key = args[0] == null ? "" : args[0];
+            String value = _node().get(key, "");
+            return args(value);
+        }
+
+        Set<String> availableKeys = new HashSet<String>(Arrays.asList(_node()
+                .keys()));
         String[] rv = new String[args.length];
         for (int i = 0; i < rv.length; i++) {
             String key = args[i] == null ? "" : args[i];
-            String value = _node().get(key, "");
-            if (rv.length == 1) {
-                rv[i] = value;
-            } else {
+            if (availableKeys.contains(key)) {
+                String value = _node().get(key, "");
                 rv[i] = key + "=" + value;
             }
-
         }
         return rv;
+
     }