From 73f8ceb3dd45e5a6fea68554ba63b0741c5791e2 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 10 May 2020 15:35:12 +0200
Subject: [PATCH] Change maximum columns to 140 characters

---
 config/IntelliJ Code Style.xml                | 52 +++++++++----------
 .../gui/fieldeditors/FieldEditorFX.java       |  5 +-
 .../gui/maintable/MainTableColumnModel.java   |  7 ++-
 .../gui/preferences/PreviewTabViewModel.java  | 13 +++--
 4 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/config/IntelliJ Code Style.xml b/config/IntelliJ Code Style.xml
index 489f44c1a5c..471a597f6bb 100644
--- a/config/IntelliJ Code Style.xml	
+++ b/config/IntelliJ Code Style.xml	
@@ -1,37 +1,35 @@
-<code_scheme name="JabRef">
-  <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-  <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-  <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-    <value />
-  </option>
-  <option name="IMPORT_LAYOUT_TABLE">
-    <value>
-      <package name="java" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="javax" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="javafx" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="org.jabref" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="" withSubpackages="true" static="true" />
-    </value>
-  </option>
-  <option name="JD_P_AT_EMPTY_LINES" value="false" />
-  <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
-  <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
-  <option name="JD_KEEP_EMPTY_RETURN" value="false" />
-  <option name="WRAP_COMMENTS" value="true" />
+<code_scheme name="JabRef" version="173">
+  <option name="RIGHT_MARGIN" value="140" />
+  <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
   <JavaCodeStyleSettings>
     <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javafx" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org.jabref" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+      </value>
+    </option>
   </JavaCodeStyleSettings>
   <codeStyleSettings language="JAVA">
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
     <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+    <option name="WRAP_COMMENTS" value="true" />
     <arrangement>
       <rules>
         <section>
@@ -292,4 +290,4 @@
       </rules>
     </arrangement>
   </codeStyleSettings>
-</code_scheme>
+</code_scheme>
\ No newline at end of file
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index 0c7debc699a..f8fafb67800 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -26,8 +26,9 @@ default boolean childIsFocused() {
     /**
      * Returns relative size of the field editor in terms of display space.
      * <p>
-     * A value of 1 means that the editor gets exactly as much space as all other regular editors. A value of 2 means
-     * that the editor gets twice as much space as regular editors.
+     * A value of 1 means that the editor gets exactly as much space as all other regular editors.
+     * <p>
+     * A value of 2 means that the editor gets twice as much space as regular editors.
      *
      * @return the relative weight of the editor in terms of display space
      */
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
index d344e8f1481..cb1bd9fa113 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
@@ -20,8 +20,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Represents the full internal name of a column in the main table. Consists of two parts: The type of the column and a
- * qualifier, like the field name to be displayed in the column.
+ * Represents the full internal name of a column in the main table. Consists of two parts: The type of the column and a qualifier, like the
+ * field name to be displayed in the column.
  */
 public class MainTableColumnModel {
 
@@ -99,8 +99,7 @@ public MainTableColumnModel(Type type, String qualifier) {
     }
 
     /**
-     * This is used by the preferences dialog, to initialize available basic icon columns, the user can add to the
-     * table.
+     * This is used by the preferences dialog, to initialize available basic icon columns, the user can add to the table.
      *
      * @param type the {@code MainTableColumnModel.Type} of the column, e.g. "GROUPS" or "LINKED_IDENTIFIER"
      */
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
index 1aebf2d6c8e..c168f8ef2ac 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
@@ -299,9 +299,13 @@ public void resetDefaultLayout() {
     }
 
     /**
-     * XML-Syntax-Highlighting for RichTextFX-Codearea created by (c) Carlos Martins (github: @cemartins) License:
-     * BSD-2-Clause see https://github.com/FXMisc/RichTextFX/blob/master/LICENSE and:
-     * https://github.com/FXMisc/RichTextFX/blob/master/richtextfx-demos/README.md#xml-editor
+     * XML-Syntax-Highlighting for RichTextFX-Codearea created by (c) Carlos Martins (github:
+     * <a href="https://github.com/cmartins">@cemartins</a>)
+     * <p>
+     * License: <a href="https://github.com/FXMisc/RichTextFX/blob/master/LICENSE">BSD-2-Clause</a>
+     * <p>
+     * See also
+     * <a href="https://github.com/FXMisc/RichTextFX/blob/master/richtextfx-demos/README.md#xml-editor">https://github.com/FXMisc/RichTextFX/blob/master/richtextfx-demos/README.md#xml-editor</a>
      *
      * @param text to parse and highlight
      * @return highlighted span for codeArea
@@ -379,8 +383,7 @@ public void dragDetected(ListProperty<PreviewLayout> sourceList, ObjectProperty<
     }
 
     /**
-     * This is called, when the user drops some PreviewLayouts either in the availableListView or in the empty space of
-     * chosenListView
+     * This is called, when the user drops some PreviewLayouts either in the availableListView or in the empty space of chosenListView
      *
      * @param targetList either availableListView or chosenListView
      */