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 21:03:17 UTC
svn commit: r1496591 - in
/incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client:
DeviceMapClient.java data/Device.java loaders/Loader.java
Author: rezan
Date: Tue Jun 25 19:03:16 2013
New Revision: 1496591
URL: http://svn.apache.org/r1496591
Log:
builder -> type
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/Device.java
incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/loaders/Loader.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=1496591&r1=1496590&r2=1496591&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 19:03:16 2013
@@ -95,10 +95,10 @@ public class DeviceMapClient {
Util.debugLog("Hit candidate: "+hit+" => "+device.getId());
if(winner!=null) {
- if("SimpleDeviceBuilder".equals(winner.getBuilder()) && !"SimpleDeviceBuilder".equals(device.getBuilder())) {
+ if("simple".equals(winner.getType()) && !"simple".equals(device.getType())) {
winner=device;
winnerStr=hit;
- } else if(hit.length()>winnerStr.length() && !"SimpleDeviceBuilder".equals(device.getBuilder())) {
+ } else if(hit.length()>winnerStr.length() && !"simple".equals(device.getType())) {
winner=device;
winnerStr=hit;
}
Modified: incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/data/Device.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/data/Device.java?rev=1496591&r1=1496590&r2=1496591&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/data/Device.java (original)
+++ incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/data/Device.java Tue Jun 25 19:03:16 2013
@@ -19,7 +19,6 @@
package org.apache.devicemap.client.data;
-import java.util.List;
import java.util.Map;
/**
@@ -32,7 +31,7 @@ public class Device {
private String parentId;
- private String builder;
+ private String type;
private Pattern pattern;
@@ -45,7 +44,7 @@ public class Device {
public String toString() {
return "id='"+id+"'," +
"parentId='"+parentId+"',"+
- "builder='"+builder+"',"+
+ "type='"+type+"',"+
"pattern="+pattern+","+
"attribytes="+attributes+".";
}
@@ -66,12 +65,12 @@ public class Device {
this.parentId = parentId;
}
- public String getBuilder() {
- return builder;
+ public String getType() {
+ return type;
}
- public void setBuilder(String builder) {
- this.builder = builder;
+ public void setType(String type) {
+ this.type = type;
}
public Pattern getPatterns() {
@@ -85,7 +84,4 @@ public class Device {
public void setAttributes(Map<String,String> attributes) {
this.attributes = attributes;
}
-
-
-
}
Modified: incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/loaders/Loader.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/loaders/Loader.java?rev=1496591&r1=1496590&r2=1496591&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/loaders/Loader.java (original)
+++ incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/loaders/Loader.java Tue Jun 25 19:03:16 2013
@@ -113,7 +113,11 @@ public class Loader {
device.getPatterns().setOrPattern(patterns);
}
- device.setBuilder(builder);
+ if(builder.equals("SimpleDeviceBuilder")) {
+ device.setType("simple");
+ } else {
+ device.setType("weak");
+ }
} else {
Util.debugLog("ERROR: device not found: '"+id+"'");
}