Fix #3805: dash correctly terminates commands in layout files (#4137)

JabRef · Jun 29, 2018 · cf9fbb0 · cf9fbb0
1 parent 8777c16
commit cf9fbb0
Show file tree

Hide file tree

Showing 6 changed files with 329 additions and 339 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where in rare cases entries where overlayed in the main table. https://github.com/JabRef/jabref/issues/3281
 - We fixed an issue where selecting a group messed up the focus of the main table / entry editor. https://github.com/JabRef/jabref/issues/3367
 - We fixed an issue where composite author names were sorted incorrectly. https://github.com/JabRef/jabref/issues/2828
+- We fixed an issue where commands followed by `-` didn't work. [#3805](https://github.com/JabRef/jabref/issues/3805)
 - We fixed an issue where some journal names were wrongly marked as abbreviated. [#4115](https://github.com/JabRef/jabref/issues/4115)
 - We fixed an issue where the custom file column were sorted incorrectly. https://github.com/JabRef/jabref/issues/3119
 - We fixed an issues where the entry losses focus when a field is edited and at the same time used for sorting. https://github.com/JabRef/jabref/issues/3373

diff --git a/src/main/java/org/jabref/logic/layout/Layout.java b/src/main/java/org/jabref/logic/layout/Layout.java
@@ -22,7 +22,6 @@ public class Layout {
 
     private final List<String> missingFormatters = new ArrayList<>();
 
-
     public Layout(List<StringInt> parsedEntries, LayoutFormatterPreferences prefs) {
         List<LayoutEntry> tmpEntries = new ArrayList<>(parsedEntries.size());
 
@@ -32,35 +31,35 @@ public Layout(List<StringInt> parsedEntries, LayoutFormatterPreferences prefs) {
 
         for (StringInt parsedEntry : parsedEntries) {
             switch (parsedEntry.i) {
-            case LayoutHelper.IS_LAYOUT_TEXT:
-            case LayoutHelper.IS_SIMPLE_FIELD:
-            case LayoutHelper.IS_OPTION_FIELD:
-                // Do nothing
-                break;
-            case LayoutHelper.IS_FIELD_START:
-            case LayoutHelper.IS_GROUP_START:
-                blockEntries = new ArrayList<>();
-                blockStart = parsedEntry.s;
-                break;
-            case LayoutHelper.IS_FIELD_END:
-            case LayoutHelper.IS_GROUP_END:
-                if ((blockStart != null) && (blockEntries != null)) {
-                    if (blockStart.equals(parsedEntry.s)) {
-                        blockEntries.add(parsedEntry);
-                        le = new LayoutEntry(blockEntries,
-                                parsedEntry.i == LayoutHelper.IS_FIELD_END ? LayoutHelper.IS_FIELD_START : LayoutHelper.IS_GROUP_START,
-                                prefs);
-                        tmpEntries.add(le);
-                        blockEntries = null;
-                    } else {
-                        LOGGER.debug(blockStart + '\n' + parsedEntry.s);
-                        LOGGER.warn("Nested field/group entries are not implemented!");
-                        Thread.dumpStack();
+                case LayoutHelper.IS_LAYOUT_TEXT:
+                case LayoutHelper.IS_SIMPLE_COMMAND:
+                case LayoutHelper.IS_OPTION_FIELD:
+                    // Do nothing
+                    break;
+                case LayoutHelper.IS_FIELD_START:
+                case LayoutHelper.IS_GROUP_START:
+                    blockEntries = new ArrayList<>();
+                    blockStart = parsedEntry.s;
+                    break;
+                case LayoutHelper.IS_FIELD_END:
+                case LayoutHelper.IS_GROUP_END:
+                    if ((blockStart != null) && (blockEntries != null)) {
+                        if (blockStart.equals(parsedEntry.s)) {
+                            blockEntries.add(parsedEntry);
+                            le = new LayoutEntry(blockEntries,
+                                    parsedEntry.i == LayoutHelper.IS_FIELD_END ? LayoutHelper.IS_FIELD_START : LayoutHelper.IS_GROUP_START,
+                                    prefs);
+                            tmpEntries.add(le);
+                            blockEntries = null;
+                        } else {
+                            LOGGER.debug(blockStart + '\n' + parsedEntry.s);
+                            LOGGER.warn("Nested field/group entries are not implemented!");
+                            Thread.dumpStack();
+                        }
                     }
-                }
-                break;
-            default:
-                break;
+                    break;
+                default:
+                    break;
             }
 
             if (blockEntries == null) {
@@ -130,8 +129,6 @@ public String doLayout(BibDatabaseContext databaseContext, Charset encoding) {
         return sb.toString();
     }
 
-    // added section - end (arudert)
-
     public List<String> getMissingFormatters() {
         return new ArrayList<>(missingFormatters);
     }