fix preview method

eclipse-jdt · Sep 11, 2024 · 84199ae · 84199ae
1 parent 31c7bdc
commit 84199ae
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 13 deletions.
diff --git a/...e.manipulation/common/org/eclipse/jdt/internal/ui/fix/UseExplicitEncodingCleanUpCore.java b/...e.manipulation/common/org/eclipse/jdt/internal/ui/fix/UseExplicitEncodingCleanUpCore.java
@@ -51,12 +51,13 @@ public UseExplicitEncodingCleanUpCore(final Map<String, String> options) {
 	public UseExplicitEncodingCleanUpCore() {
 	}
 
+	@Override
 	public CleanUpRequirements getRequirements() {
 		return new CleanUpRequirements(requireAST(), false, false, null);
 	}
 
 	public boolean requireAST() {
-		return isEnabled(EXPLICITENCODING_CLEANUP);
+		return isEnabled(EXPLICITENCODING_CLEANUP)&& !computeFixSet().isEmpty();
 	}
 	@Override
 	public ICleanUpFix createFix(final CleanUpContext context) throws CoreException {

diff --git a/...tension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewReaderExplicitEncoding.java b/...tension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewReaderExplicitEncoding.java
@@ -101,10 +101,10 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite
 	@Override
 	public String getPreview(boolean afterRefactoring,ChangeBehavior cb) {
 		if(afterRefactoring) {
-			return "Reader r=\"Channels.newReader(ch,StandardCharsets.UTF_8)\";\n"+ //$NON-NLS-1$
+			return "Reader r=Channels.newReader(ch,StandardCharsets.UTF_8);\n"+ //$NON-NLS-1$
 					""; //$NON-NLS-1$
 		}
-		return "Reader r=\"Channels.newReader(ch,\"UTF-8\")\";\n"+ //$NON-NLS-1$
+		return "Reader r=Channels.newReader(ch,\"UTF-8\");\n"+ //$NON-NLS-1$
 		""; //$NON-NLS-1$
 	}
 }
diff --git a/...tension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewWriterExplicitEncoding.java b/...tension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewWriterExplicitEncoding.java
@@ -99,10 +99,10 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite
 	@Override
 	public String getPreview(boolean afterRefactoring,ChangeBehavior cb) {
 		if(afterRefactoring) {
-			return "Writer w=\"Channels.newWriter(ch, StandardCharsets.UTF_8)\";\n"+ //$NON-NLS-1$
+			return "Writer w=Channels.newWriter(ch, StandardCharsets.UTF_8);\n"+ //$NON-NLS-1$
 					""; //$NON-NLS-1$
 		}
-		return "Writer w=\"Channels.newWriter(ch, \"UTF-8\")\";\n"+ //$NON-NLS-1$
+		return "Writer w=Channels.newWriter(ch, \"UTF-8\");\n"+ //$NON-NLS-1$
 		""; //$NON-NLS-1$
 	}
 }
diff --git a/... extension/org/eclipse/jdt/internal/corext/fix/helper/CharsetForNameExplicitEncoding.java b/... extension/org/eclipse/jdt/internal/corext/fix/helper/CharsetForNameExplicitEncoding.java
@@ -94,10 +94,10 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite
 	@Override
 	public String getPreview(boolean afterRefactoring,ChangeBehavior cb) {
 		if(afterRefactoring) {
-			return "Charset s=\"StandardCharsets.UTF_8\";\n"+ //$NON-NLS-1$
+			return "Charset s=StandardCharsets.UTF_8;\n"+ //$NON-NLS-1$
 					""; //$NON-NLS-1$
 		}
-		return "Charset s=\"Charset.forName(\"UTF-8\")\";\n"+ //$NON-NLS-1$
+		return "Charset s=Charset.forName(\"UTF-8\");\n"+ //$NON-NLS-1$
 		""; //$NON-NLS-1$
 	}
 }
diff --git a/...sion/org/eclipse/jdt/internal/corext/fix/helper/PropertiesStoreToXMLExplicitEncoding.java b/...sion/org/eclipse/jdt/internal/corext/fix/helper/PropertiesStoreToXMLExplicitEncoding.java
@@ -107,10 +107,10 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite
 	@Override
 	public String getPreview(boolean afterRefactoring,ChangeBehavior cb) {
 		if(afterRefactoring) {
-			return "Properties p=\"new Properties()\";\n"+ //$NON-NLS-1$
+			return "Properties p=new Properties();\n"+ //$NON-NLS-1$
 					"p.storeToXML(java.io.OutputStream,String,"+computeCharsetforPreview(cb)+");\n"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
-		return "Properties p=\"new Properties()\";\n"+ //$NON-NLS-1$
+		return "Properties p=new Properties();\n"+ //$NON-NLS-1$
 		"p.storeToXML(java.io.OutputStream,String,\"UTF-8\");\n"; //$NON-NLS-1$
 	}
 }
diff --git a/...xtension/org/eclipse/jdt/internal/corext/fix/helper/URLDecoderDecodeExplicitEncoding.java b/...xtension/org/eclipse/jdt/internal/corext/fix/helper/URLDecoderDecodeExplicitEncoding.java
@@ -98,10 +98,10 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite
 	@Override
 	public String getPreview(boolean afterRefactoring,ChangeBehavior cb) {
 		if(afterRefactoring) {
-			return "\"java.net.URLDecoder.decode(\"asdf\", StandardCharsets.UTF_8)\";\n"+ //$NON-NLS-1$
+			return "java.net.URLDecoder.decode(\"asdf\", StandardCharsets.UTF_8);\n"+ //$NON-NLS-1$
 					""; //$NON-NLS-1$
 		}
-		return "\"java.net.URLDecoder.decode(\"asdf\", \"UTF-8\")\";\n"+ //$NON-NLS-1$
+		return "java.net.URLDecoder.decode(\"asdf\", \"UTF-8\");\n"+ //$NON-NLS-1$
 		""; //$NON-NLS-1$
 	}
 }
diff --git a/...xtension/org/eclipse/jdt/internal/corext/fix/helper/URLEncoderEncodeExplicitEncoding.java b/...xtension/org/eclipse/jdt/internal/corext/fix/helper/URLEncoderEncodeExplicitEncoding.java
@@ -98,10 +98,10 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite
 	@Override
 	public String getPreview(boolean afterRefactoring,ChangeBehavior cb) {
 		if(afterRefactoring) {
-			return "\"java.net.URLEncoder.encode(\"asdf\", StandardCharsets.UTF_8)\";\n"+ //$NON-NLS-1$
+			return "java.net.URLEncoder.encode(\"asdf\", StandardCharsets.UTF_8);\n"+ //$NON-NLS-1$
 					""; //$NON-NLS-1$
 		}
-		return "\"java.net.URLEncoder.encode(\"asdf\", \"UTF-8\")\";\n"+ //$NON-NLS-1$
+		return "java.net.URLEncoder.encode(\"asdf\", \"UTF-8\");\n"+ //$NON-NLS-1$
 		""; //$NON-NLS-1$
 	}
 }
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UseExplicitEncodingCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UseExplicitEncodingCleanUp.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.ui.fix;
 
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -25,4 +26,8 @@ public class UseExplicitEncodingCleanUp extends AbstractCleanUpCoreWrapper<UseEx
 	public UseExplicitEncodingCleanUp(final Map<String, String> options) {
 		super(options, new UseExplicitEncodingCleanUpCore());
 	}
+
+	public UseExplicitEncodingCleanUp() {
+		this(Collections.EMPTY_MAP);
+	}
 }