devicemap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wk...@apache.org
Subject svn commit: r1659412 - in /devicemap/trunk/devicemap/java: classifier/pom.xml pom.xml simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java
Date Thu, 12 Feb 2015 21:37:15 GMT
Author: wkeil
Date: Thu Feb 12 21:37:15 2015
New Revision: 1659412

URL: http://svn.apache.org/r1659412
Log:
Updated data dependency

Modified:
    devicemap/trunk/devicemap/java/classifier/pom.xml
    devicemap/trunk/devicemap/java/pom.xml
    devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java

Modified: devicemap/trunk/devicemap/java/classifier/pom.xml
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/classifier/pom.xml?rev=1659412&r1=1659411&r2=1659412&view=diff
==============================================================================
--- devicemap/trunk/devicemap/java/classifier/pom.xml (original)
+++ devicemap/trunk/devicemap/java/classifier/pom.xml Thu Feb 12 21:37:15 2015
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.devicemap</groupId>
       <artifactId>devicemap-data</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: devicemap/trunk/devicemap/java/pom.xml
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/pom.xml?rev=1659412&r1=1659411&r2=1659412&view=diff
==============================================================================
--- devicemap/trunk/devicemap/java/pom.xml (original)
+++ devicemap/trunk/devicemap/java/pom.xml Thu Feb 12 21:37:15 2015
@@ -41,7 +41,7 @@
 		<jdkVersion>${java.version}</jdkVersion>
 		<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
 		<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
-		<devicemap.data.version>1.0.2-SNAPSHOT</devicemap.data.version>
+		<devicemap.data.version>1.0.3-SNAPSHOT</devicemap.data.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 

Modified: devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java?rev=1659412&r1=1659411&r2=1659412&view=diff
==============================================================================
--- devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java
(original)
+++ devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java
Thu Feb 12 21:37:15 2015
@@ -60,7 +60,7 @@ public class AndroidDeviceBuilder extend
     }
 
     public Device build(UserAgent userAgent, int confidenceTreshold) {
-    	logger.info("Building");
+    	logger.fine("Building");
     	logger.log(Level.FINE, "UA: " + userAgent.getCompleteUserAgent() + " :: A=" + userAgent.containsAndroid());
         final List<Device> foundDevices = new ArrayList<Device>();
         Iterator<String> it = orderedRules.keySet().iterator();
@@ -220,24 +220,6 @@ public class AndroidDeviceBuilder extend
         return null;
     }
     
-//    private Device fuzzyAndroidDeviceWithToken(final UserAgent userAgent, String token)
{
-//        if (userAgent.hasMozillaPattern() || userAgent.hasOperaPattern()) {
-//            int subtract = 1;
-//	    	for (String regEx : FUZZY_TOKEN_REGEXPS) {
-//	    		if (Pattern.matches(regEx, token)) {
-//	    			String deviceId = (String) orderedRules.get(token);
-//	                if (devices.containsKey(deviceId)) {
-//	                    Device retDevice = (Device) devices.get(deviceId).clone();
-//	                    retDevice.setConfidence(40 - subtract);
-//	                    return retDevice;
-//	                }
-//	    		}
-//	    		return null;
-//	    	}
-//        }
-//    	return null;
-//    }
-    
     private Device fixFromUserAgent(final Device device, final UserAgent userAgent) {
 //    	if (device.containsProperty(DEVICE_OS_VERSION)) {
     		String pattern = userAgent.getPatternElementsInside();
@@ -247,7 +229,7 @@ public class AndroidDeviceBuilder extend
     				final String versionPart = part.trim().substring(ANDROID.length()).trim();
     				final String versionExisting = device.get(DEVICE_OS_VERSION);
     				if (!versionPart.equals(versionExisting)) {
-    					logger.info("Fixing '" + versionExisting +"' to '" + versionPart + "'" );
+    					logger.fine("Fixing '" + versionExisting +"' to '" + versionPart + "'" );
     					device.putProperty(DEVICE_OS_VERSION, versionPart);
     				}
     			}



Mime
View raw message