Minor tweaks

eclipse-jdt · Sep 25, 2024 · 2843350 · 2843350
1 parent a30b50d
commit 2843350
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/...oposals/org/eclipse/jdt/internal/ui/text/correction/SuppressWarningsBaseSubProcessor.java b/...oposals/org/eclipse/jdt/internal/ui/text/correction/SuppressWarningsBaseSubProcessor.java
@@ -233,24 +233,6 @@ public void getRemoveUnusedSuppressWarningProposals(IInvocationContext context,
 		}
 
 		ASTNode parent= coveringNode.getParent();
-//
-//		ASTRewrite rewrite= ASTRewrite.create(coveringNode.getAST());
-//		if (parent instanceof SingleMemberAnnotation) {
-//			rewrite.remove(parent, null);
-//		} else if (parent instanceof NormalAnnotation) {
-//			NormalAnnotation annot= (NormalAnnotation) parent;
-//			if (annot.values().size() == 1) {
-//				rewrite.remove(annot, null);
-//			} else {
-//				rewrite.remove(coveringNode, null);
-//			}
-//		} else if (parent instanceof ArrayInitializer) {
-//			rewrite.remove(coveringNode, null);
-//		} else {
-//			return;
-//		}
-//		String label= Messages.format(CorrectionMessages.SuppressWarningsSubProcessor_remove_annotation_label, literal.getLiteralValue());
-//		T proposal= createASTRewriteCorrectionProposal(label, context.getCompilationUnit(), rewrite, IProposalRelevance.REMOVE_ANNOTATION);
 		if (!(parent instanceof SingleMemberAnnotation) && !(parent instanceof NormalAnnotation) && !(parent instanceof ArrayInitializer)) {
 			return;
 		}

diff --git a/...e.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SuppressWarningsSubProcessor.java b/...e.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/SuppressWarningsSubProcessor.java
@@ -81,9 +81,7 @@ protected ICommandAccess createASTRewriteCorrectionProposal(String name, ICompil
 	protected ICommandAccess createFixCorrectionProposal(IProposableFix fix, ICleanUp cleanUp, int relevance, IInvocationContext context) {
 		// Initialize as default image, though it should always trigger one of the two if statements below
 		Image image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
-		if(relevance == IProposalRelevance.FIX_SUPPRESS_TOKEN) {
-			image = JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
-		} else if (relevance == IProposalRelevance.REMOVE_ANNOTATION) {
+		if (relevance == IProposalRelevance.REMOVE_ANNOTATION) {
 			image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_DELETE);
 		}
 		FixCorrectionProposal proposal= new FixCorrectionProposal(fix, cleanUp, relevance, image, context);