Latest bnd sync
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1370165 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/libg/cafs/CAFS.java b/bundleplugin/src/main/java/aQute/libg/cafs/CAFS.java
index b97babc..c89c5f2 100644
--- a/bundleplugin/src/main/java/aQute/libg/cafs/CAFS.java
+++ b/bundleplugin/src/main/java/aQute/libg/cafs/CAFS.java
@@ -62,7 +62,12 @@
this.home = home;
if (!home.isDirectory()) {
if (create) {
- home.mkdirs();
+ if (home.exists()) {
+ throw new IOException(home + " is not a directory");
+ }
+ if (!home.mkdirs()) {
+ throw new IOException("Could not create directory " + home);
+ }
} else
throw new IllegalArgumentException("CAFS requires a directory with create=false");
}
@@ -290,6 +295,7 @@
return size;
}
+ @Override
public int read() throws IOException {
int c = super.read();
if (c < 0)
@@ -315,6 +321,7 @@
+ calculatedSha1));
}
+ @Override
public void close() throws IOException {
eof();
super.close();
diff --git a/bundleplugin/src/main/java/aQute/libg/clauses/Selector.java b/bundleplugin/src/main/java/aQute/libg/clauses/Selector.java
index 8bd998d..50b53fa 100755
--- a/bundleplugin/src/main/java/aQute/libg/clauses/Selector.java
+++ b/bundleplugin/src/main/java/aQute/libg/clauses/Selector.java
@@ -69,6 +69,7 @@
return new Selector(sb.toString(), negated);
}
+ @Override
public String toString() {
return getPattern();
}
diff --git a/bundleplugin/src/main/java/aQute/libg/command/Command.java b/bundleplugin/src/main/java/aQute/libg/command/Command.java
index deb06c5..8dd1678 100644
--- a/bundleplugin/src/main/java/aQute/libg/command/Command.java
+++ b/bundleplugin/src/main/java/aQute/libg/command/Command.java
@@ -68,6 +68,7 @@
if (timeout != 0) {
timer = new TimerTask() {
+ @Override
public void run() {
timedout = true;
process.destroy();
@@ -89,6 +90,7 @@
if (in != null) {
if (in == System.in) {
rdInThread = new Thread("Read Input Thread") {
+ @Override
public void run() {
try {
while (!finished.get()) {
@@ -204,6 +206,7 @@
setDaemon(true);
}
+ @Override
public void run() {
try {
int c = in.read();
@@ -255,6 +258,7 @@
return variables.get(name);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
String del = "";
diff --git a/bundleplugin/src/main/java/aQute/libg/cryptography/Digest.java b/bundleplugin/src/main/java/aQute/libg/cryptography/Digest.java
index aeb4bbb..119a35b 100644
--- a/bundleplugin/src/main/java/aQute/libg/cryptography/Digest.java
+++ b/bundleplugin/src/main/java/aQute/libg/cryptography/Digest.java
@@ -28,6 +28,7 @@
public abstract String getAlgorithm();
+ @Override
public boolean equals(Object other) {
if (!(other instanceof Digest))
return false;
@@ -36,6 +37,7 @@
return Arrays.equals(d.digest, digest);
}
+ @Override
public int hashCode() {
return Arrays.hashCode(digest);
}
diff --git a/bundleplugin/src/main/java/aQute/libg/sed/ReplacerAdapter.java b/bundleplugin/src/main/java/aQute/libg/sed/ReplacerAdapter.java
index 37ef451..84a0620 100644
--- a/bundleplugin/src/main/java/aQute/libg/sed/ReplacerAdapter.java
+++ b/bundleplugin/src/main/java/aQute/libg/sed/ReplacerAdapter.java
@@ -228,8 +228,7 @@
Domain parent = source.start.getParent();
if (parent != null)
return parent.getMap().get(varname);
- else
- return null;
+ return null;
}
Domain rover = domain;
@@ -371,8 +370,7 @@
if (args.length > 3)
return args[3];
- else
- return "";
+ return "";
}
public String _now(String args[]) {
@@ -520,19 +518,18 @@
if (args.length < 2) {
reporter.warning("Need at least one file name for ${dir;...}");
return null;
- } else {
- String del = "";
- StringBuilder sb = new StringBuilder();
- for (int i = 1; i < args.length; i++) {
- File f = IO.getFile(base, args[i]);
- if (f.exists() && f.getParentFile().exists()) {
- sb.append(del);
- sb.append(f.getParentFile().getAbsolutePath());
- del = ",";
- }
- }
- return sb.toString();
}
+ String del = "";
+ StringBuilder sb = new StringBuilder();
+ for (int i = 1; i < args.length; i++) {
+ File f = IO.getFile(base, args[i]);
+ if (f.exists() && f.getParentFile().exists()) {
+ sb.append(del);
+ sb.append(f.getParentFile().getAbsolutePath());
+ del = ",";
+ }
+ }
+ return sb.toString();
}
@@ -540,19 +537,18 @@
if (args.length < 2) {
reporter.warning("Need at least one file name for ${basename;...}");
return null;
- } else {
- String del = "";
- StringBuilder sb = new StringBuilder();
- for (int i = 1; i < args.length; i++) {
- File f = IO.getFile(base, args[i]);
- if (f.exists() && f.getParentFile().exists()) {
- sb.append(del);
- sb.append(f.getName());
- del = ",";
- }
- }
- return sb.toString();
}
+ String del = "";
+ StringBuilder sb = new StringBuilder();
+ for (int i = 1; i < args.length; i++) {
+ File f = IO.getFile(base, args[i]);
+ if (f.exists() && f.getParentFile().exists()) {
+ sb.append(del);
+ sb.append(f.getName());
+ del = ",";
+ }
+ }
+ return sb.toString();
}
@@ -560,14 +556,13 @@
if (args.length < 2) {
reporter.warning("Need at least one file name for ${isfile;...}");
return null;
- } else {
- boolean isfile = true;
- for (int i = 1; i < args.length; i++) {
- File f = new File(args[i]).getAbsoluteFile();
- isfile &= f.isFile();
- }
- return isfile ? "true" : "false";
}
+ boolean isfile = true;
+ for (int i = 1; i < args.length; i++) {
+ File f = new File(args[i]).getAbsoluteFile();
+ isfile &= f.isFile();
+ }
+ return isfile ? "true" : "false";
}
@@ -575,14 +570,13 @@
if (args.length < 2) {
reporter.warning("Need at least one file name for ${isdir;...}");
return null;
- } else {
- boolean isdir = true;
- for (int i = 1; i < args.length; i++) {
- File f = new File(args[i]).getAbsoluteFile();
- isdir &= f.isDirectory();
- }
- return isdir ? "true" : "false";
}
+ boolean isdir = true;
+ for (int i = 1; i < args.length; i++) {
+ File f = new File(args[i]).getAbsoluteFile();
+ isdir &= f.isDirectory();
+ }
+ return isdir ? "true" : "false";
}
@@ -801,6 +795,7 @@
return previous.contains(key);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("[");
append(sb);
diff --git a/bundleplugin/src/main/java/aQute/libg/tarjan/Tarjan.java b/bundleplugin/src/main/java/aQute/libg/tarjan/Tarjan.java
index cef8b23..c3e8ee1 100644
--- a/bundleplugin/src/main/java/aQute/libg/tarjan/Tarjan.java
+++ b/bundleplugin/src/main/java/aQute/libg/tarjan/Tarjan.java
@@ -16,6 +16,7 @@
this.name = name;
}
+ @Override
public String toString() {
return name + "{" + index + "," + low + "}";
}