You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by re...@apache.org on 2013/06/25 19:29:42 UTC
svn commit: r1496551 - in
/incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client:
DeviceMapClient.java data/Pattern.java
Author: rezan
Date: Tue Jun 25 17:29:42 2013
New Revision: 1496551
URL: http://svn.apache.org/r1496551
Log:
refactor
Modified:
incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/DeviceMapClient.java
incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/data/Pattern.java
Modified: incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/DeviceMapClient.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/DeviceMapClient.java?rev=1496551&r1=1496550&r2=1496551&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/DeviceMapClient.java (original)
+++ incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/DeviceMapClient.java Tue Jun 25 17:29:42 2013
@@ -87,20 +87,8 @@ public class DeviceMapClient {
for(String hit:hits.keySet()) {
Device device=hits.get(hit);
-
- boolean found=false;
- patterns:
- for(List<String> patternset:device.getPatterns().getPatterns()) {
- for(String pattern:patternset) {
- if(!hits.containsKey(pattern)) {
- continue patterns;
- }
- }
- found=true;
- break;
- }
- if(!found) {
+ if(!device.getPatterns().isValid(hits.keySet())) {
continue;
}
Modified: incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/data/Pattern.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/data/Pattern.java?rev=1496551&r1=1496550&r2=1496551&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/data/Pattern.java (original)
+++ incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/data/Pattern.java Tue Jun 25 17:29:42 2013
@@ -21,6 +21,7 @@ package org.apache.devicemap.client.data
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
/**
*
@@ -57,5 +58,21 @@ public class Pattern {
public List<List<String>> getPatterns() {
return patterns;
}
+
+ public boolean isValid(Set<String> patterns) {
+ boolean found=false;
+ patterns:
+ for(List<String> patternset:getPatterns()) {
+ for(String pattern:patternset) {
+ if(!patterns.contains(pattern)) {
+ continue patterns;
+ }
+ }
+ found=true;
+ break;
+ }
+
+ return found;
+ }
}