From b8610412c0fc71a5df1d5983b4bcfec94945a1f7 Mon Sep 17 00:00:00 2001 From: Simon Harrer Date: Wed, 9 Sep 2015 12:50:06 +0200 Subject: [PATCH] Execute gradlew format --- src/main/java/net/sf/jabref/Globals.java | 9 +++++++-- src/main/java/net/sf/jabref/JabRefMain.java | 1 + src/main/java/net/sf/jabref/gui/BaseAction.java | 1 + src/main/java/net/sf/jabref/gui/actions/Actions.java | 3 ++- .../gui/fieldeditors/contextmenu/CaseChangeMenu.java | 2 ++ .../jabref/importer/fileformat/FieldContentParser.java | 1 + src/main/java/net/sf/jabref/logic/util/BuildInfo.java | 2 ++ src/main/java/net/sf/jabref/logic/util/io/URLUtil.java | 2 ++ .../logic/xmp/EncryptionNotSupportedException.java | 1 + .../net/sf/jabref/migrations/PreferencesMigrations.java | 1 + 10 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/sf/jabref/Globals.java b/src/main/java/net/sf/jabref/Globals.java index b02600b9902..fc13a7c5782 100644 --- a/src/main/java/net/sf/jabref/Globals.java +++ b/src/main/java/net/sf/jabref/Globals.java @@ -32,6 +32,7 @@ import java.io.FileNotFoundException; public class Globals { + private static final Log LOGGER = LogFactory.getLog(Globals.class); // JabRef version info @@ -52,6 +53,7 @@ public class Globals { public static JournalAbbreviationRepository journalAbbrev; + public static void initializeJournalNames() { // Read internal lists: Globals.journalAbbrev = new JournalAbbreviationRepository(); @@ -79,13 +81,13 @@ public static void initializeJournalNames() { try { Globals.journalAbbrev.readJournalListFromFile(new File(Globals.prefs.get(JabRefPreferences.PERSONAL_JOURNAL_LIST))); } catch (FileNotFoundException e) { - LOGGER.info("Personal journal list file '" + Globals.prefs.get(JabRefPreferences.PERSONAL_JOURNAL_LIST) - + "' not found.", e); + LOGGER.info("Personal journal list file '" + Globals.prefs.get(JabRefPreferences.PERSONAL_JOURNAL_LIST) + "' not found.", e); } } } + public static final ImportFormatReader importFormatReader = new ImportFormatReader(); public static CacheableHandler handler; @@ -107,6 +109,7 @@ public static void initializeJournalNames() { public static FileUpdateMonitor fileUpdateMonitor; public static StreamEavesdropper streamEavesdropper; + public static void startBackgroundTasks() { Globals.focusListener = new GlobalFocusListener(); @@ -116,9 +119,11 @@ public static void startBackgroundTasks() { JabRefExecutorService.INSTANCE.executeWithLowPriorityInOwnThread(Globals.fileUpdateMonitor, "FileUpdateMonitor"); } + // Autosave manager public static AutoSaveManager autoSaveManager; + public static void startAutoSaveManager(JabRefFrame frame) { Globals.autoSaveManager = new AutoSaveManager(frame); Globals.autoSaveManager.startAutoSaveTimer(); diff --git a/src/main/java/net/sf/jabref/JabRefMain.java b/src/main/java/net/sf/jabref/JabRefMain.java index cedb9fe9132..dfe3f6833ab 100644 --- a/src/main/java/net/sf/jabref/JabRefMain.java +++ b/src/main/java/net/sf/jabref/JabRefMain.java @@ -4,6 +4,7 @@ * JabRef MainClass */ public class JabRefMain { + public static void main(String[] args) { new JabRef().start(args); } diff --git a/src/main/java/net/sf/jabref/gui/BaseAction.java b/src/main/java/net/sf/jabref/gui/BaseAction.java index e69c1367a7f..907f92814d9 100644 --- a/src/main/java/net/sf/jabref/gui/BaseAction.java +++ b/src/main/java/net/sf/jabref/gui/BaseAction.java @@ -21,5 +21,6 @@ * appropriate BaseAction object, and runs its action() method. */ public interface BaseAction { + void action() throws Throwable; } diff --git a/src/main/java/net/sf/jabref/gui/actions/Actions.java b/src/main/java/net/sf/jabref/gui/actions/Actions.java index d5a957dd695..d5d57fa243a 100644 --- a/src/main/java/net/sf/jabref/gui/actions/Actions.java +++ b/src/main/java/net/sf/jabref/gui/actions/Actions.java @@ -4,6 +4,7 @@ * Global String constants for GUI actions */ public class Actions { + public static final String ABBREVIATE_ISO = "abbreviateIso"; public static final String ABBREVIATE_MEDLINE = "abbreviateMedline"; public static final String ADD_FILE_LINK = "addFileLink"; @@ -30,7 +31,7 @@ public class Actions { public static final String FORWARD = "forward"; public static final String INC_SEARCH = "incSearch"; public static final String MAKE_KEY = "makeKey"; - public static final String MANAGE_SELECTORS= "manageSelectors"; + public static final String MANAGE_SELECTORS = "manageSelectors"; public static final String MARK_ENTRIES = "markEntries"; public static final String MERGE_DATABASE = "mergeDatabase"; public static final String MERGE_ENTRIES = "mergeEntries"; diff --git a/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/CaseChangeMenu.java b/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/CaseChangeMenu.java index 9b921847165..7bc905fa5b0 100644 --- a/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/CaseChangeMenu.java +++ b/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/CaseChangeMenu.java @@ -25,8 +25,10 @@ import java.awt.event.ActionListener; public class CaseChangeMenu extends JMenu { + private final JTextComponent parent; + public CaseChangeMenu(JTextComponent opener) { super(Localization.lang("Change case")); parent = opener; diff --git a/src/main/java/net/sf/jabref/importer/fileformat/FieldContentParser.java b/src/main/java/net/sf/jabref/importer/fileformat/FieldContentParser.java index 756cc585477..8e51e4fc9cf 100644 --- a/src/main/java/net/sf/jabref/importer/fileformat/FieldContentParser.java +++ b/src/main/java/net/sf/jabref/importer/fileformat/FieldContentParser.java @@ -24,6 +24,7 @@ * writing the same fields. */ class FieldContentParser { + /** * Performs the reformatting * @param content StringBuffer containing the field to format. key contains field name according to field diff --git a/src/main/java/net/sf/jabref/logic/util/BuildInfo.java b/src/main/java/net/sf/jabref/logic/util/BuildInfo.java index 1232931afa0..6295e4136e8 100644 --- a/src/main/java/net/sf/jabref/logic/util/BuildInfo.java +++ b/src/main/java/net/sf/jabref/logic/util/BuildInfo.java @@ -19,8 +19,10 @@ import java.util.Properties; public class BuildInfo { + private final String version; + public BuildInfo() { this("/resource/build.properties"); } diff --git a/src/main/java/net/sf/jabref/logic/util/io/URLUtil.java b/src/main/java/net/sf/jabref/logic/util/io/URLUtil.java index ff33fff8ab8..b78c2c1ccd6 100644 --- a/src/main/java/net/sf/jabref/logic/util/io/URLUtil.java +++ b/src/main/java/net/sf/jabref/logic/util/io/URLUtil.java @@ -22,8 +22,10 @@ import java.util.Objects; public class URLUtil { + private static final String URL_EXP = "^(https?|ftp)://.+"; + /** * Cleans URLs returned by Google search. * diff --git a/src/main/java/net/sf/jabref/logic/xmp/EncryptionNotSupportedException.java b/src/main/java/net/sf/jabref/logic/xmp/EncryptionNotSupportedException.java index 97080e6e401..774ff8b171d 100644 --- a/src/main/java/net/sf/jabref/logic/xmp/EncryptionNotSupportedException.java +++ b/src/main/java/net/sf/jabref/logic/xmp/EncryptionNotSupportedException.java @@ -18,6 +18,7 @@ import java.io.IOException; public class EncryptionNotSupportedException extends IOException { + private static final long serialVersionUID = 3280233692527372333L; diff --git a/src/main/java/net/sf/jabref/migrations/PreferencesMigrations.java b/src/main/java/net/sf/jabref/migrations/PreferencesMigrations.java index 071ec77486e..84d2f1c934f 100644 --- a/src/main/java/net/sf/jabref/migrations/PreferencesMigrations.java +++ b/src/main/java/net/sf/jabref/migrations/PreferencesMigrations.java @@ -4,6 +4,7 @@ import net.sf.jabref.JabRefPreferences; public class PreferencesMigrations { + /** * This method is called at startup, and makes necessary adaptations to * preferences for users from an earlier version of Jabref.