Author: wkeil Date: Sun Dec 28 15:29:01 2014 New Revision: 1648218 URL: http://svn.apache.org/r1648218 Log: DMAP-35: Refactor Simple DDR
Task-Url: https://issues.apache.org/jira/browse/DMAP-35 Modified: devicemap/trunk/devicemap/java/simpleddr/pom.xml devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java Modified: devicemap/trunk/devicemap/java/simpleddr/pom.xml URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/simpleddr/pom.xml?rev=1648218&r1=1648217&r2=1648218&view=diff ============================================================================== --- devicemap/trunk/devicemap/java/simpleddr/pom.xml (original) +++ devicemap/trunk/devicemap/java/simpleddr/pom.xml Sun Dec 28 15:29:01 2014 @@ -219,13 +219,6 @@ <artifactId>devicemap-data</artifactId> <scope>test</scope> </dependency> - <!-- - <dependency> - <groupId>org.apache.devicemap</groupId> - <artifactId>devicemap-test-data</artifactId> - <scope>test</scope> - </dependency> - --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> 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=1648218&r1=1648217&r2=1648218&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 Sun Dec 28 15:29:01 2014 @@ -86,9 +86,9 @@ public class AndroidDeviceBuilder extend String currentToken = token; String looseToken = token.replaceAll("[ _/-]", ".?"); - +System.out.println("Loose Token: " + looseToken); Pattern loosePattern = Pattern.compile("(?i).*" + looseToken + ".*"); -System.out.println("Loose Pattern: " + loosePattern); +//System.out.println("Loose Pattern: " + loosePattern); if (!loosePattern.matcher(userAgent.getCompleteUserAgent().replaceAll("Android", "")).matches()) { return null; }
