worldify (wip)2017-10-04

1 files changed, 14 insertions, 23 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.java b/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.java
index 88e4539c..a0206db2 100644
--- a/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.java
+++ b/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.java
@@ -36,24 +36,24 @@ import java.util.regex.Pattern;
 @Table
 public class ExtractionWord {
     private static Set<ExtractionWord> cache;
-    private static final Object mutex = new Object();
-    private Pattern pattern;
-
     @PrimaryKey
     String patternString;
+    private Pattern pattern;
 
-    // --------------------- static methods ---------------------
-    public static List<ExtractionWord> cached() {
-        synchronized (mutex) {
-            return new ArrayList<>(cache);
-        }
+    public ExtractionWord() {
+    }
+
+    private ExtractionWord(String patternString) {
+        this.patternString = patternString;
+    }
+
+    public static synchronized List<ExtractionWord> cached() {
+        return new ArrayList<>(cache);
     }
 
     public static synchronized void load() {
-        synchronized (mutex) {
-            OrmaDatabase orma = OrmaHolder.getORMA();
-            cache = new HashSet<>(orma.selectFromExtractionWord().toList());
-        }
+        OrmaDatabase orma = OrmaHolder.getORMA();
+        cache = new HashSet<>(orma.selectFromExtractionWord().toList());
     }
 
     private static ExtractionWord_Relation relation() {
@@ -63,19 +63,10 @@ public class ExtractionWord {
     public static synchronized ExtractionWord add(String patternString) {
         ExtractionWord extractionWord = new ExtractionWord(patternString);
         relation().upserter().execute(extractionWord);
-        synchronized (mutex) {
-            cache.add(extractionWord);
-        }
+        cache.add(extractionWord);
         return extractionWord;
     }
 
-    public ExtractionWord() {
-    }
-
-    private ExtractionWord(String patternString) {
-        this.patternString = patternString;
-    }
-
     public Pattern getPattern() {
         if (pattern == null)
             pattern = Pattern.compile(patternString);
@@ -90,4 +81,4 @@ public class ExtractionWord {
         relation().deleter().patternStringEq(patternString).execute();
         cache.remove(this);
     }
-}
+}
\ No newline at end of file