From 60d256775b2e6f85c394fa4a62c3100d1e63222b Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Sat, 9 Nov 2024 09:55:50 +0100 Subject: [PATCH] inherit specific processing in enum --- .../fix/UseExplicitEncodingCleanUpCore.java | 2 +- .../fix/UseExplicitEncodingFixCore.java | 2 +- .../fix/helper/AbstractExplicitEncoding.java | 124 +------------- ...ByteArrayOutputStreamExplicitEncoding.java | 2 +- .../corext/fix/helper/ChangeBehavior.java | 158 ++++++++++++++++++ .../ChannelsNewReaderExplicitEncoding.java | 2 +- .../ChannelsNewWriterExplicitEncoding.java | 2 +- .../CharsetForNameExplicitEncoding.java | 2 +- .../helper/FileReaderExplicitEncoding.java | 4 +- .../helper/FileWriterExplicitEncoding.java | 4 +- .../fix/helper/FormatterExplicitEncoding.java | 4 +- .../InputStreamReaderExplicitEncoding.java | 4 +- .../OutputStreamWriterExplicitEncoding.java | 4 +- .../helper/PrintStreamExplicitEncoding.java | 4 +- .../helper/PrintWriterExplicitEncoding.java | 4 +- .../PropertiesStoreToXMLExplicitEncoding.java | 2 +- .../fix/helper/ScannerExplicitEncoding.java | 2 +- .../fix/helper/StringExplicitEncoding.java | 4 +- .../StringGetBytesExplicitEncoding.java | 4 +- .../URLDecoderDecodeExplicitEncoding.java | 2 +- .../URLEncoderEncodeExplicitEncoding.java | 2 +- 21 files changed, 190 insertions(+), 148 deletions(-) create mode 100644 org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChangeBehavior.java diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/UseExplicitEncodingCleanUpCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/UseExplicitEncodingCleanUpCore.java index e9fbd9a2728..810b05245fd 100644 --- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/UseExplicitEncodingCleanUpCore.java +++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/UseExplicitEncodingCleanUpCore.java @@ -37,7 +37,7 @@ import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperation; import org.eclipse.jdt.internal.corext.fix.UseExplicitEncodingFixCore; -import org.eclipse.jdt.internal.corext.fix.helper.AbstractExplicitEncoding.ChangeBehavior; +import org.eclipse.jdt.internal.corext.fix.helper.ChangeBehavior; import org.eclipse.jdt.internal.corext.util.Messages; import org.eclipse.jdt.ui.cleanup.CleanUpContext; diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UseExplicitEncodingFixCore.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UseExplicitEncodingFixCore.java index 34cbdf878bb..d8b83785097 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UseExplicitEncodingFixCore.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UseExplicitEncodingFixCore.java @@ -27,8 +27,8 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperation; import org.eclipse.jdt.internal.corext.fix.helper.AbstractExplicitEncoding; -import org.eclipse.jdt.internal.corext.fix.helper.AbstractExplicitEncoding.ChangeBehavior; import org.eclipse.jdt.internal.corext.fix.helper.ByteArrayOutputStreamExplicitEncoding; +import org.eclipse.jdt.internal.corext.fix.helper.ChangeBehavior; import org.eclipse.jdt.internal.corext.fix.helper.ChannelsNewReaderExplicitEncoding; import org.eclipse.jdt.internal.corext.fix.helper.ChannelsNewWriterExplicitEncoding; import org.eclipse.jdt.internal.corext.fix.helper.CharsetForNameExplicitEncoding; diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/AbstractExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/AbstractExplicitEncoding.java index 9b8da961df3..47ddc549e65 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/AbstractExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/AbstractExplicitEncoding.java @@ -13,11 +13,6 @@ *******************************************************************************/ package org.eclipse.jdt.internal.corext.fix.helper; -import static org.eclipse.jdt.internal.corext.fix.LibStandardNames.METHOD_DEFAULT_CHARSET; -import static org.eclipse.jdt.internal.corext.fix.LibStandardNames.METHOD_DISPLAY_NAME; - -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; import java.util.Set; @@ -29,10 +24,7 @@ import org.eclipse.jdt.core.dom.Block; import org.eclipse.jdt.core.dom.CatchClause; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.core.dom.Expression; -import org.eclipse.jdt.core.dom.FieldAccess; import org.eclipse.jdt.core.dom.MethodDeclaration; -import org.eclipse.jdt.core.dom.MethodInvocation; import org.eclipse.jdt.core.dom.Name; import org.eclipse.jdt.core.dom.SingleVariableDeclaration; import org.eclipse.jdt.core.dom.TryStatement; @@ -43,7 +35,6 @@ import org.eclipse.jdt.core.dom.rewrite.ListRewrite; import org.eclipse.jdt.internal.common.ReferenceHolder; -import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperation; import org.eclipse.jdt.internal.corext.fix.UseExplicitEncodingFixCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -52,6 +43,7 @@ * @param Type found in Visitor */ public abstract class AbstractExplicitEncoding { + private static final String UNSUPPORTED_ENCODING_EXCEPTION= "UnsupportedEncodingException"; //$NON-NLS-1$ static Map encodingmap = Map.of( "UTF-8", "UTF_8", //$NON-NLS-1$ //$NON-NLS-2$ "UTF-16", "UTF_16", //$NON-NLS-1$ //$NON-NLS-2$ @@ -61,128 +53,20 @@ public abstract class AbstractExplicitEncoding { "US-ASCII", "US_ASCII" //$NON-NLS-1$ //$NON-NLS-2$ ); static Set encodings=encodingmap.keySet(); - public enum ChangeBehavior {KEEP_BEHAVIOR, ENFORCE_UTF8, ENFORCE_UTF8_AGGREGATE} - static class Nodedata { public boolean replace; public ASTNode visited; public String encoding; } - protected static final String ENCODING = "encoding"; //$NON-NLS-1$ protected static final String REPLACE = "replace"; //$NON-NLS-1$ public abstract void find(UseExplicitEncodingFixCore fixcore, CompilationUnit compilationUnit, Set operations, Set nodesprocessed, ChangeBehavior cb); - public abstract void rewrite(UseExplicitEncodingFixCore useExplicitEncodingFixCore, T visited, CompilationUnitRewrite cuRewrite, TextEditGroup group, ChangeBehavior cb, ReferenceHolder data); - protected static Expression computeCharsetASTNode(final CompilationUnitRewrite cuRewrite, AST ast, ChangeBehavior cb, String charset) { - Expression callToCharsetDefaultCharset=null; - switch(cb) { - case KEEP_BEHAVIOR: - if(charset!=null) { - callToCharsetDefaultCharset= addCharsetUTF8(cuRewrite, ast,charset); - } else { - // needs Java 1.5 - callToCharsetDefaultCharset= addCharsetComputation(cuRewrite, ast); - } - break; - case ENFORCE_UTF8_AGGREGATE: - /** - * @TODO not implemented - */ - case ENFORCE_UTF8: - // needs Java 1.7 - callToCharsetDefaultCharset= addCharsetUTF8(cuRewrite, ast,charset); - break; - } - return callToCharsetDefaultCharset; - } - - protected static String computeCharsetforPreview(ChangeBehavior cb) { - String insert=""; //$NON-NLS-1$ - switch(cb) { - case KEEP_BEHAVIOR: - insert="Charset.defaultCharset()"; //$NON-NLS-1$ - break; - case ENFORCE_UTF8_AGGREGATE: - // insert="charset_constant"; //$NON-NLS-1$ - //$FALL-THROUGH$ - case ENFORCE_UTF8: - insert="StandardCharsets.UTF_8"; //$NON-NLS-1$ - break; - } - return insert; - } - - /** - * Create access to StandardCharsets.UTF_8, needs Java 1.7 or newer - * - * @param cuRewrite CompilationUnitRewrite - * @param ast AST - * @param charset Charset as String - * @return FieldAccess that returns Charset for UTF_8 - */ - protected static FieldAccess addCharsetUTF8(CompilationUnitRewrite cuRewrite, AST ast, String charset) { - /** - * Add import java.nio.charset.StandardCharsets - available since Java 1.7 - */ - ImportRewrite importRewrite= cuRewrite.getImportRewrite(); - importRewrite.addImport(StandardCharsets.class.getCanonicalName()); - /** - * Add field access to StandardCharsets.UTF_8 - */ - FieldAccess fieldaccess= ast.newFieldAccess(); - fieldaccess.setExpression(ASTNodeFactory.newName(ast, StandardCharsets.class.getSimpleName())); - - fieldaccess.setName(ast.newSimpleName(charset)); - return fieldaccess; - } - /** - * Create call to Charset.defaultCharset(), needs Java 1.5 or newer - * - * @param cuRewrite CompilationUnitRewrite - * @param ast AST - * @return MethodInvocation that returns Charset for platform encoding - */ - protected static MethodInvocation addCharsetComputation(final CompilationUnitRewrite cuRewrite, AST ast) { - /** - * Add import java.nio.charset.Charset - */ - ImportRewrite importRewrite= cuRewrite.getImportRewrite(); - importRewrite.addImport(Charset.class.getCanonicalName()); - /** - * Add call to Charset.defaultCharset() - this is available since Java 1.5 - */ - MethodInvocation firstCall= ast.newMethodInvocation(); - firstCall.setExpression(ASTNodeFactory.newName(ast, Charset.class.getSimpleName())); - firstCall.setName(ast.newSimpleName(METHOD_DEFAULT_CHARSET)); - return firstCall; - } - - /** - * Create call to Charset.defaultCharset().displayName(), needs Java 1.5 or newer - * - * @param cuRewrite CompilationUnitRewrite - * @param ast AST - * @param cb ChangeBehavior - * @param charset Charset as String - * @return MethodInvocation that returns String - */ - protected static MethodInvocation addCharsetStringComputation(final CompilationUnitRewrite cuRewrite, AST ast, ChangeBehavior cb, String charset) { - Expression callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, charset); - /** - * Add second call to Charset.defaultCharset().displayName() - */ - MethodInvocation secondCall= ast.newMethodInvocation(); - secondCall.setExpression(callToCharsetDefaultCharset); - secondCall.setName(ast.newSimpleName(METHOD_DISPLAY_NAME)); - return secondCall; - } - /** * Adds an import to the class. This method should be used for every class reference added to * the generated code. @@ -213,7 +97,7 @@ protected void removeUnsupportedEncodingException(final ASTNode visited, TextEdi ListRewrite throwsRewrite = rewrite.getListRewrite(method, MethodDeclaration.THROWN_EXCEPTION_TYPES_PROPERTY); List thrownExceptions = method.thrownExceptionTypes(); for (Type exceptionType : thrownExceptions) { - if (exceptionType.toString().equals("UnsupportedEncodingException")) { //$NON-NLS-1$ + if (exceptionType.toString().equals(UNSUPPORTED_ENCODING_EXCEPTION)) { throwsRewrite.remove(exceptionType, group); } } @@ -231,7 +115,7 @@ protected void removeUnsupportedEncodingException(final ASTNode visited, TextEdi List types = unionType.types(); types.stream() - .filter(type -> type.toString().equals("UnsupportedEncodingException")) //$NON-NLS-1$ + .filter(type -> type.toString().equals(UNSUPPORTED_ENCODING_EXCEPTION)) .forEach(type -> unionRewrite.remove(type, group)); if (types.size() == 1) { @@ -239,7 +123,7 @@ protected void removeUnsupportedEncodingException(final ASTNode visited, TextEdi } else if (types.isEmpty()) { rewrite.remove(catchClause, group); } - } else if (exceptionType.toString().equals("UnsupportedEncodingException")) { //$NON-NLS-1$ + } else if (exceptionType.toString().equals(UNSUPPORTED_ENCODING_EXCEPTION)) { rewrite.remove(catchClause, group); } } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ByteArrayOutputStreamExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ByteArrayOutputStreamExplicitEncoding.java index 7446f0cc2e4..16787a70a44 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ByteArrayOutputStreamExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ByteArrayOutputStreamExplicitEncoding.java @@ -112,7 +112,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite AST ast= cuRewrite.getRoot().getAST(); ImportRewrite importRewriter= cuRewrite.getImportRewrite(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset().displayName() as second (last) parameter of "toString()" call * Add Charset.defaultCharset() as second (last) parameter diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChangeBehavior.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChangeBehavior.java new file mode 100644 index 00000000000..d54b66d314d --- /dev/null +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChangeBehavior.java @@ -0,0 +1,158 @@ +/******************************************************************************* + * Copyright (c) 2021 Carsten Hammer. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Carsten Hammer + *******************************************************************************/ +package org.eclipse.jdt.internal.corext.fix.helper; + +import static org.eclipse.jdt.internal.corext.fix.LibStandardNames.METHOD_DEFAULT_CHARSET; +import static org.eclipse.jdt.internal.corext.fix.LibStandardNames.METHOD_DISPLAY_NAME; + +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; + +import org.eclipse.jdt.core.dom.AST; +import org.eclipse.jdt.core.dom.Expression; +import org.eclipse.jdt.core.dom.FieldAccess; +import org.eclipse.jdt.core.dom.MethodInvocation; +import org.eclipse.jdt.core.dom.rewrite.ImportRewrite; + +import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory; +import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; + +public enum ChangeBehavior { + KEEP_BEHAVIOR() { + @Override + protected Expression computeCharsetASTNode(final CompilationUnitRewrite cuRewrite, AST ast, String charset) { + Expression callToCharsetDefaultCharset= null; + + if (charset != null) { + callToCharsetDefaultCharset= addCharsetUTF8(cuRewrite, ast, charset); + } else { + // needs Java 1.5 + callToCharsetDefaultCharset= addCharsetComputation(cuRewrite, ast); + } + + return callToCharsetDefaultCharset; + } + + @Override + protected String computeCharsetforPreview() { + String insert= ""; //$NON-NLS-1$ + insert= "Charset.defaultCharset()"; //$NON-NLS-1$ + return insert; + } + }, + ENFORCE_UTF8() { + @Override + protected Expression computeCharsetASTNode(final CompilationUnitRewrite cuRewrite, AST ast, String charset) { + Expression callToCharsetDefaultCharset= null; + // needs Java 1.7 + callToCharsetDefaultCharset= addCharsetUTF8(cuRewrite, ast, charset); + return callToCharsetDefaultCharset; + } + + @Override + protected String computeCharsetforPreview() { + String insert= ""; //$NON-NLS-1$ + insert= "StandardCharsets.UTF_8"; //$NON-NLS-1$ + return insert; + } + }, + ENFORCE_UTF8_AGGREGATE() { + @Override + protected Expression computeCharsetASTNode(final CompilationUnitRewrite cuRewrite, AST ast, String charset) { + Expression callToCharsetDefaultCharset= null; + /** + * @TODO not implemented + */ + return callToCharsetDefaultCharset; + } + + @Override + protected String computeCharsetforPreview() { + String insert= ""; //$NON-NLS-1$ + // insert="charset_constant"; //$NON-NLS-1$ + return insert; + } + }; + + + abstract protected Expression computeCharsetASTNode(final CompilationUnitRewrite cuRewrite, AST ast, String charset); + + abstract protected String computeCharsetforPreview(); + + /** + * Create access to StandardCharsets.UTF_8, needs Java 1.7 or newer + * + * @param cuRewrite CompilationUnitRewrite + * @param ast AST + * @param charset Charset as String + * @return FieldAccess that returns Charset for UTF_8 + */ + protected static FieldAccess addCharsetUTF8(CompilationUnitRewrite cuRewrite, AST ast, String charset) { + /** + * Add import java.nio.charset.StandardCharsets - available since Java 1.7 + */ + ImportRewrite importRewrite= cuRewrite.getImportRewrite(); + importRewrite.addImport(StandardCharsets.class.getCanonicalName()); + /** + * Add field access to StandardCharsets.UTF_8 + */ + FieldAccess fieldaccess= ast.newFieldAccess(); + fieldaccess.setExpression(ASTNodeFactory.newName(ast, StandardCharsets.class.getSimpleName())); + + fieldaccess.setName(ast.newSimpleName(charset)); + return fieldaccess; + } + + /** + * Create call to Charset.defaultCharset(), needs Java 1.5 or newer + * + * @param cuRewrite CompilationUnitRewrite + * @param ast AST + * @return MethodInvocation that returns Charset for platform encoding + */ + protected static MethodInvocation addCharsetComputation(final CompilationUnitRewrite cuRewrite, AST ast) { + /** + * Add import java.nio.charset.Charset + */ + ImportRewrite importRewrite= cuRewrite.getImportRewrite(); + importRewrite.addImport(Charset.class.getCanonicalName()); + /** + * Add call to Charset.defaultCharset() - this is available since Java 1.5 + */ + MethodInvocation firstCall= ast.newMethodInvocation(); + firstCall.setExpression(ASTNodeFactory.newName(ast, Charset.class.getSimpleName())); + firstCall.setName(ast.newSimpleName(METHOD_DEFAULT_CHARSET)); + return firstCall; + } + + /** + * Create call to Charset.defaultCharset().displayName(), needs Java 1.5 or newer + * + * @param cuRewrite CompilationUnitRewrite + * @param ast AST + * @param cb ChangeBehavior + * @param charset Charset as String + * @return MethodInvocation that returns String + */ + protected MethodInvocation addCharsetStringComputation(final CompilationUnitRewrite cuRewrite, AST ast, ChangeBehavior cb, String charset) { + Expression callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, charset); + /** + * Add second call to Charset.defaultCharset().displayName() + */ + MethodInvocation secondCall= ast.newMethodInvocation(); + secondCall.setExpression(callToCharsetDefaultCharset); + secondCall.setName(ast.newSimpleName(METHOD_DISPLAY_NAME)); + return secondCall; + } +} diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewReaderExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewReaderExplicitEncoding.java index 2770f9485bc..ddc39cd960f 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewReaderExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewReaderExplicitEncoding.java @@ -89,7 +89,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite AST ast= cuRewrite.getRoot().getAST(); ImportRewrite importRewriter= cuRewrite.getImportRewrite(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() as second (last) parameter */ diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewWriterExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewWriterExplicitEncoding.java index b58960c4e4b..975b52943f2 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewWriterExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ChannelsNewWriterExplicitEncoding.java @@ -87,7 +87,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite AST ast= cuRewrite.getRoot().getAST(); ImportRewrite importRewriter= cuRewrite.getImportRewrite(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() as second (last) parameter */ diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/CharsetForNameExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/CharsetForNameExplicitEncoding.java index 07a028631ca..8d2d00e97c3 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/CharsetForNameExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/CharsetForNameExplicitEncoding.java @@ -81,7 +81,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite TextEditGroup group,ChangeBehavior cb, ReferenceHolder data) { ASTRewrite rewrite= cuRewrite.getASTRewrite(); AST ast= cuRewrite.getRoot().getAST(); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, (String) data.get(visited)); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, (String) data.get(visited)); ASTNodes.replaceButKeepComment(rewrite, visited, callToCharsetDefaultCharset, group); } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FileReaderExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FileReaderExplicitEncoding.java index 534fc18a0c9..716f77f371a 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FileReaderExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FileReaderExplicitEncoding.java @@ -81,7 +81,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v TextEditGroup group,ChangeBehavior cb, ReferenceHolder data) { ASTRewrite rewrite= cuRewrite.getASTRewrite(); AST ast= cuRewrite.getRoot().getAST(); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, (String) data.get(visited)); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, (String) data.get(visited)); /** * new FileInputStream() */ @@ -102,7 +102,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v @Override public String getPreview(boolean afterRefactoring,ChangeBehavior cb) { if(afterRefactoring) { - return "Reader r=new InputStreamReader(new FileInputStream(inputfile),"+computeCharsetforPreview(cb)+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ + return "Reader r=new InputStreamReader(new FileInputStream(inputfile),"+cb.computeCharsetforPreview()+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ } return "Reader r=new FileReader(inputfile);\n"; //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FileWriterExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FileWriterExplicitEncoding.java index 8fc4de0bc83..d6ea6e87557 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FileWriterExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FileWriterExplicitEncoding.java @@ -61,7 +61,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v TextEditGroup group,ChangeBehavior cb, ReferenceHolder data) { ASTRewrite rewrite= cuRewrite.getASTRewrite(); AST ast= cuRewrite.getRoot().getAST(); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, (String) data.get(visited)); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, (String) data.get(visited)); /** * new FileInputStream() */ @@ -82,7 +82,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v @Override public String getPreview(boolean afterRefactoring,ChangeBehavior cb) { if(afterRefactoring) { - return "Writer w=new OutputStreamWriter(new FileOutputStream(outputfile),"+computeCharsetforPreview(cb)+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ + return "Writer w=new OutputStreamWriter(new FileOutputStream(outputfile),"+cb.computeCharsetforPreview()+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ } return "Writer w=new FileWriter(outputfile);\n"; //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FormatterExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FormatterExplicitEncoding.java index d56dfaef2d2..6f7323890dd 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FormatterExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/FormatterExplicitEncoding.java @@ -118,7 +118,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v AST ast= cuRewrite.getRoot().getAST(); ImportRewrite importRewriter= cuRewrite.getImportRewrite(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() as second (last) parameter */ @@ -134,7 +134,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v @Override public String getPreview(boolean afterRefactoring,ChangeBehavior cb) { if(afterRefactoring) { - return "Formatter r=new java.util.Formatter(out, "+computeCharsetforPreview(cb)+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ + return "Formatter r=new java.util.Formatter(out, "+cb.computeCharsetforPreview()+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ } return "Formatter r=new java.util.Formatter(out);\n"; //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/InputStreamReaderExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/InputStreamReaderExplicitEncoding.java index 6e4c78435c3..333b906b671 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/InputStreamReaderExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/InputStreamReaderExplicitEncoding.java @@ -90,7 +90,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v ASTRewrite rewrite= cuRewrite.getASTRewrite(); AST ast= cuRewrite.getRoot().getAST(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() as second (last) parameter */ @@ -105,7 +105,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v @Override public String getPreview(boolean afterRefactoring,ChangeBehavior cb) { if(afterRefactoring) { - return "Reader r=new InputStreamReader(in, "+computeCharsetforPreview(cb)+");\nInputStreamReader is=new InputStreamReader(new FileInputStream(\"\"), \"UTF-8\");\n"; //$NON-NLS-1$ //$NON-NLS-2$ + return "Reader r=new InputStreamReader(in, "+cb.computeCharsetforPreview()+");\nInputStreamReader is=new InputStreamReader(new FileInputStream(\"\"), \"UTF-8\");\n"; //$NON-NLS-1$ //$NON-NLS-2$ } return "Reader r=new InputStreamReader(in);\nInputStreamReader is=new InputStreamReader(new FileInputStream(\"\"), StandardCharsets.UTF_8);\n"; //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/OutputStreamWriterExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/OutputStreamWriterExplicitEncoding.java index d498a5685fe..2b9aea86d2c 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/OutputStreamWriterExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/OutputStreamWriterExplicitEncoding.java @@ -102,7 +102,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v ASTRewrite rewrite= cuRewrite.getASTRewrite(); AST ast= cuRewrite.getRoot().getAST(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() as second (last) parameter */ @@ -117,7 +117,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v @Override public String getPreview(boolean afterRefactoring,ChangeBehavior cb) { if(afterRefactoring) { - return "Writer w = new OutputStreamWriter(out, "+computeCharsetforPreview(cb)+");\nOutputStreamWriter os=new OutputStreamWriter(new FileOutputStream(\"\"), StandardCharsets.UTF_8);\n"; //$NON-NLS-1$ //$NON-NLS-2$ + return "Writer w = new OutputStreamWriter(out, "+cb.computeCharsetforPreview()+");\nOutputStreamWriter os=new OutputStreamWriter(new FileOutputStream(\"\"), StandardCharsets.UTF_8);\n"; //$NON-NLS-1$ //$NON-NLS-2$ } return "Writer w = new OutputStreamWriter(out);\nOutputStreamWriter os=new OutputStreamWriter(new FileOutputStream(\"\"), \"UTF-8\");\n"; //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PrintStreamExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PrintStreamExplicitEncoding.java index d676abcdf6d..55b5f5907b5 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PrintStreamExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PrintStreamExplicitEncoding.java @@ -98,7 +98,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v TextEditGroup group,ChangeBehavior cb, ReferenceHolder data) { ASTRewrite rewrite= cuRewrite.getASTRewrite(); AST ast= cuRewrite.getRoot().getAST(); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, (String) data.get(visited)); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, (String) data.get(visited)); /** * new FileOutputStream() */ @@ -125,7 +125,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v @Override public String getPreview(boolean afterRefactoring,ChangeBehavior cb) { if(afterRefactoring) { - return "Stream w=new PrintStream(\"out.txt\","+computeCharsetforPreview(cb)+"));\n"+ //$NON-NLS-1$ //$NON-NLS-2$ + return "Stream w=new PrintStream(\"out.txt\","+cb.computeCharsetforPreview()+"));\n"+ //$NON-NLS-1$ //$NON-NLS-2$ "Stream w=new PrintStream(\"out.txt\",StandardCharsets.UTF_8));\n"+ //$NON-NLS-1$ "Stream w=new PrintStream(new File(\"out.txt\"),StandardCharsets.UTF_8));\n"; //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PrintWriterExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PrintWriterExplicitEncoding.java index 075acf9db0a..4b21f3d58e4 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PrintWriterExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PrintWriterExplicitEncoding.java @@ -77,7 +77,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v TextEditGroup group,ChangeBehavior cb, ReferenceHolder data) { ASTRewrite rewrite= cuRewrite.getASTRewrite(); AST ast= cuRewrite.getRoot().getAST(); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, (String) data.get(visited)); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, (String) data.get(visited)); /** * new FileOutputStream() */ @@ -104,7 +104,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v @Override public String getPreview(boolean afterRefactoring,ChangeBehavior cb) { if(afterRefactoring) { - return "Writer w=new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputfile),"+computeCharsetforPreview(cb)+"));\n"; //$NON-NLS-1$ //$NON-NLS-2$ + return "Writer w=new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputfile),"+cb.computeCharsetforPreview()+"));\n"; //$NON-NLS-1$ //$NON-NLS-2$ } return "Writer w=new PrintWriter(outputfile);\n"; //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PropertiesStoreToXMLExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PropertiesStoreToXMLExplicitEncoding.java index b9521f09c8b..5d6853064b0 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PropertiesStoreToXMLExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/PropertiesStoreToXMLExplicitEncoding.java @@ -102,7 +102,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite AST ast= cuRewrite.getRoot().getAST(); ImportRewrite importRewriter= cuRewrite.getImportRewrite(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add StandardCharsets.UTF_8 as third (last) parameter */ diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ScannerExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ScannerExplicitEncoding.java index a9d16011c37..9c5e94e7d7d 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ScannerExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/ScannerExplicitEncoding.java @@ -116,7 +116,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v ASTRewrite rewrite= cuRewrite.getASTRewrite(); AST ast= cuRewrite.getRoot().getAST(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() as second (last) parameter */ diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/StringExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/StringExplicitEncoding.java index 0e65bf4c8c7..d0582506664 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/StringExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/StringExplicitEncoding.java @@ -112,7 +112,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v AST ast= cuRewrite.getRoot().getAST(); ImportRewrite importRewriter= cuRewrite.getImportRewrite(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() as second (last) parameter */ @@ -128,7 +128,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final ClassInstanceCreation v @Override public String getPreview(boolean afterRefactoring,ChangeBehavior cb) { if(afterRefactoring) { - return "String s=new String(byte[],"+computeCharsetforPreview(cb)+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ + return "String s=new String(byte[],"+cb.computeCharsetforPreview()+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ } return "String s=new String(byte[],\"UTF-8\");\n"; //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/StringGetBytesExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/StringGetBytesExplicitEncoding.java index 11a5b7c2988..7f4db14bb7b 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/StringGetBytesExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/StringGetBytesExplicitEncoding.java @@ -91,7 +91,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite AST ast= cuRewrite.getRoot().getAST(); ImportRewrite importRewriter= cuRewrite.getImportRewrite(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() as second (last) parameter */ @@ -108,7 +108,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite public String getPreview(boolean afterRefactoring,ChangeBehavior cb) { if(afterRefactoring) { return "String s=\"asdf\";\n"+ //$NON-NLS-1$ - "byte[] bytes= s.getBytes("+computeCharsetforPreview(cb)+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ + "byte[] bytes= s.getBytes("+cb.computeCharsetforPreview()+");\n"; //$NON-NLS-1$ //$NON-NLS-2$ } return "String s=\"asdf\";\n"+ //$NON-NLS-1$ "byte[] bytes= s.getBytes();\n"; //$NON-NLS-1$ diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/URLDecoderDecodeExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/URLDecoderDecodeExplicitEncoding.java index 739f5f32e9c..d5fa37a0d8a 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/URLDecoderDecodeExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/URLDecoderDecodeExplicitEncoding.java @@ -119,7 +119,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite AST ast= cuRewrite.getRoot().getAST(); ImportRewrite importRewriter= cuRewrite.getImportRewrite(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() or StandardCharsets.UTF_8 as second (last) parameter */ diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/URLEncoderEncodeExplicitEncoding.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/URLEncoderEncodeExplicitEncoding.java index 68fece6fa9e..75218ba4ceb 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/URLEncoderEncodeExplicitEncoding.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/helper/URLEncoderEncodeExplicitEncoding.java @@ -119,7 +119,7 @@ public void rewrite(UseExplicitEncodingFixCore upp,final MethodInvocation visite AST ast= cuRewrite.getRoot().getAST(); ImportRewrite importRewriter= cuRewrite.getImportRewrite(); Nodedata nodedata= (Nodedata) data.get(visited); - ASTNode callToCharsetDefaultCharset= computeCharsetASTNode(cuRewrite, ast, cb, nodedata.encoding); + ASTNode callToCharsetDefaultCharset= cb.computeCharsetASTNode(cuRewrite, ast, nodedata.encoding); /** * Add Charset.defaultCharset() as second (last) parameter */