Commit c6c3a91f authored by SaberXu's avatar SaberXu Committed by Stephane Nicoll

Simplify if statements

See gh-17785
parent 3efead4b
......@@ -165,7 +165,7 @@ public class ConfigurationMetadata {
if (o1 == o2) {
return true;
}
return o1 != null && o2 != null && o1.equals(o2);
return o1 != null && o1.equals(o2);
}
public static String nestedPrefix(String prefix, String name) {
......
......@@ -157,10 +157,7 @@ public final class Metadata {
if (this.deprecation == null && itemMetadata.getDeprecation() != null) {
return false;
}
if (this.deprecation != null && !this.deprecation.equals(itemMetadata.getDeprecation())) {
return false;
}
return true;
return this.deprecation == null || this.deprecation.equals(itemMetadata.getDeprecation());
}
public MetadataItemCondition ofType(Class<?> dataType) {
......@@ -342,10 +339,7 @@ public final class Metadata {
if (this.value != null && !this.value.equals(valueHint.getValue())) {
return false;
}
if (this.description != null && !this.description.equals(valueHint.getDescription())) {
return false;
}
return true;
return this.description == null || this.description.equals(valueHint.getDescription());
}
}
......
......@@ -106,17 +106,14 @@ public class LaunchScriptConfiguration implements Serializable {
return false;
}
if (this.script == null) {
if (other.script != null) {
return false;
}
return other.script == null;
}
else if (!this.script.equals(other.script)) {
return false;
}
else if (!equalContents(this.script, other.script)) {
return false;
else {
return equalContents(this.script, other.script);
}
return true;
}
private boolean equalContents(File one, File two) {
......@@ -132,7 +129,7 @@ public class LaunchScriptConfiguration implements Serializable {
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((this.properties == null) ? 0 : this.properties.hashCode());
result = prime * result + this.properties.hashCode();
result = prime * result + ((this.script == null) ? 0 : this.script.hashCode());
return result;
}
......
......@@ -381,10 +381,7 @@ public abstract class MainClassFinder {
return false;
}
MainClass other = (MainClass) obj;
if (!this.name.equals(other.name)) {
return false;
}
return true;
return this.name.equals(other.name);
}
@Override
......
......@@ -52,10 +52,7 @@ public class PropertiesMergingResourceTransformer implements ResourceTransformer
@Override
public boolean canTransformResource(String resource) {
if (this.resource != null && this.resource.equalsIgnoreCase(resource)) {
return true;
}
return false;
return this.resource != null && this.resource.equalsIgnoreCase(resource);
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment