Index: trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMap.java =================================================================== --- trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMap.java (revision 671) +++ trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/KeyboardMap.java (revision 725) @@ -12,5 +12,6 @@ import java.util.Map; import java.util.logging.Level; -import java.util.logging.Logger; + +import de.ugoe.cs.util.console.Console; /** @@ -21,7 +22,4 @@ */ public class KeyboardMap { - - /** */ - private static Logger LOG = Logger.getLogger(KeyboardMap.class.getName()); /** */ @@ -110,5 +108,5 @@ */ void init() throws IllegalArgumentException { - LOG.info("initializing keymap for locale " + locale); + Console.traceln(Level.FINE, "initializing keymap for locale " + locale); List deadKeySequences = new ArrayList(); @@ -116,6 +114,6 @@ 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,5 +133,6 @@ */ 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,5 +163,5 @@ } 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,5 +177,5 @@ } 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,5 +185,6 @@ } 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,6 +235,7 @@ 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,5 +257,5 @@ */ private VirtualKeySynonyms determineVirtualKeySynonyms(List 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,6 +281,7 @@ 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,6 +362,7 @@ } 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,6 +403,6 @@ 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,6 +1020,6 @@ } 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,6 +2018,6 @@ } 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) Index: trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/VirtualKeySynonyms.java =================================================================== --- trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/VirtualKeySynonyms.java (revision 671) +++ trunk/quest-misc/src/main/java/de/ugoe/cs/tasktree/keyboardmaps/VirtualKeySynonyms.java (revision 725) @@ -5,5 +5,7 @@ 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,7 +17,4 @@ class VirtualKeySynonyms { - /** */ - private static Logger LOG = Logger.getLogger(KeyboardMap.class.getName()); - /** */ private Map> synonyms = new HashMap>(); @@ -46,7 +45,7 @@ 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,5 +72,5 @@ } 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; }