Bug 567692 - dogfooding [cleanup & saveaction] Objects.hash()

Change-Id: Iffb4ca957072ffccf9fa88310a2d156e96871ded
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>

5 files changed, 7 insertions, 37 deletions

diff --git a/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/core/refactoring/descriptors/ExtractClassDescriptor.java b/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/core/refactoring/descriptors/ExtractClassDescriptor.java
index 4b115413f3..500d78f741 100644
--- a/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/core/refactoring/descriptors/ExtractClassDescriptor.java
+++ b/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/core/refactoring/descriptors/ExtractClassDescriptor.java
@@ -117,10 +117,7 @@ public class ExtractClassDescriptor extends JavaRefactoringDescriptor {
 
 		@Override
 		public int hashCode() {
-			final int prime= 31;
-			int result= 1;
-			result= prime * result + ((fFieldName == null) ? 0 : fFieldName.hashCode());
-			return result;
+			return Objects.hash(fFieldName);
 		}
 
 		@Override
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/InterfaceIndicatorLabelDecorator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/InterfaceIndicatorLabelDecorator.java
index 32a5642537..f04eccff27 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/InterfaceIndicatorLabelDecorator.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/InterfaceIndicatorLabelDecorator.java
@@ -115,12 +115,7 @@ public class InterfaceIndicatorLabelDecorator extends AbstractJavaElementLabelDe
 		 */
 		@Override
 		public int hashCode() {
-			final int prime= 31;
-			int result= 1;
-			result= prime * result + (fDeprecated ? 1231 : 1237);
-			result= prime * result + (fPackageDefault ? 1231 : 1237);
-			result= prime * result + ((fType == null) ? 0 : fType.hashCode());
-			return result;
+			return Objects.hash(fDeprecated, fPackageDefault, fType);
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/ClassPathContainer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/ClassPathContainer.java
index 57dc1b3423..57b23729f3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/ClassPathContainer.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/ClassPathContainer.java
@@ -114,12 +114,7 @@ public class ClassPathContainer extends PackageFragmentRootContainer {
 
 		@Override
 		public int hashCode() {
-			final int prime= 31;
-			int result= 1;
-			result= prime * result + ((fClasspathEntry == null) ? 0 : fClasspathEntry.hashCode());
-			result= prime * result + ((fParent == null) ? 0 : fParent.hashCode());
-			result= prime * result + ((fProject == null) ? 0 : fProject.hashCode());
-			return result;
+			return Objects.hash(fClasspathEntry, fParent, fProject);
 		}
 
 		@Override
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
index 8b86022c9f..76a21858af 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java
@@ -116,11 +116,7 @@ public class ModuleDependenciesPage extends BuildPathBasePage {
 		}
 		@Override
 		public int hashCode() {
-			final int prime= 31;
-			int result= 1;
-			result= prime * result + ((fBaseImage == null) ? 0 : fBaseImage.hashCode());
-			result= prime * result + ((fOverlay == null) ? 0 : fOverlay.hashCode());
-			return result;
+			return Objects.hash(fBaseImage, fOverlay);
 		}
 		@Override
 		public boolean equals(Object obj) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleEncapsulationDetail.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleEncapsulationDetail.java
index b9ee16db76..da21137638 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleEncapsulationDetail.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleEncapsulationDetail.java
@@ -170,11 +170,7 @@ public abstract class ModuleEncapsulationDetail {
 
 		@Override
 		public int hashCode() {
-			final int prime= 31;
-			int result= 1;
-			result= prime * result + ((fModule == null) ? 0 : fModule.hashCode());
-			result= prime * result + ((fPaths == null) ? 0 : fPaths.hashCode());
-			return result;
+			return Objects.hash(fModule, fPaths);
 		}
 
 		@Override
@@ -331,12 +327,7 @@ public abstract class ModuleEncapsulationDetail {
 
 		@Override
 		public int hashCode() {
-			final int prime= 31;
-			int result= 1;
-			result= prime * result + ((fPackage == null) ? 0 : fPackage.hashCode());
-			result= prime * result + ((fSourceModule == null) ? 0 : fSourceModule.hashCode());
-			result= prime * result + ((fTargetModules == null) ? 0 : fTargetModules.hashCode());
-			return result;
+			return Objects.hash(fPackage, fSourceModule, fTargetModules);
 		}
 
 		@Override
@@ -434,11 +425,7 @@ public abstract class ModuleEncapsulationDetail {
 
 		@Override
 		public int hashCode() {
-			final int prime= 31;
-			int result= 1;
-			result= prime * result + ((fSourceModule == null) ? 0 : fSourceModule.hashCode());
-			result= prime * result + ((fTargetModule == null) ? 0 : fTargetModule.hashCode());
-			return result;
+			return Objects.hash(fSourceModule, fTargetModule);
 		}
 
 		@Override