Browse Source

Reorder modifiers to follow Java Language Specification

The Java Language Specification recommends listing modifiers in
the following order:

1. Annotations
2. public
3. protected
4. private
5. abstract
6. static
7. final
8. transient
9. volatile
10. synchronized
11. native
12. strictfp

Not following this convention has no technical impact, but will reduce
the code's readability because most developers are used to the standard
order.

This was detected using SonarLint.

Change-Id: I9cddecb4f4234dae1021b677e915be23d349a380
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-5.6
David Pursehouse 5 years ago
parent
commit
064834d350
  1. 2
      org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ObjectFileServlet.java
  2. 2
      org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/CleanFilter.java
  3. 2
      org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java
  4. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java
  5. 4
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java
  6. 2
      org.eclipse.jgit.test/exttst/org/eclipse/jgit/patch/EGitPatchHistoryTest.java
  7. 12
      org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcOrphanFilesTest.java
  8. 2
      org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserBadlyFormattedTest.java
  9. 2
      org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
  10. 4
      org.eclipse.jgit/src/org/eclipse/jgit/errors/TranslationBundleException.java
  11. 2
      org.eclipse.jgit/src/org/eclipse/jgit/ignore/FastIgnoreRule.java
  12. 6
      org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java
  13. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java
  14. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
  15. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
  16. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
  17. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
  18. 10
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
  19. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackExt.java
  20. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockWriter.java
  21. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java
  22. 6
      org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java
  23. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/InflaterCache.java
  24. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdOwnerMap.java
  25. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectInserter.java
  26. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectLoader.java
  27. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectReader.java
  28. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoLine.java
  29. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
  30. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java
  31. 2
      org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java
  32. 4
      org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java
  33. 2
      org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java
  34. 2
      org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java
  35. 2
      org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
  36. 2
      org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java
  37. 4
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java
  38. 2
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
  39. 12
      org.eclipse.jgit/src/org/eclipse/jgit/util/Base64.java
  40. 4
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
  41. 2
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
  42. 2
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java
  43. 2
      org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java
  44. 2
      org.eclipse.jgit/src/org/eclipse/jgit/util/Monitoring.java
  45. 14
      org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java
  46. 2
      org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java

2
org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ObjectFileServlet.java

@ -83,7 +83,7 @@ abstract class ObjectFileServlet extends HttpServlet {
} }
} }
private static abstract class PackData extends ObjectFileServlet { private abstract static class PackData extends ObjectFileServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
PackData(String contentType) { PackData(String contentType) {

2
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/CleanFilter.java

@ -78,7 +78,7 @@ public class CleanFilter extends FilterCommand {
* The factory is responsible for creating instances of * The factory is responsible for creating instances of
* {@link org.eclipse.jgit.lfs.CleanFilter} * {@link org.eclipse.jgit.lfs.CleanFilter}
*/ */
public final static FilterCommandFactory FACTORY = CleanFilter::new; public static final FilterCommandFactory FACTORY = CleanFilter::new;
/** /**
* Registers this filter by calling * Registers this filter by calling

2
org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java

@ -92,7 +92,7 @@ public class SmudgeFilter extends FilterCommand {
* The factory is responsible for creating instances of * The factory is responsible for creating instances of
* {@link org.eclipse.jgit.lfs.SmudgeFilter} * {@link org.eclipse.jgit.lfs.SmudgeFilter}
*/ */
public final static FilterCommandFactory FACTORY = SmudgeFilter::new; public static final FilterCommandFactory FACTORY = SmudgeFilter::new;
/** /**
* Register this filter in JGit * Register this filter in JGit

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java

@ -350,7 +350,7 @@ class DiffAlgorithms extends TextBuiltin {
return false; return false;
} }
private static abstract class Algorithm { private abstract static class Algorithm {
String name; String name;
abstract DiffAlgorithm create(); abstract DiffAlgorithm create();

4
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java

@ -443,7 +443,7 @@ class TextHashFunctions extends TextBuiltin {
} }
/** Base class for any hashCode function to be tested. */ /** Base class for any hashCode function to be tested. */
private static abstract class Hash extends RawTextComparator { private abstract static class Hash extends RawTextComparator {
String name; String name;
@Override @Override
@ -453,7 +453,7 @@ class TextHashFunctions extends TextBuiltin {
} }
/** Base class for any hashCode folding function to be tested. */ /** Base class for any hashCode folding function to be tested. */
private static abstract class Fold { private abstract static class Fold {
String name; String name;
/** /**

2
org.eclipse.jgit.test/exttst/org/eclipse/jgit/patch/EGitPatchHistoryTest.java

@ -185,7 +185,7 @@ public class EGitPatchHistoryTest {
} }
} }
static abstract class CommitReader { abstract static class CommitReader {
private Process proc; private Process proc;
CommitReader(String[] args) throws IOException { CommitReader(String[] args) throws IOException {

12
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcOrphanFilesTest.java

@ -53,17 +53,17 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
public class GcOrphanFilesTest extends GcTestCase { public class GcOrphanFilesTest extends GcTestCase {
private final static String PACK = "pack"; private static final String PACK = "pack";
private final static String BITMAP_File_1 = PACK + "-1.bitmap"; private static final String BITMAP_File_1 = PACK + "-1.bitmap";
private final static String IDX_File_2 = PACK + "-2.idx"; private static final String IDX_File_2 = PACK + "-2.idx";
private final static String IDX_File_malformed = PACK + "-1234idx"; private static final String IDX_File_malformed = PACK + "-1234idx";
private final static String PACK_File_2 = PACK + "-2.pack"; private static final String PACK_File_2 = PACK + "-2.pack";
private final static String PACK_File_3 = PACK + "-3.pack"; private static final String PACK_File_3 = PACK + "-3.pack";
private File packDir; private File packDir;

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserBadlyFormattedTest.java

@ -79,7 +79,7 @@ public class GitDateParserBadlyFormattedTest {
} }
@DataPoints @DataPoints
static public String[] getDataPoints() { public static String[] getDataPoints() {
return new String[] { "", "1970", "3000.3000.3000", "3 yesterday ago", return new String[] { "", "1970", "3000.3000.3000", "3 yesterday ago",
"now yesterday ago", "yesterdays", "3.day. 2.week.ago", "now yesterday ago", "yesterdays", "3.day. 2.week.ago",
"day ago", "Gra Feb 21 15:35:00 2007 +0100", "day ago", "Gra Feb 21 15:35:00 2007 +0100",

2
org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java

@ -90,7 +90,7 @@ import org.eclipse.jgit.transport.TagOpt;
*/ */
public class PullCommand extends TransportCommand<PullCommand, PullResult> { public class PullCommand extends TransportCommand<PullCommand, PullResult> {
private final static String DOT = "."; //$NON-NLS-1$ private static final String DOT = "."; //$NON-NLS-1$
private ProgressMonitor monitor = NullProgressMonitor.INSTANCE; private ProgressMonitor monitor = NullProgressMonitor.INSTANCE;

4
org.eclipse.jgit/src/org/eclipse/jgit/errors/TranslationBundleException.java

@ -78,7 +78,7 @@ public abstract class TranslationBundleException extends RuntimeException {
* *
* @return bundle class for which the exception occurred * @return bundle class for which the exception occurred
*/ */
final public Class getBundleClass() { public final Class getBundleClass() {
return bundleClass; return bundleClass;
} }
@ -87,7 +87,7 @@ public abstract class TranslationBundleException extends RuntimeException {
* *
* @return locale for which the exception occurred * @return locale for which the exception occurred
*/ */
final public Locale getLocale() { public final Locale getLocale() {
return locale; return locale;
} }
} }

2
org.eclipse.jgit/src/org/eclipse/jgit/ignore/FastIgnoreRule.java

@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
* @since 3.6 * @since 3.6
*/ */
public class FastIgnoreRule { public class FastIgnoreRule {
private final static Logger LOG = LoggerFactory private static final Logger LOG = LoggerFactory
.getLogger(FastIgnoreRule.class); .getLogger(FastIgnoreRule.class);
/** /**

6
org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java

@ -233,7 +233,7 @@ public class Strings {
LEADING_ASTERISK_ONLY, TRAILING_ASTERISK_ONLY, COMPLEX, NONE LEADING_ASTERISK_ONLY, TRAILING_ASTERISK_ONLY, COMPLEX, NONE
} }
final static List<String> POSIX_CHAR_CLASSES = Arrays.asList( static final List<String> POSIX_CHAR_CLASSES = Arrays.asList(
"alnum", "alpha", "blank", "cntrl", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ "alnum", "alpha", "blank", "cntrl", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
// [:alnum:] [:alpha:] [:blank:] [:cntrl:] // [:alnum:] [:alpha:] [:blank:] [:cntrl:]
"digit", "graph", "lower", "print", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ "digit", "graph", "lower", "print", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@ -248,7 +248,7 @@ public class Strings {
private static final String DL = "\\p{javaDigit}\\p{javaLetter}"; //$NON-NLS-1$ private static final String DL = "\\p{javaDigit}\\p{javaLetter}"; //$NON-NLS-1$
final static List<String> JAVA_CHAR_CLASSES = Arrays static final List<String> JAVA_CHAR_CLASSES = Arrays
.asList("\\p{Alnum}", "\\p{javaLetter}", "\\p{Blank}", "\\p{Cntrl}", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ .asList("\\p{Alnum}", "\\p{javaLetter}", "\\p{Blank}", "\\p{Cntrl}", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
// [:alnum:] [:alpha:] [:blank:] [:cntrl:] // [:alnum:] [:alpha:] [:blank:] [:cntrl:]
"\\p{javaDigit}", "[\\p{Graph}" + DL + "]", "\\p{Ll}", "[\\p{Print}" + DL + "]", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ "\\p{javaDigit}", "[\\p{Graph}" + DL + "]", "\\p{Ll}", "[\\p{Print}" + DL + "]", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
@ -261,7 +261,7 @@ public class Strings {
// Collating symbols [[.a.]] or equivalence class expressions [[=a=]] are // Collating symbols [[.a.]] or equivalence class expressions [[=a=]] are
// not supported by CLI git (at least not by 1.9.1) // not supported by CLI git (at least not by 1.9.1)
final static Pattern UNSUPPORTED = Pattern static final Pattern UNSUPPORTED = Pattern
.compile("\\[\\[[.=]\\w+[.=]\\]\\]"); //$NON-NLS-1$ .compile("\\[\\[[.=]\\w+[.=]\\]\\]"); //$NON-NLS-1$
/** /**

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java

@ -705,7 +705,7 @@ public abstract class DfsObjDatabase extends ObjectDatabase {
} }
/** Snapshot of packs scanned in a single pass. */ /** Snapshot of packs scanned in a single pass. */
public static abstract class PackList { public abstract static class PackList {
/** All known packs, sorted. */ /** All known packs, sorted. */
public final DfsPackFile[] packs; public final DfsPackFile[] packs;

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java

@ -131,7 +131,7 @@ import org.slf4j.LoggerFactory;
* adapted to FileRepositories. * adapted to FileRepositories.
*/ */
public class GC { public class GC {
private final static Logger LOG = LoggerFactory private static final Logger LOG = LoggerFactory
.getLogger(GC.class); .getLogger(GC.class);
private static final String PRUNE_EXPIRE_DEFAULT = "2.weeks.ago"; //$NON-NLS-1$ private static final String PRUNE_EXPIRE_DEFAULT = "2.weeks.ago"; //$NON-NLS-1$

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java

@ -83,7 +83,7 @@ import org.slf4j.LoggerFactory;
* name. * name.
*/ */
public class LockFile { public class LockFile {
private final static Logger LOG = LoggerFactory.getLogger(LockFile.class); private static final Logger LOG = LoggerFactory.getLogger(LockFile.class);
/** /**
* Unlock the given file. * Unlock the given file.

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java

@ -109,7 +109,7 @@ import org.slf4j.LoggerFactory;
* considered. * considered.
*/ */
public class ObjectDirectory extends FileObjectDatabase { public class ObjectDirectory extends FileObjectDatabase {
private final static Logger LOG = LoggerFactory private static final Logger LOG = LoggerFactory
.getLogger(ObjectDirectory.class); .getLogger(ObjectDirectory.class);
private static final PackList NO_PACKS = new PackList( private static final PackList NO_PACKS = new PackList(

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java

@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory;
* objects are similar. * objects are similar.
*/ */
public class PackFile implements Iterable<PackIndex.MutableEntry> { public class PackFile implements Iterable<PackIndex.MutableEntry> {
private final static Logger LOG = LoggerFactory.getLogger(PackFile.class); private static final Logger LOG = LoggerFactory.getLogger(PackFile.class);
/** Sorts PackFiles to be most recently created to least recently created. */ /** Sorts PackFiles to be most recently created to least recently created. */
public static final Comparator<PackFile> SORT = new Comparator<PackFile>() { public static final Comparator<PackFile> SORT = new Comparator<PackFile>() {
@Override @Override

10
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java

@ -130,7 +130,7 @@ import org.slf4j.LoggerFactory;
* overall size of a Git repository on disk. * overall size of a Git repository on disk.
*/ */
public class RefDirectory extends RefDatabase { public class RefDirectory extends RefDatabase {
private final static Logger LOG = LoggerFactory private static final Logger LOG = LoggerFactory
.getLogger(RefDirectory.class); .getLogger(RefDirectory.class);
/** Magic string denoting the start of a symbolic reference file. */ /** Magic string denoting the start of a symbolic reference file. */
@ -1406,7 +1406,7 @@ public class RefDirectory extends RefDatabase {
LooseRef peel(ObjectIdRef newLeaf); LooseRef peel(ObjectIdRef newLeaf);
} }
private final static class LoosePeeledTag extends ObjectIdRef.PeeledTag private static final class LoosePeeledTag extends ObjectIdRef.PeeledTag
implements LooseRef { implements LooseRef {
private final FileSnapshot snapShot; private final FileSnapshot snapShot;
@ -1427,7 +1427,7 @@ public class RefDirectory extends RefDatabase {
} }
} }
private final static class LooseNonTag extends ObjectIdRef.PeeledNonTag private static final class LooseNonTag extends ObjectIdRef.PeeledNonTag
implements LooseRef { implements LooseRef {
private final FileSnapshot snapShot; private final FileSnapshot snapShot;
@ -1448,7 +1448,7 @@ public class RefDirectory extends RefDatabase {
} }
} }
private final static class LooseUnpeeled extends ObjectIdRef.Unpeeled private static final class LooseUnpeeled extends ObjectIdRef.Unpeeled
implements LooseRef { implements LooseRef {
private FileSnapshot snapShot; private FileSnapshot snapShot;
@ -1483,7 +1483,7 @@ public class RefDirectory extends RefDatabase {
} }
} }
private final static class LooseSymbolicRef extends SymbolicRef implements private static final class LooseSymbolicRef extends SymbolicRef implements
LooseRef { LooseRef {
private final FileSnapshot snapShot; private final FileSnapshot snapShot;

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackExt.java

@ -81,7 +81,7 @@ public class PackExt {
* the file extension. * the file extension.
* @return the PackExt for the ext * @return the PackExt for the ext
*/ */
public synchronized static PackExt newPackExt(String ext) { public static synchronized PackExt newPackExt(String ext) {
PackExt[] dst = new PackExt[VALUES.length + 1]; PackExt[] dst = new PackExt[VALUES.length + 1];
for (int i = 0; i < VALUES.length; i++) { for (int i = 0; i < VALUES.length; i++) {
PackExt packExt = VALUES[i]; PackExt packExt = VALUES[i];

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockWriter.java

@ -286,7 +286,7 @@ class BlockWriter {
return aLen - bLen; return aLen - bLen;
} }
static abstract class Entry { abstract static class Entry {
static int compare(Entry ea, Entry eb) { static int compare(Entry ea, Entry eb) {
byte[] a = ea.key; byte[] a = ea.key;
byte[] b = eb.key; byte[] b = eb.key;

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java

@ -80,7 +80,7 @@ public abstract class ReftableDatabase {
* @throws IOException * @throws IOException
* on I/O problems. * on I/O problems.
*/ */
abstract protected MergedReftable openMergedReftable() throws IOException; protected abstract MergedReftable openMergedReftable() throws IOException;
/** /**
* @return the next available logical timestamp for an additional reftable * @return the next available logical timestamp for an additional reftable

6
org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java

@ -243,11 +243,11 @@ public class IndexDiff {
} }
} }
private final static int TREE = 0; private static final int TREE = 0;
private final static int INDEX = 1; private static final int INDEX = 1;
private final static int WORKDIR = 2; private static final int WORKDIR = 2;
private final Repository repository; private final Repository repository;

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/InflaterCache.java

@ -73,7 +73,7 @@ public class InflaterCache {
return r != null ? r : new Inflater(false); return r != null ? r : new Inflater(false);
} }
private synchronized static Inflater getImpl() { private static synchronized Inflater getImpl() {
if (openInflaterCount > 0) { if (openInflaterCount > 0) {
final Inflater r = inflaterCache[--openInflaterCount]; final Inflater r = inflaterCache[--openInflaterCount];
inflaterCache[openInflaterCount] = null; inflaterCache[openInflaterCount] = null;

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdOwnerMap.java

@ -355,7 +355,7 @@ public class ObjectIdOwnerMap<V extends ObjectIdOwnerMap.Entry>
} }
/** Type of entry stored in the {@link ObjectIdOwnerMap}. */ /** Type of entry stored in the {@link ObjectIdOwnerMap}. */
public static abstract class Entry extends ObjectId { public abstract static class Entry extends ObjectId {
transient Entry next; transient Entry next;
/** /**

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectInserter.java

@ -98,7 +98,7 @@ public abstract class ObjectInserter implements AutoCloseable {
} }
/** Wraps a delegate ObjectInserter. */ /** Wraps a delegate ObjectInserter. */
public static abstract class Filter extends ObjectInserter { public abstract static class Filter extends ObjectInserter {
/** @return delegate ObjectInserter to handle all processing. */ /** @return delegate ObjectInserter to handle all processing. */
protected abstract ObjectInserter delegate(); protected abstract ObjectInserter delegate();

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectLoader.java

@ -333,7 +333,7 @@ public abstract class ObjectLoader {
* *
* @since 4.10 * @since 4.10
*/ */
public static abstract class Filter extends ObjectLoader { public abstract static class Filter extends ObjectLoader {
/** /**
* @return delegate ObjectLoader to handle all processing. * @return delegate ObjectLoader to handle all processing.
* @since 4.10 * @since 4.10

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectReader.java

@ -495,7 +495,7 @@ public abstract class ObjectReader implements AutoCloseable {
* *
* @since 4.4 * @since 4.4
*/ */
public static abstract class Filter extends ObjectReader { public abstract static class Filter extends ObjectReader {
/** /**
* @return delegate ObjectReader to handle all processing. * @return delegate ObjectReader to handle all processing.
* @since 4.4 * @since 4.4

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoLine.java

@ -105,7 +105,7 @@ public class RebaseTodoLine {
* @param token * @param token
* @return the Action * @return the Action
*/ */
static public Action parse(String token) { public static Action parse(String token) {
for (Action action : Action.values()) { for (Action action : Action.values()) {
if (action.token.equals(token) if (action.token.equals(token)
|| action.shortToken.equals(token)) || action.shortToken.equals(token))

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java

@ -827,7 +827,7 @@ public abstract class RefUpdate {
* Handle the abstraction of storing a ref update. This is because both * Handle the abstraction of storing a ref update. This is because both
* updating and deleting of a ref have merge testing in common. * updating and deleting of a ref have merge testing in common.
*/ */
private static abstract class Store { private abstract static class Store {
abstract Result execute(Result status) throws IOException; abstract Result execute(Result status) throws IOException;
} }
} }

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryCache.java

@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Cache of active {@link org.eclipse.jgit.lib.Repository} instances. * Cache of active {@link org.eclipse.jgit.lib.Repository} instances.
*/ */
public class RepositoryCache { public class RepositoryCache {
private final static Logger LOG = LoggerFactory private static final Logger LOG = LoggerFactory
.getLogger(RepositoryCache.class); .getLogger(RepositoryCache.class);
private static final RepositoryCache cache = new RepositoryCache(); private static final RepositoryCache cache = new RepositoryCache();

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java

@ -83,7 +83,7 @@ public final class MergeAlgorithm {
// An special edit which acts as a sentinel value by marking the end the // An special edit which acts as a sentinel value by marking the end the
// list of edits // list of edits
private final static Edit END_EDIT = new Edit(Integer.MAX_VALUE, private static final Edit END_EDIT = new Edit(Integer.MAX_VALUE,
Integer.MAX_VALUE); Integer.MAX_VALUE);
@SuppressWarnings("ReferenceEquality") @SuppressWarnings("ReferenceEquality")

4
org.eclipse.jgit/src/org/eclipse/jgit/nls/NLS.java

@ -133,8 +133,8 @@ public class NLS {
return b.get(type); return b.get(type);
} }
final private Locale locale; private final Locale locale;
final private ConcurrentHashMap<Class, TranslationBundle> map = new ConcurrentHashMap<>(); private final ConcurrentHashMap<Class, TranslationBundle> map = new ConcurrentHashMap<>();
private NLS(Locale locale) { private NLS(Locale locale) {
this.locale = locale; this.locale = locale;

2
org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java

@ -58,7 +58,7 @@ import org.eclipse.jgit.util.MutableInteger;
* Hunk header for a hunk appearing in a "diff --cc" style patch. * Hunk header for a hunk appearing in a "diff --cc" style patch.
*/ */
public class CombinedHunkHeader extends HunkHeader { public class CombinedHunkHeader extends HunkHeader {
private static abstract class CombinedOldImage extends OldImage { private abstract static class CombinedOldImage extends OldImage {
int nContext; int nContext;
} }

2
org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java

@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* The configuration file that is stored in the file of the file system. * The configuration file that is stored in the file of the file system.
*/ */
public class FileBasedConfig extends StoredConfig { public class FileBasedConfig extends StoredConfig {
private final static Logger LOG = LoggerFactory private static final Logger LOG = LoggerFactory
.getLogger(FileBasedConfig.class); .getLogger(FileBasedConfig.class);
private final File configFile; private final File configFile;

2
org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java

@ -2003,7 +2003,7 @@ public class ReceivePack {
} }
/** Interface for reporting status messages. */ /** Interface for reporting status messages. */
static abstract class Reporter { abstract static class Reporter {
abstract void sendString(String s) throws IOException; abstract void sendString(String s) throws IOException;
} }

2
org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java

@ -324,7 +324,7 @@ abstract class WalkEncryption {
* Base implementation of JGit symmetric encryption. Supports V2 properties * Base implementation of JGit symmetric encryption. Supports V2 properties
* format. * format.
*/ */
static abstract class SymmetricEncryption extends WalkEncryption abstract static class SymmetricEncryption extends WalkEncryption
implements Keys, Vals { implements Keys, Vals {
/** Encryption profile, root name of group of related properties. */ /** Encryption profile, root name of group of related properties. */

4
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java

@ -275,7 +275,7 @@ public class FileTreeIterator extends WorkingTreeIterator {
/** /**
* a singleton instance of the default FileModeStrategy * a singleton instance of the default FileModeStrategy
*/ */
public final static DefaultFileModeStrategy INSTANCE = public static final DefaultFileModeStrategy INSTANCE =
new DefaultFileModeStrategy(); new DefaultFileModeStrategy();
@Override @Override
@ -308,7 +308,7 @@ public class FileTreeIterator extends WorkingTreeIterator {
/** /**
* a singleton instance of the default FileModeStrategy * a singleton instance of the default FileModeStrategy
*/ */
public final static NoGitlinksStrategy INSTANCE = new NoGitlinksStrategy(); public static final NoGitlinksStrategy INSTANCE = new NoGitlinksStrategy();
@Override @Override
public FileMode getMode(File f, FS.Attributes attributes) { public FileMode getMode(File f, FS.Attributes attributes) {

2
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

@ -1180,7 +1180,7 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
* *
* @since 5.0 * @since 5.0
*/ */
public static abstract class Entry { public abstract static class Entry {
byte[] encodedName; byte[] encodedName;
int encodedNameLen; int encodedNameLen;

12
org.eclipse.jgit/src/org/eclipse/jgit/util/Base64.java

@ -28,26 +28,26 @@ import org.eclipse.jgit.internal.JGitText;
*/ */
public class Base64 { public class Base64 {
/** The equals sign (=) as a byte. */ /** The equals sign (=) as a byte. */
private final static byte EQUALS_SIGN = (byte) '='; private static final byte EQUALS_SIGN = (byte) '=';
/** Indicates equals sign in encoding. */ /** Indicates equals sign in encoding. */
private final static byte EQUALS_SIGN_DEC = -1; private static final byte EQUALS_SIGN_DEC = -1;
/** Indicates white space in encoding. */ /** Indicates white space in encoding. */
private final static byte WHITE_SPACE_DEC = -2; private static final byte WHITE_SPACE_DEC = -2;
/** Indicates an invalid byte during decoding. */ /** Indicates an invalid byte during decoding. */
private final static byte INVALID_DEC = -3; private static final byte INVALID_DEC = -3;
/** The 64 valid Base64 values. */ /** The 64 valid Base64 values. */
private final static byte[] ENC; private static final byte[] ENC;
/** /**
* Translates a Base64 value to either its 6-bit reconstruction value or a * Translates a Base64 value to either its 6-bit reconstruction value or a
* negative number indicating some other meaning. The table is only 7 bits * negative number indicating some other meaning. The table is only 7 bits
* wide, as the 8th bit is discarded during decoding. * wide, as the 8th bit is discarded during decoding.
*/ */
private final static byte[] DEC; private static final byte[] DEC;
static { static {
ENC = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ" // //$NON-NLS-1$ ENC = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ" // //$NON-NLS-1$

4
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java

@ -213,7 +213,7 @@ public abstract class FS {
* *
* @since 5.1.9 * @since 5.1.9
*/ */
public final static class FileStoreAttributes { public static final class FileStoreAttributes {
private static final Duration UNDEFINED_DURATION = Duration private static final Duration UNDEFINED_DURATION = Duration
.ofNanos(Long.MAX_VALUE); .ofNanos(Long.MAX_VALUE);
@ -691,7 +691,7 @@ public abstract class FS {
/** The auto-detected implementation selected for this operating system and JRE. */ /** The auto-detected implementation selected for this operating system and JRE. */
public static final FS DETECTED = detect(); public static final FS DETECTED = detect();
private volatile static FSFactory factory; private static volatile FSFactory factory;
/** /**
* Auto-detect the appropriate file system abstraction. * Auto-detect the appropriate file system abstraction.

2
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java

@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory;
* @since 3.0 * @since 3.0
*/ */
public class FS_POSIX extends FS { public class FS_POSIX extends FS {
private final static Logger LOG = LoggerFactory.getLogger(FS_POSIX.class); private static final Logger LOG = LoggerFactory.getLogger(FS_POSIX.class);
private static final int DEFAULT_UMASK = 0022; private static final int DEFAULT_UMASK = 0022;
private volatile int umask = -1; private volatile int umask = -1;

2
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java

@ -72,7 +72,7 @@ import org.slf4j.LoggerFactory;
* @since 3.0 * @since 3.0
*/ */
public class FS_Win32 extends FS { public class FS_Win32 extends FS {
private final static Logger LOG = LoggerFactory.getLogger(FS_Win32.class); private static final Logger LOG = LoggerFactory.getLogger(FS_Win32.class);
/** /**
* Constructor * Constructor

2
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java

@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory;
* @since 3.0 * @since 3.0
*/ */
public class FS_Win32_Cygwin extends FS_Win32 { public class FS_Win32_Cygwin extends FS_Win32 {
private final static Logger LOG = LoggerFactory private static final Logger LOG = LoggerFactory
.getLogger(FS_Win32_Cygwin.class); .getLogger(FS_Win32_Cygwin.class);
private static String cygpath; private static String cygpath;

2
org.eclipse.jgit/src/org/eclipse/jgit/util/Monitoring.java

@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
* @since 5.1.13 * @since 5.1.13
*/ */
public class Monitoring { public class Monitoring {
private final static Logger LOG = LoggerFactory.getLogger(Monitoring.class); private static final Logger LOG = LoggerFactory.getLogger(Monitoring.class);
/** /**
* Register a MBean with the platform MBean server * Register a MBean with the platform MBean server

14
org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java

@ -52,19 +52,19 @@ import org.eclipse.jgit.internal.JGitText;
* in the format defined by {@code git log --relative-date}. * in the format defined by {@code git log --relative-date}.
*/ */
public class RelativeDateFormatter { public class RelativeDateFormatter {
final static long SECOND_IN_MILLIS = 1000; static final long SECOND_IN_MILLIS = 1000;
final static long MINUTE_IN_MILLIS = 60 * SECOND_IN_MILLIS; static final long MINUTE_IN_MILLIS = 60 * SECOND_IN_MILLIS;
final static long HOUR_IN_MILLIS = 60 * MINUTE_IN_MILLIS; static final long HOUR_IN_MILLIS = 60 * MINUTE_IN_MILLIS;
final static long DAY_IN_MILLIS = 24 * HOUR_IN_MILLIS; static final long DAY_IN_MILLIS = 24 * HOUR_IN_MILLIS;
final static long WEEK_IN_MILLIS = 7 * DAY_IN_MILLIS; static final long WEEK_IN_MILLIS = 7 * DAY_IN_MILLIS;
final static long MONTH_IN_MILLIS = 30 * DAY_IN_MILLIS; static final long MONTH_IN_MILLIS = 30 * DAY_IN_MILLIS;
final static long YEAR_IN_MILLIS = 365 * DAY_IN_MILLIS; static final long YEAR_IN_MILLIS = 365 * DAY_IN_MILLIS;
/** /**
* Get age of given {@link java.util.Date} compared to now formatted in the * Get age of given {@link java.util.Date} compared to now formatted in the

2
org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java

@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory;
*/ */
public abstract class SystemReader { public abstract class SystemReader {
private final static Logger LOG = LoggerFactory private static final Logger LOG = LoggerFactory
.getLogger(SystemReader.class); .getLogger(SystemReader.class);
private static final SystemReader DEFAULT; private static final SystemReader DEFAULT;

Loading…
Cancel
Save