Perform clean code of build/org.eclipse.pde.build

eclipse-pde-bot · laeubi · commit 52a17fb1fe6c · 2025-03-17T06:26:11.000+01:00
diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Config.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Config.java
@@ -54,11 +54,10 @@ public boolean equals(Object config) {
 			return true;
 		}
 
-		if (!(config instanceof Config)) {
+		if (!(config instanceof Config aConfig)) {
 			return false;
 		}
 
-		Config aConfig = (Config) config;
 		if (!os.equalsIgnoreCase(aConfig.os)) {
 			return false;
 		}
diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java
@@ -69,8 +69,7 @@ public Entry(String id, String version) {
 
 		@Override
 		public boolean equals(Object obj) {
-			if (obj instanceof Entry) {
-				Entry objEntry = (Entry) obj;
+			if (obj instanceof Entry objEntry) {
 				if (!(id.equals(((Entry) obj).id) && version.equals(objEntry.version))) {
 					return false;
 				}
diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java
@@ -729,8 +729,7 @@ public MapFileEntry(String id, Version v) {
 
 		@Override
 		public int compareTo(Object o) {
-			if (o instanceof MapFileEntry) {
-				MapFileEntry entry = (MapFileEntry) o;
+			if (o instanceof MapFileEntry entry) {
 				int result = id.compareTo(entry.id);
 				if (result != 0) {
 					return result;
@@ -742,8 +741,7 @@ public int compareTo(Object o) {
 
 		@Override
 		public boolean equals(Object o) {
-			if (o instanceof MapFileEntry) {
-				MapFileEntry entry = (MapFileEntry) o;
+			if (o instanceof MapFileEntry entry) {
 				return id.equals(entry.id) && v.equals(entry.v);
 			}
 			return false;
diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ClasspathComputer3_0.java
@@ -123,8 +123,7 @@ public void addRules(String newRule) {
 		 */
 		@Override
 		public boolean equals(Object obj) {
-			if (obj instanceof ClasspathElement) {
-				ClasspathElement element = (ClasspathElement) obj;
+			if (obj instanceof ClasspathElement element) {
 				if (!path.equals(element.getPath())) {
 					return false;
 				}
diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ProfileManager.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/ProfileManager.java
@@ -184,8 +184,7 @@ private InputStream getProfileListInputStream(Object container) {
 					return null;
 				}
 			}
-		} else if (container instanceof ZipFile) {
-			ZipFile zipFile = (ZipFile) container;
+		} else if (container instanceof ZipFile zipFile) {
 			ZipEntry listEntry = ((ZipFile) container).getEntry(PROFILE_LIST);
 			if (listEntry != null) {
 				try {
@@ -194,8 +193,7 @@ private InputStream getProfileListInputStream(Object container) {
 					return null;
 				}
 			}
-		} else if (container instanceof Bundle) {
-			Bundle systemBundle = (Bundle) container;
+		} else if (container instanceof Bundle systemBundle) {
 			URL url = systemBundle.getEntry(PROFILE_LIST);
 			if (url != null) {
 				try {
diff --git a/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Config.java b/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Config.java
@@ -50,11 +50,10 @@ public boolean equals(Object config) {
 			return true;
 		}
 
-		if (!(config instanceof Config)) {
+		if (!(config instanceof Config aConfig)) {
 			return false;
 		}
 
-		Config aConfig = (Config) config;
 		if (!os.equalsIgnoreCase(aConfig.os)) {
 			return false;
 		}
diff --git a/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Version.java b/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Version.java
@@ -291,11 +291,10 @@ public boolean equals(Object object) {
 			return true;
 		}
 
-		if (!(object instanceof Version)) {
+		if (!(object instanceof Version other)) {
 			return false;
 		}
 
-		Version other = (Version) object;
 		return (major == other.major) && (minor == other.minor) && (micro == other.micro) && qualifier.equals(other.qualifier);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,10 @@ public boolean equals(Object config) {`
`54`	`54`	`return true;`
`55`	`55`	`}`
`56`	`56`
`57`		`- if (!(config instanceof Config)) {`
	`57`	`+ if (!(config instanceof Config aConfig)) {`
`58`	`58`	`return false;`
`59`	`59`	`}`
`60`	`60`
`61`		`- Config aConfig = (Config) config;`
`62`	`61`	`if (!os.equalsIgnoreCase(aConfig.os)) {`
`63`	`62`	`return false;`
`64`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ public Entry(String id, String version) {`
`69`	`69`
`70`	`70`	`@Override`
`71`	`71`	`public boolean equals(Object obj) {`
`72`		`- if (obj instanceof Entry) {`
`73`		`- Entry objEntry = (Entry) obj;`
	`72`	`+ if (obj instanceof Entry objEntry) {`
`74`	`73`	`if (!(id.equals(((Entry) obj).id) && version.equals(objEntry.version))) {`
`75`	`74`	`return false;`
`76`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,7 @@ private InputStream getProfileListInputStream(Object container) {`
`184`	`184`	`return null;`
`185`	`185`	`}`
`186`	`186`	`}`
`187`		`- } else if (container instanceof ZipFile) {`
`188`		`- ZipFile zipFile = (ZipFile) container;`
	`187`	`+ } else if (container instanceof ZipFile zipFile) {`
`189`	`188`	`ZipEntry listEntry = ((ZipFile) container).getEntry(PROFILE_LIST);`
`190`	`189`	`if (listEntry != null) {`
`191`	`190`	`try {`
`@@ -194,8 +193,7 @@ private InputStream getProfileListInputStream(Object container) {`
`194`	`193`	`return null;`
`195`	`194`	`}`
`196`	`195`	`}`
`197`		`- } else if (container instanceof Bundle) {`
`198`		`- Bundle systemBundle = (Bundle) container;`
	`196`	`+ } else if (container instanceof Bundle systemBundle) {`
`199`	`197`	`URL url = systemBundle.getEntry(PROFILE_LIST);`
`200`	`198`	`if (url != null) {`
`201`	`199`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,10 @@ public boolean equals(Object config) {`
`50`	`50`	`return true;`
`51`	`51`	`}`
`52`	`52`
`53`		`- if (!(config instanceof Config)) {`
	`53`	`+ if (!(config instanceof Config aConfig)) {`
`54`	`54`	`return false;`
`55`	`55`	`}`
`56`	`56`
`57`		`- Config aConfig = (Config) config;`
`58`	`57`	`if (!os.equalsIgnoreCase(aConfig.os)) {`
`59`	`58`	`return false;`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -291,11 +291,10 @@ public boolean equals(Object object) {`
`291`	`291`	`return true;`
`292`	`292`	`}`
`293`	`293`
`294`		`- if (!(object instanceof Version)) {`
	`294`	`+ if (!(object instanceof Version other)) {`
`295`	`295`	`return false;`
`296`	`296`	`}`
`297`	`297`
`298`		`- Version other = (Version) object;`
`299`	`298`	`return (major == other.major) && (minor == other.minor) && (micro == other.micro) && qualifier.equals(other.qualifier);`
`300`	`299`	`}`
`301`	`300`