Nested enum types are implicitly static. Change-Id: Id3d7886087494fb67bc0d080b4a3491fb4baac19 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v5.7.0.202002241735-m3
@@ -161,11 +161,11 @@ class LfsStore extends TextBuiltin { | |||
} | |||
} | |||
private static enum StoreType { | |||
private enum StoreType { | |||
FS, S3; | |||
} | |||
private static enum StorageClass { | |||
private enum StorageClass { | |||
REDUCED_REDUNDANCY, STANDARD | |||
} | |||
@@ -83,7 +83,7 @@ class ShowCommands extends TextBuiltin { | |||
errw.println(); | |||
} | |||
static enum Format { | |||
enum Format { | |||
/** */ | |||
USAGE { | |||
@Override |
@@ -341,7 +341,7 @@ public class ConfigTest { | |||
assertFalse(c.getBoolean("s", "b", true)); | |||
} | |||
static enum TestEnum { | |||
enum TestEnum { | |||
ONE_TWO; | |||
} | |||
@@ -137,7 +137,7 @@ public class CheckoutCommand extends GitCommand<Ref> { | |||
/** | |||
* Stage to check out, see {@link CheckoutCommand#setStage(Stage)}. | |||
*/ | |||
public static enum Stage { | |||
public enum Stage { | |||
/** | |||
* Base stage (#1) | |||
*/ |
@@ -67,7 +67,7 @@ public final class Attribute { | |||
* The attribute value state | |||
* see also https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html | |||
*/ | |||
public static enum State { | |||
public enum State { | |||
/** the attribute is set */ | |||
SET, | |||
@@ -59,7 +59,7 @@ public class DiffConfig { | |||
public static final Config.SectionParser<DiffConfig> KEY = DiffConfig::new; | |||
/** Permissible values for {@code diff.renames}. */ | |||
public static enum RenameDetectionType { | |||
public enum RenameDetectionType { | |||
/** Rename detection is disabled. */ | |||
FALSE, | |||
@@ -72,7 +72,7 @@ public class DiffEntry { | |||
public static final String DEV_NULL = "/dev/null"; //$NON-NLS-1$ | |||
/** General type of change a single file-level patch describes. */ | |||
public static enum ChangeType { | |||
public enum ChangeType { | |||
/** Add a new file to the project */ | |||
ADD, | |||
@@ -90,7 +90,7 @@ public class DiffEntry { | |||
} | |||
/** Specify the old or new side for more generalized access. */ | |||
public static enum Side { | |||
public enum Side { | |||
/** The old side of a DiffEntry. */ | |||
OLD, | |||
@@ -64,7 +64,7 @@ package org.eclipse.jgit.diff; | |||
*/ | |||
public class Edit { | |||
/** Type of edit */ | |||
public static enum Type { | |||
public enum Type { | |||
/** Sequence B has inserted the region. */ | |||
INSERT, | |||
@@ -63,7 +63,7 @@ public class NoMergeBaseException extends IOException { | |||
* An enum listing the different reason why no merge base could be | |||
* determined. | |||
*/ | |||
public static enum MergeBaseFailureReason { | |||
public enum MergeBaseFailureReason { | |||
/** | |||
* Multiple merge bases have been found (e.g. the commits to be merged | |||
* have multiple common predecessors) but the merge strategy doesn't |
@@ -59,7 +59,7 @@ import java.util.List; | |||
*/ | |||
public class IgnoreNode { | |||
/** Result from {@link IgnoreNode#isIgnored(String, boolean)}. */ | |||
public static enum MatchResult { | |||
public enum MatchResult { | |||
/** The file is not ignored, due to a rule saying its not ignored. */ | |||
NOT_IGNORED, | |||
@@ -229,7 +229,7 @@ public class Strings { | |||
return PatternState.COMPLEX; | |||
} | |||
static enum PatternState { | |||
enum PatternState { | |||
LEADING_ASTERISK_ONLY, TRAILING_ASTERISK_ONLY, COMPLEX, NONE | |||
} | |||
@@ -126,7 +126,7 @@ public abstract class KetchLeader { | |||
private static final Logger log = LoggerFactory.getLogger(KetchLeader.class); | |||
/** Current state of the leader instance. */ | |||
public static enum State { | |||
public enum State { | |||
/** Newly created instance trying to elect itself leader. */ | |||
CANDIDATE, | |||
@@ -97,7 +97,7 @@ public abstract class DfsObjDatabase extends ObjectDatabase { | |||
* comparator based on {@link Enum#compareTo}. Prefer {@link | |||
* #DEFAULT_COMPARATOR} or your own {@link ComparatorBuilder}. | |||
*/ | |||
public static enum PackSource { | |||
public enum PackSource { | |||
/** The pack is created by ObjectInserter due to local activity. */ | |||
INSERT, | |||
@@ -60,7 +60,7 @@ import org.eclipse.jgit.lib.ObjectReader; | |||
import org.eclipse.jgit.util.FS; | |||
abstract class FileObjectDatabase extends ObjectDatabase { | |||
static enum InsertLooseObjectResult { | |||
enum InsertLooseObjectResult { | |||
INSERTED, EXISTS_PACKED, EXISTS_LOOSE, FAILURE; | |||
} | |||
@@ -2432,7 +2432,7 @@ public class PackWriter implements AutoCloseable { | |||
} | |||
/** Possible states that a PackWriter can be in. */ | |||
public static enum PackingPhase { | |||
public enum PackingPhase { | |||
/** Counting objects phase. */ | |||
COUNTING, | |||
@@ -60,7 +60,7 @@ public class CoreConfig { | |||
public static final Config.SectionParser<CoreConfig> KEY = CoreConfig::new; | |||
/** Permissible values for {@code core.autocrlf}. */ | |||
public static enum AutoCRLF { | |||
public enum AutoCRLF { | |||
/** Automatic CRLF->LF conversion is disabled. */ | |||
FALSE, | |||
@@ -78,7 +78,7 @@ public class CoreConfig { | |||
* | |||
* @since 4.3 | |||
*/ | |||
public static enum EOL { | |||
public enum EOL { | |||
/** Check in with LF, check out with CRLF. */ | |||
CRLF, | |||
@@ -94,7 +94,7 @@ public class CoreConfig { | |||
* | |||
* @since 4.3 | |||
*/ | |||
public static enum EolStreamType { | |||
public enum EolStreamType { | |||
/** Convert to CRLF without binary detection. */ | |||
TEXT_CRLF, | |||
@@ -116,7 +116,7 @@ public class CoreConfig { | |||
* | |||
* @since 3.0 | |||
*/ | |||
public static enum CheckStat { | |||
public enum CheckStat { | |||
/** | |||
* Only check the size and whole second part of time stamp when | |||
* comparing the stat info in the dircache with actual file stat info. | |||
@@ -135,7 +135,7 @@ public class CoreConfig { | |||
* | |||
* @since 5.6 | |||
*/ | |||
public static enum LogRefUpdates { | |||
public enum LogRefUpdates { | |||
/** Don't create ref logs; default for bare repositories. */ | |||
FALSE, | |||
@@ -164,7 +164,7 @@ public class CoreConfig { | |||
* | |||
* @since 3.3 | |||
*/ | |||
public static enum SymLinks { | |||
public enum SymLinks { | |||
/** Check out symbolic links as plain files . */ | |||
FALSE, | |||
@@ -177,7 +177,7 @@ public class CoreConfig { | |||
* | |||
* @since 3.5 | |||
*/ | |||
public static enum HideDotFiles { | |||
public enum HideDotFiles { | |||
/** Do not hide .files. */ | |||
FALSE, | |||
@@ -108,7 +108,7 @@ public class IndexDiff { | |||
* @see IndexDiff#getConflictingStageStates() | |||
* @since 3.0 | |||
*/ | |||
public static enum StageState { | |||
public enum StageState { | |||
/** | |||
* Exists in base, but neither in ours nor in theirs. | |||
*/ |
@@ -58,7 +58,7 @@ public class RebaseTodoLine { | |||
* Describes rebase actions | |||
*/ | |||
@SuppressWarnings("nls") | |||
public static enum Action { | |||
public enum Action { | |||
/** Use commit */ | |||
PICK("pick", "p"), | |||
@@ -66,7 +66,7 @@ public abstract class RefUpdate { | |||
* unknown values are failures, and may generally treat them the same as | |||
* {@link #REJECTED_OTHER_REASON}. | |||
*/ | |||
public static enum Result { | |||
public enum Result { | |||
/** The ref update/delete has not been attempted by the caller. */ | |||
NOT_ATTEMPTED, | |||
@@ -58,7 +58,7 @@ public class BinaryHunk { | |||
private static final byte[] DELTA = encodeASCII("delta "); //$NON-NLS-1$ | |||
/** Type of information stored in a binary hunk. */ | |||
public static enum Type { | |||
public enum Type { | |||
/** The full content is stored, deflated. */ | |||
LITERAL_DEFLATED, | |||
@@ -104,7 +104,7 @@ public class FileHeader extends DiffEntry { | |||
static final byte[] NEW_NAME = encodeASCII("+++ "); //$NON-NLS-1$ | |||
/** Type of patch used by this file. */ | |||
public static enum PatchType { | |||
public enum PatchType { | |||
/** A traditional unified diff style patch of a text file. */ | |||
UNIFIED, | |||
@@ -54,7 +54,7 @@ import org.eclipse.jgit.util.RawParseUtils; | |||
*/ | |||
public class FormatError { | |||
/** Classification of an error. */ | |||
public static enum Severity { | |||
public enum Severity { | |||
/** The error is unexpected, but can be worked around. */ | |||
WARNING, | |||
@@ -280,7 +280,7 @@ public final class GitProtocolConstants { | |||
*/ | |||
public static final String COMMAND_FETCH = "fetch"; //$NON-NLS-1$ | |||
static enum MultiAck { | |||
enum MultiAck { | |||
OFF, CONTINUE, DETAILED; | |||
} | |||
@@ -103,7 +103,7 @@ public abstract class PackParser { | |||
private static final int BUFFER_SIZE = 8192; | |||
/** Location data is being obtained from. */ | |||
public static enum Source { | |||
public enum Source { | |||
/** Data is read from the incoming stream. */ | |||
INPUT, | |||
@@ -95,7 +95,7 @@ public class PacketLineIn { | |||
@Deprecated | |||
public static final String DELIM = new StringBuilder(0).toString(); /* must not string pool */ | |||
static enum AckNackResult { | |||
enum AckNackResult { | |||
/** NAK */ | |||
NAK, | |||
/** ACK */ |
@@ -72,7 +72,7 @@ import org.eclipse.jgit.revwalk.RevWalk; | |||
*/ | |||
public class ReceiveCommand { | |||
/** Type of operation requested. */ | |||
public static enum Type { | |||
public enum Type { | |||
/** Create a new ref; the ref must not already exist. */ | |||
CREATE, | |||
@@ -98,7 +98,7 @@ public class ReceiveCommand { | |||
} | |||
/** Result of the update command. */ | |||
public static enum Result { | |||
public enum Result { | |||
/** The command has not yet been attempted by the server. */ | |||
NOT_ATTEMPTED, | |||
@@ -72,7 +72,7 @@ public class RemoteRefUpdate { | |||
/** | |||
* Represent current status of a remote ref update. | |||
*/ | |||
public static enum Status { | |||
public enum Status { | |||
/** | |||
* Push process hasn't yet attempted to update this ref. This is the | |||
* default status, prior to push process execution. |
@@ -90,7 +90,7 @@ import org.eclipse.jgit.lib.Repository; | |||
*/ | |||
public abstract class TransportProtocol { | |||
/** Fields within a {@link URIish} that a transport uses. */ | |||
public static enum URIishField { | |||
public enum URIishField { | |||
/** the user field */ | |||
USER, | |||
/** the pass (aka password) field */ |
@@ -137,7 +137,7 @@ import org.eclipse.jgit.util.io.TimeoutOutputStream; | |||
*/ | |||
public class UploadPack { | |||
/** Policy the server uses to validate client requests */ | |||
public static enum RequestPolicy { | |||
public enum RequestPolicy { | |||
/** Client may only ask for objects the server advertised a reference for. */ | |||
ADVERTISED, | |||
@@ -111,7 +111,7 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { | |||
/** | |||
* @since 4.2 | |||
*/ | |||
public static enum OperationType { | |||
public enum OperationType { | |||
/** | |||
* Represents a checkout operation (for example a checkout or reset | |||
* operation). |
@@ -68,7 +68,7 @@ public class GitDateFormatter { | |||
/** | |||
* Git and JGit formats | |||
*/ | |||
static public enum Format { | |||
public enum Format { | |||
/** | |||
* Git format: Time and original time zone |
@@ -51,7 +51,7 @@ public class ProcessResult { | |||
/** | |||
* Status of a process' execution. | |||
*/ | |||
public static enum Status { | |||
public enum Status { | |||
/** | |||
* The script was found and launched properly. It may still have exited | |||
* with a non-zero {@link #exitCode}. |