Browse Source

Remove final modifier on args4j option or argument fields

Remove final field modifier since args4j does no longer allow use of
final fields [1].

[1] 6e11f89d40

Change-Id: Ib3dee10828d87d6b558c2e90387eadd9aa2ce260
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.9
Matthias Sohn 7 years ago
parent
commit
a0558b7094
  1. 10
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
  2. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java
  3. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java
  4. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java

10
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java

@ -87,16 +87,16 @@ class Daemon extends TextBuiltin {
int timeout = -1; int timeout = -1;
@Option(name = "--enable", metaVar = "metaVar_service", usage = "usage_enableTheServiceInAllRepositories") @Option(name = "--enable", metaVar = "metaVar_service", usage = "usage_enableTheServiceInAllRepositories")
final List<String> enable = new ArrayList<>(); List<String> enable = new ArrayList<>();
@Option(name = "--disable", metaVar = "metaVar_service", usage = "usage_disableTheServiceInAllRepositories") @Option(name = "--disable", metaVar = "metaVar_service", usage = "usage_disableTheServiceInAllRepositories")
final List<String> disable = new ArrayList<>(); List<String> disable = new ArrayList<>();
@Option(name = "--allow-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename") @Option(name = "--allow-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename")
final List<String> canOverride = new ArrayList<>(); List<String> canOverride = new ArrayList<>();
@Option(name = "--forbid-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename") @Option(name = "--forbid-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename")
final List<String> forbidOverride = new ArrayList<>(); List<String> forbidOverride = new ArrayList<>();
@Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk") @Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk")
boolean exportAll; boolean exportAll;
@ -109,7 +109,7 @@ class Daemon extends TextBuiltin {
} }
@Argument(required = true, metaVar = "metaVar_directory", usage = "usage_directoriesToExport") @Argument(required = true, metaVar = "metaVar_directory", usage = "usage_directoriesToExport")
final List<File> directory = new ArrayList<>(); List<File> directory = new ArrayList<>();
@Override @Override
protected boolean requiresRepository() { protected boolean requiresRepository() {

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java

@ -67,7 +67,7 @@ class DiffTree extends TextBuiltin {
} }
@Argument(index = 1, metaVar = "metaVar_treeish", required = true) @Argument(index = 1, metaVar = "metaVar_treeish", required = true)
private final List<AbstractTreeIterator> trees = new ArrayList<>(); private List<AbstractTreeIterator> trees = new ArrayList<>();
@Option(name = "--", metaVar = "metaVar_path", handler = PathTreeFilterHandler.class) @Option(name = "--", metaVar = "metaVar_path", handler = PathTreeFilterHandler.class)
private TreeFilter pathFilter = TreeFilter.ALL; private TreeFilter pathFilter = TreeFilter.ALL;

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java

@ -63,7 +63,7 @@ class MergeBase extends TextBuiltin {
} }
@Argument(index = 1, metaVar = "metaVar_commitish", required = true) @Argument(index = 1, metaVar = "metaVar_commitish", required = true)
private final List<RevCommit> commits = new ArrayList<>(); private List<RevCommit> commits = new ArrayList<>();
@Override @Override
protected void run() throws Exception { protected void run() throws Exception {

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java

@ -77,7 +77,7 @@ class Push extends TextBuiltin {
private String remote = Constants.DEFAULT_REMOTE_NAME; private String remote = Constants.DEFAULT_REMOTE_NAME;
@Argument(index = 1, metaVar = "metaVar_refspec") @Argument(index = 1, metaVar = "metaVar_refspec")
private final List<RefSpec> refSpecs = new ArrayList<>(); private List<RefSpec> refSpecs = new ArrayList<>();
@Option(name = "--all") @Option(name = "--all")
private boolean all; private boolean all;

Loading…
Cancel
Save