natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tersify logic ;->

This commit is contained in:
Gintas Grigelionis 2017-12-05 12:36:37 +01:00
parent a123650842
commit 14bdf34a9b
14 changed files with 20 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
View File

@ -571,14 +571,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor {
return false;
}
DefaultModuleDescriptor other = (DefaultModuleDescriptor) obj;
if (revId == null) {
if (other.revId != null) {
return false;
}
} else if (!revId.equals(other.revId)) {
return false;
}
return true;
return revId == null ? other.revId == null : revId.equals(other.revId);
}
@Override

9
src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java
View File

@ -189,14 +189,7 @@ public class ArtifactDownloadReport {
return true;
}
ArtifactDownloadReport other = (ArtifactDownloadReport) obj;
if (artifact == null) {
if (other.artifact != null) {
return false;
}
} else if (!artifact.equals(other.artifact)) {
return false;
}
return true;
return artifact == null ? other.artifact == null : artifact.equals(other.artifact);
}
}

9
src/java/org/apache/ivy/osgi/core/BundleCapability.java
View File

@ -79,14 +79,7 @@ public class BundleCapability {
} else if (!name.equals(other.name)) {
return false;
}
if (version == null) {
if (other.version != null) {
return false;
}
} else if (!version.equals(other.version)) {
return false;
}
return true;
return version == null ? other.version == null : version.equals(other.version);
}
}

13
src/java/org/apache/ivy/osgi/core/BundleInfo.java
View File

@ -325,17 +325,8 @@ public class BundleInfo {
} else if (!versionTarget.equals(other.versionTarget)) {
return false;
}
if (hasInnerClasspath != other.hasInnerClasspath) {
return false;
}
if (classpath == null) {
if (other.classpath != null) {
return false;
}
} else if (!classpath.equals(other.classpath)) {
return false;
}
return true;
return hasInnerClasspath == other.hasInnerClasspath
&& (classpath == null ? other.classpath == null : classpath.equals(other.classpath));
}
public Set<BundleRequirement> getRequires() {

9
src/java/org/apache/ivy/osgi/core/BundleRequirement.java
View File

@ -99,13 +99,6 @@ public class BundleRequirement {
} else if (!resolution.equals(other.resolution)) {
return false;
}
if (version == null) {
if (other.version != null) {
return false;
}
} else if (!version.equals(other.version)) {
return false;
}
return true;
return version == null ? other.version == null : version.equals(other.version);
}
}

9
src/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfile.java
View File

@ -64,14 +64,7 @@ public class ExecutionEnvironmentProfile {
} else if (!name.equals(other.name)) {
return false;
}
if (pkgNames == null) {
if (other.pkgNames != null) {
return false;
}
} else if (!pkgNames.equals(other.pkgNames)) {
return false;
}
return true;
return pkgNames == null ? other.pkgNames == null : pkgNames.equals(other.pkgNames);
}
public String toString() {

9
src/java/org/apache/ivy/osgi/core/ExportPackage.java
View File

@ -57,14 +57,7 @@ public class ExportPackage extends BundleCapability {
return false;
}
ExportPackage other = (ExportPackage) obj;
if (uses == null) {
if (other.uses != null) {
return false;
}
} else if (!uses.equals(other.uses)) {
return false;
}
return true;
return uses == null ? other.uses == null : uses.equals(other.uses);
}
}

9
src/java/org/apache/ivy/osgi/filter/CompareFilter.java
View File

@ -144,13 +144,6 @@ public class CompareFilter extends OSGiFilter {
} else if (!operator.equals(other.operator)) {
return false;
}
if (rightValue == null) {
if (other.rightValue != null) {
return false;
}
} else if (!rightValue.equals(other.rightValue)) {
return false;
}
return true;
return rightValue == null ? other.rightValue == null : rightValue.equals(other.rightValue);
}
}

12
src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java
View File

@ -73,14 +73,8 @@ public abstract class MultiOperatorFilter extends OSGiFilter {
return false;
}
MultiOperatorFilter other = (MultiOperatorFilter) obj;
if (subFilters == null) {
if (other.subFilters != null) {
return false;
}
} else if (other.subFilters == null || subFilters.size() != other.subFilters.size()
|| !subFilters.containsAll(other.subFilters)) {
return false;
}
return true;
return subFilters == null ? other.subFilters == null
: other.subFilters != null && subFilters.size() == other.subFilters.size()
&& subFilters.containsAll(other.subFilters);
}
}

9
src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java
View File

@ -59,13 +59,6 @@ public abstract class UniOperatorFilter extends OSGiFilter {
return false;
}
UniOperatorFilter other = (UniOperatorFilter) obj;
if (subFilter == null) {
if (other.subFilter != null) {
return false;
}
} else if (!subFilter.equals(other.subFilter)) {
return false;
}
return true;
return subFilter == null ? other.subFilter == null : subFilter.equals(other.subFilter);
}
}

9
src/java/org/apache/ivy/osgi/repo/EditableRepoDescriptor.java
View File

@ -157,14 +157,7 @@ public class EditableRepoDescriptor extends RepoDescriptor {
return true;
}
EditableRepoDescriptor other = (EditableRepoDescriptor) obj;
if (modules == null) {
if (other.modules != null) {
return false;
}
} else if (!modules.equals(other.modules)) {
return false;
}
return true;
return modules == null ? other.modules == null : modules.equals(other.modules);
}
}

13
src/java/org/apache/ivy/osgi/util/Version.java
View File

@ -151,17 +151,8 @@ public class Version implements Comparable<Version> {
Version other = (Version) obj;
ensureSplit();
other.ensureSplit();
if (major != other.major || minor != other.minor || patch != other.patch) {
return false;
}
if (qualifier == null) {
if (other.qualifier != null) {
return false;
}
} else if (!qualifier.equals(other.qualifier)) {
return false;
}
return true;
return major == other.major && minor == other.minor && patch == other.patch
&& (qualifier == null ? other.qualifier == null : qualifier.equals(other.qualifier));
}
public Version withNudgedPatch() {

13
src/java/org/apache/ivy/osgi/util/VersionRange.java
View File

@ -340,17 +340,8 @@ public class VersionRange {
} else if (!endVersion.equals(other.endVersion)) {
return false;
}
if (startExclusive != other.startExclusive) {
return false;
}
if (startVersion == null) {
if (other.startVersion != null) {
return false;
}
} else if (!startVersion.equals(other.startVersion)) {
return false;
}
return true;
return startExclusive == other.startExclusive
&& (startVersion == null ? other.startVersion == null : startVersion.equals(other.startVersion));
}
}

6
src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java
View File

@ -150,10 +150,8 @@ public class SFTPRepository extends AbstractSshBasedRepository {
private void mkdirs(String directory, ChannelSftp c) throws SftpException {
try {
SftpATTRS att = c.stat(directory);
if (att != null) {
if (att.isDir()) {
return;
}
if (att != null && att.isDir()) {
return;
}
} catch (SftpException ex) {
if (directory.indexOf('/') != -1) {