Format and version bump

CONTRIBUTING.md

@@ -7,5 +7,5 @@ Before submitting a pull request, if you are adding a new plugin, make sure you
 
 If you decide to close your pull request for a new plugin as you would rather have it in a different repository, please comment on the issue with a reference to its new home, so it may be added to the README.
 
-Should you decide you want your code removed in the future, if there isn't code elsewhere in this repository that depends on it, it will be removed from future releases. 
+Should you decide you want your code removed in the future, if there isn't code elsewhere in this repository that depends on it, it will be removed from future releases.
 If your removed code was a plugin, and it has a new home, please submit an issue with a reference to it so it may be added to the README.

README.md

@@ -26,8 +26,8 @@ This program uses the [haruhi](https://github.com/DeflatedPickle/haruhi) framewo
 Though there isn't an official way to develop external plugins, there are two routes I can think of;
 
 1. Clone this repository and develop your plugin as a submodule
-    - **Pro:** Easier to debug
-    - **Con:** Harder to distribute
+	- **Pro:** Easier to debug
+	- **Con:** Harder to distribute
 2. Develop your plugin in its own repository, then build it and place the build in your install of Quiver's `/plugins` directory when you want to test it
-    - **Pro:** Doesn't require the Quiver source
-    - **Con:** Harder to test
+	- **Pro:** Doesn't require the Quiver source
+	- **Con:** Harder to test

build.gradle

@@ -10,7 +10,7 @@ plugins {
 }
 
 group 'com.deflatedpickle'
-version '1.4.1'
+version '1.5.0'
 
 allprojects {
 	apply plugin: 'org.jetbrains.kotlin.jvm'
@@ -25,7 +25,7 @@ allprojects {
 	}
 
 	spotless {
-		ratchetFrom 'origin/rewrite'
+		// ratchetFrom 'origin/rewrite'
 
 		java {
 			importOrder()

core/src/main/java/so/madprogrammer/PatternFilter.java

@@ -1,32 +1,33 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package so.madprogrammer;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DocumentFilter;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 // https://stackoverflow.com/a/28790963
 public class PatternFilter extends DocumentFilter {
-    private final Pattern pattern;
+  private final Pattern pattern;
 
-    public PatternFilter(String pat) {
-        pattern = Pattern.compile(pat);
-    }
+  public PatternFilter(String pat) {
+    pattern = Pattern.compile(pat);
+  }
 
-    public void insertString(FilterBypass fb, int offset, String string, AttributeSet attr)
-            throws BadLocationException {
-        String newStr = fb.getDocument().getText(0, fb.getDocument().getLength()) + string;
-        Matcher m = pattern.matcher(newStr);
-        if (m.matches()) {
-            super.insertString(fb, offset, string, attr);
-        }
+  public void insertString(FilterBypass fb, int offset, String string, AttributeSet attr)
+      throws BadLocationException {
+    String newStr = fb.getDocument().getText(0, fb.getDocument().getLength()) + string;
+    Matcher m = pattern.matcher(newStr);
+    if (m.matches()) {
+      super.insertString(fb, offset, string, attr);
     }
+  }
 
-    public void replace(FilterBypass fb, int offset,
-                        int length, String string, AttributeSet attr)
-            throws BadLocationException {
-        if (length > 0) fb.remove(offset, length);
-        insertString(fb, offset, string, attr);
-    }
-}
+  public void replace(FilterBypass fb, int offset, int length, String string, AttributeSet attr)
+      throws BadLocationException {
+    if (length > 0) fb.remove(offset, length);
+    insertString(fb, offset, string, attr);
+  }
+}

core/src/main/java/so/madprogrammer/ScaleUtil.java

@@ -1,29 +1,31 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package so.madprogrammer;
 
 import java.awt.*;
 
 public class ScaleUtil {
-    static public double getScaleFactor(int iMasterSize, int iTargetSize) {
-        return (double) iTargetSize / (double) iMasterSize;
-    }
-
-    static public double getScaleFactorToFit(Dimension original, Dimension toFit) {
-        double dScale = 1d;
+  public static double getScaleFactor(int iMasterSize, int iTargetSize) {
+    return (double) iTargetSize / (double) iMasterSize;
+  }
 
-        if (original != null && toFit != null) {
-            double dScaleWidth = getScaleFactor(original.width, toFit.width);
-            double dScaleHeight = getScaleFactor(original.height, toFit.height);
+  public static double getScaleFactorToFit(Dimension original, Dimension toFit) {
+    double dScale = 1d;
 
-            dScale = Math.min(dScaleHeight, dScaleWidth);
-        }
+    if (original != null && toFit != null) {
+      double dScaleWidth = getScaleFactor(original.width, toFit.width);
+      double dScaleHeight = getScaleFactor(original.height, toFit.height);
 
-        return dScale;
+      dScale = Math.min(dScaleHeight, dScaleWidth);
     }
 
-    public static double getScaleFactorToFill(Dimension masterSize, Dimension targetSize) {
-        double dScaleWidth = getScaleFactor(masterSize.width, targetSize.width);
-        double dScaleHeight = getScaleFactor(masterSize.height, targetSize.height);
+    return dScale;
+  }
 
-        return Math.max(dScaleHeight, dScaleWidth);
-    }
+  public static double getScaleFactorToFill(Dimension masterSize, Dimension targetSize) {
+    double dScaleWidth = getScaleFactor(masterSize.width, targetSize.width);
+    double dScaleHeight = getScaleFactor(masterSize.height, targetSize.height);
+
+    return Math.max(dScaleHeight, dScaleWidth);
+  }
 }

core/src/main/kotlin/com/deflatedpickle/quiver/backend/api/Viewer.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.api
 
 import javax.swing.JComponent
@@ -8,4 +10,4 @@ interface Viewer<T : Any> {
 
     fun getComponent(): JComponent
     fun getScroller(): JScrollPane
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/backend/event/EventOpenFile.kt

@@ -1,6 +1,8 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.event
 
 import com.deflatedpickle.haruhi.api.event.AbstractEvent
 import java.io.File
 
-object EventOpenFile : AbstractEvent<File>()
+object EventOpenFile : AbstractEvent<File>()

core/src/main/kotlin/com/deflatedpickle/quiver/backend/event/EventSearchFile.kt

@@ -1,6 +1,8 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.event
 
 import com.deflatedpickle.haruhi.api.event.AbstractEvent
 import java.io.File
 
-object EventSearchFile : AbstractEvent<File>()
+object EventSearchFile : AbstractEvent<File>()

core/src/main/kotlin/com/deflatedpickle/quiver/backend/event/EventSearchFolder.kt

@@ -1,6 +1,8 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.event
 
 import com.deflatedpickle.haruhi.api.event.AbstractEvent
 import java.io.File
 
-object EventSearchFolder : AbstractEvent<File>()
+object EventSearchFolder : AbstractEvent<File>()

core/src/main/kotlin/com/deflatedpickle/quiver/backend/event/EventSelectFile.kt

@@ -1,6 +1,8 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.event
 
 import com.deflatedpickle.haruhi.api.event.AbstractEvent
 import java.io.File
 
-object EventSelectFile : AbstractEvent<File>()
+object EventSelectFile : AbstractEvent<File>()

core/src/main/kotlin/com/deflatedpickle/quiver/backend/event/EventSelectFolder.kt

@@ -1,6 +1,8 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.event
 
 import com.deflatedpickle.haruhi.api.event.AbstractEvent
 import java.io.File
 
-object EventSelectFolder : AbstractEvent<File>()
+object EventSelectFolder : AbstractEvent<File>()

core/src/main/kotlin/com/deflatedpickle/quiver/backend/extension/Dimension.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.extension
 
 import java.awt.Dimension
@@ -9,4 +11,4 @@ operator fun Dimension.compareTo(size: Dimension): Int =
         -1
     } else {
         0
-    }
+    }

core/src/main/kotlin/com/deflatedpickle/quiver/backend/util/DocumentUtil.kt

@@ -1,7 +1,9 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.util
 
 import java.io.File
 
 object DocumentUtil {
     var current: File? = null
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/backend/util/Filters.kt

@@ -1,8 +1,10 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.util
 
 import so.madprogrammer.PatternFilter
 
 object Filters {
     val FILE = PatternFilter("[^\\./:*?\"<>|]*")
     val PATH = PatternFilter("[A-Za-z]:[^:*?\"<>|]*")
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/backend/util/PackType.kt

@@ -1,6 +1,8 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.util
 
 enum class PackType {
     EMPTY_PACK,
     DEFAULT_PACK
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/backend/util/Version.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.util
 
 class Version(
@@ -77,7 +79,7 @@ class VersionIterator(
 class VersionProgression(
     override val start: Version,
     override val endInclusive: Version
-): Iterable<Version>, ClosedRange<Version> {
+) : Iterable<Version>, ClosedRange<Version> {
     override fun toString(): String = "$start - $endInclusive"
     override fun iterator(): Iterator<Version> = VersionIterator(start, endInclusive)
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/backend/util/VersionUtil.kt

@@ -1,7 +1,9 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.quiver.backend.util
 
 object VersionUtil {
     val RELEASE = Regex("""\d+\.\d+(\.\d+)?""")
     val ALPHA = Regex("""\d+w\d+a""")
     val BETA = Regex("""\d+w\d+b""")
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/FillBothFinishLine.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/FillHorizontal.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/FillHorizontalFinishLine.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/FillVerticalStickEast.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/FinishLine.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/StickCenter.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints
@@ -6,4 +8,4 @@ object StickCenter : GridBagConstraints() {
     init {
         anchor = CENTER
     }
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/StickCenterFinishLine.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints
@@ -7,4 +9,4 @@ object StickCenterFinishLine : GridBagConstraints() {
         anchor = CENTER
         gridwidth = REMAINDER
     }
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/StickEast.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints
@@ -6,4 +8,4 @@ object StickEast : GridBagConstraints() {
     init {
         anchor = EAST
     }
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/StickEastFillHorizontal.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints
@@ -8,4 +10,4 @@ object StickEastFillHorizontal : GridBagConstraints() {
         fill = HORIZONTAL
         weightx = 1.0
     }
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/StickEastFinishLine.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints
@@ -7,4 +9,4 @@ object StickEastFinishLine : GridBagConstraints() {
         anchor = EAST
         gridwidth = REMAINDER
     }
-}
+}

core/src/main/kotlin/com/deflatedpickle/quiver/frontend/constraints/StickWest.kt

@@ -1,3 +1,5 @@
+/* Copyright (c) 2020 DeflatedPickle under the MIT license */
+
 package com.deflatedpickle.rawky.ui.constraints
 
 import java.awt.GridBagConstraints
@@ -6,4 +8,4 @@ object StickWest : GridBagConstraints() {
     init {
         anchor = WEST
     }
-}
+}