small cleanups

languagetool-org · Mar 16, 2015 · 52b0a1d · 52b0a1d
1 parent 9c2e437
commit 52b0a1d
Showing 1 changed file with 20 additions and 28 deletions.
diff --git a/languagetool-core/src/main/java/org/languagetool/rules/patterns/Element.java b/languagetool-core/src/main/java/org/languagetool/rules/patterns/Element.java
@@ -83,8 +83,8 @@ public class Element implements Cloneable {
   private int minOccurrence = 1;
   private int maxOccurrence = 1;
 
-  private Pattern p;
+  private Pattern pattern;
-  private Pattern pPos;
+  private Pattern posPattern;
 
   /** The reference to another element in the pattern. **/
   private Match tokenReference;
@@ -109,9 +109,7 @@ public class Element implements Cloneable {
   private Map<String, List<String>> unificationFeatures;
   private boolean posUnknown;
 
-  /**
+  /** Set to true on tokens that close the unification block. */
-   * Set to true on tokens that close the unification block.
-   */
   private boolean isLastUnified;
 
   /**
@@ -145,11 +143,11 @@ public final boolean isMatched(final AnalyzedToken token) {
     }
     final boolean matched;
     if (testString) {
-      matched = isStringTokenMatched(token) ^ negation
+      matched = isStringTokenMatched(token) ^ negation &&
-          && isPosTokenMatched(token) ^ posNegation;
+                isPosTokenMatched(token) ^ posNegation;
     } else {
-      matched = !negation
+      matched = !negation &&
-          && isPosTokenMatched(token) ^ posNegation;
+                isPosTokenMatched(token) ^ posNegation;
     }
     return matched;
   }
@@ -329,21 +327,19 @@ public final void setPosElement(final String posToken, final boolean regExp,
     this.posNegation = negation;
     posRegExp = regExp;
     if (posRegExp) {
-      pPos = Pattern.compile(posToken);
+      posPattern = Pattern.compile(posToken);
-      final Matcher mPos = pPos.matcher(UNKNOWN_TAG);
+      posUnknown = posPattern.matcher(UNKNOWN_TAG).matches();
-      posUnknown = mPos.matches();
     } else {
       posUnknown = UNKNOWN_TAG.equals(posToken);
     }
   }
 
-  /**
+  /** @since 2.3 */
-   * @since 2.3
-   */
   public final void setChunkElement(final ChunkTag chunkTag) {
     this.chunkToken = chunkTag;
   }
 
+  @Nullable
   public final String getString() {
     return stringToken;
   }
@@ -361,7 +357,7 @@ public final void setStringElement(final String token) {
         regToken = CASE_INSENSITIVE + stringToken;
       }
       if (!"\\0".equals(token)) {
-        p = Pattern.compile(regToken);
+        pattern = Pattern.compile(regToken);
       }
     }
   }
@@ -385,7 +381,6 @@ public final void setStringPosException(
           final String token, final boolean regExp, final boolean inflected,
           final boolean negation, final boolean scopeNext, final boolean scopePrevious,
           final String posToken, final boolean posRegExp, final boolean posNegation, final Boolean caseSensitivity) {
-
     final Element exception = new Element(token, caseSensitivity == null ? caseSensitive : caseSensitivity, regExp, inflected);
     exception.setNegation(negation);
     exception.setPosElement(posToken, posRegExp, posNegation);
@@ -413,7 +408,6 @@ public final void setStringPosException(
     setStringPosException(token, regExp, inflected, negation, scopeNext, scopePrevious, posToken, posRegExp, posNegation, Boolean.valueOf(caseSensitivity));
   }
 
-
   private void setException(final Element elem, final boolean scopePrevious) {
     exceptionValidPrevious |= scopePrevious;
     if (exceptionList == null && !scopePrevious) {
@@ -471,7 +465,7 @@ private boolean isPosTokenMatched(final AnalyzedToken token) {
     }
     boolean match;
     if (posRegExp) {
-      final Matcher mPos = pPos.matcher(token.getPOSTag());
+      final Matcher mPos = posPattern.matcher(token.getPOSTag());
       match = mPos.matches();
     } else {
       match = posToken.equals(token.getPOSTag());
@@ -490,7 +484,7 @@ private boolean isPosTokenMatched(final AnalyzedToken token) {
   boolean isStringTokenMatched(final AnalyzedToken token) {
     final String testToken = getTestToken(token);
     if (stringRegExp) {
-      final Matcher m = p.matcher(testToken);
+      final Matcher m = pattern.matcher(testToken);
       return m.matches();
     }
     if (caseSensitive) {
@@ -631,7 +625,7 @@ public final Element compile(final AnalyzedTokenReadings token, final Synthesize
   }
 
   void doCompile(final AnalyzedTokenReadings token, final Synthesizer synth) throws IOException {
-    p = null;
+    pattern = null;
     final MatchState matchState = tokenReference.createState(synth, token);
 
     if (StringTools.isEmpty(referenceString)) {
@@ -652,10 +646,10 @@ void doCompile(final AnalyzedTokenReadings token, final Synthesizer synth) throw
 
   /**
    * Sets the phrase the element is in.
-   * @param s ID of the phrase.
+   * @param id ID of the phrase.
    */
-  public final void setPhraseName(final String s) {
+  public final void setPhraseName(final String id) {
-    phraseName = s;
+    phraseName = id;
   }
 
   /**
@@ -736,16 +730,14 @@ public final boolean isUnified() {
     return unified;
   }
 
-
-
   public final void setUnification(final Map<String, List<String>> uniFeatures) {
     unificationFeatures = uniFeatures;
     unified = true;
   }
 
   /**
    * Get unification features and types.
-   * @return A map from features to a list of types.
+   * @return A map from features to a list of types or {@code null}
    * @since 1.0.1
    */
   @Nullable
@@ -774,7 +766,7 @@ public final void setLastInUnification() {
    * and simply added.
    * @return True when the element is not included in unifying.
    * @since 2.5
-   **/
+   */
   public boolean isUnificationNeutral() {
     return unificationNeutral;
   }