-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Reformat codebase (more carefully) #13885
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+6,327
−5,447
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
a8507e2
Fix non record comments by carl
subhramit 226fff5
Add file exceptions
subhramit b255a5d
Remove shebang line
koppor b24c9e5
Remove shebang line
koppor 74f1743
Remove shebang line
koppor add4002
Expand variables & rename class
subhramit 6e914a6
Merge remote-tracking branch 'origin/reformat-again' into reformat-again
subhramit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
2 changes: 0 additions & 2 deletions
2
build-support/src/main/java/CitationStyleCatalogGenerator.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| ///usr/bin/env jbang "$0" "$@" ; exit $? | ||
|
|
||
| //JAVA 24 | ||
| //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| ///usr/bin/env jbang "$0" "$@" ; exit $? | ||
|
|
||
| //JAVA 24 | ||
| //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -137,11 +137,10 @@ public static void shutdown(BibDatabaseContext bibDatabaseContext, Path backupDi | |
| /** | ||
| * Checks whether a backup file exists for the given database file. If it exists, it is checked whether it is | ||
| * newer and different from the original. | ||
| * | ||
| * <p> | ||
| * In case a discarded file is present, the method also returns <code>false</code>, See also {@link #discardBackup(Path)}. | ||
| * | ||
| * @param originalPath Path to the file a backup should be checked for. Example: jabref.bib. | ||
| * | ||
| * @return <code>true</code> if backup file exists AND differs from originalPath. <code>false</code> is the | ||
| * "default" return value in the good case. In case a discarded file exists, <code>false</code> is returned, too. | ||
| * In the case of an exception <code>true</code> is returned to ensure that the user checks the output. | ||
|
|
@@ -303,7 +302,7 @@ private static Path determineDiscardedFile(Path file, Path backupDir) { | |
|
|
||
| /** | ||
| * Marks the backups as discarded. | ||
| * | ||
| * <p> | ||
| * We do not delete any files, because the user might want to recover old backup files. | ||
| * Therefore, we mark discarded backups by a --discarded file. | ||
| */ | ||
|
|
@@ -340,11 +339,11 @@ private void startBackupTask(Path backupDir) { | |
| fillQueue(backupDir); | ||
|
|
||
| executor.scheduleAtFixedRate( | ||
| // We need to determine the backup path on each action, because we use the timestamp in the filename | ||
| () -> determineBackupPathForNewBackup(backupDir).ifPresent(this::performBackup), | ||
| DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS, | ||
| DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS, | ||
| TimeUnit.SECONDS); | ||
| // We need to determine the backup path on each action, because we use the timestamp in the filename | ||
| () -> determineBackupPathForNewBackup(backupDir).ifPresent(this::performBackup), | ||
| DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS, | ||
| DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS, | ||
| TimeUnit.SECONDS); | ||
| } | ||
|
|
||
| private void fillQueue(Path backupDir) { | ||
|
|
@@ -370,7 +369,7 @@ private void fillQueue(Path backupDir) { | |
| * Unregisters the BackupManager from the eventBus of {@link BibDatabaseContext}. | ||
| * This method should only be used when closing a database/JabRef in a normal way. | ||
| * | ||
| * @param backupDir The backup directory | ||
| * @param backupDir The backup directory | ||
|
Comment on lines
-373
to
+372
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is relatively okay |
||
| * @param createBackup If the backup manager should still perform a backup | ||
| */ | ||
| private void shutdown(Path backupDir, boolean createBackup) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a bit odd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be formatted to "createLibraryTab" in the next line?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IntelliJ style - description always on the same column