[SCM] UNNAMED PROJECT branch, master, updated. debian/1.8.3-3-g48c6b6f
Emmanuel Bourg
ebourg at apache.org
Tue Jun 11 21:21:20 UTC 2013
The following commit has been merged in the master branch:
commit 48c6b6fdd7758f1107bb29520069b12fafae4ee5
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 11 23:21:06 2013 +0200
Code cleanup and formatting
diff --git a/src/main/java/org/debian/maven/cliargs/Argument.java b/src/main/java/org/debian/maven/cliargs/Argument.java
index a16e68d..25c9579 100644
--- a/src/main/java/org/debian/maven/cliargs/Argument.java
+++ b/src/main/java/org/debian/maven/cliargs/Argument.java
@@ -8,17 +8,17 @@ public class Argument {
Argument(final String arg) {
final String trimmed = arg.trim();
- if(trimmed.startsWith("--")) {
+ if (trimmed.startsWith("--")) {
type = Type.LONG;
int equalsPosition = trimmed.indexOf("=");
- if(-1 == equalsPosition) {
+ if (-1 == equalsPosition) {
name = trimmed.substring(2);
value = null;
} else {
name = trimmed.substring(2, equalsPosition);
value = trimmed.substring(equalsPosition + 1);
}
- } else if(trimmed.startsWith("-")) {
+ } else if (trimmed.startsWith("-")) {
type = Type.SHORT;
name = trimmed.substring(1, 2);
value = trimmed.length() <= 2 ? null : trimmed.substring(2);
diff --git a/src/main/java/org/debian/maven/cliargs/ArgumentsIterable.java b/src/main/java/org/debian/maven/cliargs/ArgumentsIterable.java
index f51117d..fc57eab 100644
--- a/src/main/java/org/debian/maven/cliargs/ArgumentsIterable.java
+++ b/src/main/java/org/debian/maven/cliargs/ArgumentsIterable.java
@@ -9,7 +9,8 @@ public class ArgumentsIterable implements Iterable<Argument> {
this.args = args;
}
- @Override public Iterator<Argument> iterator() {
+ @Override
+ public Iterator<Argument> iterator() {
return new ArgumentsIterator();
}
@@ -17,21 +18,25 @@ public class ArgumentsIterable implements Iterable<Argument> {
private int pointer = -1;
private int next = -1;
- @Override public boolean hasNext() {
- if(pointer == next) {
+ @Override
+ public boolean hasNext() {
+ if (pointer == next) {
do {
pointer++;
- } while ( pointer < args.length && args[pointer].isEmpty() );
+ } while (pointer < args.length && args[pointer].isEmpty());
}
return pointer < args.length;
}
- @Override public Argument next() {
+ @Override
+ public Argument next() {
hasNext();
next = pointer;
return new Argument(args[next].trim());
}
- @Override public void remove() {}
+ @Override
+ public void remove() {
+ }
}
}
diff --git a/src/main/java/org/debian/maven/cliargs/ArgumentsMap.java b/src/main/java/org/debian/maven/cliargs/ArgumentsMap.java
index 21ed56e..dc4f4fe 100644
--- a/src/main/java/org/debian/maven/cliargs/ArgumentsMap.java
+++ b/src/main/java/org/debian/maven/cliargs/ArgumentsMap.java
@@ -16,23 +16,23 @@ public class ArgumentsMap {
private final List<String> args = new ArrayList<String>();
public ArgumentsMap(final ArgumentsIterable it) {
- for(Argument argument : it) {
- switch(argument.type) {
- case LONG:
- addToMap(longMap, argument.name, argument.value);
- break;
- case SHORT:
- addToMap(shortMap, argument.name, argument.value);
- break;
- case ARG:
- args.add(argument.value);
- break;
+ for (Argument argument : it) {
+ switch (argument.type) {
+ case LONG:
+ addToMap(longMap, argument.name, argument.value);
+ break;
+ case SHORT:
+ addToMap(shortMap, argument.name, argument.value);
+ break;
+ case ARG:
+ args.add(argument.value);
+ break;
}
}
}
- private void addToMap(Map<String, List<String>> map, String name, String value ) {
- if(!map.containsKey(name)) {
+ private void addToMap(Map<String, List<String>> map, String name, String value) {
+ if (!map.containsKey(name)) {
map.put(name, new ArrayList<String>());
}
map.get(name).add(value);
@@ -46,7 +46,9 @@ public class ArgumentsMap {
* Returns the first argument or the given default value.
*/
public String getFirstArgument(String defaultArgument) {
- if(args.isEmpty()) return defaultArgument;
+ if (args.isEmpty()) {
+ return defaultArgument;
+ }
return getFirstArgument();
}
@@ -63,14 +65,20 @@ public class ArgumentsMap {
}
public String getValue(String longName, String shortName, String defaultValue) {
- if(longMap.containsKey(longName)) return getLastOfList(longMap, longName);
- if(shortMap.containsKey(shortName)) return getLastOfList(shortMap, shortName);
+ if (longMap.containsKey(longName)) {
+ return getLastOfList(longMap, longName);
+ }
+ if (shortMap.containsKey(shortName)) {
+ return getLastOfList(shortMap, shortName);
+ }
return defaultValue;
}
public File getFile(String longName, String shortName, File defaultFile) {
String fileName = getValue(longName, shortName, null);
- if(fileName == null) return defaultFile;
+ if (fileName == null) {
+ return defaultFile;
+ }
return new File(fileName);
}
@@ -81,7 +89,7 @@ public class ArgumentsMap {
return result;
}
- private Collection<String> getAllValues( Map<String, List<String>> map, String name) {
+ private Collection<String> getAllValues(Map<String, List<String>> map, String name) {
return map.containsKey(name) ? map.get(name) : EMPTY_LIST;
}
diff --git a/src/main/java/org/debian/maven/repo/Dependency.java b/src/main/java/org/debian/maven/repo/Dependency.java
index 2557a81..969b9e2 100644
--- a/src/main/java/org/debian/maven/repo/Dependency.java
+++ b/src/main/java/org/debian/maven/repo/Dependency.java
@@ -16,7 +16,12 @@
package org.debian.maven.repo;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -29,7 +34,7 @@ public class Dependency implements Comparable<Dependency>, Cloneable {
public static final Dependency PROTO_JAR = new Dependency(null, null, "jar", null);
public static final Dependency PROTO_PLUGIN = new Dependency("org.apache.maven.plugins", null, "maven-plugin", null);
- private static final Pattern compactDependencyNotationMatcher =
+ private static final Pattern COMPACT_DEPENDENCY_NOTATION_MATCHER =
Pattern.compile("(\\w[a-zA-Z0-9\\-_\\.]*):(\\w[a-zA-Z0-9\\-_]*):(\\d[a-zA-Z0-9\\-_\\.]*)");
private String groupId;
@@ -313,7 +318,7 @@ public class Dependency implements Comparable<Dependency>, Cloneable {
}
public static Dependency fromCompactNotation(String depNotation) {
- Matcher dependencyMatcher = compactDependencyNotationMatcher.matcher(depNotation);
+ Matcher dependencyMatcher = COMPACT_DEPENDENCY_NOTATION_MATCHER.matcher(depNotation);
if (dependencyMatcher.matches()) {
return new Dependency(dependencyMatcher.group(1),
dependencyMatcher.group(2), "jar", dependencyMatcher.group(3));
@@ -322,9 +327,7 @@ public class Dependency implements Comparable<Dependency>, Cloneable {
}
public String formatCompactNotation() {
- return getGroupId() + ":" +
- getArtifactId() + ":" +
- getVersion();
+ return getGroupId() + ":" + getArtifactId() + ":" + getVersion();
}
public Builder builder() {
@@ -382,8 +385,14 @@ public class Dependency implements Comparable<Dependency>, Cloneable {
}
public enum Field {
- GROUPID("groupId"), ARTIFACTID("artifactId"), TYPE("type"), VERSION("version"),
- OPTIONAL("optional"), SCOPE("scope"), CLASSIFIER("classifier"), RELATIVEPATH("relativePath");
+ GROUPID("groupId"),
+ ARTIFACTID("artifactId"),
+ TYPE("type"),
+ VERSION("version"),
+ OPTIONAL("optional"),
+ SCOPE("scope"),
+ CLASSIFIER("classifier"),
+ RELATIVEPATH("relativePath");
public final static Map<String, Field> map;
static {
diff --git a/src/main/java/org/debian/maven/repo/DependencyRule.java b/src/main/java/org/debian/maven/repo/DependencyRule.java
index 18842ea..d6904e9 100644
--- a/src/main/java/org/debian/maven/repo/DependencyRule.java
+++ b/src/main/java/org/debian/maven/repo/DependencyRule.java
@@ -67,7 +67,7 @@ public class DependencyRule implements Comparable<DependencyRule> {
}
private static Rule maybeParseRule(StringTokenizer st, Rule defaultRule) {
- if(st.hasMoreTokens()) {
+ if (st.hasMoreTokens()) {
return new Rule(st.nextToken());
} else {
return defaultRule;
@@ -103,8 +103,11 @@ public class DependencyRule implements Comparable<DependencyRule> {
}
public boolean matches(Dependency dependency) {
- return groupRule.match(dependency.getGroupId()) && artifactRule.match(dependency.getArtifactId()) && typeRule.match(dependency.getType())
- && versionRule.match(dependency.getVersion()) && scopeRule.match(dependency.getScope())
+ return groupRule.match(dependency.getGroupId())
+ && artifactRule.match(dependency.getArtifactId())
+ && typeRule.match(dependency.getType())
+ && versionRule.match(dependency.getVersion())
+ && scopeRule.match(dependency.getScope())
&& classifierRule.match(dependency.getClassifier());
}
@@ -120,7 +123,9 @@ public class DependencyRule implements Comparable<DependencyRule> {
}
public boolean matchesAndPreservesGroupArtifactAndType(Dependency dependency) {
- if(!matches(dependency)) return false;
+ if (!matches(dependency)) {
+ return false;
+ }
Dependency transformed = apply(dependency);
return transformed.getGroupId().equals(dependency.getGroupId())
&& transformed.getArtifactId().equals(dependency.getArtifactId())
diff --git a/src/main/java/org/debian/maven/repo/DependencyRuleSet.java b/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
index 84d371b..eb3599f 100644
--- a/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
+++ b/src/main/java/org/debian/maven/repo/DependencyRuleSet.java
@@ -40,7 +40,6 @@ public class DependencyRuleSet implements Iterable<DependencyRule> {
}
public DependencyRuleSet(Set<DependencyRule> rules, String description) {
- super();
this.rules = rules;
this.description = description;
}
diff --git a/src/main/java/org/debian/maven/repo/DependencyRuleSetFiles.java b/src/main/java/org/debian/maven/repo/DependencyRuleSetFiles.java
index 14b98d0..da8b060 100644
--- a/src/main/java/org/debian/maven/repo/DependencyRuleSetFiles.java
+++ b/src/main/java/org/debian/maven/repo/DependencyRuleSetFiles.java
@@ -26,7 +26,7 @@ public class DependencyRuleSetFiles {
public DependencyRuleSetFiles() {
this(new EnumMap<RulesType, DependencyRuleSet>(RulesType.class));
- for(RulesType type : RulesType.values()) {
+ for (RulesType type : RulesType.values()) {
files.put(type, new DependencyRuleSet());
}
}
@@ -37,9 +37,11 @@ public class DependencyRuleSetFiles {
public static DependencyRuleSetFiles fromCLIArguments(ArgumentsMap argsMap, boolean verbose) {
DependencyRuleSetFiles depFiles = new DependencyRuleSetFiles();
- for(RulesType type : RulesType.values()) {
+ for (RulesType type : RulesType.values()) {
CLIArgs args = type.cliArgs;
- if(args == null) continue;
+ if (args == null) {
+ continue;
+ }
File rulesFile = argsMap.getFile(args.fileLong, args.fileShort, null);
List<String> rulesExtra = argsMap.getValueList(args.extraLong, args.extraShort);
@@ -52,7 +54,7 @@ public class DependencyRuleSetFiles {
}
public void save(File outputDirectory) {
- for(RulesType type : RulesType.values()) {
+ for (RulesType type : RulesType.values()) {
save(outputDirectory, type);
}
}
diff --git a/src/main/java/org/debian/maven/repo/POMInfo.java b/src/main/java/org/debian/maven/repo/POMInfo.java
index 43c7ceb..2274630 100644
--- a/src/main/java/org/debian/maven/repo/POMInfo.java
+++ b/src/main/java/org/debian/maven/repo/POMInfo.java
@@ -24,9 +24,6 @@ import static org.debian.maven.repo.POMInfo.DependencyType.*;
*/
public class POMInfo implements Cloneable {
- public static final String MODULES = "Modules";
- public static final String PARENT = "Parent";
-
private String originalParentVersion;
private Dependency originalPom;
private Dependency parent;
@@ -263,13 +260,13 @@ public class POMInfo implements Cloneable {
public static Map<DependencyType, List<Dependency>> initDependenciesMultiMap() {
Map<DependencyType, List<Dependency>> dependencies = new EnumMap<DependencyType, List<Dependency>>(DependencyType.class);
- for(DependencyType depType : DependencyType.values()) {
+ for (DependencyType depType : DependencyType.values()) {
dependencies.put(depType, new ArrayList<Dependency>());
}
return dependencies;
}
- public enum DependencyType{
+ public enum DependencyType {
// The order of the patterns is important! More specific patterns first!
DEPENDENCY_MANAGEMENT_LIST("/project/dependencyManagement/dependencies/dependency"),
PROFILE_DEPENDENCY_MANAGEMENT_LIST("profile/dependencyManagement/dependencies/dependency"),
@@ -301,13 +298,14 @@ public class POMInfo implements Cloneable {
}
Dependency dependencyPrototype() {
- if(pattern.endsWith("plugin"))
+ if (pattern.endsWith("plugin")) {
return new Dependency(Dependency.PROTO_PLUGIN);
- else
+ } else {
return new Dependency(Dependency.PROTO_JAR);
+ }
}
- public DependencyType byPatter(String pattern) {
+ public DependencyType byPattern(String pattern) {
return byPatternMap.get(pattern);
}
}
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list