From 3335ce6d13e09fe55a894aaef9af755dcf25ca94 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Tue, 14 Nov 2023 17:47:51 +0100 Subject: [PATCH] Automatic code reformat (@gsantner) --- .../net/gsantner/markor/activity/MarkorBaseActivity.java | 5 ----- .../java/net/gsantner/markor/format/ActionButtonBase.java | 1 - .../markor/format/todotxt/TodoTxtActionButtons.java | 1 - .../gsantner/markor/frontend/AttachLinkOrFileDialog.java | 2 +- .../gsantner/markor/frontend/textview/TextViewUtils.java | 8 ++++++-- .../main/java/net/gsantner/markor/model/AppSettings.java | 3 ++- .../opoc/frontend/GsSearchOrCustomTextDialog.java | 1 - .../frontend/filebrowser/GsFileBrowserListAdapter.java | 2 +- .../java/net/gsantner/opoc/util/GsCollectionUtils.java | 2 -- .../main/java/net/gsantner/opoc/util/GsContextUtils.java | 1 - app/src/main/java/net/gsantner/opoc/util/GsFileUtils.java | 6 ++---- 11 files changed, 12 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java b/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java index 9fac8c5f8..0f4e2d33f 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java @@ -7,17 +7,12 @@ import android.view.WindowManager; import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; import net.gsantner.markor.ApplicationObject; import net.gsantner.markor.R; import net.gsantner.markor.model.AppSettings; import net.gsantner.markor.util.MarkorContextUtils; import net.gsantner.opoc.frontend.base.GsActivityBase; -import net.gsantner.opoc.util.GsCollectionUtils; - -import java.util.List; public abstract class MarkorBaseActivity extends GsActivityBase { diff --git a/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java b/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java index 29ff25fe7..d7d3c6d78 100644 --- a/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java +++ b/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java @@ -47,7 +47,6 @@ import net.gsantner.markor.util.MarkorContextUtils; import net.gsantner.opoc.format.GsTextUtils; import net.gsantner.opoc.util.GsCollectionUtils; -import net.gsantner.opoc.util.GsContextUtils; import net.gsantner.opoc.util.GsFileUtils; import net.gsantner.opoc.wrapper.GsCallback; diff --git a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java index ac2a1be18..6503f2f02 100644 --- a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java +++ b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java @@ -26,7 +26,6 @@ import net.gsantner.markor.frontend.textview.TextViewUtils; import net.gsantner.markor.model.Document; import net.gsantner.opoc.util.GsCollectionUtils; -import net.gsantner.opoc.util.GsContextUtils; import net.gsantner.opoc.util.GsFileUtils; import net.gsantner.opoc.wrapper.GsCallback; diff --git a/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java b/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java index 9e1a50ef6..a814df4c7 100644 --- a/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java +++ b/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java @@ -62,7 +62,7 @@ private static String getLinkFormat(final int textFormatId) { return "{{LINK|TITLE}}"; } else if (textFormatId == FormatRegistry.FORMAT_ASCIIDOC) { return "link:LINK[TITLE]"; - } else{ + } else { return "TITLE"; } } diff --git a/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java b/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java index e8793065d..dc8d32c5c 100644 --- a/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java +++ b/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java @@ -155,7 +155,9 @@ public static int[] getLineSelection(final CharSequence seq) { } - /** Get lines of text in which sel[0] -> sel[1] is contained **/ + /** + * Get lines of text in which sel[0] -> sel[1] is contained + **/ public static String getSelectedLines(final TextView text, final int... sel) { return getSelectedLines(text.getText(), sel); } @@ -164,7 +166,9 @@ public static String getSelectedLines(final CharSequence seq) { return getSelectedLines(seq, getSelection(seq)); } - /** Get lines of text in which sel[0] -> sel[1] is contained **/ + /** + * Get lines of text in which sel[0] -> sel[1] is contained + **/ public static String getSelectedLines(final CharSequence seq, final int... sel) { if (sel == null || sel.length == 0) { return ""; diff --git a/app/src/main/java/net/gsantner/markor/model/AppSettings.java b/app/src/main/java/net/gsantner/markor/model/AppSettings.java index 18130f77d..397f8998e 100644 --- a/app/src/main/java/net/gsantner/markor/model/AppSettings.java +++ b/app/src/main/java/net/gsantner/markor/model/AppSettings.java @@ -935,7 +935,8 @@ public String getShareIntoPrefix() { return getString(R.string.pref_key__share_into_format, "\\n----\\n{{text}}"); } - public @NonNull File getAttachmentFolder(final File file) { + public @NonNull + File getAttachmentFolder(final File file) { final File parent = file.getParentFile(); if (parent == null) { return getNotebookDirectory(); diff --git a/app/src/main/java/net/gsantner/opoc/frontend/GsSearchOrCustomTextDialog.java b/app/src/main/java/net/gsantner/opoc/frontend/GsSearchOrCustomTextDialog.java index 45528c6d1..4f3754efe 100644 --- a/app/src/main/java/net/gsantner/opoc/frontend/GsSearchOrCustomTextDialog.java +++ b/app/src/main/java/net/gsantner/opoc/frontend/GsSearchOrCustomTextDialog.java @@ -55,7 +55,6 @@ import net.gsantner.opoc.wrapper.GsCallback; import net.gsantner.opoc.wrapper.GsTextWatcherAdapter; -import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java index de5f0486d..98ac60f2c 100644 --- a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java +++ b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java @@ -523,7 +523,7 @@ public void onChanged() { /** * Show a file in the current folder and blink it * - * @param file File to blink + * @param file File to blink */ private void showAndBlink(final File file) { final int pos = getFilePosition(file); diff --git a/app/src/main/java/net/gsantner/opoc/util/GsCollectionUtils.java b/app/src/main/java/net/gsantner/opoc/util/GsCollectionUtils.java index 887d947b2..ef185d32a 100644 --- a/app/src/main/java/net/gsantner/opoc/util/GsCollectionUtils.java +++ b/app/src/main/java/net/gsantner/opoc/util/GsCollectionUtils.java @@ -11,8 +11,6 @@ import android.util.Pair; -import androidx.lifecycle.LifecycleKt; - import net.gsantner.opoc.wrapper.GsCallback; import java.util.ArrayList; diff --git a/app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java b/app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java index da41a094a..57b225519 100644 --- a/app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java +++ b/app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java @@ -1736,7 +1736,6 @@ public String extractFileFromIntentStr(final Context context, final Intent recei * The requested image savepath has to be stored at caller side (not contained in intent), * it can be retrieved using {@link #extractResultFromActivityResult(Activity, int, int, Intent)} * returns null if an error happened. - * */ public void requestCameraPicture(final Activity activity) { try { diff --git a/app/src/main/java/net/gsantner/opoc/util/GsFileUtils.java b/app/src/main/java/net/gsantner/opoc/util/GsFileUtils.java index dcca29597..1353f5b33 100644 --- a/app/src/main/java/net/gsantner/opoc/util/GsFileUtils.java +++ b/app/src/main/java/net/gsantner/opoc/util/GsFileUtils.java @@ -16,8 +16,6 @@ import android.text.TextUtils; import android.util.Pair; -import androidx.annotation.Nullable; - import net.gsantner.opoc.format.GsTextUtils; import java.io.BufferedInputStream; @@ -701,8 +699,8 @@ public static String getPrefix(final String name) { * This is highly performant as each file is processed exactly once. * Inspired by python's sort * - * @param sortBy String key of what to sort - * @param file The file object to get the + * @param sortBy String key of what to sort + * @param file The file object to get the * @return A key which can be used for comparisons / sorting */ private static String makeSortKey(final String sortBy, final File file) {