Perform clean code of bundles/org.eclipse.equinox.p2.publisher.eclipse

eclipse-equinox-bot · laeubi · commit 2d2a0e44d732 · 2025-03-17T07:12:10.000+01:00
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/BundleDescriptionImpl.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/BundleDescriptionImpl.java
@@ -429,10 +429,9 @@ public Object getKey() {
 
 	@Override
 	public boolean compare(KeyedElement other) {
-		if (!(other instanceof BundleDescriptionImpl)) {
+		if (!(other instanceof BundleDescriptionImpl otherBundleDescription)) {
 			return false;
 		}
-		BundleDescriptionImpl otherBundleDescription = (BundleDescriptionImpl) other;
 		return bundleId == otherBundleDescription.bundleId;
 	}
 
@@ -733,10 +732,9 @@ public int hashCode() {
 
 		@Override
 		public boolean equals(Object obj) {
-			if (!(obj instanceof BundleWireImpl)) {
+			if (!(obj instanceof BundleWireImpl other)) {
 				return false;
 			}
-			BundleWireImpl other = (BundleWireImpl) obj;
 			return capability.equals(other.getCapability()) && requirement.equals(other.getRequirement()) && provider.equals(other.getProviderWiring()) && requirer.equals(other.getRequirerWiring());
 		}
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/BundleSpecificationImpl.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/BundleSpecificationImpl.java
@@ -73,10 +73,9 @@ void setArbitraryDirectives(Map<String, ?> directives) {
 
 	@Override
 	public boolean isSatisfiedBy(BaseDescription supplier) {
-		if (!(supplier instanceof BundleDescriptionImpl)) {
+		if (!(supplier instanceof BundleDescriptionImpl candidate)) {
 			return false;
 		}
-		BundleDescriptionImpl candidate = (BundleDescriptionImpl) supplier;
 		if (candidate.getHost() != null) {
 			return false;
 		}
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/GenericSpecificationImpl.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/GenericSpecificationImpl.java
@@ -57,10 +57,9 @@ void setMatchingFilter(Filter matchingFilter) {
 
 	@Override
 	public boolean isSatisfiedBy(BaseDescription supplier) {
-		if (!(supplier instanceof GenericDescription)) {
+		if (!(supplier instanceof GenericDescription candidate)) {
 			return false;
 		}
-		GenericDescription candidate = (GenericDescription) supplier;
 		if (!getType().equals(candidate.getType())) {
 			return false;
 		}
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/HostSpecificationImpl.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/HostSpecificationImpl.java
@@ -49,10 +49,9 @@ void setArbitraryDirectives(Map<String, ?> directives) {
 
 	@Override
 	public boolean isSatisfiedBy(BaseDescription supplier) {
-		if (!(supplier instanceof BundleDescriptionImpl)) {
+		if (!(supplier instanceof BundleDescriptionImpl candidate)) {
 			return false;
 		}
-		BundleDescriptionImpl candidate = (BundleDescriptionImpl) supplier;
 		if (candidate.getHost() != null) {
 			return false;
 		}
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/VersionConstraintImpl.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/bundledescription/VersionConstraintImpl.java
@@ -206,8 +206,7 @@ static StringBuilder addFilterAttribute(StringBuilder filter, String attr, Objec
 	}
 
 	static StringBuilder addFilterAttribute(StringBuilder filter, String attr, Object value, boolean escapeWildCard) {
-		if (value instanceof VersionRange) {
-			VersionRange range = (VersionRange) value;
+		if (value instanceof VersionRange range) {
 			filter.append(range.toFilterString(attr));
 		} else {
 			filter.append('(').append(attr).append('=').append(escapeValue(value, escapeWildCard)).append(')');
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
@@ -537,8 +537,7 @@ private Object convertAttribute(Object attr) {
 	}
 
 	private Object convertScalarAttribute(Object attr) {
-		if (attr instanceof org.osgi.framework.Version) {
-			org.osgi.framework.Version osgiVer = (org.osgi.framework.Version) attr;
+		if (attr instanceof org.osgi.framework.Version osgiVer) {
 			return Version.createOSGi(osgiVer.getMajor(), osgiVer.getMinor(), osgiVer.getMicro(),
 					osgiVer.getQualifier());
 		}
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EclipsePublisherHelper.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EclipsePublisherHelper.java
@@ -40,9 +40,7 @@ public static IInstallableUnit[] createEclipseIU(BundleDescription bd, boolean i
 	}
 
 	private static void addExtraProperties(IInstallableUnit iiu, Map<String, String> extraProperties) {
-		if (iiu instanceof InstallableUnit) {
-			InstallableUnit iu = (InstallableUnit) iiu;
-
+		if (iiu instanceof InstallableUnit iu) {
 			for (Entry<String, String> entry : extraProperties.entrySet()) {
 				iu.setProperty(entry.getKey(), entry.getValue());
 			}
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/swt/tools/IconExe.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/swt/tools/IconExe.java
@@ -1022,10 +1022,9 @@ public boolean equals(Object object) {
 			if (object == this) {
 				return true;
 			}
-			if (!(object instanceof RGB)) {
+			if (!(object instanceof RGB rgb)) {
 				return false;
 			}
-			RGB rgb = (RGB) object;
 			return (rgb.red == this.red) && (rgb.green == this.green) && (rgb.blue == this.blue);
 		}
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src_ant/org/eclipse/equinox/internal/p2/publisher/ant/FeaturesAndBundlesPublisherTask.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src_ant/org/eclipse/equinox/internal/p2/publisher/ant/FeaturesAndBundlesPublisherTask.java
@@ -56,9 +56,7 @@ public void execute() throws BuildException {
 	private File[] getLocations(List<Object> collection) {
 		ArrayList<Object> results = new ArrayList<>();
 		for (Object obj : collection) {
-			if (obj instanceof FileSet) {
-				FileSet set = (FileSet) obj;
-
+			if (obj instanceof FileSet set) {
 				DirectoryScanner scanner = set.getDirectoryScanner(getProject());
 				String[][] elements = new String[][] {scanner.getIncludedDirectories(), scanner.getIncludedFiles()};
 				for (int i = 0; i < 2; i++) {

Original file line number	Diff line number	Diff line change
`@@ -429,10 +429,9 @@ public Object getKey() {`
`429`	`429`
`430`	`430`	`@Override`
`431`	`431`	`public boolean compare(KeyedElement other) {`
`432`		`- if (!(other instanceof BundleDescriptionImpl)) {`
	`432`	`+ if (!(other instanceof BundleDescriptionImpl otherBundleDescription)) {`
`433`	`433`	`return false;`
`434`	`434`	`}`
`435`		`- BundleDescriptionImpl otherBundleDescription = (BundleDescriptionImpl) other;`
`436`	`435`	`return bundleId == otherBundleDescription.bundleId;`
`437`	`436`	`}`
`438`	`437`
`@@ -733,10 +732,9 @@ public int hashCode() {`
`733`	`732`
`734`	`733`	`@Override`
`735`	`734`	`public boolean equals(Object obj) {`
`736`		`- if (!(obj instanceof BundleWireImpl)) {`
	`735`	`+ if (!(obj instanceof BundleWireImpl other)) {`
`737`	`736`	`return false;`
`738`	`737`	`}`
`739`		`- BundleWireImpl other = (BundleWireImpl) obj;`
`740`	`738`	`return capability.equals(other.getCapability()) && requirement.equals(other.getRequirement()) && provider.equals(other.getProviderWiring()) && requirer.equals(other.getRequirerWiring());`
`741`	`739`	`}`
`742`	`740`
Original file line number	Diff line number	Diff line change
`@@ -73,10 +73,9 @@ void setArbitraryDirectives(Map<String, ?> directives) {`
`73`	`73`
`74`	`74`	`@Override`
`75`	`75`	`public boolean isSatisfiedBy(BaseDescription supplier) {`
`76`		`- if (!(supplier instanceof BundleDescriptionImpl)) {`
	`76`	`+ if (!(supplier instanceof BundleDescriptionImpl candidate)) {`
`77`	`77`	`return false;`
`78`	`78`	`}`
`79`		`- BundleDescriptionImpl candidate = (BundleDescriptionImpl) supplier;`
`80`	`79`	`if (candidate.getHost() != null) {`
`81`	`80`	`return false;`
`82`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,9 @@ void setMatchingFilter(Filter matchingFilter) {`
`57`	`57`
`58`	`58`	`@Override`
`59`	`59`	`public boolean isSatisfiedBy(BaseDescription supplier) {`
`60`		`- if (!(supplier instanceof GenericDescription)) {`
	`60`	`+ if (!(supplier instanceof GenericDescription candidate)) {`
`61`	`61`	`return false;`
`62`	`62`	`}`
`63`		`- GenericDescription candidate = (GenericDescription) supplier;`
`64`	`63`	`if (!getType().equals(candidate.getType())) {`
`65`	`64`	`return false;`
`66`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,9 @@ void setArbitraryDirectives(Map<String, ?> directives) {`
`49`	`49`
`50`	`50`	`@Override`
`51`	`51`	`public boolean isSatisfiedBy(BaseDescription supplier) {`
`52`		`- if (!(supplier instanceof BundleDescriptionImpl)) {`
	`52`	`+ if (!(supplier instanceof BundleDescriptionImpl candidate)) {`
`53`	`53`	`return false;`
`54`	`54`	`}`
`55`		`- BundleDescriptionImpl candidate = (BundleDescriptionImpl) supplier;`
`56`	`55`	`if (candidate.getHost() != null) {`
`57`	`56`	`return false;`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,8 +206,7 @@ static StringBuilder addFilterAttribute(StringBuilder filter, String attr, Objec`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`static StringBuilder addFilterAttribute(StringBuilder filter, String attr, Object value, boolean escapeWildCard) {`
`209`		`- if (value instanceof VersionRange) {`
`210`		`- VersionRange range = (VersionRange) value;`
	`209`	`+ if (value instanceof VersionRange range) {`
`211`	`210`	`filter.append(range.toFilterString(attr));`
`212`	`211`	`} else {`
`213`	`212`	`filter.append('(').append(attr).append('=').append(escapeValue(value, escapeWildCard)).append(')');`
Original file line number	Diff line number	Diff line change
`@@ -537,8 +537,7 @@ private Object convertAttribute(Object attr) {`
`537`	`537`	`}`
`538`	`538`
`539`	`539`	`private Object convertScalarAttribute(Object attr) {`
`540`		`- if (attr instanceof org.osgi.framework.Version) {`
`541`		`- org.osgi.framework.Version osgiVer = (org.osgi.framework.Version) attr;`
	`540`	`+ if (attr instanceof org.osgi.framework.Version osgiVer) {`
`542`	`541`	`return Version.createOSGi(osgiVer.getMajor(), osgiVer.getMinor(), osgiVer.getMicro(),`
`543`	`542`	`osgiVer.getQualifier());`
`544`	`543`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,7 @@ public static IInstallableUnit[] createEclipseIU(BundleDescription bd, boolean i`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`private static void addExtraProperties(IInstallableUnit iiu, Map<String, String> extraProperties) {`
`43`		`- if (iiu instanceof InstallableUnit) {`
`44`		`- InstallableUnit iu = (InstallableUnit) iiu;`
`45`		`-`
	`43`	`+ if (iiu instanceof InstallableUnit iu) {`
`46`	`44`	`for (Entry<String, String> entry : extraProperties.entrySet()) {`
`47`	`45`	`iu.setProperty(entry.getKey(), entry.getValue());`
`48`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1022,10 +1022,9 @@ public boolean equals(Object object) {`
`1022`	`1022`	`if (object == this) {`
`1023`	`1023`	`return true;`
`1024`	`1024`	`}`
`1025`		`- if (!(object instanceof RGB)) {`
	`1025`	`+ if (!(object instanceof RGB rgb)) {`
`1026`	`1026`	`return false;`
`1027`	`1027`	`}`
`1028`		`- RGB rgb = (RGB) object;`
`1029`	`1028`	`return (rgb.red == this.red) && (rgb.green == this.green) && (rgb.blue == this.blue);`
`1030`	`1029`	`}`
`1031`	`1030`