devicemap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wk...@apache.org
Subject svn commit: r1721278 - in /devicemap/trunk/clients/1.0/java: client/src/main/java/org/apache/devicemap/DeviceMapClient.java console/src/main/java/org/apache/devicemap/console/DeviceMapConsole.java
Date Mon, 21 Dec 2015 23:01:02 GMT
Author: wkeil
Date: Mon Dec 21 23:01:01 2015
New Revision: 1721278

URL: http://svn.apache.org/viewvc?rev=1721278&view=rev
Log:
DMAP-186: Some arguments like debug/log won't work in Java Console 

Task-Url: https://issues.apache.org/jira/browse/DMAP-186

Modified:
    devicemap/trunk/clients/1.0/java/client/src/main/java/org/apache/devicemap/DeviceMapClient.java
    devicemap/trunk/clients/1.0/java/console/src/main/java/org/apache/devicemap/console/DeviceMapConsole.java

Modified: devicemap/trunk/clients/1.0/java/client/src/main/java/org/apache/devicemap/DeviceMapClient.java
URL: http://svn.apache.org/viewvc/devicemap/trunk/clients/1.0/java/client/src/main/java/org/apache/devicemap/DeviceMapClient.java?rev=1721278&r1=1721277&r2=1721278&view=diff
==============================================================================
--- devicemap/trunk/clients/1.0/java/client/src/main/java/org/apache/devicemap/DeviceMapClient.java
(original)
+++ devicemap/trunk/clients/1.0/java/client/src/main/java/org/apache/devicemap/DeviceMapClient.java
Mon Dec 21 23:01:01 2015
@@ -110,7 +110,7 @@ public class DeviceMapClient {
         DeviceType winner = null;
         Pattern winnerPattern = null;
 
-        LOG.log(Level.INFO, "classify: ''{0}''", text); // TODO set back to FINE
+        LOG.log(Level.FINE, "classify: ''{0}''", text);
 
         List<String> parts = split(text);
 
@@ -146,10 +146,10 @@ public class DeviceMapClient {
         }
 
         if (winner != null) {
-            LOG.log(Level.INFO, "Result: {0}", winner); // TODO set back to FINE
+            LOG.log(Level.FINE, "Result: {0}", winner);
             
             UserAgent userAgent = UserAgent.of(text);
-            LOG.log(Level.INFO, "User Agent: {0}", userAgent);
+            LOG.log(Level.FINE, "User Agent: {0}", userAgent);
             //fixFromUserAgent(winner, userAgent);
             return fixFromUserAgent(winner, userAgent).getAttributes();
         } else {

Modified: devicemap/trunk/clients/1.0/java/console/src/main/java/org/apache/devicemap/console/DeviceMapConsole.java
URL: http://svn.apache.org/viewvc/devicemap/trunk/clients/1.0/java/console/src/main/java/org/apache/devicemap/console/DeviceMapConsole.java?rev=1721278&r1=1721277&r2=1721278&view=diff
==============================================================================
--- devicemap/trunk/clients/1.0/java/console/src/main/java/org/apache/devicemap/console/DeviceMapConsole.java
(original)
+++ devicemap/trunk/clients/1.0/java/console/src/main/java/org/apache/devicemap/console/DeviceMapConsole.java
Mon Dec 21 23:01:01 2015
@@ -43,7 +43,7 @@ import org.apache.devicemap.loader.impl.
 /**
  * @author Reza Naghibi
  * @author Werner Keil
- * @version 1.1.3
+ * @version 1.1.4
  */
 public class DeviceMapConsole {
 	private static final String APP_NAME = "DeviceMap Java Console";
@@ -160,6 +160,9 @@ public class DeviceMapConsole {
 				loaderPath = null;
 			}
 
+			if (LoaderOption.UNINITIALIZED.equals(option)) {
+				option = LoaderOption.URL;
+			}
 			final DeviceMapClient client = new DeviceMapClient();
 			final long start = System.currentTimeMillis();
 			client.initDeviceData(option, loaderPath);
@@ -168,7 +171,7 @@ public class DeviceMapConsole {
 			System.out.println("Loaded " + client.getDeviceCount()
 					+ " devices with " + client.getPatternCount()
 					+ " patterns and " + client.getNodeCount() + " nodes in "
-					+ diff + "ms");
+					+ diff + " ms");
 
 			System.out.println("Cold run");
 			long startn = System.nanoTime();



Mime
View raw message