Perform clean code of ds/org.eclipse.pde.ds.annotations

Author: eclipse-pde-bot

ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/AnnotationVisitor.java

@@ -316,11 +316,10 @@ public boolean visit(AnnotationTypeDeclaration node) {
 
 	private Annotation findComponentAnnotation(AbstractTypeDeclaration type) {
 		for (Object item : type.modifiers()) {
-			if (!(item instanceof Annotation)) {
+			if (!(item instanceof Annotation annotation)) {
 				continue;
 			}
 
-			Annotation annotation = (Annotation) item;
 			IAnnotationBinding annotationBinding = annotation.resolveAnnotationBinding();
 			if (annotationBinding == null) {
 				if (debug.isDebugging()) {
@@ -670,8 +669,7 @@ private void processComponent(IDSModel model, TypeDeclaration type, ITypeBinding
 			configPid = (String) value;
 			validateComponentConfigPID(annotation, configPid, -1);
 			requiredVersion = DSAnnotationVersion.V1_2;
-		} else if (DSAnnotationVersion.V1_3.isEqualOrHigherThan(specVersion) && value instanceof Object[]) {
-			Object[] configPidElems = (Object[]) value;
+		} else if (DSAnnotationVersion.V1_3.isEqualOrHigherThan(specVersion) && value instanceof Object[] configPidElems) {
 			if (configPidElems.length > 0) {
 				LinkedHashSet<String> configPids = new LinkedHashSet<>(configPidElems.length);
 				HashMap<String, Integer> pidDuplicates = errorLevel.isIgnore() ? null : new HashMap<>(configPidElems.length);
@@ -901,11 +899,10 @@ private void processComponent(IDSModel model, TypeDeclaration type, ITypeBinding
 		if (DSAnnotationVersion.V1_3.isEqualOrHigherThan(specVersion)) {
 			for (FieldDeclaration field : type.getFields()) {
 				for (Object modifier : field.modifiers()) {
-					if (!(modifier instanceof Annotation)) {
+					if (!(modifier instanceof Annotation fieldAnnotation)) {
 						continue;
 					}
 
-					Annotation fieldAnnotation = (Annotation) modifier;
 					IAnnotationBinding fieldAnnotationBinding = fieldAnnotation.resolveAnnotationBinding();
 					if (fieldAnnotationBinding == null) {
 						if (debug.isDebugging()) {
@@ -1006,11 +1003,10 @@ private void processComponent(IDSModel model, TypeDeclaration type, ITypeBinding
 
 		for (MethodDeclaration method : type.getMethods()) {
 			for (Object modifier : method.modifiers()) {
-				if (!(modifier instanceof Annotation)) {
+				if (!(modifier instanceof Annotation methodAnnotation)) {
 					continue;
 				}
 
-				Annotation methodAnnotation = (Annotation) modifier;
 				IAnnotationBinding methodAnnotationBinding = methodAnnotation.resolveAnnotationBinding();
 				if (methodAnnotationBinding == null) {
 					if (debug.isDebugging()) {
@@ -1564,8 +1560,7 @@ private <T extends IDSSingleProperty> void updateProperties(IDSModel model, Type
 	private String[] collectProperties(String key, Map<String, ?> params) {
 		Object value = params.get(key);
 		String[] properties;
-		if (value instanceof Object[]) { // $NON-NLS-1$
-			Object[] elements = (Object[]) value;
+		if (value instanceof Object[] elements) { // $NON-NLS-1$
 			ArrayList<String> list = new ArrayList<>(elements.length);
 			for (Object element : elements) {
 				if (element instanceof String) {
@@ -1624,8 +1619,7 @@ private String[] collectPropertiesFiles(String key, ITypeBinding typeBinding, An
 			Map<String, ?> params) {
 		Object value = params.get(key);
 		String[] propertyFiles;
-		if (value instanceof Object[]) { // $NON-NLS-1$
-			Object[] elements = (Object[]) value;
+		if (value instanceof Object[] elements) { // $NON-NLS-1$
 			ArrayList<String> list = new ArrayList<>(elements.length);
 			for (Object element : elements) {
 				if (element instanceof String) {

ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/ProblemReporter.java

@@ -73,8 +73,7 @@ public void reportProblem(Annotation annotation, String member, int valueIndex,
 		int start = element.getStartPosition();
 		int length = element.getLength();
 
-		if (valueIndex >= 0 && element instanceof ArrayInitializer) {
-			ArrayInitializer ai = (ArrayInitializer) element;
+		if (valueIndex >= 0 && element instanceof ArrayInitializer ai) {
 			if (valueIndex < ai.expressions().size()) {
 				Expression expression = (Expression) ai.expressions().get(valueIndex);
 				start = expression.getStartPosition();