Optimize imports & autoformat

gsantner · Nov 20, 2021 · 93129cb · 93129cb
1 parent 152a91c
commit 93129cb
Show file tree

Hide file tree

Showing 22 changed files with 65 additions and 66 deletions.
diff --git a/app/src/main/java/net/gsantner/markor/activity/ActionOrderActivity.java b/app/src/main/java/net/gsantner/markor/activity/ActionOrderActivity.java
@@ -9,6 +9,8 @@
 #########################################################*/
 package net.gsantner.markor.activity;
 
+import static android.support.v7.widget.helper.ItemTouchHelper.ACTION_STATE_DRAG;
+
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
@@ -45,8 +47,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import static android.support.v7.widget.helper.ItemTouchHelper.ACTION_STATE_DRAG;
-
 public class ActionOrderActivity extends AppCompatActivity {
 
     public static final String EXTRA_FORMAT_KEY = "FORMAT_KEY";

diff --git a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtTextActions.java b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtTextActions.java
@@ -19,7 +19,6 @@
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 import android.text.Editable;
-import android.text.Spannable;
 import android.view.HapticFeedbackConstants;
 import android.view.View;
 

diff --git a/app/src/main/java/net/gsantner/markor/format/zimwiki/ZimWikiLinkResolver.java b/app/src/main/java/net/gsantner/markor/format/zimwiki/ZimWikiLinkResolver.java
@@ -81,7 +81,7 @@ private String resolveZimPath(String zimPath) {
         // the link types below need knowledge of the notebook root dir
         if (_shouldDynamicallyDetermineRoot) {
             _notebookRootDir = findNotebookRootDir(_currentPage);
-            if (_notebookRootDir==null) {
+            if (_notebookRootDir == null) {
                 return null;
             }
         }
@@ -103,7 +103,7 @@ private String resolveZimPath(String zimPath) {
     }
 
     private File findNotebookRootDir(File currentPage) {
-        if (currentPage!= null && currentPage.exists()) {
+        if (currentPage != null && currentPage.exists()) {
             if (FileUtils.join(currentPage, "notebook.zim").exists()) {
                 return currentPage;
             } else {

diff --git a/app/src/main/java/net/gsantner/markor/format/zimwiki/ZimWikiTextActions.java b/app/src/main/java/net/gsantner/markor/format/zimwiki/ZimWikiTextActions.java
@@ -196,16 +196,16 @@ private boolean onClickImpl(final View view) {
 
         private void openLink() {
             String fullZimLink = tryExtractZimLink();
-            
-            if (fullZimLink==null) {
+
+            if (fullZimLink == null) {
                 // the link under the cursor is not a zim link, probably just a plain url
                 runCommonTextAction(CommonTextActions.ACTION_OPEN_LINK_BROWSER);
                 return;
             }
 
             ZimWikiLinkResolver resolver = ZimWikiLinkResolver.resolve(fullZimLink, _appSettings.getNotebookDirectory(), _document.getFile(), _appSettings.isZimWikiDynamicNotebookRootEnabled());
             String resolvedLink = resolver.getResolvedLink();
-            if (resolvedLink==null) {
+            if (resolvedLink == null) {
                 return;
             }
 
@@ -222,11 +222,11 @@ private String tryExtractZimLink() {
             int lineStart = StringUtils.getLineStart(text, cursorPos);
             int lineEnd = StringUtils.getLineEnd(text, cursorPos);
             CharSequence line = text.subSequence(lineStart, lineEnd);
-            int cursorPosInLine = cursorPos-lineStart;
+            int cursorPosInLine = cursorPos - lineStart;
 
             Matcher m = ZimWikiHighlighter.Patterns.LINK.pattern.matcher(line);
             while (m.find()) {
-                if (m.start()<cursorPosInLine && m.end()>cursorPosInLine) {
+                if (m.start() < cursorPosInLine && m.end() > cursorPosInLine) {
                     return m.group();
                 }
             }

diff --git a/app/src/main/java/net/gsantner/markor/format/zimwiki/ZimWikiTextConverter.java b/app/src/main/java/net/gsantner/markor/format/zimwiki/ZimWikiTextConverter.java
@@ -140,7 +140,7 @@ private String convertLink(String group, Context context, File file) {
         if (resolver.isWebLink()) {
             markdownLink = resolver.getResolvedLink().replaceAll(" ", "%20");
         } else {
-            markdownLink = "file://"+resolver.getResolvedLink();
+            markdownLink = "file://" + resolver.getResolvedLink();
         }
 
         String linkDescription = resolver.getLinkDescription() != null ? resolver.getLinkDescription() : resolver.getZimPath();

diff --git a/app/src/main/java/net/gsantner/markor/ui/SearchOrCustomTextDialogCreator.java b/app/src/main/java/net/gsantner/markor/ui/SearchOrCustomTextDialogCreator.java
@@ -9,6 +9,14 @@
 #########################################################*/
 package net.gsantner.markor.ui;
 
+import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_CONTEXT;
+import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_CREATION_DATE;
+import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_DESCRIPTION;
+import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_DUE_DATE;
+import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_LINE;
+import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_PRIORITY;
+import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_PROJECT;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -47,14 +55,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_CONTEXT;
-import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_CREATION_DATE;
-import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_DESCRIPTION;
-import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_DUE_DATE;
-import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_LINE;
-import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_PRIORITY;
-import static net.gsantner.markor.format.todotxt.TodoTxtTask.SttTaskSimpleComparator.BY_PROJECT;
-
 public class SearchOrCustomTextDialogCreator {
     public static void showSpecialKeyDialog(Activity activity, Callback.a1<String> callback) {
         SearchOrCustomTextDialog.DialogOptions dopt = new SearchOrCustomTextDialog.DialogOptions();

diff --git a/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java b/app/src/main/java/net/gsantner/opoc/util/ContextUtils.java
@@ -10,6 +10,10 @@
 #########################################################*/
 package net.gsantner.opoc.util;
 
+import static android.content.Context.VIBRATOR_SERVICE;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.graphics.Bitmap.CompressFormat;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -89,10 +93,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import static android.content.Context.VIBRATOR_SERVICE;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-import static android.graphics.Bitmap.CompressFormat;
-
 @SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "ObsoleteSdkInt", "deprecation", "SpellCheckingInspection", "TryFinallyCanBeTryWithResources", "UnusedAssignment", "UnusedReturnValue"})
 public class ContextUtils {
     //

diff --git a/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java b/app/src/main/java/net/gsantner/opoc/util/ShareUtil.java
@@ -10,6 +10,8 @@
 #########################################################*/
 package net.gsantner.opoc.util;
 
+import static android.app.Activity.RESULT_OK;
+
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -71,8 +73,6 @@
 import java.util.Locale;
 import java.util.Random;
 
-import static android.app.Activity.RESULT_OK;
-
 /**
  * A utility class to ease information sharing on Android.
  * Also allows to parse/fetch information out of shared information.

diff --git a/...src/test/java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternBoldTest.java b/...src/test/java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternBoldTest.java
@@ -9,14 +9,14 @@
 #########################################################*/
 package net.gsantner.markor.format.markdown;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class MarkdownHighlighterPatternBoldTest {
 
     private Pattern pattern;

diff --git a/...c/test/java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternItalicTest.java b/...c/test/java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternItalicTest.java
@@ -9,14 +9,14 @@
 #########################################################*/
 package net.gsantner.markor.format.markdown;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class MarkdownHighlighterPatternItalicTest {
 
     private Pattern pattern;

diff --git a/...src/test/java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternListTest.java b/...src/test/java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternListTest.java
@@ -9,14 +9,14 @@
 #########################################################*/
 package net.gsantner.markor.format.markdown;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class MarkdownHighlighterPatternListTest {
 
     private Pattern pattern;

diff --git a/...t/java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternOrderedListTest.java b/...t/java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternOrderedListTest.java
@@ -9,14 +9,14 @@
 #########################################################*/
 package net.gsantner.markor.format.markdown;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class MarkdownHighlighterPatternOrderedListTest {
 
     private Pattern pattern;

diff --git a/...java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternStrikethroughTest.java b/...java/net/gsantner/markor/format/markdown/MarkdownHighlighterPatternStrikethroughTest.java
@@ -9,14 +9,14 @@
 #########################################################*/
 package net.gsantner.markor.format.markdown;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class MarkdownHighlighterPatternStrikethroughTest {
 
     private Pattern pattern;

diff --git a/app/src/test/java/net/gsantner/markor/format/todotxt/TodoTxtFileRecognitionTests.java b/app/src/test/java/net/gsantner/markor/format/todotxt/TodoTxtFileRecognitionTests.java
@@ -10,12 +10,12 @@
 #########################################################*/
 package net.gsantner.markor.format.todotxt;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Test;
 
 import java.util.regex.Pattern;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class TodoTxtFileRecognitionTests {
 
     @Test

diff --git a/app/src/test/java/net/gsantner/markor/format/zimwiki/ZimWikiFileTests.java b/app/src/test/java/net/gsantner/markor/format/zimwiki/ZimWikiFileTests.java
@@ -9,6 +9,8 @@
 #########################################################*/
 package net.gsantner.markor.format.zimwiki;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Test;
 
 import java.util.Calendar;
@@ -18,8 +20,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class ZimWikiFileTests {
 
     public static class GeneratorTests {

diff --git a/app/src/test/java/net/gsantner/markor/format/zimwiki/ZimWikiHighlighterTests.java b/app/src/test/java/net/gsantner/markor/format/zimwiki/ZimWikiHighlighterTests.java
@@ -9,14 +9,14 @@
 #########################################################*/
 package net.gsantner.markor.format.zimwiki;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class ZimWikiHighlighterTests {
 
     public static class HeadingTests {

diff --git a/app/src/test/java/net/gsantner/markor/format/zimwiki/ZimWikiLinkResolverTests.java b/app/src/test/java/net/gsantner/markor/format/zimwiki/ZimWikiLinkResolverTests.java
@@ -1,5 +1,11 @@
 package net.gsantner.markor.format.zimwiki;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import net.gsantner.opoc.util.FileUtils;
 
 import org.junit.After;
@@ -10,12 +16,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 public class ZimWikiLinkResolverTests {
     private Path tempFolder;
     private Path notebookRoot;
@@ -27,7 +27,7 @@ public void before() {
             tempFolder = Files.createTempDirectory("markorTemp");
             notebookRoot = Files.createDirectory(tempFolder.resolve("notebookRoot"));
             createTestNotebookStructure();
-            System.out.println("Created test notebook in: "+ tempFolder);
+            System.out.println("Created test notebook in: " + tempFolder);
         } catch (IOException e) {
             e.printStackTrace();
             fail("Could not create the test directory");
@@ -36,13 +36,13 @@ public void before() {
 
     /**
      * Creates the following notebook structure:
-     *
+     * <p>
      * notebookRoot ___ My page ___ Another page ___ Very cool subpage
-     *   |                   |___ Yet another page ___ Interesting page
-     *   |                                      |___ Strange page
-     *   |___ Your page ___ Another page
-     *   |            |___ The coolest page
-     *   |___ Another page
+     * |                   |___ Yet another page ___ Interesting page
+     * |                                      |___ Strange page
+     * |___ Your page ___ Another page
+     * |            |___ The coolest page
+     * |___ Another page
      */
     private void createTestNotebookStructure() throws IOException {
 
@@ -67,7 +67,7 @@ private void createTestNotebookStructure() throws IOException {
     @After
     public void after() {
         FileUtils.deleteRecursive(tempFolder.toFile());
-        System.out.println("Deleted: "+tempFolder);
+        System.out.println("Deleted: " + tempFolder);
     }
 
     @Test
@@ -151,7 +151,7 @@ public void doesNotResolveTopLevelLinkIfRootCannotBeDetermined() {
 
     private void assertResolvedLinkAndDescription(String expectedLinkRelativeToRoot, String expectedDescription, String zimLink, String currentPageRelativeToRoot) {
         ZimWikiLinkResolver resolver = ZimWikiLinkResolver.resolve(zimLink, notebookRoot.toFile(), notebookRoot.resolve(currentPageRelativeToRoot).toFile(), false);
-        String expectedLink = expectedLinkRelativeToRoot!=null ? notebookRoot.resolve(expectedLinkRelativeToRoot).toString() : null;
+        String expectedLink = expectedLinkRelativeToRoot != null ? notebookRoot.resolve(expectedLinkRelativeToRoot).toString() : null;
         assertEquals(expectedLink, resolver.getResolvedLink());
         assertEquals(expectedDescription, resolver.getLinkDescription());
         assertFalse(resolver.isWebLink());

diff --git a/...src/test/java/net/gsantner/markor/format/zimwiki/ZimWikiReplacePatternGeneratorTests.java b/...src/test/java/net/gsantner/markor/format/zimwiki/ZimWikiReplacePatternGeneratorTests.java
@@ -9,15 +9,15 @@
 #########################################################*/
 package net.gsantner.markor.format.zimwiki;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import net.gsantner.markor.ui.hleditor.TextActions;
 
 import org.junit.Test;
 
 import java.util.List;
 import java.util.regex.Matcher;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class ZimWikiReplacePatternGeneratorTests {
 
 

diff --git a/app/src/test/java/net/gsantner/markor/model/TestPlayground.java b/app/src/test/java/net/gsantner/markor/model/TestPlayground.java
@@ -9,10 +9,10 @@
 #########################################################*/
 package net.gsantner.markor.model;
 
-import org.junit.Test;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.Test;
+
 @SuppressWarnings("ALL")
 public class TestPlayground {