Perform clean code of ui/org.eclipse.pde.bnd.ui

Author: eclipse-pde-bot

ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/model/resolution/CapReqComparator.java

@@ -29,32 +29,38 @@ public class CapReqComparator implements Comparator<Object> {
 
 	@Override
 	public int compare(Object o1, Object o2) {
-		if (o1 instanceof Requirement)
+		if (o1 instanceof Requirement) {
 			return compareReqToObj((Requirement) o1, o2);
+		}
 
-		if (o1 instanceof RequirementWrapper)
+		if (o1 instanceof RequirementWrapper) {
 			return compareReqToObj(((RequirementWrapper) o1).requirement, o2);
+		}
 
-		if (o1 instanceof Capability)
+		if (o1 instanceof Capability) {
 			return compareCapToObj((Capability) o1, o2);
+		}
 
 		return 0;
 	}
 
 	private int compareReqToObj(Requirement r1, Object o2) {
-		if (o2 instanceof Requirement)
+		if (o2 instanceof Requirement) {
 			return compareReqToReq(r1, (Requirement) o2);
+		}
 
-		if (o2 instanceof RequirementWrapper)
+		if (o2 instanceof RequirementWrapper) {
 			return compareReqToReq(r1, ((RequirementWrapper) o2).requirement);
+		}
 
 		// requirements sort before other things
 		return -1;
 	}
 
 	private int compareCapToObj(Capability c1, Object o2) {
-		if (o2 instanceof Capability)
+		if (o2 instanceof Capability) {
 			return compareCapToCap(c1, (Capability) o2);
+		}
 
 		// capabilities sort after other things
 		return 1;
@@ -65,8 +71,9 @@ private int compareCapToCap(Capability c1, Capability c2) {
 		String ns1 = c1.getNamespace();
 		String ns2 = c2.getNamespace();
 		int nsDiff = ns1.compareTo(ns2);
-		if (nsDiff != 0)
+		if (nsDiff != 0) {
 			return nsDiff;
+		}
 
 		// Compare the main attribute
 		String attribName = R5LabelFormatter.getMainAttributeName(ns1);
@@ -78,14 +85,16 @@ private int compareCapToCap(Capability c1, Capability c2) {
 		if (attrib1 != null && attrib2 != null) {
 			int attribDiff = attrib1.toString()
 				.compareTo(attrib2.toString());
-			if (attribDiff != 0)
+			if (attribDiff != 0) {
 				return attribDiff;
+			}
 		}
 
 		// Compare the versions
 		String versionAttribName = R5LabelFormatter.getVersionAttributeName(ns1);
-		if (versionAttribName == null)
+		if (versionAttribName == null) {
 			return 0;
+		}
 
 		Version v1 = highestVersion(c1.getAttributes().get(versionAttribName));
 	    Version v2 = highestVersion(c2.getAttributes().get(versionAttribName));

ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/model/resolution/CapReqMapContentProvider.java

@@ -74,8 +74,9 @@ public Object[] getElements(Object input) {
 		for (Entry<String, List<Object>> entry : map.entrySet()) {
 			// Skip if namespace is a member of the namespaces we have already
 			// added.
-			if (NAMESPACES.contains(entry.getKey()))
+			if (NAMESPACES.contains(entry.getKey())) {
 				continue;
+			}
 
 			List<Object> listForNs = entry.getValue();
 			Object[] array = listForNs.toArray();
@@ -112,8 +113,7 @@ public Object getParent(Object object) {
 	public boolean hasChildren(Object object) {
 		boolean children = false;
 
-		if (object instanceof RequirementWrapper) {
-			RequirementWrapper rw = (RequirementWrapper) object;
+		if (object instanceof RequirementWrapper rw) {
 			children = rw.requirers != null && !rw.requirers.isEmpty();
 		}
 
@@ -125,18 +125,20 @@ public Object[] getChildren(Object parent) {
 		Object[] result = EMPTY;
 		if (parent instanceof RequirementWrapper) {
 			Collection<? extends Object> requirers = ((RequirementWrapper) parent).requirers;
-			if (requirers != null)
+			if (requirers != null) {
 				result = requirers.toArray();
+			}
 		}
 		return result;
 	}
 
 	public void setFilter(String filterString) {
 		if (filterString == null || filterString.length() == 0 || filterString.trim()
-			.equals("*"))
+			.equals("*")) {
 			wildcardFilter = null;
-		else
+		} else {
 			wildcardFilter = "*" + filterString.trim() + "*";
+		}
 
 	}
 

ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/model/resolution/CapabilityLabelProvider.java

@@ -89,18 +89,20 @@ static String tooltipText(Capability cap) {
 		}
 
 		for (Entry<String, Object> attribute : cap.getAttributes()
-			.entrySet())
+			.entrySet()) {
 			buf.append(";\n\t")
 				.append(attribute.getKey())
 				.append(" = ")
 				.append(attribute.getValue());
+		}
 
 		for (Entry<String, String> directive : cap.getDirectives()
-			.entrySet())
+			.entrySet()) {
 			buf.append(";\n\t")
 				.append(directive.getKey())
 				.append(" := ")
 				.append(directive.getValue());
+		}
 
 		return buf.toString();
 	}

ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/model/resolution/RequirementWrapper.java

@@ -53,12 +53,15 @@ public int hashCode() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if (this == obj) {
 			return true;
-		if (obj == null)
+		}
+		if (obj == null) {
 			return false;
-		if (getClass() != obj.getClass())
+		}
+		if (getClass() != obj.getClass()) {
 			return false;
+		}
 		RequirementWrapper other = (RequirementWrapper) obj;
 		return java == other.java && Objects.equals(requirement, other.requirement)
 			&& Objects.equals(requirers, other.requirers) && resolved == other.resolved;

ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/model/resolution/RequirementWrapperLabelProvider.java

@@ -43,15 +43,14 @@ public RequirementWrapperLabelProvider(boolean shortenNamespaces) {
 	@Override
 	public void update(ViewerCell cell) {
 		Object element = cell.getElement();
-		if (element instanceof RequirementWrapper) {
-			RequirementWrapper rw = (RequirementWrapper) element;
-
+		if (element instanceof RequirementWrapper rw) {
 			Image icon = Resources.getImage(R5LabelFormatter.getNamespaceImagePath(rw.requirement.getNamespace()));
 			cell.setImage(icon);
 
 			StyledString label = getLabel(rw.requirement);
-			if (rw.resolved || rw.java)
+			if (rw.resolved || rw.java) {
 				label.setStyle(0, label.length(), resolved);
+			}
 
 			cell.setText(label.getString());
 			cell.setStyleRanges(label.getStyleRanges());
@@ -93,10 +92,12 @@ static String tooltipText(RequirementWrapper rw) {
 		Requirement req = rw.requirement;
 
 		StringBuilder buf = new StringBuilder(300);
-		if (rw.resolved)
+		if (rw.resolved) {
 			buf.append("RESOLVED:\n");
-		if (rw.java)
+		}
+		if (rw.java) {
 			buf.append("JAVA:\n");
+		}
 
 		Resource r = req.getResource();
 
@@ -117,18 +118,20 @@ static String tooltipText(RequirementWrapper rw) {
 		buf.append(req.getNamespace());
 
 		for (Entry<String, Object> attr : req.getAttributes()
-			.entrySet())
+			.entrySet()) {
 			buf.append(";\n\t")
 				.append(attr.getKey())
 				.append(" = ")
 				.append(attr.getValue());
+		}
 
 		for (Entry<String, String> directive : req.getDirectives()
-			.entrySet())
+			.entrySet()) {
 			buf.append(";\n\t")
 				.append(directive.getKey())
 				.append(" := ")
 				.append(directive.getValue());
+		}
 
 		return buf.toString();
 	}