Merge remote-tracking branch 'upstream/master' into reworkPostOpenACtion

* upstream/master:
  Fix Some Codacy Code Convention Issues (#4904)
  Bump ridl from 6.2.2 to 6.2.3 (#4903)
  Bump juh from 6.2.2 to 6.2.3 (#4902)
  Bump jurt from 6.2.2 to 6.2.3 (#4901)
  Bump unoil from 6.2.2 to 6.2.3 (#4900)
  Bump richtextfx from 0.9.3 to 0.10.0 (#4899)
  Store column widths as integer (#4896)

Author: Siedlerchr

build.gradle

@@ -101,10 +101,10 @@ dependencies {
 
     compile 'commons-cli:commons-cli:1.4'
 
-    compile "org.libreoffice:juh:6.2.2"
-    compile "org.libreoffice:jurt:6.2.2"
-    compile "org.libreoffice:ridl:6.2.2"
-    compile "org.libreoffice:unoil:6.2.2"
+    compile "org.libreoffice:juh:6.2.3"
+    compile "org.libreoffice:jurt:6.2.3"
+    compile "org.libreoffice:ridl:6.2.3"
+    compile "org.libreoffice:unoil:6.2.3"
 
     compile 'io.github.java-diff-utils:java-diff-utils:4.0'
     compile 'info.debatty:java-string-similarity:1.2.1'
@@ -130,7 +130,7 @@ dependencies {
     compile 'de.saxsys:mvvmfx:1.8.0'
     compile 'org.fxmisc.easybind:easybind:1.0.3'
     compile 'org.fxmisc.flowless:flowless:0.6.1'
-    compile 'org.fxmisc.richtext:richtextfx:0.9.3'
+    compile 'org.fxmisc.richtext:richtextfx:0.10.0'
     compile 'com.sibvisions.external.jvxfx:dndtabpane:0.1'
     compile 'javax.inject:javax.inject:1'
     compile 'com.jfoenix:jfoenix:8.0.8'

src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java

@@ -72,7 +72,7 @@ private void initialize() {
 
         generalFileDirectory.textProperty().bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
         userSpecificFileDirectory.textProperty().bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
-        laTexFileDirectory.textProperty().bindBidirectional(viewModel.LaTexFileDirectoryProperty());
+        laTexFileDirectory.textProperty().bindBidirectional(viewModel.laTexFileDirectoryProperty());
 
         encoding.itemsProperty().bind(viewModel.encodingsProperty());
         encoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
@@ -142,7 +142,7 @@ private void storeSettings() {
             metaData.setUserFileDirectory(preferencesService.getUser(), text);
         }
 
-        text = viewModel.LaTexFileDirectoryProperty().getValue();
+        text = viewModel.laTexFileDirectoryProperty().getValue();
         if (text.isEmpty()) {
             metaData.clearLaTexFileDirectory(preferencesService.getUser());
         } else {
@@ -180,7 +180,7 @@ private void storeSettings() {
 
         boolean changed = saveOrderConfigChanged || encodingChanged
                           || viewModel.generalFileDirChanged() || viewModel.userFileDirChanged()
-                          || viewModel.protectedValueChanged() || saveActionsChanged || viewModel.LaTexFileDirChanged();
+                          || viewModel.protectedValueChanged() || saveActionsChanged || viewModel.laTexFileDirChanged();
         // ... if so, mark base changed. Prevent the Undo button from removing
         // change marking:
         if (changed) {

src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java

@@ -80,7 +80,7 @@ public StringProperty userSpecificFileDirectoryProperty() {
         return this.userSpecificFileDirectoryProperty;
     }
 
-    public StringProperty LaTexFileDirectoryProperty() {
+    public StringProperty laTexFileDirectoryProperty() {
         return this.laTexFileDirectoryProperty;
     }
 
@@ -116,7 +116,7 @@ public boolean userFileDirChanged() {
         return !oldUserSpecificFileDir.equals(userSpecificFileDirectoryProperty.getValue());
     }
 
-    public boolean LaTexFileDirChanged() {
+    public boolean laTexFileDirChanged() {
         return !oldLaTexFileDir.equals(laTexFileDirectoryProperty.getValue());
     }
 

src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java

@@ -61,12 +61,12 @@ private void updateColumnPreferences() {
                 NormalTableColumn normalColumn = (NormalTableColumn) column;
 
                 columnNames.add(normalColumn.getColumnName());
-                columnsWidths.add(String.valueOf(normalColumn.getWidth()));
+                columnsWidths.add(String.valueOf(Double.valueOf(normalColumn.getWidth()).intValue()));
             }
         }
 
-        if (columnNames.size() == columnsWidths.size() &&
-                columnNames.size() == preferences.getStringList(JabRefPreferences.COLUMN_NAMES).size()) {
+        if ((columnNames.size() == columnsWidths.size()) &&
+                (columnNames.size() == preferences.getStringList(JabRefPreferences.COLUMN_NAMES).size())) {
             preferences.putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
             preferences.putStringList(JabRefPreferences.COLUMN_WIDTHS, columnsWidths);
         }

src/main/java/org/jabref/gui/preferences/TableColumnsTab.java

@@ -502,7 +502,7 @@ public void storeSettings() {
 
             for (TableRow tr : data) {
                 names.add(tr.getName().toLowerCase(Locale.ROOT));
-                widths.add(String.valueOf(tr.getLength()));
+                widths.add(String.valueOf(Double.valueOf(tr.getLength()).intValue()));
             }
 
             // Finally, we store the new preferences.
@@ -522,14 +522,14 @@ private void updateOrderAction() {
         final HashMap<String, Integer> map = new HashMap<>();
 
         // first element (#) not inside data
-            /*
-            for (TableColumn<BibEntry, ?> column : panel.getMainTable().getColumns()) {
-                String name = column.getText();
-                if ((name != null) && !name.isEmpty()) {
-                    map.put(name.toLowerCase(Locale.ROOT), i);
-                }
+        /*
+        for (TableColumn<BibEntry, ?> column : panel.getMainTable().getColumns()) {
+            String name = column.getText();
+            if ((name != null) && !name.isEmpty()) {
+                map.put(name.toLowerCase(Locale.ROOT), i);
             }
-            */
+        }
+        */
         data.sort((o1, o2) -> {
             Integer n1 = map.get(o1.getName());
             Integer n2 = map.get(o2.getName());

src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java

@@ -24,16 +24,13 @@
 /**
  * LaTeX Aux to BibTeX Parser
  * <p>
- * Extracts a subset of BibTeX entries from a BibDatabase that are included in an AUX file.
- * Also supports nested AUX files (latex \\include).
+ * Extracts a subset of BibTeX entries from a BibDatabase that are included in an AUX file. Also supports nested AUX
+ * files (latex \\include).
  *
- * There exists no specification of the AUX file.
- * Every package, class or document can write to the AUX file.
- * The AUX file consists of LaTeX macros and is read at the \begin{document} and again at the \end{document}.
+ * There exists no specification of the AUX file. Every package, class or document can write to the AUX file. The AUX
+ * file consists of LaTeX macros and is read at the \begin{document} and again at the \end{document}.
  *
- * BibTeX citation: \citation{x,y,z}
- * Biblatex citation: \abx@aux@cite{x,y,z}
- * Nested AUX files: \@input{x}
+ * BibTeX citation: \citation{x,y,z} Biblatex citation: \abx@aux@cite{x,y,z} Nested AUX files: \@input{x}
  */
 public class DefaultAuxParser implements AuxParser {
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultAuxParser.class);
@@ -128,15 +125,14 @@ private void matchCitation(AuxParserResult result, String line) {
      */
     private void resolveTags(AuxParserResult result) {
         for (String key : result.getUniqueKeys()) {
-            Optional<BibEntry> entry = masterDatabase.getEntryByKey(key);
-
-            if (result.getGeneratedBibDatabase().getEntryByKey(key).isPresent()) {
-                // do nothing, key has already been processed
-            } else if (entry.isPresent()) {
-                insertEntry(entry.get(), result);
-                resolveCrossReferences(entry.get(), result);
-            } else {
-                result.getUnresolvedKeys().add(key);
+            if (!result.getGeneratedBibDatabase().getEntryByKey(key).isPresent()) {
+                Optional<BibEntry> entry = masterDatabase.getEntryByKey(key);
+                if (entry.isPresent()) {
+                    insertEntry(entry.get(), result);
+                    resolveCrossReferences(entry.get(), result);
+                } else {
+                    result.getUnresolvedKeys().add(key);
+                }
             }
         }