Skip to content

Commit ca5d2d8

Browse files
committed
Organize imports
1 parent b0d63e4 commit ca5d2d8

File tree

1,596 files changed

+6728
-11313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,596 files changed

+6728
-11313
lines changed

src/jmh/java/org/jabref/benchmarks/Benchmarks.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
package org.jabref.benchmarks;
22

3-
import java.io.IOException;
4-
import java.io.StringReader;
5-
import java.io.StringWriter;
6-
import java.util.EnumSet;
7-
import java.util.List;
8-
import java.util.Random;
9-
import java.util.stream.Collectors;
10-
113
import org.jabref.gui.Globals;
124
import org.jabref.logic.bibtex.FieldPreferences;
135
import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -35,14 +27,21 @@
3527
import org.jabref.model.metadata.MetaData;
3628
import org.jabref.model.search.rules.SearchRules.SearchFlags;
3729
import org.jabref.preferences.JabRefPreferences;
38-
3930
import org.openjdk.jmh.Main;
4031
import org.openjdk.jmh.annotations.Benchmark;
4132
import org.openjdk.jmh.annotations.Scope;
4233
import org.openjdk.jmh.annotations.Setup;
4334
import org.openjdk.jmh.annotations.State;
4435
import org.openjdk.jmh.runner.RunnerException;
4536

37+
import java.io.IOException;
38+
import java.io.StringReader;
39+
import java.io.StringWriter;
40+
import java.util.EnumSet;
41+
import java.util.List;
42+
import java.util.Random;
43+
import java.util.stream.Collectors;
44+
4645
import static org.mockito.Mockito.mock;
4746

4847
@State(Scope.Thread)

src/main/java/org/jabref/cli/ArgumentProcessor.java

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,14 @@
11
package org.jabref.cli;
22

3-
import java.io.IOException;
4-
import java.nio.charset.StandardCharsets;
5-
import java.nio.file.Files;
6-
import java.nio.file.Path;
7-
import java.util.ArrayList;
8-
import java.util.Collections;
9-
import java.util.List;
10-
import java.util.Locale;
11-
import java.util.Optional;
12-
import java.util.Set;
13-
import java.util.prefs.BackingStoreException;
14-
3+
import com.google.common.base.Throwables;
154
import org.jabref.gui.Globals;
165
import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
176
import org.jabref.gui.undo.NamedCompound;
187
import org.jabref.logic.JabRefException;
198
import org.jabref.logic.bibtex.FieldPreferences;
209
import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
21-
import org.jabref.logic.exporter.AtomicFileWriter;
22-
import org.jabref.logic.exporter.BibDatabaseWriter;
23-
import org.jabref.logic.exporter.BibWriter;
24-
import org.jabref.logic.exporter.BibtexDatabaseWriter;
25-
import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter;
26-
import org.jabref.logic.exporter.Exporter;
27-
import org.jabref.logic.exporter.ExporterFactory;
28-
import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
29-
import org.jabref.logic.exporter.XmpPdfExporter;
30-
import org.jabref.logic.importer.FetcherException;
31-
import org.jabref.logic.importer.ImportException;
32-
import org.jabref.logic.importer.ImportFormatPreferences;
33-
import org.jabref.logic.importer.ImportFormatReader;
34-
import org.jabref.logic.importer.OpenDatabase;
35-
import org.jabref.logic.importer.OutputPrinter;
36-
import org.jabref.logic.importer.ParseException;
37-
import org.jabref.logic.importer.ParserResult;
38-
import org.jabref.logic.importer.SearchBasedFetcher;
39-
import org.jabref.logic.importer.WebFetchers;
10+
import org.jabref.logic.exporter.*;
11+
import org.jabref.logic.importer.*;
4012
import org.jabref.logic.importer.fileformat.BibtexParser;
4113
import org.jabref.logic.journals.JournalAbbreviationRepository;
4214
import org.jabref.logic.l10n.Localization;
@@ -58,11 +30,16 @@
5830
import org.jabref.preferences.FilePreferences;
5931
import org.jabref.preferences.PreferencesService;
6032
import org.jabref.preferences.SearchPreferences;
61-
62-
import com.google.common.base.Throwables;
6333
import org.slf4j.Logger;
6434
import org.slf4j.LoggerFactory;
6535

36+
import java.io.IOException;
37+
import java.nio.charset.StandardCharsets;
38+
import java.nio.file.Files;
39+
import java.nio.file.Path;
40+
import java.util.*;
41+
import java.util.prefs.BackingStoreException;
42+
6643
public class ArgumentProcessor {
6744

6845
private static final Logger LOGGER = LoggerFactory.getLogger(ArgumentProcessor.class);

src/main/java/org/jabref/cli/AuxCommandLine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.jabref.cli;
22

3-
import java.nio.file.Path;
4-
53
import org.jabref.gui.auximport.AuxParserResultViewModel;
64
import org.jabref.logic.auxparser.AuxParser;
75
import org.jabref.logic.auxparser.AuxParserResult;
86
import org.jabref.logic.auxparser.DefaultAuxParser;
97
import org.jabref.model.database.BibDatabase;
108
import org.jabref.model.strings.StringUtil;
119

10+
import java.nio.file.Path;
11+
1212
public class AuxCommandLine {
1313
private final String auxFile;
1414
private final BibDatabase database;

src/main/java/org/jabref/cli/JabRefCLI.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package org.jabref.cli;
22

3-
import java.util.List;
4-
import java.util.Objects;
5-
63
import javafx.util.Pair;
7-
4+
import org.apache.commons.cli.*;
85
import org.jabref.gui.Globals;
96
import org.jabref.logic.exporter.ExporterFactory;
107
import org.jabref.logic.importer.ImportFormatReader;
@@ -14,12 +11,8 @@
1411
import org.jabref.model.util.DummyFileUpdateMonitor;
1512
import org.jabref.preferences.PreferencesService;
1613

17-
import org.apache.commons.cli.CommandLine;
18-
import org.apache.commons.cli.DefaultParser;
19-
import org.apache.commons.cli.HelpFormatter;
20-
import org.apache.commons.cli.Option;
21-
import org.apache.commons.cli.Options;
22-
import org.apache.commons.cli.ParseException;
14+
import java.util.List;
15+
import java.util.Objects;
2316

2417
public class JabRefCLI {
2518
private static final int WIDTH = 100; // Number of characters per line before a line break must be added.

src/main/java/org/jabref/cli/JournalListMvGenerator.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package org.jabref.cli;
22

3+
import org.h2.mvstore.MVMap;
4+
import org.h2.mvstore.MVStore;
5+
import org.jabref.logic.journals.Abbreviation;
6+
import org.jabref.logic.journals.JournalAbbreviationLoader;
7+
import org.jooq.lambda.Unchecked;
8+
39
import java.io.IOException;
410
import java.nio.file.DirectoryStream;
511
import java.nio.file.Files;
@@ -9,13 +15,6 @@
915
import java.util.Set;
1016
import java.util.stream.Collectors;
1117

12-
import org.jabref.logic.journals.Abbreviation;
13-
import org.jabref.logic.journals.JournalAbbreviationLoader;
14-
15-
import org.h2.mvstore.MVMap;
16-
import org.h2.mvstore.MVStore;
17-
import org.jooq.lambda.Unchecked;
18-
1918
public class JournalListMvGenerator {
2019

2120
public static void main(String[] args) throws IOException {

src/main/java/org/jabref/cli/Launcher.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
package org.jabref.cli;
22

3-
import java.io.File;
4-
import java.io.IOException;
5-
import java.net.Authenticator;
6-
import java.nio.file.DirectoryStream;
7-
import java.nio.file.Files;
8-
import java.nio.file.Path;
9-
import java.util.Comparator;
10-
import java.util.Map;
11-
3+
import org.apache.commons.cli.ParseException;
124
import org.jabref.gui.Globals;
135
import org.jabref.gui.MainApplication;
146
import org.jabref.logic.journals.JournalAbbreviationLoader;
@@ -27,13 +19,20 @@
2719
import org.jabref.model.util.FileUpdateMonitor;
2820
import org.jabref.preferences.JabRefPreferences;
2921
import org.jabref.preferences.PreferencesService;
30-
31-
import org.apache.commons.cli.ParseException;
3222
import org.slf4j.Logger;
3323
import org.slf4j.LoggerFactory;
3424
import org.slf4j.bridge.SLF4JBridgeHandler;
3525
import org.tinylog.configuration.Configuration;
3626

27+
import java.io.File;
28+
import java.io.IOException;
29+
import java.net.Authenticator;
30+
import java.nio.file.DirectoryStream;
31+
import java.nio.file.Files;
32+
import java.nio.file.Path;
33+
import java.util.Comparator;
34+
import java.util.Map;
35+
3736
/**
3837
* The main entry point for the JabRef application.
3938
* <p>

src/main/java/org/jabref/gui/ClipBoardManager.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
package org.jabref.gui;
22

3-
import java.awt.Toolkit;
4-
import java.awt.datatransfer.DataFlavor;
5-
import java.awt.datatransfer.StringSelection;
6-
import java.awt.datatransfer.Transferable;
7-
import java.awt.datatransfer.UnsupportedFlavorException;
8-
import java.io.IOException;
9-
import java.util.List;
10-
113
import javafx.application.Platform;
124
import javafx.scene.control.TextInputControl;
135
import javafx.scene.input.Clipboard;
146
import javafx.scene.input.ClipboardContent;
157
import javafx.scene.input.DataFormat;
168
import javafx.scene.input.MouseButton;
17-
189
import org.jabref.architecture.AllowedToUseAwt;
1910
import org.jabref.logic.bibtex.BibEntryWriter;
2011
import org.jabref.logic.bibtex.FieldWriter;
2112
import org.jabref.model.database.BibDatabaseMode;
2213
import org.jabref.model.entry.BibEntry;
2314
import org.jabref.model.entry.BibEntryTypesManager;
2415
import org.jabref.preferences.PreferencesService;
25-
2616
import org.slf4j.Logger;
2717
import org.slf4j.LoggerFactory;
2818

19+
import java.awt.*;
20+
import java.awt.datatransfer.DataFlavor;
21+
import java.awt.datatransfer.StringSelection;
22+
import java.awt.datatransfer.Transferable;
23+
import java.awt.datatransfer.UnsupportedFlavorException;
24+
import java.io.IOException;
25+
import java.util.List;
26+
2927
@AllowedToUseAwt("Requires ava.awt.datatransfer.Clipboard")
3028
public class ClipBoardManager {
3129

src/main/java/org/jabref/gui/DefaultInjector.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.jabref.gui;
22

3-
import java.util.function.Function;
4-
5-
import javax.swing.undo.UndoManager;
6-
3+
import com.airhacks.afterburner.injection.Injector;
4+
import com.airhacks.afterburner.injection.PresenterFactory;
75
import org.jabref.gui.keyboard.KeyBindingRepository;
86
import org.jabref.gui.theme.ThemeManager;
97
import org.jabref.gui.util.TaskExecutor;
@@ -12,12 +10,12 @@
1210
import org.jabref.model.entry.BibEntryTypesManager;
1311
import org.jabref.model.util.FileUpdateMonitor;
1412
import org.jabref.preferences.PreferencesService;
15-
16-
import com.airhacks.afterburner.injection.Injector;
17-
import com.airhacks.afterburner.injection.PresenterFactory;
1813
import org.slf4j.Logger;
1914
import org.slf4j.LoggerFactory;
2015

16+
import javax.swing.undo.UndoManager;
17+
import java.util.function.Function;
18+
2119
public class DefaultInjector implements PresenterFactory {
2220

2321
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultInjector.class);

src/main/java/org/jabref/gui/DialogService.java

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
package org.jabref.gui;
22

3-
import java.io.IOException;
4-
import java.nio.file.Path;
5-
import java.util.Collection;
6-
import java.util.List;
7-
import java.util.Optional;
8-
import java.util.function.Consumer;
9-
103
import javafx.concurrent.Task;
114
import javafx.print.PrinterJob;
12-
import javafx.scene.control.Alert;
13-
import javafx.scene.control.ButtonType;
14-
import javafx.scene.control.ChoiceDialog;
15-
import javafx.scene.control.DialogPane;
16-
import javafx.scene.control.TextInputDialog;
17-
5+
import javafx.scene.control.*;
6+
import org.controlsfx.control.textfield.CustomPasswordField;
7+
import org.controlsfx.dialog.ProgressDialog;
188
import org.jabref.gui.util.BaseDialog;
199
import org.jabref.gui.util.DirectoryDialogConfiguration;
2010
import org.jabref.gui.util.FileDialogConfiguration;
2111
import org.jabref.logic.l10n.Localization;
2212

23-
import org.controlsfx.control.textfield.CustomPasswordField;
24-
import org.controlsfx.dialog.ProgressDialog;
13+
import java.io.IOException;
14+
import java.nio.file.Path;
15+
import java.util.Collection;
16+
import java.util.List;
17+
import java.util.Optional;
18+
import java.util.function.Consumer;
2519

2620
/**
2721
* This interface provides methods to create dialogs and show them to the user.

src/main/java/org/jabref/gui/DragAndDropDataFormats.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package org.jabref.gui;
22

3-
import java.util.List;
4-
53
import javafx.scene.input.DataFormat;
6-
74
import org.jabref.logic.preview.PreviewLayout;
85

6+
import java.util.List;
7+
98
/**
109
* Contains all the different {@link DataFormat}s that may occur in JabRef.
1110
*/

0 commit comments

Comments
 (0)