Changeset 725 for trunk/quest-misc

Timestamp:

08/31/12 10:27:50 (12 years ago)

Author:

pharms

Message:

• use console for logging instead of logger

Location:

trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps

Files:

• KeyboardMap.java (modified) (15 diffs)
• VirtualKeySynonyms.java (modified) (4 diffs)

trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMap.java

@@ -12 +12 @@
 import java.util.Map;
 import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import de.ugoe.cs.util.console.Console;
 
 /**
@@ -21 +22 @@
  */
 public class KeyboardMap {
-
-    /** */
-    private static Logger LOG = Logger.getLogger(KeyboardMap.class.getName());
 
     /** */
@@ -110 +108 @@
      */
     void init() throws IllegalArgumentException {
-        LOG.info("initializing keymap for locale " + locale);
+        Console.traceln(Level.FINE, "initializing keymap for locale " + locale);
 
         List<String[]> deadKeySequences = new ArrayList<String[]>();
@@ -116 +114 @@
         readStream(getStream(fileName), deadKeySequences, keyStrokes);
 
-        LOG.info("read " + keyStrokes.size() + " key strokes and " + deadKeySequences.size() +
-                 " dead key sequences");
+        Console.traceln(Level.FINER, "read " + keyStrokes.size() + " key strokes and " +
+                        deadKeySequences.size() + " dead key sequences");
 
         VirtualKeySynonyms virtualKeySynonyms = determineVirtualKeySynonyms(keyStrokes);
@@ -135 +133 @@
      */
     private InputStream getStream(String name) {
-        LOG.info("reading keymap for locale " + locale + " from resource keymaps/" + name);
+        Console.traceln
+          (Level.FINER, "reading keymap for locale " + locale + " from resource keymaps/" + name);
 
         InputStream stream =
@@ -164 +163 @@
         }
         catch (UnsupportedEncodingException e) {
-            LOG.log(Level.WARNING, "no keyboard map available for locale " + locale, e);
+            Console.traceln(Level.WARNING, "no keyboard map available for locale " + locale);
             throw new IllegalArgumentException
                 ("provided stream can not be read due to invalid encoding", e);
@@ -178 +177 @@
         }
         catch (IOException e) {
-            LOG.log(Level.WARNING, "no keyboard map available for locale " + locale, e);
+            Console.traceln(Level.WARNING, "no keyboard map available for locale " + locale);
             throw new IllegalArgumentException("no keyboard map available for locale " + locale, e);
         }
@@ -186 +185 @@
             }
             catch (IOException e) {
-                LOG.warning("could not close input stream for reading keyboard map");
+                Console.traceln
+                    (Level.WARNING, "could not close input stream for reading keyboard map");
             }
         }
@@ -235 +235 @@
             for (int i = 0; i < keyStrokes.size(); i++) {
                 if (keyStrokes.get(i)[0].equals(values[0])) {
-                    LOG.finest("replacing key stroke " + values[0] + " with former keyid " +
-                               keyStrokes.get(i)[1] + " with new key id " + values[1]);
+                    Console.traceln(Level.FINEST, "replacing key stroke " + values[0] +
+                                    " with former keyid " + keyStrokes.get(i)[1] +
+                                    " with new key id " + values[1]);
                     keyStrokes.set(i, values);
                     alreadyAdded = true;
@@ -256 +257 @@
      */
     private VirtualKeySynonyms determineVirtualKeySynonyms(List<String[]> keyStrokes) {
-        LOG.info("determining virtual keys and synonyms for the keymap");
+        Console.traceln(Level.FINER, "determining virtual keys and synonyms for the keymap");
 
         VirtualKeySynonyms virtualKeySynonyms = new VirtualKeySynonyms();
@@ -280 +281 @@
         for (String[] unmatchedKeyStroke : unmatchedKeyStrokes) {
             if (!virtualKeySynonyms.containsKey(getKeyId(unmatchedKeyStroke[1]))) {
-                LOG.finest("no virtual key mapped to key stroke " + unmatchedKeyStroke[0] + "(" +
-                           unmatchedKeyStroke[1] + ") of keyboard map for locale " + locale);
+                Console.traceln(Level.FINEST, "no virtual key mapped to key stroke " +
+                                unmatchedKeyStroke[0] + "(" + unmatchedKeyStroke[1] +
+                                ") of keyboard map for locale " + locale);
             }
         }
@@ -360 +362 @@
                 }
                 else {
-                    LOG.severe("unknown condition " + values[i] + " specified for key stroke " +
-                               keyStrokeName + " through keyboard map for locale " + locale);
+                    Console.traceln(Level.SEVERE, "unknown condition " + values[i] +
+                                    " specified for key stroke " + keyStrokeName +
+                                    " through keyboard map for locale " + locale);
                     throw new IllegalArgumentException
                         ("no keyboard map available for locale " + locale);
@@ -400 +403 @@
 
         if (virtualKeys == null) {
-            LOG.severe("no virtual key mapped to key stroke " + keyStrokeName +
-                       " of keyboard map for locale " + locale);
+            Console.traceln(Level.SEVERE, "no virtual key mapped to key stroke " + keyStrokeName +
+                            " of keyboard map for locale " + locale);
             // throw new IllegalArgumentException("no keyboard map available for locale " +
             // mLocale);
@@ -1017 +1020 @@
         }
         else {
-            LOG.finest("unknown virtual key for key stroke " + keyStrokeName +
-                       " specified through " + "keyboard map for locale " + locale);
+            Console.traceln(Level.FINEST, "unknown virtual key for key stroke " + keyStrokeName +
+                            " specified through " + "keyboard map for locale " + locale);
 
             return null;
@@ -2015 +2018 @@
         }
         else {
-            LOG.severe("unknown key stroke name " + keyStrokeName +
-                       " specified through keyboard map " + "for locale " + locale);
+            Console.traceln(Level.SEVERE, "unknown key stroke name " + keyStrokeName +
+                            " specified through keyboard map " + "for locale " + locale);
 
             // if (shift)

trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/VirtualKeySynonyms.java

@@ -5 +5 @@
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
+import java.util.logging.Level;
+
+import de.ugoe.cs.util.console.Console;
 
 /**
@@ -15 +17 @@
 class VirtualKeySynonyms {
     
-    /** */
-    private static Logger LOG = Logger.getLogger(KeyboardMap.class.getName());
-
     /** */
     private Map<Integer, List<VirtualKey>> synonyms = new HashMap<Integer, List<VirtualKey>>();
@@ -46 +45 @@
 
         if ((existingKeyId != null) && (existingKeyId != keyId)) {
-            LOG.finest("virtual key " + virtualKey +
-                       " is mapped to more than one key id (current is " + existingKeyId +
-                       ", new is " + keyId + "). New key id will be used (" + keyId + ").");
+            Console.traceln(Level.FINEST, "virtual key " + virtualKey + " is mapped to more " +
+                            "than one key id (current is " + existingKeyId + ", new is " + keyId +
+                            "). New key id will be used (" + keyId + ").");
         }
 
@@ -73 +72 @@
         }
         else {
-            LOG.warning("no virtual key define for key id " + keyId);
+            Console.traceln(Level.WARNING, "no virtual key define for key id " + keyId);
             return null;
         }