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/27 17:02:52 UTC
svn commit: r1497391 -
/incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/loaders/Loader.java
Author: rezan
Date: Thu Jun 27 15:02:51 2013
New Revision: 1497391
URL: http://svn.apache.org/r1497391
Log:
unigram for twostep builder
Modified:
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/loaders/Loader.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemapjava/src/main/java/org/apache/devicemap/client/loaders/Loader.java?rev=1497391&r1=1497390&r2=1497391&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 Thu Jun 27 15:02:51 2013
@@ -36,8 +36,6 @@ public class Loader {
private Map<String,Device> devices;
- private static boolean blackberryFix=true;
-
public Loader() {
devices=new HashMap<String,Device>();
}
@@ -103,12 +101,20 @@ public class Loader {
device=devices.get(XMLParser.getAttribute(tag,"id"));
} else if(tag.equals("</device>")) {
if(device!=null) {
- if(blackberryFix && patterns.contains("blackberry") && patterns.size()>1) {
- patterns.remove("blackberry");
- }
-
if(builder.equals("TwoStepDeviceBuilder")) {
device.getPatterns().setAndPattern(patterns);
+
+ String unigram="";
+
+ for(String pattern:patterns) {
+ if(pattern.contains(unigram)) {
+ unigram=pattern;
+ } else {
+ unigram+=pattern;
+ }
+ }
+
+ device.getPatterns().setPattern(unigram);
} else {
device.getPatterns().setOrPattern(patterns);
}