Sync with latest bnd code for testing purposes
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1354104 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/bnd/differ/DiffImpl.java b/bundleplugin/src/main/java/aQute/bnd/differ/DiffImpl.java
index ea6cd50..57c7da5 100644
--- a/bundleplugin/src/main/java/aQute/bnd/differ/DiffImpl.java
+++ b/bundleplugin/src/main/java/aQute/bnd/differ/DiffImpl.java
@@ -200,10 +200,10 @@
if (getDelta() == other.getDelta()) {
if (getType() == other.getType()) {
return getName().compareTo(other.getName());
- } else
- return getType().compareTo(other.getType());
- } else
- return getDelta().compareTo(other.getDelta());
+ }
+ return getType().compareTo(other.getType());
+ }
+ return getDelta().compareTo(other.getDelta());
}
public Diff get(String name) {
diff --git a/bundleplugin/src/main/java/aQute/bnd/differ/Element.java b/bundleplugin/src/main/java/aQute/bnd/differ/Element.java
index 683c7a8..3d27f62 100644
--- a/bundleplugin/src/main/java/aQute/bnd/differ/Element.java
+++ b/bundleplugin/src/main/java/aQute/bnd/differ/Element.java
@@ -97,8 +97,7 @@
public int compareTo(Tree other) {
if (type == other.getType())
return name.compareTo(other.getName());
- else
- return type.compareTo(other.getType());
+ return type.compareTo(other.getType());
}
public boolean equals(Object other) {
@@ -125,7 +124,7 @@
}
public Diff diff(Tree older) {
- return new DiffImpl(this, (Element) older);
+ return new DiffImpl(this, older);
}
public Element get(String name) {
diff --git a/bundleplugin/src/main/java/aQute/bnd/differ/JavaElement.java b/bundleplugin/src/main/java/aQute/bnd/differ/JavaElement.java
index c5bdb4b..fd3515a 100644
--- a/bundleplugin/src/main/java/aQute/bnd/differ/JavaElement.java
+++ b/bundleplugin/src/main/java/aQute/bnd/differ/JavaElement.java
@@ -297,12 +297,11 @@
Clazz c = analyzer.findClass(name);
if (c == null) {
return "Cannot load " + name;
- } else {
- Element s = classElement(c);
- for (Element child : s.children) {
- if (INHERITED.contains(child.type) && !child.name.startsWith("<")) {
- members.add(child);
- }
+ }
+ Element s = classElement(c);
+ for (Element child : s.children) {
+ if (INHERITED.contains(child.type) && !child.name.startsWith("<")) {
+ members.add(child);
}
}
}
@@ -629,7 +628,7 @@
elements.addAll(set);
}
- private static void access(Collection<Element> children, int access, boolean deprecated) {
+ private static void access(Collection<Element> children, int access, @SuppressWarnings("unused") boolean deprecated) {
if (!isPublic(access))
children.add(PROTECTED);
if (isAbstract(access))
diff --git a/bundleplugin/src/main/java/aQute/bnd/differ/packageinfo b/bundleplugin/src/main/java/aQute/bnd/differ/packageinfo
new file mode 100644
index 0000000..a4f1546
--- /dev/null
+++ b/bundleplugin/src/main/java/aQute/bnd/differ/packageinfo
@@ -0,0 +1 @@
+version 1.0
\ No newline at end of file