Skip to content

Commit add1432

Browse files
kopporkoppor
committed
Clean up packages in JabKit
1 parent d7ca873 commit add1432

24 files changed

+55
-30
lines changed

‎jabkit/src/main/java/module-info.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
requires org.jabref.jablib;
33

44
requires info.picocli;
5-
opens org.jabref.toolkit.cli;
6-
opens org.jabref.toolkit.cli.converter;
5+
opens org.jabref.toolkit.commands;
6+
opens org.jabref.toolkit.converter;
7+
opens org.jabref.toolkit;
78

89
requires transitive org.jspecify;
910
requires java.prefs;

jabkit/src/main/java/org/jabref/toolkit/cli/ArgumentProcessor.java renamed to jabkit/src/main/java/org/jabref/toolkit/ArgumentProcessor.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jabref.toolkit.cli;
1+
package org.jabref.toolkit;
22

33
import java.io.IOException;
44
import java.net.MalformedURLException;
@@ -28,6 +28,17 @@
2828
import org.jabref.model.database.BibDatabaseContext;
2929
import org.jabref.model.entry.BibEntryTypesManager;
3030
import org.jabref.model.util.DummyFileUpdateMonitor;
31+
import org.jabref.toolkit.commands.CheckConsistency;
32+
import org.jabref.toolkit.commands.CheckIntegrity;
33+
import org.jabref.toolkit.commands.Convert;
34+
import org.jabref.toolkit.commands.DoiToBibtex;
35+
import org.jabref.toolkit.commands.Fetch;
36+
import org.jabref.toolkit.commands.GenerateBibFromAux;
37+
import org.jabref.toolkit.commands.GenerateCitationKeys;
38+
import org.jabref.toolkit.commands.Pdf;
39+
import org.jabref.toolkit.commands.Preferences;
40+
import org.jabref.toolkit.commands.Pseudonymize;
41+
import org.jabref.toolkit.commands.Search;
3142

3243
import org.slf4j.Logger;
3344
import org.slf4j.LoggerFactory;

‎jabkit/src/main/java/org/jabref/toolkit/JabKit.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.jabref.model.entry.BibEntryTypesManager;
3333
import org.jabref.model.util.DummyFileUpdateMonitor;
3434
import org.jabref.model.util.FileUpdateMonitor;
35-
import org.jabref.toolkit.cli.ArgumentProcessor;
3635

3736
import com.airhacks.afterburner.injection.Injector;
3837
import org.slf4j.Logger;

jabkit/src/main/java/org/jabref/toolkit/cli/CheckConsistency.java renamed to jabkit/src/main/java/org/jabref/toolkit/commands/CheckConsistency.java

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

33
import java.io.IOException;
44
import java.io.OutputStreamWriter;
@@ -14,7 +14,8 @@
1414
import org.jabref.logic.quality.consistency.BibliographyConsistencyCheckResultTxtWriter;
1515
import org.jabref.logic.quality.consistency.BibliographyConsistencyCheckResultWriter;
1616
import org.jabref.model.database.BibDatabaseContext;
17-
import org.jabref.toolkit.cli.converter.CygWinPathConverter;
17+
import org.jabref.toolkit.ArgumentProcessor;
18+
import org.jabref.toolkit.converter.CygWinPathConverter;
1819

1920
import org.slf4j.Logger;
2021
import org.slf4j.LoggerFactory;

jabkit/src/main/java/org/jabref/toolkit/cli/CheckIntegrity.java renamed to jabkit/src/main/java/org/jabref/toolkit/commands/CheckIntegrity.java

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

33
import java.io.IOException;
44
import java.io.OutputStreamWriter;
@@ -20,7 +20,8 @@
2020
import org.jabref.logic.journals.JournalAbbreviationLoader;
2121
import org.jabref.logic.l10n.Localization;
2222
import org.jabref.model.database.BibDatabaseContext;
23-
import org.jabref.toolkit.cli.converter.CygWinPathConverter;
23+
import org.jabref.toolkit.ArgumentProcessor;
24+
import org.jabref.toolkit.converter.CygWinPathConverter;
2425

2526
import org.slf4j.Logger;
2627
import org.slf4j.LoggerFactory;

jabkit/src/main/java/org/jabref/toolkit/cli/Convert.java renamed to jabkit/src/main/java/org/jabref/toolkit/commands/Convert.java

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

33
import java.io.IOException;
44
import java.nio.file.Path;
@@ -15,7 +15,8 @@
1515
import org.jabref.logic.journals.JournalAbbreviationRepository;
1616
import org.jabref.logic.l10n.Localization;
1717
import org.jabref.model.database.BibDatabaseContext;
18-
import org.jabref.toolkit.cli.converter.CygWinPathConverter;
18+
import org.jabref.toolkit.ArgumentProcessor;
19+
import org.jabref.toolkit.converter.CygWinPathConverter;
1920

2021
import com.airhacks.afterburner.injection.Injector;
2122
import org.jspecify.annotations.NonNull;

jabkit/src/main/java/org/jabref/toolkit/cli/DoiToBibtex.java renamed to jabkit/src/main/java/org/jabref/toolkit/commands/DoiToBibtex.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jabref.toolkit.cli;
1+
package org.jabref.toolkit.commands;
22

33
import java.io.IOException;
44
import java.io.OutputStreamWriter;
@@ -16,6 +16,7 @@
1616
import org.jabref.model.database.BibDatabaseContext;
1717
import org.jabref.model.entry.BibEntry;
1818
import org.jabref.model.entry.identifier.DOI;
19+
import org.jabref.toolkit.ArgumentProcessor;
1920

2021
import org.slf4j.Logger;
2122
import org.slf4j.LoggerFactory;

jabkit/src/main/java/org/jabref/toolkit/cli/Fetch.java renamed to jabkit/src/main/java/org/jabref/toolkit/commands/Fetch.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jabref.toolkit.cli;
1+
package org.jabref.toolkit.commands;
22

33
import java.nio.file.Path;
44
import java.util.List;
@@ -12,6 +12,7 @@
1212
import org.jabref.logic.l10n.Localization;
1313
import org.jabref.model.database.BibDatabase;
1414
import org.jabref.model.entry.BibEntry;
15+
import org.jabref.toolkit.ArgumentProcessor;
1516

1617
import org.slf4j.Logger;
1718
import org.slf4j.LoggerFactory;

jabkit/src/main/java/org/jabref/toolkit/cli/GenerateBibFromAux.java renamed to jabkit/src/main/java/org/jabref/toolkit/commands/GenerateBibFromAux.java

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

33
import java.nio.file.Files;
44
import java.nio.file.Path;
@@ -13,7 +13,8 @@
1313
import org.jabref.logic.l10n.Localization;
1414
import org.jabref.model.database.BibDatabase;
1515
import org.jabref.model.entry.BibEntry;
16-
import org.jabref.toolkit.cli.converter.CygWinPathConverter;
16+
import org.jabref.toolkit.ArgumentProcessor;
17+
import org.jabref.toolkit.converter.CygWinPathConverter;
1718

1819
import org.slf4j.Logger;
1920
import org.slf4j.LoggerFactory;

jabkit/src/main/java/org/jabref/toolkit/cli/GenerateCitationKeys.java renamed to jabkit/src/main/java/org/jabref/toolkit/commands/GenerateCitationKeys.java

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

33
import java.nio.file.Path;
44
import java.util.Optional;
@@ -9,7 +9,8 @@
99
import org.jabref.logic.l10n.Localization;
1010
import org.jabref.model.database.BibDatabaseContext;
1111
import org.jabref.model.entry.BibEntry;
12-
import org.jabref.toolkit.cli.converter.CygWinPathConverter;
12+
import org.jabref.toolkit.ArgumentProcessor;
13+
import org.jabref.toolkit.converter.CygWinPathConverter;
1314

1415
import org.slf4j.Logger;
1516
import org.slf4j.LoggerFactory;

0 commit comments

Comments
 (0)