Braces checking followup (#2598)

* Fix error in braces checking * Remove unused imports
JabRef · Mar 1, 2017 · 36ccd64 · 36ccd64
1 parent bf12dff
commit 36ccd64
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java b/src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.bibtex;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.model.strings.StringUtil;
@@ -254,9 +251,8 @@ private void putIn(String s) {
     }
 
     private static void checkBraces(String text) throws IllegalArgumentException {
-        List<Integer> left = new ArrayList<>(5);
-        List<Integer> right = new ArrayList<>(5);
-        int current = -1;
+        int left = 0;
+        int right = 0;
 
         // First we collect all occurrences:
         for (int i = 0; i < text.length(); i++) {
@@ -268,20 +264,20 @@ private static void checkBraces(String text) throws IllegalArgumentException {
             }
 
             if(!charBeforeIsEscape && item == '{') {
-                left.add(current);
-            } else if (!charBeforeIsEscape && item == '{') {
-                right.add(current);
+                left++;
+            } else if (!charBeforeIsEscape && item == '}') {
+                right++;
             }
         }
 
         // Then we throw an exception if the error criteria are met.
-        if (!right.isEmpty() && left.isEmpty()) {
+        if (!(right == 0) && (left == 0)) {
             throw new IllegalArgumentException("'}' character ends string prematurely.");
         }
-        if (!right.isEmpty() && (right.get(0) < left.get(0))) {
+        if (!(right == 0) && (right < left)) {
             throw new IllegalArgumentException("'}' character ends string prematurely.");
         }
-        if (left.size() != right.size()) {
+        if (left != right) {
             throw new IllegalArgumentException("Braces don't match.");
         }
 

diff --git a/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java b/src/test/java/org/jabref/logic/bibtex/LatexFieldFormatterTests.java
@@ -95,4 +95,18 @@ public void reportUnbalancedBracingWithEscapedBraces() {
 
         formatter.format(unbalanced, "anyfield");
     }
+
+    @Test
+    public void tolerateBalancedBrace() {
+        String text = "Incorporating evolutionary {Measures into Conservation Prioritization}";
+
+        assertEquals("{" + text + "}", formatter.format(text, "anyfield"));
+    }
+
+    @Test
+    public void tolerateEscapeCharacters() {
+        String text = "Incorporating {\\O}evolutionary {Measures into Conservation Prioritization}";
+
+        assertEquals("{" + text + "}", formatter.format(text, "anyfield"));
+    }
 }