From a75b5068d2d457fcfe96cce1dba51f5685581f31 Mon Sep 17 00:00:00 2001 From: endolf Date: Sat, 31 Oct 2009 11:06:12 +0000 Subject: Use java logging instead of system out in core and plugins. git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@229 e343933a-64c8-49c5-92b1-88f2ce3e89e8 --- .../java/net/java/games/input/ControllerEnvironment.java | 3 ++- .../java/games/input/DefaultControllerEnvironment.java | 13 ++++++++----- .../OSX/src/java/net/java/games/input/OSXHIDDevice.java | 16 +++++++++------- .../java/net/java/games/input/LinuxNativeTypesMap.java | 9 ++++++--- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/coreAPI/src/java/net/java/games/input/ControllerEnvironment.java b/coreAPI/src/java/net/java/games/input/ControllerEnvironment.java index db6f1dc..17208f7 100644 --- a/coreAPI/src/java/net/java/games/input/ControllerEnvironment.java +++ b/coreAPI/src/java/net/java/games/input/ControllerEnvironment.java @@ -43,6 +43,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Iterator; +import java.util.logging.Logger; /** * A ControllerEnvironment represents a collection of controllers that are @@ -74,7 +75,7 @@ public abstract class ControllerEnvironment { } static void log(String msg) { - System.out.print(msg); + Logger.getLogger(ControllerEnvironment.class.getName()).info(msg); } /** diff --git a/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java b/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java index 93db7c7..833fe6f 100644 --- a/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java +++ b/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java @@ -49,6 +49,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; +import java.util.logging.Logger; + import net.java.games.util.plugins.*; /** @@ -60,6 +62,8 @@ import net.java.games.util.plugins.*; class DefaultControllerEnvironment extends ControllerEnvironment { static String libPath; + private static Logger log = Logger.getLogger(DefaultControllerEnvironment.class.getName()); + /** * Static utility method for loading native libraries. * It will try to load from either the path given by @@ -138,12 +142,11 @@ class DefaultControllerEnvironment extends ControllerEnvironment { } else if(osName.equals("Windows 98") || osName.equals("Windows 2000")) { pluginClasses = pluginClasses + " net.java.games.input.DirectInputEnvironmentPlugin"; } else if (osName.startsWith("Windows")) { - System.out.println("WARNING: Found unknown Windows version: " + osName); - System.out.println("Attempting to use default windows plug-in."); - System.out.flush(); + log.warning("Found unknown Windows version: " + osName); + log.info("Attempting to use default windows plug-in."); pluginClasses = pluginClasses + " net.java.games.input.DirectAndRawInputEnvironmentPlugin"; } else { - System.out.println("Trying to use default plugin, OS name " + osName +" not recognised"); + log.info("Trying to use default plugin, OS name " + osName +" not recognised"); } } @@ -152,7 +155,7 @@ class DefaultControllerEnvironment extends ControllerEnvironment { String className = pluginClassTok.nextToken(); try { if(!loadedPlugins.contains(className)) { - System.out.println("Loading: " + className); + log.info("Loading: " + className); Class ceClass = Class.forName(className); ControllerEnvironment ce = (ControllerEnvironment) ceClass.newInstance(); if(ce.isSupported()) { diff --git a/plugins/OSX/src/java/net/java/games/input/OSXHIDDevice.java b/plugins/OSX/src/java/net/java/games/input/OSXHIDDevice.java index 27102ca..40024c3 100644 --- a/plugins/OSX/src/java/net/java/games/input/OSXHIDDevice.java +++ b/plugins/OSX/src/java/net/java/games/input/OSXHIDDevice.java @@ -43,6 +43,7 @@ import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.Iterator; +import java.util.logging.Logger; /** OSX HIDManager implementation * @author elias @@ -50,6 +51,7 @@ import java.util.Iterator; * @version 1.0 */ final class OSXHIDDevice { + private final static Logger log = Logger.getLogger(OSXHIDDevice.class.getName()); private final static int AXIS_DEFAULT_MIN_VALUE = 0; private final static int AXIS_DEFAULT_MAX_VALUE = 64*1024; @@ -152,7 +154,7 @@ final class OSXHIDDevice { int usage_page = getIntFromProperties(element_properties, kIOHIDElementUsagePageKey); UsagePair usage_pair = createUsagePair(usage_page, usage); if (usage_pair == null || (element_type != ElementType.INPUT_MISC && element_type != ElementType.INPUT_BUTTON && element_type != ElementType.INPUT_AXIS)) { -//System.out.println("element_type = 0x" + element_type + " | usage = " + usage + " | usage_page = " + usage_page); + //log.info("element_type = 0x" + element_type + " | usage = " + usage + " | usage_page = " + usage_page); return null; } else { return new OSXHIDElement(this, usage_pair, element_cookie, element_type, min, max, is_relative); @@ -238,17 +240,17 @@ final class OSXHIDDevice { } */ private final void dumpProperties() { - System.out.println(toString()); + log.info(toString()); dumpMap("", properties); } private final static void dumpArray(String prefix, Object[] array) { - System.out.println(prefix + "{"); + log.info(prefix + "{"); for (int i = 0; i < array.length; i++) { dumpObject(prefix + "\t", array[i]); - System.out.println(prefix + ","); + log.info(prefix + ","); } - System.out.println(prefix + "}"); + log.info(prefix + "}"); } private final static void dumpMap(String prefix, Map map) { @@ -264,13 +266,13 @@ final class OSXHIDDevice { private final static void dumpObject(String prefix, Object obj) { if (obj instanceof Long) { Long l = (Long)obj; - System.out.println(prefix + "0x" + Long.toHexString(l.longValue())); + log.info(prefix + "0x" + Long.toHexString(l.longValue())); } else if (obj instanceof Map) dumpMap(prefix, (Map)obj); else if (obj.getClass().isArray()) dumpArray(prefix, (Object[])obj); else - System.out.println(prefix + obj); + log.info(prefix + obj); } private final Map getDeviceProperties() throws IOException { diff --git a/plugins/linux/src/java/net/java/games/input/LinuxNativeTypesMap.java b/plugins/linux/src/java/net/java/games/input/LinuxNativeTypesMap.java index 509c108..31d36e7 100644 --- a/plugins/linux/src/java/net/java/games/input/LinuxNativeTypesMap.java +++ b/plugins/linux/src/java/net/java/games/input/LinuxNativeTypesMap.java @@ -25,6 +25,8 @@ */ package net.java.games.input; +import java.util.logging.Logger; + /** * Mapping utility class between native type ints and string names or * Key.Identifiers @@ -32,6 +34,7 @@ package net.java.games.input; */ class LinuxNativeTypesMap { private static LinuxNativeTypesMap INSTANCE = new LinuxNativeTypesMap(); + private static Logger log = Logger.getLogger(LinuxNativeTypesMap.class.getName()); private final Component.Identifier relAxesIDs[]; private final Component.Identifier absAxesIDs[]; @@ -755,7 +758,7 @@ class LinuxNativeTypesMap { try { retval = INSTANCE.relAxesIDs[nativeID]; } catch (ArrayIndexOutOfBoundsException e) { - System.out.println("INSTANCE.relAxesIDis only " + INSTANCE.relAxesIDs.length + " long, so " + nativeID + " not contained"); + log.warn("INSTANCE.relAxesIDis only " + INSTANCE.relAxesIDs.length + " long, so " + nativeID + " not contained"); //ignore, pretend it was null } if(retval == null) { @@ -773,7 +776,7 @@ class LinuxNativeTypesMap { try { retval = INSTANCE.absAxesIDs[nativeID]; } catch (ArrayIndexOutOfBoundsException e) { - System.out.println("INSTANCE.absAxesIDs is only " + INSTANCE.absAxesIDs.length + " long, so " + nativeID + " not contained"); + log.warn("INSTANCE.absAxesIDs is only " + INSTANCE.absAxesIDs.length + " long, so " + nativeID + " not contained"); //ignore, pretend it was null } if(retval == null) { @@ -791,7 +794,7 @@ class LinuxNativeTypesMap { try { retval = INSTANCE.buttonIDs[nativeID]; } catch (ArrayIndexOutOfBoundsException e) { - System.out.println("INSTANCE.buttonIDs is only " + INSTANCE.buttonIDs.length + " long, so " + nativeID + " not contained"); + log.warn("INSTANCE.buttonIDs is only " + INSTANCE.buttonIDs.length + " long, so " + nativeID + " not contained"); //ignore, pretend it was null } if(retval == null) { -- cgit v1.2.3