From d11adcfa6c819430e06e1418619e8f06c88a60d1 Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Thu, 5 Sep 2024 21:07:06 +0200 Subject: [PATCH 1/2] dogfooding - if else to switch cleanup (#1567) * dogfooding - if else to switch cleanup --- org.eclipse.jdt.bcoview.feature/feature.xml | 2 +- org.eclipse.jdt.bcoview/META-INF/MANIFEST.MF | 2 +- org.eclipse.jdt.bcoview/pom.xml | 2 +- .../bcoview/asm/CommentedClassVisitor.java | 21 +- .../bcoview/views/BytecodeOutlineView.java | 24 +- .../CoreJavaDocSnippetStringEvaluator.java | 18 +- .../javadoc/CoreJavadocAccessImpl.java | 94 ++--- .../jdt/internal/ui/dialogs/StatusInfo.java | 28 +- .../UnresolvedElementsBaseSubProcessor.java | 44 ++- .../corext/fix/UnusedCodeFixCore.java | 264 +++++++------- .../corext/refactoring/code/CallInliner.java | 116 +++--- .../refactoring/code/SourceProvider.java | 20 +- org.eclipse.jdt.junit/META-INF/MANIFEST.MF | 2 +- .../junit/ui/JUnitClasspathFixProcessor.java | 25 +- .../internal/ui/dialogs/TypeInfoViewer.java | 32 +- .../jdt/internal/ui/actions/IndentAction.java | 194 +++++----- .../formatter/FormatterModifyDialog.java | 57 +-- .../ui/text/ContentAssistPreference.java | 71 ++-- .../JavaDocSnippetStringEvaluator.java | 18 +- .../buildpaths/CPListLabelProvider.java | 343 +++++++++--------- .../buildpaths/LibrariesWorkbookPage.java | 106 +++--- .../SourceContainerWorkbookPage.java | 69 ++-- .../DynamicSourcesWorkingSetUpdater.java | 50 +-- .../ui/workingsets/WorkingSetModel.java | 45 ++- .../ui/actions/ExternalizeStringsAction.java | 74 ++-- 25 files changed, 958 insertions(+), 763 deletions(-) diff --git a/org.eclipse.jdt.bcoview.feature/feature.xml b/org.eclipse.jdt.bcoview.feature/feature.xml index 4dd7af3f66a..31f3ad306d2 100644 --- a/org.eclipse.jdt.bcoview.feature/feature.xml +++ b/org.eclipse.jdt.bcoview.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jdt.bcoview/META-INF/MANIFEST.MF b/org.eclipse.jdt.bcoview/META-INF/MANIFEST.MF index ce08584a6ad..436c9f9cb7e 100644 --- a/org.eclipse.jdt.bcoview/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.bcoview/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.bcoview;singleton:=true -Bundle-Version: 1.2.500.qualifier +Bundle-Version: 1.2.600.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.jdt.bcoview.BytecodeOutlinePlugin Bundle-Vendor: %providerName diff --git a/org.eclipse.jdt.bcoview/pom.xml b/org.eclipse.jdt.bcoview/pom.xml index 78c47e6a373..acb05a03870 100644 --- a/org.eclipse.jdt.bcoview/pom.xml +++ b/org.eclipse.jdt.bcoview/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jdt org.eclipse.jdt.bcoview - 1.2.500-SNAPSHOT + 1.2.600-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.jdt.bcoview/src/org/eclipse/jdt/bcoview/asm/CommentedClassVisitor.java b/org.eclipse.jdt.bcoview/src/org/eclipse/jdt/bcoview/asm/CommentedClassVisitor.java index 6eeca2ba44c..300872ac345 100644 --- a/org.eclipse.jdt.bcoview/src/org/eclipse/jdt/bcoview/asm/CommentedClassVisitor.java +++ b/org.eclipse.jdt.bcoview/src/org/eclipse/jdt/bcoview/asm/CommentedClassVisitor.java @@ -212,14 +212,19 @@ protected void appendDescriptor(StringBuilder buf1, int type, String desc, boole } break; case FIELD_DESCRIPTOR: - if ("T".equals(desc)) { //$NON-NLS-1$ - buf1.append("top"); //$NON-NLS-1$ - } else if ("N".equals(desc)) { //$NON-NLS-1$ - buf1.append("null"); //$NON-NLS-1$ - } else if ("U".equals(desc)) { //$NON-NLS-1$ - buf1.append("uninitialized_this"); //$NON-NLS-1$ - } else { - buf1.append(getSimpleName(Type.getType(desc))); + switch (desc) { + case "T": //$NON-NLS-1$ + buf1.append("top"); //$NON-NLS-1$ + break; + case "N": //$NON-NLS-1$ + buf1.append("null"); //$NON-NLS-1$ + break; + case "U": //$NON-NLS-1$ + buf1.append("uninitialized_this"); //$NON-NLS-1$ + break; + default: + buf1.append(getSimpleName(Type.getType(desc))); + break; } break; diff --git a/org.eclipse.jdt.bcoview/src/org/eclipse/jdt/bcoview/views/BytecodeOutlineView.java b/org.eclipse.jdt.bcoview/src/org/eclipse/jdt/bcoview/views/BytecodeOutlineView.java index 834b5a992fe..4e878723de8 100644 --- a/org.eclipse.jdt.bcoview/src/org/eclipse/jdt/bcoview/views/BytecodeOutlineView.java +++ b/org.eclipse.jdt.bcoview/src/org/eclipse/jdt/bcoview/views/BytecodeOutlineView.java @@ -1634,15 +1634,21 @@ public ToggleOrientationAction(int orientation) { super("", AS_RADIO_BUTTON); //$NON-NLS-1$ String symbolicName = BytecodeOutlinePlugin.getDefault().getBundle().getSymbolicName(); - if (orientation == VIEW_ORIENTATION_HORIZONTAL) { - setText(Messages.BytecodeOutlineView_toggle_horizontal_label); - setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(symbolicName, "icons/th_horizontal.gif")); //$NON-NLS-1$ - } else if (orientation == VIEW_ORIENTATION_VERTICAL) { - setText(Messages.BytecodeOutlineView_toggle_vertical_label); - setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(symbolicName, "icons/th_vertical.gif")); //$NON-NLS-1$ - } else if (orientation == VIEW_ORIENTATION_AUTOMATIC) { - setText(Messages.BytecodeOutlineView_toggle_automatic_label); - setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(symbolicName, "icons/th_automatic.gif")); //$NON-NLS-1$ + switch (orientation) { + case VIEW_ORIENTATION_HORIZONTAL: + setText(Messages.BytecodeOutlineView_toggle_horizontal_label); + setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(symbolicName, "icons/th_horizontal.gif")); //$NON-NLS-1$ + break; + case VIEW_ORIENTATION_VERTICAL: + setText(Messages.BytecodeOutlineView_toggle_vertical_label); + setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(symbolicName, "icons/th_vertical.gif")); //$NON-NLS-1$ + break; + case VIEW_ORIENTATION_AUTOMATIC: + setText(Messages.BytecodeOutlineView_toggle_automatic_label); + setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(symbolicName, "icons/th_automatic.gif")); //$NON-NLS-1$ + break; + default: + break; } actionOrientation = orientation; } diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/internal/javadoc/CoreJavaDocSnippetStringEvaluator.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/internal/javadoc/CoreJavaDocSnippetStringEvaluator.java index cf3890cd165..65a5a74585e 100644 --- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/internal/javadoc/CoreJavaDocSnippetStringEvaluator.java +++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/internal/javadoc/CoreJavaDocSnippetStringEvaluator.java @@ -184,12 +184,18 @@ protected String getModifiedString(String str, List tags) { String modifiedStr= str; for (TagElement tag : tags) { String name= tag.getTagName(); - if (TagElement.TAG_HIGHLIGHT.equals(name)) { - handleSnippetHighlight(modifiedStr, tag, actionElements); - } else if (TagElement.TAG_REPLACE.equals(name)) { - modifiedStr= handleSnippetReplace(modifiedStr, tag, actionElements); - } else if (TagElement.TAG_LINK.equals(name)) { - handleSnippetLink(modifiedStr, tag, actionElements); + switch (name) { + case TagElement.TAG_HIGHLIGHT: + handleSnippetHighlight(modifiedStr, tag, actionElements); + break; + case TagElement.TAG_REPLACE: + modifiedStr= handleSnippetReplace(modifiedStr, tag, actionElements); + break; + case TagElement.TAG_LINK: + handleSnippetLink(modifiedStr, tag, actionElements); + break; + default: + break; } } return getString(modifiedStr, actionElements); diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/internal/javadoc/CoreJavadocAccessImpl.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/internal/javadoc/CoreJavadocAccessImpl.java index 448874f081f..ff7ef412cad 100644 --- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/internal/javadoc/CoreJavadocAccessImpl.java +++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/core/manipulation/internal/javadoc/CoreJavadocAccessImpl.java @@ -1137,58 +1137,66 @@ protected boolean handleInheritDoc(TagElement node) { CharSequence inherited= fJavadocLookup.getInheritedMainDescription(fMethod); return handleInherited(inherited); - } else if (TagElement.TAG_PARAM.equals(blockTagName)) { - List fragments= blockTag.fragments(); - int size= fragments.size(); - if (size > 0) { - Object first= fragments.get(0); - if (first instanceof SimpleName) { - String name= ((SimpleName) first).getIdentifier(); - String[] parameterNames= fMethod.getParameterNames(); - for (int i= 0; i < parameterNames.length; i++) { - if (name.equals(parameterNames[i])) { - CharSequence inherited= fJavadocLookup.getInheritedParamDescription(fMethod, i); - return handleInherited(inherited); - } - } - } else if (size > 2 && first instanceof TextElement) { - String firstText= ((TextElement) first).getText(); - if ("<".equals(firstText)) { //$NON-NLS-1$ - Object second= fragments.get(1); - Object third= fragments.get(2); - if (second instanceof SimpleName && third instanceof TextElement) { - String thirdText= ((TextElement) third).getText(); - if (">".equals(thirdText)) { //$NON-NLS-1$ - String name= ((SimpleName) second).getIdentifier(); - ITypeParameter[] typeParameters= fMethod.getTypeParameters(); - for (int i= 0; i < typeParameters.length; i++) { - ITypeParameter typeParameter= typeParameters[i]; - if (name.equals(typeParameter.getElementName())) { - CharSequence inherited= getInheritedTypeParamDescription(i); - return handleInherited(inherited); + } else + switch (blockTagName) { + case TagElement.TAG_PARAM: { + List fragments= blockTag.fragments(); + int size= fragments.size(); + if (size > 0) { + Object first= fragments.get(0); + if (first instanceof SimpleName) { + String name= ((SimpleName) first).getIdentifier(); + String[] parameterNames= fMethod.getParameterNames(); + for (int i= 0; i < parameterNames.length; i++) { + if (name.equals(parameterNames[i])) { + CharSequence inherited= fJavadocLookup.getInheritedParamDescription(fMethod, i); + return handleInherited(inherited); + } + } + } else if (size > 2 && first instanceof TextElement) { + String firstText= ((TextElement) first).getText(); + if ("<".equals(firstText)) { //$NON-NLS-1$ + Object second= fragments.get(1); + Object third= fragments.get(2); + if (second instanceof SimpleName && third instanceof TextElement) { + String thirdText= ((TextElement) third).getText(); + if (">".equals(thirdText)) { //$NON-NLS-1$ + String name= ((SimpleName) second).getIdentifier(); + ITypeParameter[] typeParameters= fMethod.getTypeParameters(); + for (int i= 0; i < typeParameters.length; i++) { + ITypeParameter typeParameter= typeParameters[i]; + if (name.equals(typeParameter.getElementName())) { + CharSequence inherited= getInheritedTypeParamDescription(i); + return handleInherited(inherited); + } + } } } } } } + break; } - } - - } else if (TagElement.TAG_RETURN.equals(blockTagName)) { - CharSequence inherited= fJavadocLookup.getInheritedReturnDescription(fMethod); - return handleInherited(inherited); - - } else if (TagElement.TAG_THROWS.equals(blockTagName) || TagElement.TAG_EXCEPTION.equals(blockTagName)) { - List fragments= blockTag.fragments(); - if (fragments.size() > 0) { - Object first= fragments.get(0); - if (first instanceof Name) { - String name= ASTNodes.getSimpleNameIdentifier((Name) first); - CharSequence inherited= fJavadocLookup.getInheritedExceptionDescription(fMethod, name); + case TagElement.TAG_RETURN: { + CharSequence inherited= fJavadocLookup.getInheritedReturnDescription(fMethod); return handleInherited(inherited); } + case TagElement.TAG_THROWS: + case TagElement.TAG_EXCEPTION: { + List fragments= blockTag.fragments(); + if (fragments.size() > 0) { + Object first= fragments.get(0); + if (first instanceof Name) { + String name= ASTNodes.getSimpleNameIdentifier((Name) first); + CharSequence inherited= fJavadocLookup.getInheritedExceptionDescription(fMethod, name); + return handleInherited(inherited); + } + } + break; + } + default: + break; } - } } catch (JavaModelException e) { JavaManipulationPlugin.log(e); } diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/dialogs/StatusInfo.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/dialogs/StatusInfo.java index b583e18a3c2..bff6963d4f1 100644 --- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/dialogs/StatusInfo.java +++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/dialogs/StatusInfo.java @@ -192,17 +192,23 @@ public IStatus[] getChildren() { public String toString() { StringBuilder buf = new StringBuilder(); buf.append("StatusInfo "); //$NON-NLS-1$ - if (fSeverity == OK) { - buf.append("OK"); //$NON-NLS-1$ - } else if (fSeverity == ERROR) { - buf.append("ERROR"); //$NON-NLS-1$ - } else if (fSeverity == WARNING) { - buf.append("WARNING"); //$NON-NLS-1$ - } else if (fSeverity == INFO) { - buf.append("INFO"); //$NON-NLS-1$ - } else { - buf.append("severity="); //$NON-NLS-1$ - buf.append(fSeverity); + switch (fSeverity) { + case OK: + buf.append("OK"); //$NON-NLS-1$ + break; + case ERROR: + buf.append("ERROR"); //$NON-NLS-1$ + break; + case WARNING: + buf.append("WARNING"); //$NON-NLS-1$ + break; + case INFO: + buf.append("INFO"); //$NON-NLS-1$ + break; + default: + buf.append("severity="); //$NON-NLS-1$ + buf.append(fSeverity); + break; } buf.append(": "); //$NON-NLS-1$ buf.append(fStatusMessage); diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/UnresolvedElementsBaseSubProcessor.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/UnresolvedElementsBaseSubProcessor.java index 96b1de6bc4e..71c658c5275 100644 --- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/UnresolvedElementsBaseSubProcessor.java +++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/UnresolvedElementsBaseSubProcessor.java @@ -2214,27 +2214,35 @@ public void collectConstructorProposals(IInvocationContext context, IProblemLoca IMethodBinding recursiveConstructor= null; int type= selectedNode.getNodeType(); - if (type == ASTNode.CLASS_INSTANCE_CREATION) { - ClassInstanceCreation creation= (ClassInstanceCreation) selectedNode; - - ITypeBinding binding= creation.getType().resolveBinding(); - if (binding != null) { - targetBinding= binding; - arguments= creation.arguments(); + switch (type) { + case ASTNode.CLASS_INSTANCE_CREATION: { + ClassInstanceCreation creation= (ClassInstanceCreation) selectedNode; + ITypeBinding binding= creation.getType().resolveBinding(); + if (binding != null) { + targetBinding= binding; + arguments= creation.arguments(); + } + break; } - } else if (type == ASTNode.SUPER_CONSTRUCTOR_INVOCATION) { - ITypeBinding typeBinding= Bindings.getBindingOfParentType(selectedNode); - if (typeBinding != null && !typeBinding.isAnonymous()) { - targetBinding= typeBinding.getSuperclass(); - arguments= ((SuperConstructorInvocation) selectedNode).arguments(); + case ASTNode.SUPER_CONSTRUCTOR_INVOCATION: { + ITypeBinding typeBinding= Bindings.getBindingOfParentType(selectedNode); + if (typeBinding != null && !typeBinding.isAnonymous()) { + targetBinding= typeBinding.getSuperclass(); + arguments= ((SuperConstructorInvocation) selectedNode).arguments(); + } + break; } - } else if (type == ASTNode.CONSTRUCTOR_INVOCATION) { - ITypeBinding typeBinding= Bindings.getBindingOfParentType(selectedNode); - if (typeBinding != null && !typeBinding.isAnonymous()) { - targetBinding= typeBinding; - arguments= ((ConstructorInvocation) selectedNode).arguments(); - recursiveConstructor= ASTResolving.findParentMethodDeclaration(selectedNode).resolveBinding(); + case ASTNode.CONSTRUCTOR_INVOCATION: { + ITypeBinding typeBinding= Bindings.getBindingOfParentType(selectedNode); + if (typeBinding != null && !typeBinding.isAnonymous()) { + targetBinding= typeBinding; + arguments= ((ConstructorInvocation) selectedNode).arguments(); + recursiveConstructor= ASTResolving.findParentMethodDeclaration(selectedNode).resolveBinding(); + } + break; } + default: + break; } if (selectedNode.getParent() instanceof EnumConstantDeclaration enumNode) { diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnusedCodeFixCore.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnusedCodeFixCore.java index 03a967b184e..20a2a90e56d 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnusedCodeFixCore.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnusedCodeFixCore.java @@ -342,138 +342,146 @@ private void removeVariableReferences(ASTRewrite rewrite, SimpleName reference, } int nameParentType= parent.getNodeType(); - if (nameParentType == ASTNode.ASSIGNMENT) { - Assignment assignment= (Assignment) parent; - Expression rightHand= assignment.getRightHandSide(); - - ASTNode assignParent= assignment.getParent(); - if (assignParent.getNodeType() == ASTNode.EXPRESSION_STATEMENT && rightHand.getNodeType() != ASTNode.ASSIGNMENT) { - removeVariableWithInitializer(rewrite, rightHand, assignParent, group); - } else { - rewrite.replace(assignment, rewrite.createCopyTarget(rightHand), group); - } - } else if (nameParentType == ASTNode.SINGLE_VARIABLE_DECLARATION) { - rewrite.remove(parent, group); - } else if (nameParentType == ASTNode.VARIABLE_DECLARATION_FRAGMENT) { - VariableDeclarationFragment frag= (VariableDeclarationFragment) parent; - ASTNode varDecl= frag.getParent(); - List fragments; - if (varDecl instanceof VariableDeclarationExpression) { - fragments= ((VariableDeclarationExpression) varDecl).fragments(); - } else if (varDecl instanceof FieldDeclaration) { - fragments= ((FieldDeclaration) varDecl).fragments(); - } else { - fragments= ((VariableDeclarationStatement) varDecl).fragments(); - } - Expression initializer= frag.getInitializer(); - ArrayList sideEffects= new ArrayList<>(); - if (initializer != null) { - initializer.accept(new SideEffectFinder(sideEffects)); - } - - /* - * Special case for when the variable initializer is a conditional expression. - * Certain actions must be taken depending on where in the conditional the side effect expressions are located. - */ - if (initializer instanceof ConditionalExpression && varDecl instanceof VariableDeclarationStatement) { - AST ast= rewrite.getAST(); - ConditionalExpression ce= (ConditionalExpression) initializer; - - // check if side effects and both expressions are to be removed then we remove whole statement - if (fForceRemove || (!checkSideEffects(sideEffects) && - !checkCondtionalExpression(ce.getThenExpression()) && - !checkCondtionalExpression(ce.getElseExpression()))) { - rewrite.remove(varDecl, group); - return; + switch (nameParentType) { + case ASTNode.ASSIGNMENT: { + Assignment assignment= (Assignment) parent; + Expression rightHand= assignment.getRightHandSide(); + ASTNode assignParent= assignment.getParent(); + if (assignParent.getNodeType() == ASTNode.EXPRESSION_STATEMENT && rightHand.getNodeType() != ASTNode.ASSIGNMENT) { + removeVariableWithInitializer(rewrite, rightHand, assignParent, group); + } else { + rewrite.replace(assignment, rewrite.createCopyTarget(rightHand), group); } - - IfStatement ifStatement= ast.newIfStatement(); - ifStatement.setExpression((Expression) rewrite.createCopyTarget(ASTNodes.getUnparenthesedExpression(ce.getExpression()))); - - Block thenBlock= ast.newBlock(); - // check if 'then' block contains code to keep - if (checkCondtionalExpression(ce.getThenExpression())) { - ASTNode thenExpression= rewrite.createCopyTarget(ASTNodes.getUnparenthesedExpression(ce.getThenExpression())); - thenBlock.statements().add(ast.newExpressionStatement((Expression) thenExpression)); + break; + } + case ASTNode.SINGLE_VARIABLE_DECLARATION: + rewrite.remove(parent, group); + break; + case ASTNode.VARIABLE_DECLARATION_FRAGMENT: { + VariableDeclarationFragment frag= (VariableDeclarationFragment) parent; + ASTNode varDecl= frag.getParent(); + List fragments; + if (varDecl instanceof VariableDeclarationExpression) { + fragments= ((VariableDeclarationExpression) varDecl).fragments(); + } else if (varDecl instanceof FieldDeclaration) { + fragments= ((FieldDeclaration) varDecl).fragments(); + } else { + fragments= ((VariableDeclarationStatement) varDecl).fragments(); } - ifStatement.setThenStatement(thenBlock); - - // check if 'else' block contains code to keep - if (checkCondtionalExpression(ce.getElseExpression())) { - Block elseBlock= ast.newBlock(); - ASTNode elseExpression= rewrite.createCopyTarget(ASTNodes.getUnparenthesedExpression(ce.getElseExpression())); - elseBlock.statements().add(ast.newExpressionStatement((Expression) elseExpression)); - ifStatement.setElseStatement(elseBlock); + Expression initializer= frag.getInitializer(); + ArrayList sideEffects= new ArrayList<>(); + if (initializer != null) { + initializer.accept(new SideEffectFinder(sideEffects)); } + /* + * Special case for when the variable initializer is a conditional expression. + * Certain actions must be taken depending on where in the conditional the side effect expressions are located. + */ + if (initializer instanceof ConditionalExpression && varDecl instanceof VariableDeclarationStatement) { + AST ast= rewrite.getAST(); + ConditionalExpression ce= (ConditionalExpression) initializer; + + // check if side effects and both expressions are to be removed then we remove whole statement + if (fForceRemove || (!checkSideEffects(sideEffects) && + !checkCondtionalExpression(ce.getThenExpression()) && + !checkCondtionalExpression(ce.getElseExpression()))) { + rewrite.remove(varDecl, group); + return; + } - rewrite.replace(varDecl, ifStatement, group); - return; - } + IfStatement ifStatement= ast.newIfStatement(); + ifStatement.setExpression((Expression) rewrite.createCopyTarget(ASTNodes.getUnparenthesedExpression(ce.getExpression()))); - boolean sideEffectInitializer= sideEffects.size() > 0; - if (fragments.size() == fUnusedNames.length) { - if (fForceRemove) { - rewrite.remove(varDecl, group); - return; - } - if (parent.getParent() instanceof FieldDeclaration) { - rewrite.remove(varDecl, group); + Block thenBlock= ast.newBlock(); + // check if 'then' block contains code to keep + if (checkCondtionalExpression(ce.getThenExpression())) { + ASTNode thenExpression= rewrite.createCopyTarget(ASTNodes.getUnparenthesedExpression(ce.getThenExpression())); + thenBlock.statements().add(ast.newExpressionStatement((Expression) thenExpression)); + } + ifStatement.setThenStatement(thenBlock); + + // check if 'else' block contains code to keep + if (checkCondtionalExpression(ce.getElseExpression())) { + Block elseBlock= ast.newBlock(); + ASTNode elseExpression= rewrite.createCopyTarget(ASTNodes.getUnparenthesedExpression(ce.getElseExpression())); + elseBlock.statements().add(ast.newExpressionStatement((Expression) elseExpression)); + ifStatement.setElseStatement(elseBlock); + } + + rewrite.replace(varDecl, ifStatement, group); return; } - if (sideEffectInitializer) { - if (varDecl.getLocationInParent() == ForStatement.INITIALIZERS_PROPERTY) { - Expression[] exps= new Expression[sideEffects.size()]; - for (int i= 0; i < exps.length; i++) { + boolean sideEffectInitializer= sideEffects.size() > 0; + if (fragments.size() == fUnusedNames.length) { + if (fForceRemove) { + rewrite.remove(varDecl, group); + return; + } + if (parent.getParent() instanceof FieldDeclaration) { + rewrite.remove(varDecl, group); + return; + } + if (sideEffectInitializer) { + if (varDecl.getLocationInParent() == ForStatement.INITIALIZERS_PROPERTY) { + Expression[] exps= new Expression[sideEffects.size()]; + for (int i= 0; i < exps.length; i++) { + Expression sideEffect= sideEffects.get(i); + Expression movedInit= (Expression) rewrite.createMoveTarget(sideEffect); + exps[i]= movedInit; + } + ReplaceRewrite replaceRewrite= ReplaceRewrite.create(rewrite, new ASTNode[] { varDecl }); + replaceRewrite.replace(exps, group); + } else { + Statement[] wrapped= new Statement[sideEffects.size()]; + for (int i= 0; i < wrapped.length; i++) { Expression sideEffect= sideEffects.get(i); Expression movedInit= (Expression) rewrite.createMoveTarget(sideEffect); - exps[i]= movedInit; + wrapped[i]= rewrite.getAST().newExpressionStatement(movedInit); + } + StatementRewrite statementRewrite= new StatementRewrite(rewrite, new ASTNode[] { varDecl }); + statementRewrite.replace(wrapped, group); } - ReplaceRewrite replaceRewrite= ReplaceRewrite.create(rewrite, new ASTNode[] { varDecl }); - replaceRewrite.replace(exps, group); } else { - Statement[] wrapped= new Statement[sideEffects.size()]; - for (int i= 0; i < wrapped.length; i++) { - Expression sideEffect= sideEffects.get(i); - Expression movedInit= (Expression) rewrite.createMoveTarget(sideEffect); - wrapped[i]= rewrite.getAST().newExpressionStatement(movedInit); - } - StatementRewrite statementRewrite= new StatementRewrite(rewrite, new ASTNode[] { varDecl }); - statementRewrite.replace(wrapped, group); + rewrite.remove(varDecl, group); } } else { - rewrite.remove(varDecl, group); - } - } else { - if (fForceRemove) { - rewrite.remove(frag, group); - return; - } - //multiple declarations in one line - ASTNode declaration= parent.getParent(); - if (declaration instanceof FieldDeclaration) { - rewrite.remove(frag, group); - return; - } - if (declaration instanceof VariableDeclarationStatement) { - splitUpDeclarations(rewrite, group, frag, (VariableDeclarationStatement) declaration, sideEffects); - rewrite.remove(frag, group); - return; - } - if (declaration instanceof VariableDeclarationExpression) { - //keep constructors and method invocations - if (!sideEffectInitializer) { + if (fForceRemove) { + rewrite.remove(frag, group); + return; + } + //multiple declarations in one line + ASTNode declaration= parent.getParent(); + if (declaration instanceof FieldDeclaration) { rewrite.remove(frag, group); + return; + } + if (declaration instanceof VariableDeclarationStatement) { + splitUpDeclarations(rewrite, group, frag, (VariableDeclarationStatement) declaration, sideEffects); + rewrite.remove(frag, group); + return; + } + if (declaration instanceof VariableDeclarationExpression) { + //keep constructors and method invocations + if (!sideEffectInitializer) { + rewrite.remove(frag, group); + } } } + break; } - } else if (nameParentType == ASTNode.POSTFIX_EXPRESSION || nameParentType == ASTNode.PREFIX_EXPRESSION) { - Expression expression= (Expression) parent; - ASTNode expressionParent= expression.getParent(); - if (expressionParent.getNodeType() == ASTNode.EXPRESSION_STATEMENT) { - removeStatement(rewrite, expressionParent, group); - } else { - rewrite.remove(expression, group); + case ASTNode.POSTFIX_EXPRESSION: + case ASTNode.PREFIX_EXPRESSION: { + Expression expression= (Expression) parent; + ASTNode expressionParent= expression.getParent(); + if (expressionParent.getNodeType() == ASTNode.EXPRESSION_STATEMENT) { + removeStatement(rewrite, expressionParent, group); + } else { + rewrite.remove(expression, group); + } + break; } + default: + break; } } @@ -1069,18 +1077,24 @@ private static boolean hasSideEffect(SimpleName reference) { ASTNode node= null; int nameParentType= parent.getNodeType(); - if (nameParentType == ASTNode.ASSIGNMENT) { - Assignment assignment= (Assignment) parent; - node= assignment.getRightHandSide(); - } else if (nameParentType == ASTNode.SINGLE_VARIABLE_DECLARATION) { - SingleVariableDeclaration decl= (SingleVariableDeclaration) parent; - node= decl.getInitializer(); - if (node == null) + switch (nameParentType) { + case ASTNode.ASSIGNMENT: { + Assignment assignment= (Assignment) parent; + node= assignment.getRightHandSide(); + break; + } + case ASTNode.SINGLE_VARIABLE_DECLARATION: { + SingleVariableDeclaration decl= (SingleVariableDeclaration) parent; + node= decl.getInitializer(); + if (node == null) + return false; + break; + } + case ASTNode.VARIABLE_DECLARATION_FRAGMENT: + node= parent; + break; + default: return false; - } else if (nameParentType == ASTNode.VARIABLE_DECLARATION_FRAGMENT) { - node= parent; - } else { - return false; } ArrayList sideEffects= new ArrayList<>(); diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/CallInliner.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/CallInliner.java index 9fb490054df..2eda5f518af 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/CallInliner.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/CallInliner.java @@ -893,62 +893,72 @@ private void initializeInsertionPoint(int nos) { ASTNode container= parentStatement.getParent(); int type= container.getNodeType(); - if (type == ASTNode.BLOCK) { - Block block= (Block)container; - fListRewrite= fRewrite.getListRewrite(block, Block.STATEMENTS_PROPERTY); - fInsertionIndex= fListRewrite.getRewrittenList().indexOf(parentStatement); - } else if (type == ASTNode.SWITCH_STATEMENT) { - SwitchStatement switchStatement= (SwitchStatement)container; - fListRewrite= fRewrite.getListRewrite(switchStatement, SwitchStatement.STATEMENTS_PROPERTY); - fInsertionIndex= fListRewrite.getRewrittenList().indexOf(parentStatement); - } else if (type == ASTNode.SWITCH_EXPRESSION) { - SwitchExpression switchExpression= (SwitchExpression)container; - fListRewrite= fRewrite.getListRewrite(switchExpression, SwitchExpression.STATEMENTS_PROPERTY); - fInsertionIndex= fListRewrite.getRewrittenList().indexOf(parentStatement); - } else if (isControlStatement(container) || type == ASTNode.LABELED_STATEMENT) { - fNeedsStatement= true; - if (nos > 1 || needsBlockAroundDanglingIf()) { - Block block= fInvocation.getAST().newBlock(); - fInsertionIndex= 0; - Statement currentStatement= null; - switch(type) { - case ASTNode.LABELED_STATEMENT: - currentStatement= ((LabeledStatement)container).getBody(); - break; - case ASTNode.FOR_STATEMENT: - currentStatement= ((ForStatement)container).getBody(); - break; - case ASTNode.ENHANCED_FOR_STATEMENT: - currentStatement= ((EnhancedForStatement)container).getBody(); - break; - case ASTNode.WHILE_STATEMENT: - currentStatement= ((WhileStatement)container).getBody(); - break; - case ASTNode.DO_STATEMENT: - currentStatement= ((DoStatement)container).getBody(); - break; - case ASTNode.IF_STATEMENT: - IfStatement node= (IfStatement)container; - Statement thenPart= node.getThenStatement(); - if (fTargetNode == thenPart || ASTNodes.isParent(fTargetNode, thenPart)) { - currentStatement= thenPart; + switch (type) { + case ASTNode.BLOCK: { + Block block= (Block)container; + fListRewrite= fRewrite.getListRewrite(block, Block.STATEMENTS_PROPERTY); + fInsertionIndex= fListRewrite.getRewrittenList().indexOf(parentStatement); + break; + } + case ASTNode.SWITCH_STATEMENT: { + SwitchStatement switchStatement= (SwitchStatement)container; + fListRewrite= fRewrite.getListRewrite(switchStatement, SwitchStatement.STATEMENTS_PROPERTY); + fInsertionIndex= fListRewrite.getRewrittenList().indexOf(parentStatement); + break; + } + case ASTNode.SWITCH_EXPRESSION: { + SwitchExpression switchExpression= (SwitchExpression)container; + fListRewrite= fRewrite.getListRewrite(switchExpression, SwitchExpression.STATEMENTS_PROPERTY); + fInsertionIndex= fListRewrite.getRewrittenList().indexOf(parentStatement); + break; + } + default: + if (isControlStatement(container) || type == ASTNode.LABELED_STATEMENT) { + fNeedsStatement= true; + if (nos > 1 || needsBlockAroundDanglingIf()) { + Block block= fInvocation.getAST().newBlock(); + fInsertionIndex= 0; + Statement currentStatement= null; + switch(type) { + case ASTNode.LABELED_STATEMENT: + currentStatement= ((LabeledStatement)container).getBody(); + break; + case ASTNode.FOR_STATEMENT: + currentStatement= ((ForStatement)container).getBody(); + break; + case ASTNode.ENHANCED_FOR_STATEMENT: + currentStatement= ((EnhancedForStatement)container).getBody(); + break; + case ASTNode.WHILE_STATEMENT: + currentStatement= ((WhileStatement)container).getBody(); + break; + case ASTNode.DO_STATEMENT: + currentStatement= ((DoStatement)container).getBody(); + break; + case ASTNode.IF_STATEMENT: + IfStatement node= (IfStatement)container; + Statement thenPart= node.getThenStatement(); + if (fTargetNode == thenPart || ASTNodes.isParent(fTargetNode, thenPart)) { + currentStatement= thenPart; + } else { + currentStatement= node.getElseStatement(); + } + break; + } + Assert.isNotNull(currentStatement); + fRewrite.replace(currentStatement, block, null); + fListRewrite= fRewrite.getListRewrite(block, Block.STATEMENTS_PROPERTY); + // The method to be inlined is not the body of the control statement. + if (currentStatement != fTargetNode) { + fListRewrite.insertLast(fRewrite.createCopyTarget(currentStatement), null); } else { - currentStatement= node.getElseStatement(); + // We can't replace a copy with something else. So we + // have to insert all statements to be inlined. + fTargetNode= null; } - break; - } - Assert.isNotNull(currentStatement); - fRewrite.replace(currentStatement, block, null); - fListRewrite= fRewrite.getListRewrite(block, Block.STATEMENTS_PROPERTY); - // The method to be inlined is not the body of the control statement. - if (currentStatement != fTargetNode) { - fListRewrite.insertLast(fRewrite.createCopyTarget(currentStatement), null); - } else { - // We can't replace a copy with something else. So we - // have to insert all statements to be inlined. - fTargetNode= null; + } } - } + break; } // We only insert one new statement or we delete the existing call. // So there is no need to have an insertion index. diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/SourceProvider.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/SourceProvider.java index 13b5ba2e592..096618ce468 100644 --- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/SourceProvider.java +++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/SourceProvider.java @@ -910,14 +910,18 @@ private boolean isSingleControlStatementWithoutBlock() { return false; Statement statement= statements.get(size - 1); int nodeType= statement.getNodeType(); - if (nodeType == ASTNode.IF_STATEMENT) { - IfStatement ifStatement= (IfStatement) statement; - return !(ifStatement.getThenStatement() instanceof Block) - && !(ifStatement.getElseStatement() instanceof Block); - } else if (nodeType == ASTNode.FOR_STATEMENT) { - return !(((ForStatement)statement).getBody() instanceof Block); - } else if (nodeType == ASTNode.WHILE_STATEMENT) { - return !(((WhileStatement)statement).getBody() instanceof Block); + switch (nodeType) { + case ASTNode.IF_STATEMENT: { + IfStatement ifStatement= (IfStatement) statement; + return !(ifStatement.getThenStatement() instanceof Block) + && !(ifStatement.getElseStatement() instanceof Block); + } + case ASTNode.FOR_STATEMENT: + return !(((ForStatement)statement).getBody() instanceof Block); + case ASTNode.WHILE_STATEMENT: + return !(((WhileStatement)statement).getBody() instanceof Block); + default: + break; } return false; } diff --git a/org.eclipse.jdt.junit/META-INF/MANIFEST.MF b/org.eclipse.jdt.junit/META-INF/MANIFEST.MF index 62db399c51e..7127c647756 100644 --- a/org.eclipse.jdt.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.junit Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.junit;singleton:=true -Bundle-Version: 3.16.500.qualifier +Bundle-Version: 3.16.600.qualifier Bundle-Activator: org.eclipse.jdt.internal.junit.ui.JUnitPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitClasspathFixProcessor.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitClasspathFixProcessor.java index b6e375fd5a4..397827abba0 100644 --- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitClasspathFixProcessor.java +++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitClasspathFixProcessor.java @@ -162,13 +162,24 @@ public ClasspathFixProposal[] getFixImportProposals(IJavaProject project, String res= JUNIT4; } else if ("TestCase".equals(s) || "TestSuite".equals(s) || s.startsWith("junit.")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ res= JUNIT3; - } else if ("Test".equals(s)) { //$NON-NLS-1$ - res= JUNIT3 | JUNIT4 | JUNIT5; - } else if ("TestFactory".equals(s) || "Testable".equals(s) || "TestTemplate".equals(s) || "ParameterizedTest".equals(s) || "RepeatedTest".equals(s)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - res= JUNIT5; - } else if ("RunWith".equals(s)) { //$NON-NLS-1$ - res= JUNIT4; - } + } else + switch (s) { + case "Test": //$NON-NLS-1$ + res= JUNIT3 | JUNIT4 | JUNIT5; + break; + case "TestFactory": //$NON-NLS-1$ + case "Testable": //$NON-NLS-1$ + case "TestTemplate": //$NON-NLS-1$ + case "ParameterizedTest": //$NON-NLS-1$ + case "RepeatedTest": //$NON-NLS-1$ + res= JUNIT5; + break; + case "RunWith": //$NON-NLS-1$ + res= JUNIT4; + break; + default: + break; + } if (res != 0) { ArrayList proposals= new ArrayList<>(); if ((res & JUNIT5) != 0 && JUnitStubUtility.is18OrHigher(project)) { diff --git a/org.eclipse.jdt.ui/internal compatibility/org/eclipse/jdt/internal/ui/dialogs/TypeInfoViewer.java b/org.eclipse.jdt.ui/internal compatibility/org/eclipse/jdt/internal/ui/dialogs/TypeInfoViewer.java index 26ce58d43fa..a671973cd94 100644 --- a/org.eclipse.jdt.ui/internal compatibility/org/eclipse/jdt/internal/ui/dialogs/TypeInfoViewer.java +++ b/org.eclipse.jdt.ui/internal compatibility/org/eclipse/jdt/internal/ui/dialogs/TypeInfoViewer.java @@ -887,20 +887,28 @@ public void controlResized(ControlEvent event) { fTable.addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { - if (e.keyCode == SWT.DEL) { - deleteHistoryEntry(); - } else if (e.keyCode == SWT.ARROW_DOWN) { - int index= fTable.getSelectionIndex(); - if (index == fDashLineIndex - 1) { - e.doit= false; - setTableSelection(index + 2); + switch (e.keyCode) { + case SWT.DEL: + deleteHistoryEntry(); + break; + case SWT.ARROW_DOWN: { + int index= fTable.getSelectionIndex(); + if (index == fDashLineIndex - 1) { + e.doit= false; + setTableSelection(index + 2); + } + break; } - } else if (e.keyCode == SWT.ARROW_UP) { - int index= fTable.getSelectionIndex(); - if (fDashLineIndex != -1 && index == fDashLineIndex + 1) { - e.doit= false; - setTableSelection(index - 2); + case SWT.ARROW_UP: { + int index= fTable.getSelectionIndex(); + if (fDashLineIndex != -1 && index == fDashLineIndex + 1) { + e.doit= false; + setTableSelection(index - 2); + } + break; } + default: + break; } } }); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/IndentAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/IndentAction.java index 8ecce721a10..eb60fd2bb84 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/IndentAction.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/IndentAction.java @@ -948,56 +948,65 @@ public static String getTextBlockIndentationString(IDocument document, int offse String commandIndent= EMPTY_STR; if (isTextBlockStarting) { if (!prevLineEndsWithComma) { - if (textBlockIndentationOption == DefaultCodeFormatterConstants.INDENT_ON_COLUMN) { - String newStr= indentation; - int length= IndentAction.measureLengthInSpaces(stringTocalculate, CodeFormatterUtil.getTabWidth(javaProject)); - StringBuilder str= new StringBuilder(); - if (getUseTabsOnlyForLeadingIndentations(javaProject)) { - int existing= IndentAction.measureLengthInSpaces(indentation, CodeFormatterUtil.getTabWidth(javaProject)); - if (length - existing > 0) { - for (int i= 0; i < length - existing; i++) { - newStr+= IndentAction.SPACE_STR; - } - } - } else { - for (int i= 0; i < length; i++) { - str.append(IndentAction.SPACE_STR); - } - int units= Strings.computeIndentUnits(str.toString(), javaProject); - newStr= CodeFormatterUtil.createIndentString(units, javaProject); - int newLength= IndentManipulation.measureIndentInSpaces(newStr, CodeFormatterUtil.getTabWidth(javaProject)); - if (newLength < length) { - if (DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue) || JavaCore.SPACE.equals(formatterTabValue)) { - for (int i= newLength; i < length; i++) { + switch (textBlockIndentationOption) { + case DefaultCodeFormatterConstants.INDENT_ON_COLUMN: { + String newStr= indentation; + int length= IndentAction.measureLengthInSpaces(stringTocalculate, CodeFormatterUtil.getTabWidth(javaProject)); + StringBuilder str= new StringBuilder(); + if (getUseTabsOnlyForLeadingIndentations(javaProject)) { + int existing= IndentAction.measureLengthInSpaces(indentation, CodeFormatterUtil.getTabWidth(javaProject)); + if (length - existing > 0) { + for (int i= 0; i < length - existing; i++) { newStr+= IndentAction.SPACE_STR; } - } else if (JavaCore.TAB.equals(formatterTabValue)) { - newStr+= tabString; + } + } else { + for (int i= 0; i < length; i++) { + str.append(IndentAction.SPACE_STR); + } + int units= Strings.computeIndentUnits(str.toString(), javaProject); + newStr= CodeFormatterUtil.createIndentString(units, javaProject); + int newLength= IndentManipulation.measureIndentInSpaces(newStr, CodeFormatterUtil.getTabWidth(javaProject)); + if (newLength < length) { + if (DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue) || JavaCore.SPACE.equals(formatterTabValue)) { + for (int i= newLength; i < length; i++) { + newStr+= IndentAction.SPACE_STR; + } + } else if (JavaCore.TAB.equals(formatterTabValue)) { + newStr+= tabString; + } } } + indentation= newStr; + break; } - indentation= newStr; - } else if (textBlockIndentationOption == DefaultCodeFormatterConstants.INDENT_BY_ONE) { - if (JavaCore.TAB.equals(formatterTabValue) - || DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue)) { - indentation+= tabString; - } else if (JavaCore.SPACE.equals(formatterTabValue)) { - indentation+= tabSpaceString; - } - } else if (textBlockIndentationOption == DefaultCodeFormatterConstants.INDENT_PRESERVE) { - indentation= IndentAction.EMPTY_STR; - } else if (textBlockIndentationOption == DefaultCodeFormatterConstants.INDENT_DEFAULT) { - String indentString= EMPTY_STR; - if (JavaCore.TAB.equals(formatterTabValue) - || DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue)) { - indentString= tabString; - } else if (JavaCore.SPACE.equals(formatterTabValue)) { - indentString= tabSpaceString; - } - int count= getFormatterContinuationIndentation(javaProject); - for (int i= 0; i < count; i++) { - indentation+= indentString; + case DefaultCodeFormatterConstants.INDENT_BY_ONE: + if (JavaCore.TAB.equals(formatterTabValue) + || DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue)) { + indentation+= tabString; + } else if (JavaCore.SPACE.equals(formatterTabValue)) { + indentation+= tabSpaceString; + } + break; + case DefaultCodeFormatterConstants.INDENT_PRESERVE: + indentation= IndentAction.EMPTY_STR; + break; + case DefaultCodeFormatterConstants.INDENT_DEFAULT: { + String indentString= EMPTY_STR; + if (JavaCore.TAB.equals(formatterTabValue) + || DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue)) { + indentString= tabString; + } else if (JavaCore.SPACE.equals(formatterTabValue)) { + indentString= tabSpaceString; + } + int count= getFormatterContinuationIndentation(javaProject); + for (int i= 0; i < count; i++) { + indentation+= indentString; + } + break; } + default: + break; } } } @@ -1026,56 +1035,65 @@ public static String getIndentationAsPerTextBlockSettings(IDocument document, in int textBlockIndentationOption= getTextBlockIndentation(javaProject); String formatterTabValue= getFormatterTabValue(javaProject); String stringTocalculate= fullStrNoTrim; - if (textBlockIndentationOption == DefaultCodeFormatterConstants.INDENT_ON_COLUMN) { - String newStr= indentation; - int length= IndentAction.measureLengthInSpaces(stringTocalculate, CodeFormatterUtil.getTabWidth(javaProject)); - StringBuilder str= new StringBuilder(); - if (getUseTabsOnlyForLeadingIndentations(javaProject)) { - int existing= IndentAction.measureLengthInSpaces(indentation, CodeFormatterUtil.getTabWidth(javaProject)); - if (length - existing > 0) { - for (int i= 0; i < length - existing; i++) { - newStr+= IndentAction.SPACE_STR; - } - } - } else { - for (int i= 0; i < length; i++) { - str.append(IndentAction.SPACE_STR); - } - int units= Strings.computeIndentUnits(str.toString(), javaProject); - newStr= CodeFormatterUtil.createIndentString(units, javaProject); - int newLength= IndentManipulation.measureIndentInSpaces(newStr, CodeFormatterUtil.getTabWidth(javaProject)); - if (newLength < length) { - if (DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue) || JavaCore.SPACE.equals(formatterTabValue)) { - for (int i= newLength; i < length; i++) { + switch (textBlockIndentationOption) { + case DefaultCodeFormatterConstants.INDENT_ON_COLUMN: { + String newStr= indentation; + int length= IndentAction.measureLengthInSpaces(stringTocalculate, CodeFormatterUtil.getTabWidth(javaProject)); + StringBuilder str= new StringBuilder(); + if (getUseTabsOnlyForLeadingIndentations(javaProject)) { + int existing= IndentAction.measureLengthInSpaces(indentation, CodeFormatterUtil.getTabWidth(javaProject)); + if (length - existing > 0) { + for (int i= 0; i < length - existing; i++) { newStr+= IndentAction.SPACE_STR; } - } else if (JavaCore.TAB.equals(formatterTabValue)) { - newStr+= tabString; + } + } else { + for (int i= 0; i < length; i++) { + str.append(IndentAction.SPACE_STR); + } + int units= Strings.computeIndentUnits(str.toString(), javaProject); + newStr= CodeFormatterUtil.createIndentString(units, javaProject); + int newLength= IndentManipulation.measureIndentInSpaces(newStr, CodeFormatterUtil.getTabWidth(javaProject)); + if (newLength < length) { + if (DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue) || JavaCore.SPACE.equals(formatterTabValue)) { + for (int i= newLength; i < length; i++) { + newStr+= IndentAction.SPACE_STR; + } + } else if (JavaCore.TAB.equals(formatterTabValue)) { + newStr+= tabString; + } } } + indentation= newStr; + break; } - indentation= newStr; - } else if (textBlockIndentationOption == DefaultCodeFormatterConstants.INDENT_BY_ONE) { - if (JavaCore.TAB.equals(formatterTabValue) - || DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue)) { - indentation+= tabString; - } else if (JavaCore.SPACE.equals(formatterTabValue)) { - indentation+= tabSpaceString; - } - } else if (textBlockIndentationOption == DefaultCodeFormatterConstants.INDENT_PRESERVE) { - indentation= IndentAction.EMPTY_STR; - } else if (textBlockIndentationOption == DefaultCodeFormatterConstants.INDENT_DEFAULT) { - String indentString= EMPTY_STR; - if (JavaCore.TAB.equals(formatterTabValue) - || DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue)) { - indentString= tabString; - } else if (JavaCore.SPACE.equals(formatterTabValue)) { - indentString= tabSpaceString; - } - int count= getFormatterContinuationIndentation(javaProject); - for (int i= 0; i < count; i++) { - indentation+= indentString; + case DefaultCodeFormatterConstants.INDENT_BY_ONE: + if (JavaCore.TAB.equals(formatterTabValue) + || DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue)) { + indentation+= tabString; + } else if (JavaCore.SPACE.equals(formatterTabValue)) { + indentation+= tabSpaceString; + } + break; + case DefaultCodeFormatterConstants.INDENT_PRESERVE: + indentation= IndentAction.EMPTY_STR; + break; + case DefaultCodeFormatterConstants.INDENT_DEFAULT: { + String indentString= EMPTY_STR; + if (JavaCore.TAB.equals(formatterTabValue) + || DefaultCodeFormatterConstants.MIXED.equals(formatterTabValue)) { + indentString= tabString; + } else if (JavaCore.SPACE.equals(formatterTabValue)) { + indentString= tabSpaceString; + } + int count= getFormatterContinuationIndentation(javaProject); + for (int i= 0; i < count; i++) { + indentation+= indentString; + } + break; } + default: + break; } return indentation; } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java index 06d45b46efa..290fea38a90 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterModifyDialog.java @@ -808,32 +808,37 @@ private void updateTabPreferences() { * visual tab size to the value piggy backed in the INDENTATION_SIZE * preference. See also CodeFormatterUtil. */ - if (DefaultCodeFormatterConstants.MIXED.equals(tabPolicy)) { - if (JavaCore.SPACE.equals(fOldTabChar) || JavaCore.TAB.equals(fOldTabChar)) - swapTabValues(); - tabSizePref.setEnabled(true); - tabSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE); - indentSizePref.setEnabled(true); - indentSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_INDENTATION_SIZE); - onlyForLeadingPref.setEnabled(true); - } else if (JavaCore.SPACE.equals(tabPolicy)) { - if (DefaultCodeFormatterConstants.MIXED.equals(fOldTabChar)) - swapTabValues(); - tabSizePref.setEnabled(true); - tabSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_INDENTATION_SIZE); - indentSizePref.setEnabled(true); - indentSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE); - onlyForLeadingPref.setEnabled(false); - } else if (JavaCore.TAB.equals(tabPolicy)) { - if (DefaultCodeFormatterConstants.MIXED.equals(fOldTabChar)) - swapTabValues(); - tabSizePref.setEnabled(true); - tabSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE); - indentSizePref.setEnabled(false); - indentSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE); - onlyForLeadingPref.setEnabled(true); - } else { - Assert.isTrue(false); + switch (tabPolicy) { + case DefaultCodeFormatterConstants.MIXED: + if (JavaCore.SPACE.equals(fOldTabChar) || JavaCore.TAB.equals(fOldTabChar)) + swapTabValues(); + tabSizePref.setEnabled(true); + tabSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE); + indentSizePref.setEnabled(true); + indentSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_INDENTATION_SIZE); + onlyForLeadingPref.setEnabled(true); + break; + case JavaCore.SPACE: + if (DefaultCodeFormatterConstants.MIXED.equals(fOldTabChar)) + swapTabValues(); + tabSizePref.setEnabled(true); + tabSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_INDENTATION_SIZE); + indentSizePref.setEnabled(true); + indentSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE); + onlyForLeadingPref.setEnabled(false); + break; + case JavaCore.TAB: + if (DefaultCodeFormatterConstants.MIXED.equals(fOldTabChar)) + swapTabValues(); + tabSizePref.setEnabled(true); + tabSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE); + indentSizePref.setEnabled(false); + indentSizePref.setKey(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE); + onlyForLeadingPref.setEnabled(true); + break; + default: + Assert.isTrue(false); + break; } fOldTabChar= tabPolicy; } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/ContentAssistPreference.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/ContentAssistPreference.java index a6e13cc79a2..cfcf185100e 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/ContentAssistPreference.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/ContentAssistPreference.java @@ -221,32 +221,51 @@ public static void changeConfiguration(ContentAssistant assistant, IPreferenceSt String p= event.getProperty(); - if (AUTOACTIVATION.equals(p)) { - boolean enabled= store.getBoolean(AUTOACTIVATION); - assistant.enableAutoActivation(enabled); - } else if (AUTOACTIVATION_DELAY.equals(p)) { - int delay= store.getInt(AUTOACTIVATION_DELAY); - assistant.setAutoActivationDelay(delay); - } else if (PARAMETERS_FOREGROUND.equals(p)) { - Color c= getColor(store, PARAMETERS_FOREGROUND); - assistant.setContextInformationPopupForeground(c); - assistant.setContextSelectorForeground(c); - } else if (PARAMETERS_BACKGROUND.equals(p)) { - Color c= getColor(store, PARAMETERS_BACKGROUND); - assistant.setContextInformationPopupBackground(c); - assistant.setContextSelectorBackground(c); - } else if (AUTOINSERT.equals(p)) { - boolean enabled= store.getBoolean(AUTOINSERT); - assistant.enableAutoInsert(enabled); - } else if (PREFIX_COMPLETION.equals(p)) { - boolean enabled= store.getBoolean(PREFIX_COMPLETION); - assistant.enablePrefixCompletion(enabled); - } else if (USE_COLORED_LABELS.equals(p)) { - boolean enabled= store.getBoolean(USE_COLORED_LABELS); - assistant.enableColoredLabels(enabled); - } else if (DISABLE_COMPLETION_PROPOSAL_TRIGGER_CHARS.equals(p)) { - boolean disabled = store.getBoolean(DISABLE_COMPLETION_PROPOSAL_TRIGGER_CHARS); - assistant.enableCompletionProposalTriggerChars(!disabled); + switch (p) { + case AUTOACTIVATION: { + boolean enabled= store.getBoolean(AUTOACTIVATION); + assistant.enableAutoActivation(enabled); + break; + } + case AUTOACTIVATION_DELAY: { + int delay= store.getInt(AUTOACTIVATION_DELAY); + assistant.setAutoActivationDelay(delay); + break; + } + case PARAMETERS_FOREGROUND: { + Color c= getColor(store, PARAMETERS_FOREGROUND); + assistant.setContextInformationPopupForeground(c); + assistant.setContextSelectorForeground(c); + break; + } + case PARAMETERS_BACKGROUND: { + Color c= getColor(store, PARAMETERS_BACKGROUND); + assistant.setContextInformationPopupBackground(c); + assistant.setContextSelectorBackground(c); + break; + } + case AUTOINSERT: { + boolean enabled= store.getBoolean(AUTOINSERT); + assistant.enableAutoInsert(enabled); + break; + } + case PREFIX_COMPLETION: { + boolean enabled= store.getBoolean(PREFIX_COMPLETION); + assistant.enablePrefixCompletion(enabled); + break; + } + case USE_COLORED_LABELS: { + boolean enabled= store.getBoolean(USE_COLORED_LABELS); + assistant.enableColoredLabels(enabled); + break; + } + case DISABLE_COMPLETION_PROPOSAL_TRIGGER_CHARS: { + boolean disabled = store.getBoolean(DISABLE_COMPLETION_PROPOSAL_TRIGGER_CHARS); + assistant.enableCompletionProposalTriggerChars(!disabled); + break; + } + default: + break; } changeJavaProcessor(assistant, store, p); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDocSnippetStringEvaluator.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDocSnippetStringEvaluator.java index 88e1b0a29b9..9bbb9b59ded 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDocSnippetStringEvaluator.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDocSnippetStringEvaluator.java @@ -168,12 +168,18 @@ private String getModifiedString(String str, List tags) { String modifiedStr= str; for (TagElement tag : tags) { String name= tag.getTagName(); - if (TagElement.TAG_HIGHLIGHT.equals(name)) { - handleSnippetHighlight(modifiedStr, tag, actionElements); - } else if (TagElement.TAG_REPLACE.equals(name)) { - modifiedStr= handleSnippetReplace(modifiedStr, tag, actionElements); - } else if (TagElement.TAG_LINK.equals(name)) { - handleSnippetLink(modifiedStr, tag, actionElements); + switch (name) { + case TagElement.TAG_HIGHLIGHT: + handleSnippetHighlight(modifiedStr, tag, actionElements); + break; + case TagElement.TAG_REPLACE: + modifiedStr= handleSnippetReplace(modifiedStr, tag, actionElements); + break; + case TagElement.TAG_LINK: + handleSnippetLink(modifiedStr, tag, actionElements); + break; + default: + break; } } return getString( modifiedStr, actionElements); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListLabelProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListLabelProvider.java index 875600ff142..45abdd9c0ef 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListLabelProvider.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListLabelProvider.java @@ -138,181 +138,191 @@ public String getCPUserLibraryText(CPUserLibraryElement element) { public String getCPListElementAttributeText(CPListElementAttribute attrib) { String notAvailable= NewWizardMessages.CPListLabelProvider_none; String key= attrib.getKey(); - if (CPListElement.SOURCEATTACHMENT.equals(key)) { - String arg; - IPath path= (IPath) attrib.getValue(); - if (path != null && !path.isEmpty()) { - if (attrib.getParent().getEntryKind() == IClasspathEntry.CPE_VARIABLE) { - arg= getVariableString(path); + switch (key) { + case CPListElement.SOURCEATTACHMENT: { + String arg; + IPath path= (IPath) attrib.getValue(); + if (path != null && !path.isEmpty()) { + if (attrib.getParent().getEntryKind() == IClasspathEntry.CPE_VARIABLE) { + arg= getVariableString(path); + } else { + arg= getPathString(path, path.getDevice() != null); + } } else { - arg= getPathString(path, path.getDevice() != null); + arg= notAvailable; } - } else { - arg= notAvailable; + return Messages.format(NewWizardMessages.CPListLabelProvider_source_attachment_label, new String[] { arg }); } - return Messages.format(NewWizardMessages.CPListLabelProvider_source_attachment_label, new String[] { arg }); - } else if (CPListElement.OUTPUT.equals(key)) { - String arg= null; - IPath path= (IPath) attrib.getValue(); - if (path != null) { - arg= BasicElementLabels.getPathLabel(path, false); - } else { - arg= NewWizardMessages.CPListLabelProvider_default_output_folder_label; + case CPListElement.OUTPUT: { + String arg= null; + IPath path= (IPath) attrib.getValue(); + if (path != null) { + arg= BasicElementLabels.getPathLabel(path, false); + } else { + arg= NewWizardMessages.CPListLabelProvider_default_output_folder_label; + } + return Messages.format(NewWizardMessages.CPListLabelProvider_output_folder_label, new String[] { arg }); } - return Messages.format(NewWizardMessages.CPListLabelProvider_output_folder_label, new String[] { arg }); - } else if (CPListElement.EXCLUSION.equals(key)) { - String arg= null; - IPath[] patterns= (IPath[]) attrib.getValue(); - if (patterns != null && patterns.length > 0) { - int patternsCount= 0; - StringBuilder buf= new StringBuilder(); - for (IPath p : patterns) { - if (p.segmentCount() > 0) { - String pattern= BasicElementLabels.getPathLabel(p, false); - if (patternsCount > 0) { - buf.append(NewWizardMessages.CPListLabelProvider_exclusion_filter_separator); + case CPListElement.EXCLUSION: { + String arg= null; + IPath[] patterns= (IPath[]) attrib.getValue(); + if (patterns != null && patterns.length > 0) { + int patternsCount= 0; + StringBuilder buf= new StringBuilder(); + for (IPath p : patterns) { + if (p.segmentCount() > 0) { + String pattern= BasicElementLabels.getPathLabel(p, false); + if (patternsCount > 0) { + buf.append(NewWizardMessages.CPListLabelProvider_exclusion_filter_separator); + } + buf.append(pattern); + patternsCount++; } - buf.append(pattern); - patternsCount++; } - } - if (patternsCount > 0) { - arg= buf.toString(); + if (patternsCount > 0) { + arg= buf.toString(); + } else { + arg= notAvailable; + } } else { arg= notAvailable; } - } else { - arg= notAvailable; + return Messages.format(NewWizardMessages.CPListLabelProvider_exclusion_filter_label, new String[] { arg }); } - return Messages.format(NewWizardMessages.CPListLabelProvider_exclusion_filter_label, new String[] { arg }); - } else if (CPListElement.INCLUSION.equals(key)) { - String arg= null; - IPath[] patterns= (IPath[]) attrib.getValue(); - if (patterns != null && patterns.length > 0) { - int patternsCount= 0; - StringBuilder buf= new StringBuilder(); - for (IPath p : patterns) { - if (p.segmentCount() > 0) { - String pattern= BasicElementLabels.getPathLabel(p, false); - if (patternsCount > 0) { - buf.append(NewWizardMessages.CPListLabelProvider_inclusion_filter_separator); + case CPListElement.INCLUSION: { + String arg= null; + IPath[] patterns= (IPath[]) attrib.getValue(); + if (patterns != null && patterns.length > 0) { + int patternsCount= 0; + StringBuilder buf= new StringBuilder(); + for (IPath p : patterns) { + if (p.segmentCount() > 0) { + String pattern= BasicElementLabels.getPathLabel(p, false); + if (patternsCount > 0) { + buf.append(NewWizardMessages.CPListLabelProvider_inclusion_filter_separator); + } + buf.append(pattern); + patternsCount++; } - buf.append(pattern); - patternsCount++; } - } - if (patternsCount > 0) { - arg= buf.toString(); + if (patternsCount > 0) { + arg= buf.toString(); + } else { + arg= notAvailable; + } } else { - arg= notAvailable; + arg= NewWizardMessages.CPListLabelProvider_all; } - } else { - arg= NewWizardMessages.CPListLabelProvider_all; + return Messages.format(NewWizardMessages.CPListLabelProvider_inclusion_filter_label, new String[] { arg }); } - return Messages.format(NewWizardMessages.CPListLabelProvider_inclusion_filter_label, new String[] { arg }); - } else if (CPListElement.ACCESSRULES.equals(key)) { - IAccessRule[] rules= (IAccessRule[]) attrib.getValue(); - int nRules= rules != null ? rules.length : 0; - - int parentKind= attrib.getParent().getEntryKind(); - if (parentKind == IClasspathEntry.CPE_PROJECT) { - Boolean combined= (Boolean) attrib.getParent().getAttribute(CPListElement.COMBINE_ACCESSRULES); - if (nRules > 0) { - if (combined) { - if (nRules == 1) { - return NewWizardMessages.CPListLabelProvider_project_access_rules_combined_singular; + case CPListElement.ACCESSRULES: { + IAccessRule[] rules= (IAccessRule[]) attrib.getValue(); + int nRules= rules != null ? rules.length : 0; + int parentKind= attrib.getParent().getEntryKind(); + if (parentKind == IClasspathEntry.CPE_PROJECT) { + Boolean combined= (Boolean) attrib.getParent().getAttribute(CPListElement.COMBINE_ACCESSRULES); + if (nRules > 0) { + if (combined) { + if (nRules == 1) { + return NewWizardMessages.CPListLabelProvider_project_access_rules_combined_singular; + } else { + return Messages.format(NewWizardMessages.CPListLabelProvider_project_access_rules_combined_plural, String.valueOf(nRules)); + } } else { - return Messages.format(NewWizardMessages.CPListLabelProvider_project_access_rules_combined_plural, String.valueOf(nRules)); + if (nRules == 1) { + return NewWizardMessages.CPListLabelProvider_project_access_rules_not_combined_singular; + } else { + return Messages.format(NewWizardMessages.CPListLabelProvider_project_access_rules_not_combined_plural, String.valueOf(nRules)); + } } } else { - if (nRules == 1) { - return NewWizardMessages.CPListLabelProvider_project_access_rules_not_combined_singular; + return NewWizardMessages.CPListLabelProvider_project_access_rules_no_rules; + } + } else if (parentKind == IClasspathEntry.CPE_CONTAINER) { + if (nRules > 1) { + return Messages.format(NewWizardMessages.CPListLabelProvider_container_access_rules_plural, String.valueOf(nRules)); + } else if (nRules == 1) { + return NewWizardMessages.CPListLabelProvider_container_access_rules_singular; + } else { + return NewWizardMessages.CPListLabelProvider_container_no_access_rules; + } + } else { + if (nRules > 1) { + return Messages.format(NewWizardMessages.CPListLabelProvider_access_rules_enabled_plural, String.valueOf(nRules)); + } else if (nRules == 1) { + return NewWizardMessages.CPListLabelProvider_access_rules_enabled_singular; + } else { + return NewWizardMessages.CPListLabelProvider_access_rules_disabled; + } + } + } + case CPListElement.IGNORE_OPTIONAL_PROBLEMS: { + String arg; + if ("true".equals(attrib.getValue())) { //$NON-NLS-1$ + arg= NewWizardMessages.CPListLabelProvider_ignore_optional_problems_yes; + } else { + arg= NewWizardMessages.CPListLabelProvider_ignore_optional_problems_no; + } + return Messages.format(NewWizardMessages.CPListLabelProvider_ignore_optional_problems_label, arg); + } + case CPListElement.MODULE: { + Object value= attrib.getValue(); + if (value instanceof ModuleEncapsulationDetail[]) { + boolean limitModules= false; + boolean modifiesEncaps= false; + for (ModuleEncapsulationDetail detail : (ModuleEncapsulationDetail[]) value) { + if (detail instanceof LimitModules) { + limitModules= true; } else { - return Messages.format(NewWizardMessages.CPListLabelProvider_project_access_rules_not_combined_plural, String.valueOf(nRules)); + modifiesEncaps= true; } } + if (modifiesEncaps) { + if (limitModules) + return NewWizardMessages.CPListLabelProvider_modular_modifiesContentsAndEncapsulation_label; + return NewWizardMessages.CPListLabelProvider_modular_modifiesEncapsulation_label; + } else if (limitModules) { + return NewWizardMessages.CPListLabelProvider_modular_modifiesContents_label; + } + return NewWizardMessages.CPListLabelProvider_modular_label; } else { - return NewWizardMessages.CPListLabelProvider_project_access_rules_no_rules; + return NewWizardMessages.CPListLabelProvider_not_modular_label; } - } else if (parentKind == IClasspathEntry.CPE_CONTAINER) { - if (nRules > 1) { - return Messages.format(NewWizardMessages.CPListLabelProvider_container_access_rules_plural, String.valueOf(nRules)); - } else if (nRules == 1) { - return NewWizardMessages.CPListLabelProvider_container_access_rules_singular; + } + case CPListElement.TEST: { + String arg; + if ("true".equals(attrib.getValue())) { //$NON-NLS-1$ + arg= NewWizardMessages.CPListLabelProvider_test_yes; } else { - return NewWizardMessages.CPListLabelProvider_container_no_access_rules; + arg= NewWizardMessages.CPListLabelProvider_test_no; } - } else { - if (nRules > 1) { - return Messages.format(NewWizardMessages.CPListLabelProvider_access_rules_enabled_plural, String.valueOf(nRules)); - } else if (nRules == 1) { - return NewWizardMessages.CPListLabelProvider_access_rules_enabled_singular; + return Messages.format(attrib.getParent().getEntryKind() == IClasspathEntry.CPE_SOURCE + ? NewWizardMessages.CPListLabelProvider_test_sources_label + : NewWizardMessages.CPListLabelProvider_test_dependency_label, arg); + } + case CPListElement.WITHOUT_TEST_CODE: { + String arg; + if ("true".equals(attrib.getValue())) { //$NON-NLS-1$ + arg= NewWizardMessages.CPListLabelProvider_test_yes; } else { - return NewWizardMessages.CPListLabelProvider_access_rules_disabled; + arg= NewWizardMessages.CPListLabelProvider_test_no; } + return Messages.format(NewWizardMessages.CPListLabelProvider_without_test_code_label, arg); } - } else if (CPListElement.IGNORE_OPTIONAL_PROBLEMS.equals(key)) { - String arg; - if ("true".equals(attrib.getValue())) { //$NON-NLS-1$ - arg= NewWizardMessages.CPListLabelProvider_ignore_optional_problems_yes; - } else { - arg= NewWizardMessages.CPListLabelProvider_ignore_optional_problems_no; - } - return Messages.format(NewWizardMessages.CPListLabelProvider_ignore_optional_problems_label, arg); - } else if (CPListElement.MODULE.equals(key)) { - Object value= attrib.getValue(); - if (value instanceof ModuleEncapsulationDetail[]) { - boolean limitModules= false; - boolean modifiesEncaps= false; - for (ModuleEncapsulationDetail detail : (ModuleEncapsulationDetail[]) value) { - if (detail instanceof LimitModules) { - limitModules= true; - } else { - modifiesEncaps= true; - } + default: { + ClasspathAttributeConfiguration config= fAttributeDescriptors.get(key); + if (config != null) { + ClasspathAttributeAccess access= attrib.getClasspathAttributeAccess(); + String nameLabel= config.getNameLabel(access); + String valueLabel= config.getValueLabel(access); // should be LTR marked + return Messages.format(NewWizardMessages.CPListLabelProvider_attribute_label, new String[] { nameLabel, valueLabel }); } - if (modifiesEncaps) { - if (limitModules) - return NewWizardMessages.CPListLabelProvider_modular_modifiesContentsAndEncapsulation_label; - return NewWizardMessages.CPListLabelProvider_modular_modifiesEncapsulation_label; - } else if (limitModules) { - return NewWizardMessages.CPListLabelProvider_modular_modifiesContents_label; + String arg= (String) attrib.getValue(); + if (arg == null) { + arg= notAvailable; } - return NewWizardMessages.CPListLabelProvider_modular_label; - } else { - return NewWizardMessages.CPListLabelProvider_not_modular_label; - } - } else if (CPListElement.TEST.equals(key)) { - String arg; - if ("true".equals(attrib.getValue())) { //$NON-NLS-1$ - arg= NewWizardMessages.CPListLabelProvider_test_yes; - } else { - arg= NewWizardMessages.CPListLabelProvider_test_no; - } - return Messages.format(attrib.getParent().getEntryKind() == IClasspathEntry.CPE_SOURCE - ? NewWizardMessages.CPListLabelProvider_test_sources_label - : NewWizardMessages.CPListLabelProvider_test_dependency_label, arg); - } else if (CPListElement.WITHOUT_TEST_CODE.equals(key)) { - String arg; - if ("true".equals(attrib.getValue())) { //$NON-NLS-1$ - arg= NewWizardMessages.CPListLabelProvider_test_yes; - } else { - arg= NewWizardMessages.CPListLabelProvider_test_no; - } - return Messages.format(NewWizardMessages.CPListLabelProvider_without_test_code_label, arg); - } else { - ClasspathAttributeConfiguration config= fAttributeDescriptors.get(key); - if (config != null) { - ClasspathAttributeAccess access= attrib.getClasspathAttributeAccess(); - String nameLabel= config.getNameLabel(access); - String valueLabel= config.getValueLabel(access); // should be LTR marked - return Messages.format(NewWizardMessages.CPListLabelProvider_attribute_label, new String[] { nameLabel, valueLabel }); + return Messages.format(NewWizardMessages.CPListLabelProvider_attribute_label, new String[] { key, arg }); } - String arg= (String) attrib.getValue(); - if (arg == null) { - arg= notAvailable; - } - return Messages.format(NewWizardMessages.CPListLabelProvider_attribute_label, new String[] { key, arg }); } } @@ -520,27 +530,32 @@ public Image getImage(Object element) { } else if (element instanceof CPListElementAttribute) { CPListElementAttribute attribute= (CPListElementAttribute) element; String key= (attribute).getKey(); - if (CPListElement.SOURCEATTACHMENT.equals(key)) { - return fRegistry.get(JavaPluginImages.DESC_OBJS_SOURCE_ATTACH_ATTRIB); - } else if (CPListElement.OUTPUT.equals(key)) { - return fRegistry.get(JavaPluginImages.DESC_OBJS_OUTPUT_FOLDER_ATTRIB); - } else if (CPListElement.EXCLUSION.equals(key)) { - return fRegistry.get(JavaPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB); - } else if (CPListElement.INCLUSION.equals(key)) { - return fRegistry.get(JavaPluginImages.DESC_OBJS_INCLUSION_FILTER_ATTRIB); - } else if (CPListElement.ACCESSRULES.equals(key)) { - return fRegistry.get(JavaPluginImages.DESC_OBJS_ACCESSRULES_ATTRIB); - } else if (CPListElement.IGNORE_OPTIONAL_PROBLEMS.equals(key)) { - Image image= fRegistry.get(getCPListElementBaseImage(attribute.getParent(), false)); - if (image != null) { - ImageDescriptor overlay= JavaPluginImages.DESC_OVR_IGNORE_OPTIONAL_PROBLEMS; - ImageDescriptor imageDescriptor= new DecorationOverlayIcon(image, overlay, IDecoration.BOTTOM_LEFT); - return fRegistry.get(imageDescriptor); + switch (key) { + case CPListElement.SOURCEATTACHMENT: + return fRegistry.get(JavaPluginImages.DESC_OBJS_SOURCE_ATTACH_ATTRIB); + case CPListElement.OUTPUT: + return fRegistry.get(JavaPluginImages.DESC_OBJS_OUTPUT_FOLDER_ATTRIB); + case CPListElement.EXCLUSION: + return fRegistry.get(JavaPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB); + case CPListElement.INCLUSION: + return fRegistry.get(JavaPluginImages.DESC_OBJS_INCLUSION_FILTER_ATTRIB); + case CPListElement.ACCESSRULES: + return fRegistry.get(JavaPluginImages.DESC_OBJS_ACCESSRULES_ATTRIB); + case CPListElement.IGNORE_OPTIONAL_PROBLEMS: { + Image image= fRegistry.get(getCPListElementBaseImage(attribute.getParent(), false)); + if (image != null) { + ImageDescriptor overlay= JavaPluginImages.DESC_OVR_IGNORE_OPTIONAL_PROBLEMS; + ImageDescriptor imageDescriptor= new DecorationOverlayIcon(image, overlay, IDecoration.BOTTOM_LEFT); + return fRegistry.get(imageDescriptor); + } + break; } - } else { - ClasspathAttributeConfiguration config= fAttributeDescriptors.get(key); - if (config != null) { - return fRegistry.get(config.getImageDescriptor(attribute.getClasspathAttributeAccess())); + default: { + ClasspathAttributeConfiguration config= fAttributeDescriptors.get(key); + if (config != null) { + return fRegistry.get(config.getImageDescriptor(attribute.getClasspathAttributeAccess())); + } + break; } } return fSharedImages.getImage(ISharedImages.IMG_OBJS_CLASSPATH_VAR_ENTRY); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java index eb4c1184d46..7b244bdbb0c 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java @@ -782,63 +782,71 @@ private void editAttributeEntry(CPListElementAttribute elem) { canEditEncoding= !attribute.isNonModifiable() && !attribute.isNotSupported(); } } - if (CPListElement.SOURCEATTACHMENT.equals(key)) { - IClasspathEntry result= BuildPathDialogAccess.configureSourceAttachment(getShell(), selElement.getClasspathEntry(), canEditEncoding); - if (result != null) { - selElement.setAttribute(CPListElement.SOURCEATTACHMENT, result.getSourceAttachmentPath()); - selElement.setAttribute(CPListElement.SOURCE_ATTACHMENT_ENCODING, SourceAttachmentBlock.getSourceAttachmentEncoding(result)); - String[] changedAttributes= { CPListElement.SOURCEATTACHMENT, CPListElement.SOURCE_ATTACHMENT_ENCODING }; - attributeUpdated(selElement, changedAttributes); - fLibrariesList.refresh(elem); - fLibrariesList.update(selElement); // image - fClassPathList.refresh(); // images - updateEnabledState(); - } - } else if (CPListElement.ACCESSRULES.equals(key)) { - AccessRulesDialog dialog= new AccessRulesDialog(getShell(), selElement, fCurrJProject, fPageContainer != null); - int res= dialog.open(); - if (res == Window.OK || res == AccessRulesDialog.SWITCH_PAGE) { - selElement.setAttribute(CPListElement.ACCESSRULES, dialog.getAccessRules()); - String[] changedAttributes= { CPListElement.ACCESSRULES }; - attributeUpdated(selElement, changedAttributes); - - fLibrariesList.refresh(elem); - fClassPathList.dialogFieldChanged(); // validate - updateEnabledState(); - - if (res == AccessRulesDialog.SWITCH_PAGE) { // switch after updates and validation - dialog.performPageSwitch(fPageContainer); + switch (key) { + case CPListElement.SOURCEATTACHMENT: { + IClasspathEntry result= BuildPathDialogAccess.configureSourceAttachment(getShell(), selElement.getClasspathEntry(), canEditEncoding); + if (result != null) { + selElement.setAttribute(CPListElement.SOURCEATTACHMENT, result.getSourceAttachmentPath()); + selElement.setAttribute(CPListElement.SOURCE_ATTACHMENT_ENCODING, SourceAttachmentBlock.getSourceAttachmentEncoding(result)); + String[] changedAttributes= { CPListElement.SOURCEATTACHMENT, CPListElement.SOURCE_ATTACHMENT_ENCODING }; + attributeUpdated(selElement, changedAttributes); + fLibrariesList.refresh(elem); + fLibrariesList.update(selElement); // image + fClassPathList.refresh(); // images + updateEnabledState(); } + break; } - } else if (CPListElement.MODULE.equals(key)) { - boolean wasModular= selElement.getAttribute(CPListElement.MODULE) != null; - if (showModuleDialog(getShell(), elem)) { - String[] changedAttributes= { CPListElement.MODULE }; - attributeUpdated(selElement, changedAttributes); - if (hasRootNodes()) { - boolean isModular= selElement.getAttribute(CPListElement.MODULE) != null; - RootNodeChange direction= RootNodeChange.fromOldAndNew(wasModular, isModular); - if (direction != RootNodeChange.NoChange) { - moveCPElementAcrossNode(fLibrariesList, selElement, direction); + case CPListElement.ACCESSRULES: { + AccessRulesDialog dialog= new AccessRulesDialog(getShell(), selElement, fCurrJProject, fPageContainer != null); + int res= dialog.open(); + if (res == Window.OK || res == AccessRulesDialog.SWITCH_PAGE) { + selElement.setAttribute(CPListElement.ACCESSRULES, dialog.getAccessRules()); + String[] changedAttributes= { CPListElement.ACCESSRULES }; + attributeUpdated(selElement, changedAttributes); + + fLibrariesList.refresh(elem); + fClassPathList.dialogFieldChanged(); // validate + updateEnabledState(); + + if (res == AccessRulesDialog.SWITCH_PAGE) { // switch after updates and validation + dialog.performPageSwitch(fPageContainer); } } - fLibrariesList.refresh(elem); - fClassPathList.dialogFieldChanged(); // validate - updateEnabledState(); + break; } - } else { - if (editCustomAttribute(getShell(), elem)) { - String[] changedAttributes= { key }; - attributeUpdated(selElement, changedAttributes); - if(CPListElement.TEST.equals(key) || CPListElement.WITHOUT_TEST_CODE.equals(key)) { - fLibrariesList.refresh(elem.getParent()); - } else { + case CPListElement.MODULE: { + boolean wasModular= selElement.getAttribute(CPListElement.MODULE) != null; + if (showModuleDialog(getShell(), elem)) { + String[] changedAttributes= { CPListElement.MODULE }; + attributeUpdated(selElement, changedAttributes); + if (hasRootNodes()) { + boolean isModular= selElement.getAttribute(CPListElement.MODULE) != null; + RootNodeChange direction= RootNodeChange.fromOldAndNew(wasModular, isModular); + if (direction != RootNodeChange.NoChange) { + moveCPElementAcrossNode(fLibrariesList, selElement, direction); + } + } fLibrariesList.refresh(elem); + fClassPathList.dialogFieldChanged(); // validate + updateEnabledState(); } - fClassPathList.dialogFieldChanged(); // validate - updateEnabledState(); - checkAttributeEffect(key, fCurrJProject); + break; } + default: + if (editCustomAttribute(getShell(), elem)) { + String[] changedAttributes= { key }; + attributeUpdated(selElement, changedAttributes); + if(CPListElement.TEST.equals(key) || CPListElement.WITHOUT_TEST_CODE.equals(key)) { + fLibrariesList.refresh(elem.getParent()); + } else { + fLibrariesList.refresh(elem); + } + fClassPathList.dialogFieldChanged(); // validate + updateEnabledState(); + checkAttributeEffect(key, fCurrJProject); + } + break; } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java index d1e47e3b010..821ea0bd9f8 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java @@ -410,37 +410,50 @@ private void editElementEntry(CPListElement elem) { private void editAttributeEntry(CPListElementAttribute elem) { String key= elem.getKey(); - if (CPListElement.OUTPUT.equals(key)) { - CPListElement selElement= elem.getParent(); - OutputLocationDialog dialog= new OutputLocationDialog(getShell(), selElement, fClassPathList.getElements(), new Path(fOutputLocationField.getText()).makeAbsolute(), true); - if (dialog.open() == Window.OK) { - selElement.setAttribute(CPListElement.OUTPUT, dialog.getOutputLocation()); - fFoldersList.refresh(); - fClassPathList.dialogFieldChanged(); // validate + switch (key) { + case CPListElement.OUTPUT: { + CPListElement selElement= elem.getParent(); + OutputLocationDialog dialog= new OutputLocationDialog(getShell(), selElement, fClassPathList.getElements(), new Path(fOutputLocationField.getText()).makeAbsolute(), true); + if (dialog.open() == Window.OK) { + selElement.setAttribute(CPListElement.OUTPUT, dialog.getOutputLocation()); + fFoldersList.refresh(); + fClassPathList.dialogFieldChanged(); // validate + } + break; } - } else if (CPListElement.EXCLUSION.equals(key) || CPListElement.INCLUSION.equals(key)) { - EditFilterWizard wizard= newEditFilterWizard(elem.getParent(), fFoldersList.getElements(), fOutputLocationField.getText()); - OpenBuildPathWizardAction action= new OpenBuildPathWizardAction(wizard); - action.run(); - } else if (CPListElement.IGNORE_OPTIONAL_PROBLEMS.equals(key)) { - String newValue= "true".equals(elem.getValue()) ? null : "true"; //$NON-NLS-1$ //$NON-NLS-2$ - elem.setValue(newValue); - fFoldersList.refresh(elem); - } else if (CPListElement.TEST.equals(key)) { - String newValue= "true".equals(elem.getValue()) ? null : "true"; //$NON-NLS-1$ //$NON-NLS-2$ - elem.setValue(newValue); - fFoldersList.refresh(elem.getParent()); - fClassPathList.dialogFieldChanged(); // validate - } else if (CPListElement.WITHOUT_TEST_CODE.equals(key)) { - String newValue= "true".equals(elem.getValue()) ? null : "true"; //$NON-NLS-1$ //$NON-NLS-2$ - elem.setValue(newValue); - fFoldersList.refresh(elem.getParent()); - } else { - if (editCustomAttribute(getShell(), elem)) { - fFoldersList.refresh(); + case CPListElement.EXCLUSION: + case CPListElement.INCLUSION: { + EditFilterWizard wizard= newEditFilterWizard(elem.getParent(), fFoldersList.getElements(), fOutputLocationField.getText()); + OpenBuildPathWizardAction action= new OpenBuildPathWizardAction(wizard); + action.run(); + break; + } + case CPListElement.IGNORE_OPTIONAL_PROBLEMS: { + String newValue= "true".equals(elem.getValue()) ? null : "true"; //$NON-NLS-1$ //$NON-NLS-2$ + elem.setValue(newValue); + fFoldersList.refresh(elem); + break; + } + case CPListElement.TEST: { + String newValue= "true".equals(elem.getValue()) ? null : "true"; //$NON-NLS-1$ //$NON-NLS-2$ + elem.setValue(newValue); + fFoldersList.refresh(elem.getParent()); fClassPathList.dialogFieldChanged(); // validate - checkAttributeEffect(key, fCurrJProject); + break; } + case CPListElement.WITHOUT_TEST_CODE: { + String newValue= "true".equals(elem.getValue()) ? null : "true"; //$NON-NLS-1$ //$NON-NLS-2$ + elem.setValue(newValue); + fFoldersList.refresh(elem.getParent()); + break; + } + default: + if (editCustomAttribute(getShell(), elem)) { + fFoldersList.refresh(); + fClassPathList.dialogFieldChanged(); // validate + checkAttributeEffect(key, fCurrJProject); + } + break; } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/DynamicSourcesWorkingSetUpdater.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/DynamicSourcesWorkingSetUpdater.java index 6f010c58fcc..bfa96620ff4 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/DynamicSourcesWorkingSetUpdater.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/DynamicSourcesWorkingSetUpdater.java @@ -63,31 +63,39 @@ public void elementChanged(ElementChangedEvent event) { private boolean processJavaDelta(IJavaElementDelta delta) { IJavaElement jElement= delta.getElement(); int type= jElement.getElementType(); - if (type == IJavaElement.PACKAGE_FRAGMENT_ROOT) { - int kind= delta.getKind(); - if (kind == IJavaElementDelta.ADDED || kind == IJavaElementDelta.REMOVED) { - // this can happen without "classpath changed" event, if the directory corresponding to an optional source folder is created. - triggerUpdate(); - return true; - } - // do not traverse into children - } else if (type == IJavaElement.JAVA_PROJECT) { - int kind= delta.getKind(); - int flags= delta.getFlags(); - if (kind == IJavaElementDelta.ADDED || kind == IJavaElementDelta.REMOVED - || (flags & (IJavaElementDelta.F_OPENED | IJavaElementDelta.F_CLOSED | IJavaElementDelta.F_CLASSPATH_CHANGED)) != 0) { - triggerUpdate(); - return true; - } - for (IJavaElementDelta element : delta.getAffectedChildren()) { - if (processJavaDelta(element)) + switch (type) { + case IJavaElement.PACKAGE_FRAGMENT_ROOT: { + int kind= delta.getKind(); + if (kind == IJavaElementDelta.ADDED || kind == IJavaElementDelta.REMOVED) { + // this can happen without "classpath changed" event, if the directory corresponding to an optional source folder is created. + triggerUpdate(); return true; + } + // do not traverse into children + break; } - } else if (type == IJavaElement.JAVA_MODEL) { - for (IJavaElementDelta element : delta.getAffectedChildren()) { - if (processJavaDelta(element)) + case IJavaElement.JAVA_PROJECT: { + int kind= delta.getKind(); + int flags= delta.getFlags(); + if (kind == IJavaElementDelta.ADDED || kind == IJavaElementDelta.REMOVED + || (flags & (IJavaElementDelta.F_OPENED | IJavaElementDelta.F_CLOSED | IJavaElementDelta.F_CLASSPATH_CHANGED)) != 0) { + triggerUpdate(); return true; + } + for (IJavaElementDelta element : delta.getAffectedChildren()) { + if (processJavaDelta(element)) + return true; + } + break; } + case IJavaElement.JAVA_MODEL: + for (IJavaElementDelta element : delta.getAffectedChildren()) { + if (processJavaDelta(element)) + return true; + } + break; + default: + break; } return false; } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java index 2bd57252966..8069586d084 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/WorkingSetModel.java @@ -622,26 +622,35 @@ private void workingSetManagerChanged(PropertyChangeEvent event) { if (!isAffected(event)) return; - if (IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE.equals(property)) { - IWorkingSet workingSet= (IWorkingSet)event.getNewValue(); - IAdaptable[] elements= fElementMapper.refresh(workingSet); - if (elements != null) { - fireEvent(event); + switch (property) { + case IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE: { + IWorkingSet workingSet= (IWorkingSet)event.getNewValue(); + IAdaptable[] elements= fElementMapper.refresh(workingSet); + if (elements != null) { + fireEvent(event); + } + break; } - } else if (IWorkingSetManager.CHANGE_WORKING_SET_REMOVE.equals(property)) { - IWorkingSet workingSet= (IWorkingSet)event.getOldValue(); - List elements= new ArrayList<>(fActiveWorkingSets); - elements.remove(workingSet); - List allElements= new ArrayList<>(Arrays.asList(getAllWorkingSets())); - allElements.remove(workingSet); - setWorkingSets(allElements.toArray(new IWorkingSet[allElements.size()]), fIsSortingEnabled, elements.toArray(new IWorkingSet[elements.size()])); - } else if (IWorkingSetManager.CHANGE_WORKING_SET_LABEL_CHANGE.equals(property)) { - IWorkingSet workingSet= (IWorkingSet)event.getNewValue(); - if (isSortingEnabled() && Arrays.asList(getAllWorkingSets()).contains(workingSet)) { - setWorkingSets(getAllWorkingSets(), isSortingEnabled(), fActiveWorkingSets.toArray(new IWorkingSet[fActiveWorkingSets.size()])); - } else { - fireEvent(event); + case IWorkingSetManager.CHANGE_WORKING_SET_REMOVE: { + IWorkingSet workingSet= (IWorkingSet)event.getOldValue(); + List elements= new ArrayList<>(fActiveWorkingSets); + elements.remove(workingSet); + List allElements= new ArrayList<>(Arrays.asList(getAllWorkingSets())); + allElements.remove(workingSet); + setWorkingSets(allElements.toArray(new IWorkingSet[allElements.size()]), fIsSortingEnabled, elements.toArray(new IWorkingSet[elements.size()])); + break; + } + case IWorkingSetManager.CHANGE_WORKING_SET_LABEL_CHANGE: { + IWorkingSet workingSet= (IWorkingSet)event.getNewValue(); + if (isSortingEnabled() && Arrays.asList(getAllWorkingSets()).contains(workingSet)) { + setWorkingSets(getAllWorkingSets(), isSortingEnabled(), fActiveWorkingSets.toArray(new IWorkingSet[fActiveWorkingSets.size()])); + } else { + fireEvent(event); + } + break; } + default: + break; } } diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ExternalizeStringsAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ExternalizeStringsAction.java index f4a77fe87af..a420f67068a 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ExternalizeStringsAction.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/ExternalizeStringsAction.java @@ -236,44 +236,52 @@ private List analyze(Object obj, IProgressMonitor pm) throws Core IJavaElement element= (IJavaElement) obj; int elementType= element.getElementType(); - if (elementType == IJavaElement.PACKAGE_FRAGMENT) { - return analyze((IPackageFragment) element, Progress.subMonitor(pm, 1)); - } else if (elementType == IJavaElement.PACKAGE_FRAGMENT_ROOT) { - IPackageFragmentRoot root= (IPackageFragmentRoot)element; - if (!root.isExternal() && !ReorgUtilsCore.isClassFolder(root)) { - return analyze((IPackageFragmentRoot) element, Progress.subMonitor(pm, 1)); - } else { - pm.worked(1); - } - } else if (elementType == IJavaElement.JAVA_PROJECT) { - return analyze((IJavaProject) element, Progress.subMonitor(pm, 1)); - } else if (elementType == IJavaElement.COMPILATION_UNIT) { - ICompilationUnit cu= (ICompilationUnit)element; - if (cu.exists()) { - NonNLSElement nlsElement= analyze(cu); - if (nlsElement != null) { + switch (elementType) { + case IJavaElement.PACKAGE_FRAGMENT: + return analyze((IPackageFragment) element, Progress.subMonitor(pm, 1)); + case IJavaElement.PACKAGE_FRAGMENT_ROOT: { + IPackageFragmentRoot root= (IPackageFragmentRoot)element; + if (!root.isExternal() && !ReorgUtilsCore.isClassFolder(root)) { + return analyze((IPackageFragmentRoot) element, Progress.subMonitor(pm, 1)); + } else { pm.worked(1); - ArrayList result= new ArrayList<>(); - result.add(nlsElement); - return result; } + break; } - pm.worked(1); - } else if (elementType == IJavaElement.TYPE) { - IType type= (IType)element; - ICompilationUnit cu= type.getCompilationUnit(); - if (cu != null && cu.exists()) { - NonNLSElement nlsElement= analyze(cu); - if (nlsElement != null) { - pm.worked(1); - ArrayList result= new ArrayList<>(); - result.add(nlsElement); - return result; + case IJavaElement.JAVA_PROJECT: + return analyze((IJavaProject) element, Progress.subMonitor(pm, 1)); + case IJavaElement.COMPILATION_UNIT: { + ICompilationUnit cu= (ICompilationUnit)element; + if (cu.exists()) { + NonNLSElement nlsElement= analyze(cu); + if (nlsElement != null) { + pm.worked(1); + ArrayList result= new ArrayList<>(); + result.add(nlsElement); + return result; + } + } + pm.worked(1); + break; + } + case IJavaElement.TYPE: { + IType type= (IType)element; + ICompilationUnit cu= type.getCompilationUnit(); + if (cu != null && cu.exists()) { + NonNLSElement nlsElement= analyze(cu); + if (nlsElement != null) { + pm.worked(1); + ArrayList result= new ArrayList<>(); + result.add(nlsElement); + return result; + } } + pm.worked(1); + break; } - pm.worked(1); - } else { - pm.worked(1); + default: + pm.worked(1); + break; } } else if (obj instanceof IWorkingSet) { List result= new ArrayList<>(); From 1df6c00479ebd2cb7030ea92ae10a28112a8b367 Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Thu, 5 Sep 2024 21:15:07 +0200 Subject: [PATCH 2/2] Reduce deprecated class warnings (#1540) Replace deprecated CompilationUnitRewriteOperation with CompilationUnitRewriteOperationWithSourceRange --- .../corext/fix/ControlStatementsFix.java | 10 +++++----- .../internal/corext/fix/ExpressionsFix.java | 20 +++++++++---------- .../corext/fix/NullAnnotationsFix.java | 12 +++++------ .../fix/NullAnnotationsRewriteOperations.java | 8 ++++---- .../corext/fix/TypeAnnotationFix.java | 2 +- .../fix/TypeAnnotationRewriteOperations.java | 4 ++-- .../jdt/internal/ui/fix/AddAllCleanUp.java | 12 +++++------ .../internal/ui/fix/ArraysFillCleanUp.java | 8 ++++---- .../internal/ui/fix/AutoboxingCleanUp.java | 8 ++++---- .../BitwiseConditionalExpressionCleanup.java | 8 ++++---- .../ui/fix/BooleanLiteralCleanUp.java | 8 ++++---- .../jdt/internal/ui/fix/BreakLoopCleanUp.java | 8 ++++---- .../ui/fix/CollectionCloningCleanUp.java | 8 ++++---- .../ui/fix/ComparingOnCriteriaCleanUp.java | 9 ++++----- .../ui/fix/ControlFlowMergeCleanUp.java | 8 ++++---- .../ui/fix/DoubleNegationCleanUp.java | 8 ++++---- .../internal/ui/fix/EmbeddedIfCleanUp.java | 8 ++++---- .../ui/fix/EvaluateNullableCleanUp.java | 8 ++++---- .../ui/fix/ExtractIncrementCleanUp.java | 8 ++++---- .../jdt/internal/ui/fix/HashCleanUp.java | 8 ++++---- .../internal/ui/fix/InstanceofCleanUp.java | 8 ++++---- .../jdt/internal/ui/fix/JoinCleanUp.java | 8 ++++---- .../internal/ui/fix/LazyLogicalCleanUp.java | 8 ++++---- .../internal/ui/fix/MapCloningCleanUp.java | 8 ++++---- .../jdt/internal/ui/fix/MapMethodCleanUp.java | 8 ++++---- .../ui/fix/MergeConditionalBlocksCleanUp.java | 10 +++++----- .../internal/ui/fix/NumberSuffixCleanUp.java | 8 ++++---- .../internal/ui/fix/ObjectsEqualsCleanUp.java | 8 ++++---- .../ui/fix/OperandFactorizationCleanUp.java | 8 ++++---- .../jdt/internal/ui/fix/PatternCleanUp.java | 8 ++++---- .../ui/fix/PrimitiveParsingCleanUp.java | 12 +++++------ .../ui/fix/PrimitiveSerializationCleanUp.java | 8 ++++---- .../ui/fix/PullUpAssignmentCleanUp.java | 10 +++++----- .../ui/fix/PushDownNegationCleanUp.java | 10 +++++----- .../ui/fix/ReduceIndentationCleanUp.java | 10 +++++----- .../RedundantComparisonStatementCleanUp.java | 8 ++++---- ...edundantFallingThroughBlockEndCleanUp.java | 8 ++++---- .../ui/fix/RedundantIfConditionCleanUp.java | 8 ++++---- .../ui/fix/RedundantModifiersCleanUp.java | 8 ++++---- .../ui/fix/RedundantSuperCallCleanUp.java | 8 ++++---- .../ui/fix/SingleUsedFieldCleanUp.java | 8 ++++---- .../fix/StrictlyEqualOrDifferentCleanUp.java | 8 ++++---- .../internal/ui/fix/StringBuilderCleanUp.java | 8 ++++---- .../ui/fix/TernaryOperatorCleanUp.java | 8 ++++---- .../jdt/internal/ui/fix/UnboxingCleanUp.java | 8 ++++---- .../internal/ui/fix/UnloopedWhileCleanUp.java | 8 ++++---- .../ui/fix/UnreachableBlockCleanUp.java | 8 ++++---- .../ui/fix/UseStringIsBlankCleanUp.java | 8 ++++---- .../ui/fix/UselessContinueCleanUp.java | 8 ++++---- .../internal/ui/fix/UselessReturnCleanUp.java | 8 ++++---- 50 files changed, 212 insertions(+), 213 deletions(-) diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/ControlStatementsFix.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/ControlStatementsFix.java index 603d67b071f..c655e447d40 100644 --- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/ControlStatementsFix.java +++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/ControlStatementsFix.java @@ -48,7 +48,7 @@ public class ControlStatementsFix extends CompilationUnitRewriteOperationsFix { private final static class ControlStatementFinder extends GenericVisitor { - private final List fResult; + private final List fResult; private final boolean fFindControlStatementsWithoutBlock; private final boolean fRemoveUnnecessaryBlocks; private final boolean fRemoveUnnecessaryBlocksOnlyWhenReturnOrThrow; @@ -56,7 +56,7 @@ private final static class ControlStatementFinder extends GenericVisitor { public ControlStatementFinder(boolean findControlStatementsWithoutBlock, boolean removeUnnecessaryBlocks, boolean removeUnnecessaryBlocksOnlyWhenReturnOrThrow, - List resultingCollection) { + List resultingCollection) { fFindControlStatementsWithoutBlock= findControlStatementsWithoutBlock; fRemoveUnnecessaryBlocks= removeUnnecessaryBlocks; @@ -487,18 +487,18 @@ public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, if (!convertSingleStatementToBlock && !removeUnnecessaryBlock && !removeUnnecessaryBlockContainingReturnOrThrow) return null; - List operations= new ArrayList<>(); + List operations= new ArrayList<>(); ControlStatementFinder finder= new ControlStatementFinder(convertSingleStatementToBlock, removeUnnecessaryBlock, removeUnnecessaryBlockContainingReturnOrThrow, operations); compilationUnit.accept(finder); if (operations.isEmpty()) return null; - CompilationUnitRewriteOperation[] ops= operations.toArray(new CompilationUnitRewriteOperation[operations.size()]); + CompilationUnitRewriteOperationWithSourceRange[] ops= operations.toArray(new CompilationUnitRewriteOperationWithSourceRange[operations.size()]); return new ControlStatementsFix(FixMessages.ControlStatementsFix_change_name, compilationUnit, ops); } - protected ControlStatementsFix(String name, CompilationUnit compilationUnit, CompilationUnitRewriteOperation[] fixRewriteOperations) { + protected ControlStatementsFix(String name, CompilationUnit compilationUnit, CompilationUnitRewriteOperationWithSourceRange[] fixRewriteOperations) { super(name, compilationUnit, fixRewriteOperations); } diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/ExpressionsFix.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/ExpressionsFix.java index c3ee7f12cfe..a80f7f6d831 100644 --- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/ExpressionsFix.java +++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/ExpressionsFix.java @@ -95,7 +95,7 @@ public boolean visit(ParenthesizedExpression node) { } } - private static class AddParenthesisOperation extends CompilationUnitRewriteOperation { + private static class AddParenthesisOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Expression[] fExpressions; @@ -119,7 +119,7 @@ public void rewriteASTInternal(CompilationUnitRewrite cuRewrite, LinkedProposalM } } - private static class RemoveParenthesisOperation extends CompilationUnitRewriteOperation { + private static class RemoveParenthesisOperation extends CompilationUnitRewriteOperationWithSourceRange { private final HashSet fExpressions; @@ -172,8 +172,8 @@ public static ExpressionsFix createAddParanoidalParenthesisFix(CompilationUnit c return null; - CompilationUnitRewriteOperation op= new AddParenthesisOperation(changedNodes.toArray(new Expression[changedNodes.size()])); - return new ExpressionsFix(FixMessages.ExpressionsFix_addParanoiacParentheses_description, compilationUnit, new CompilationUnitRewriteOperation[] {op}); + CompilationUnitRewriteOperationWithSourceRange op= new AddParenthesisOperation(changedNodes.toArray(new Expression[changedNodes.size()])); + return new ExpressionsFix(FixMessages.ExpressionsFix_addParanoiacParentheses_description, compilationUnit, new CompilationUnitRewriteOperationWithSourceRange[] {op}); } public static ExpressionsFix createRemoveUnnecessaryParenthesisFix(CompilationUnit compilationUnit, ASTNode[] nodes) { @@ -188,7 +188,7 @@ public static ExpressionsFix createRemoveUnnecessaryParenthesisFix(CompilationUn HashSet expressions= new HashSet<>(changedNodes); RemoveParenthesisOperation op= new RemoveParenthesisOperation(expressions); - return new ExpressionsFix(FixMessages.ExpressionsFix_removeUnnecessaryParentheses_description, compilationUnit, new CompilationUnitRewriteOperation[] {op}); + return new ExpressionsFix(FixMessages.ExpressionsFix_removeUnnecessaryParentheses_description, compilationUnit, new CompilationUnitRewriteOperationWithSourceRange[] {op}); } public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, @@ -202,8 +202,8 @@ public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, if (changedNodes.isEmpty()) return null; - CompilationUnitRewriteOperation op= new AddParenthesisOperation(changedNodes.toArray(new Expression[changedNodes.size()])); - return new ExpressionsFix(FixMessages.ExpressionsFix_add_parentheses_change_name, compilationUnit, new CompilationUnitRewriteOperation[] {op}); + CompilationUnitRewriteOperationWithSourceRange op= new AddParenthesisOperation(changedNodes.toArray(new Expression[changedNodes.size()])); + return new ExpressionsFix(FixMessages.ExpressionsFix_add_parentheses_change_name, compilationUnit, new CompilationUnitRewriteOperationWithSourceRange[] {op}); } else if (removeUnnecessaryParenthesis) { final ArrayList changedNodes = new ArrayList<>(); compilationUnit.accept(new UnnecessaryParenthesisVisitor(changedNodes)); @@ -212,13 +212,13 @@ public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, return null; HashSet expressions= new HashSet<>(changedNodes); - CompilationUnitRewriteOperation op= new RemoveParenthesisOperation(expressions); - return new ExpressionsFix(FixMessages.ExpressionsFix_remove_parentheses_change_name, compilationUnit, new CompilationUnitRewriteOperation[] {op}); + CompilationUnitRewriteOperationWithSourceRange op= new RemoveParenthesisOperation(expressions); + return new ExpressionsFix(FixMessages.ExpressionsFix_remove_parentheses_change_name, compilationUnit, new CompilationUnitRewriteOperationWithSourceRange[] {op}); } return null; } - protected ExpressionsFix(String name, CompilationUnit compilationUnit, CompilationUnitRewriteOperation[] fixRewriteOperations) { + protected ExpressionsFix(String name, CompilationUnit compilationUnit, CompilationUnitRewriteOperationWithSourceRange[] fixRewriteOperations) { super(name, compilationUnit, fixRewriteOperations); } } diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/NullAnnotationsFix.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/NullAnnotationsFix.java index da45a0c5530..0d8be70f602 100644 --- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/NullAnnotationsFix.java +++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/NullAnnotationsFix.java @@ -53,7 +53,7 @@ public class NullAnnotationsFix extends CompilationUnitRewriteOperationsFix { private CompilationUnit cu; - public NullAnnotationsFix(String name, CompilationUnit compilationUnit, CompilationUnitRewriteOperation[] operations) { + public NullAnnotationsFix(String name, CompilationUnit compilationUnit, CompilationUnitRewriteOperationWithSourceRange[] operations) { super(name, compilationUnit, operations); cu= compilationUnit; } @@ -170,7 +170,7 @@ public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, IProble if (!JavaModelUtil.is50OrHigher(cu.getJavaProject())) return null; - List operations= new ArrayList<>(); + List operations= new ArrayList<>(); if (locations == null) { org.eclipse.jdt.core.compiler.IProblem[] problems= compilationUnit.getProblems(); locations= new IProblemLocation[problems.length]; @@ -190,11 +190,11 @@ public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, IProble } if (operations.isEmpty()) return null; - CompilationUnitRewriteOperation[] operationsArray= operations.toArray(new CompilationUnitRewriteOperation[operations.size()]); + CompilationUnitRewriteOperationWithSourceRange[] operationsArray= operations.toArray(new CompilationUnitRewriteOperationWithSourceRange[operations.size()]); return new NullAnnotationsFix(message, compilationUnit, operationsArray); } - private static boolean createMoveTypeAnnotationOperations(CompilationUnit compilationUnit, IProblemLocation[] locations, List operations) { + private static boolean createMoveTypeAnnotationOperations(CompilationUnit compilationUnit, IProblemLocation[] locations, List operations) { boolean isMove= false; for (IProblemLocation location: locations) { if (location == null) @@ -206,7 +206,7 @@ private static boolean createMoveTypeAnnotationOperations(CompilationUnit compil return isMove; } - private static void createAddNullAnnotationOperations(CompilationUnit compilationUnit, IProblemLocation[] locations, List result) { + private static void createAddNullAnnotationOperations(CompilationUnit compilationUnit, IProblemLocation[] locations, List result) { String nullableAnnotationName= getNullableAnnotationName(compilationUnit.getJavaElement(), false); String nonNullAnnotationName= getNonNullAnnotationName(compilationUnit.getJavaElement(), false); @@ -262,7 +262,7 @@ private static void createAddNullAnnotationOperations(CompilationUnit compilatio } } - private static void createRemoveRedundantNullAnnotationsOperations(CompilationUnit compilationUnit, IProblemLocation[] locations, List result) { + private static void createRemoveRedundantNullAnnotationsOperations(CompilationUnit compilationUnit, IProblemLocation[] locations, List result) { for (IProblemLocation problem : locations) { if (problem == null) continue; // problem was filtered out by createCleanUp() diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/NullAnnotationsRewriteOperations.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/NullAnnotationsRewriteOperations.java index 99bac376c72..da901a50437 100644 --- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/NullAnnotationsRewriteOperations.java +++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/NullAnnotationsRewriteOperations.java @@ -70,7 +70,7 @@ import org.eclipse.jdt.internal.corext.codemanipulation.RedundantNullnessTypeAnnotationsFilter; import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.dom.Bindings; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; import org.eclipse.jdt.internal.corext.util.Messages; @@ -96,7 +96,7 @@ public enum ChangeKind { TARGET // change the target method of a method call } - static abstract class SignatureAnnotationRewriteOperation extends CompilationUnitRewriteOperation { + static abstract class SignatureAnnotationRewriteOperation extends CompilationUnitRewriteOperationWithSourceRange { // initialized from the Builder: protected CompilationUnit fUnit; protected String fAnnotationToAdd; @@ -329,7 +329,7 @@ public void rewriteASTInternal(CompilationUnitRewrite cuRewrite, LinkedProposalM } } - static class RemoveRedundantAnnotationRewriteOperation extends CompilationUnitRewriteOperation { + static class RemoveRedundantAnnotationRewriteOperation extends CompilationUnitRewriteOperationWithSourceRange { private IProblemLocation fProblem; private CompilationUnit fCompilationUnit; @@ -385,7 +385,7 @@ public void rewriteASTInternal(CompilationUnitRewrite cuRewrite, LinkedProposalM } } - static class AddMissingDefaultNullnessRewriteOperation extends CompilationUnitRewriteOperation { + static class AddMissingDefaultNullnessRewriteOperation extends CompilationUnitRewriteOperationWithSourceRange { private IProblemLocation fProblem; private CompilationUnit fCompilationUnit; diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/TypeAnnotationFix.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/TypeAnnotationFix.java index 001d2769d69..baf1623ab0b 100644 --- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/TypeAnnotationFix.java +++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/TypeAnnotationFix.java @@ -20,7 +20,7 @@ import org.eclipse.jdt.ui.text.java.IProblemLocation; public class TypeAnnotationFix extends CompilationUnitRewriteOperationsFix { - public TypeAnnotationFix(String name, CompilationUnit compilationUnit, CompilationUnitRewriteOperation operation) { + public TypeAnnotationFix(String name, CompilationUnit compilationUnit, CompilationUnitRewriteOperationWithSourceRange operation) { super(name, compilationUnit, operation); } diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/TypeAnnotationRewriteOperations.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/TypeAnnotationRewriteOperations.java index 696c67d1cb7..9b640ca9ab2 100644 --- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/TypeAnnotationRewriteOperations.java +++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/TypeAnnotationRewriteOperations.java @@ -40,13 +40,13 @@ import org.eclipse.jdt.core.dom.rewrite.ASTRewrite; import org.eclipse.jdt.core.dom.rewrite.ListRewrite; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.ui.text.java.IProblemLocation; public class TypeAnnotationRewriteOperations { - static class MoveTypeAnnotationRewriteOperation extends CompilationUnitRewriteOperation { + static class MoveTypeAnnotationRewriteOperation extends CompilationUnitRewriteOperationWithSourceRange { private IProblemLocation fProblem; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AddAllCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AddAllCleanUp.java index b99d8745ccc..56fca36093e 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AddAllCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AddAllCleanUp.java @@ -51,11 +51,11 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory; import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.dom.ForLoops; -import org.eclipse.jdt.internal.corext.dom.VarDefinitionsUsesVisitor; import org.eclipse.jdt.internal.corext.dom.ForLoops.ForLoopContent; +import org.eclipse.jdt.internal.corext.dom.VarDefinitionsUsesVisitor; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; @@ -111,7 +111,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -260,7 +260,7 @@ private boolean isSameVariable(final ForLoopContent loopContent, final MethodInv } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.AddAllCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -278,7 +278,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class AddOrRemoveAllForArrayOperation extends CompilationUnitRewriteOperation { + private static class AddOrRemoveAllForArrayOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Statement toReplace; private final Expression affectedCollection; private final Expression addedData; @@ -328,7 +328,7 @@ public void rewriteASTInternal(final CompilationUnitRewrite cuRewrite, final Lin } } - private static class AddAllForCollectionOperation extends CompilationUnitRewriteOperation { + private static class AddAllForCollectionOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Statement toReplace; private final Expression affectedCollection; private final Expression addedData; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ArraysFillCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ArraysFillCleanUp.java index bab84287242..b5385c437e4 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ArraysFillCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ArraysFillCleanUp.java @@ -49,7 +49,7 @@ import org.eclipse.jdt.internal.corext.dom.ForLoops.ForLoopContent; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -106,7 +106,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -197,7 +197,7 @@ private boolean isSameVariable(final ForLoopContent loopContent, final ArrayAcce } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.ArraysFillCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -210,7 +210,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class ArraysFillOperation extends CompilationUnitRewriteOperation { + private static class ArraysFillOperation extends CompilationUnitRewriteOperationWithSourceRange { private final ForStatement node; private final Assignment assignment; private final ArrayAccess arrayAccess; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AutoboxingCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AutoboxingCleanUp.java index 57809570068..7ad8f24d0bf 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AutoboxingCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/AutoboxingCleanUp.java @@ -42,7 +42,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; @@ -103,7 +103,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -186,7 +186,7 @@ private boolean hasConflictingMethodOrConstructor(final MethodInvocation visited } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.AutoboxingCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[rewriteOperations.size()])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[rewriteOperations.size()])); } @Override @@ -199,7 +199,7 @@ protected ICleanUpFix createFix(CompilationUnit unit, IProblemLocation[] problem return null; } - private static class AutoboxingOperation extends CompilationUnitRewriteOperation { + private static class AutoboxingOperation extends CompilationUnitRewriteOperationWithSourceRange { private final ASTNode node; private final ITypeBinding primitiveType; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BitwiseConditionalExpressionCleanup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BitwiseConditionalExpressionCleanup.java index 59a9194e6ee..f6e5a74146e 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BitwiseConditionalExpressionCleanup.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BitwiseConditionalExpressionCleanup.java @@ -36,7 +36,7 @@ import org.eclipse.jdt.internal.corext.dom.AbortSearchException; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -89,7 +89,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -141,7 +141,7 @@ public boolean visit(InfixExpression node) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.CheckSignOfBitwiseOperation_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -154,7 +154,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class RewriteInfixExpressionOperator extends CompilationUnitRewriteOperation { + private static class RewriteInfixExpressionOperator extends CompilationUnitRewriteOperationWithSourceRange { private InfixExpression fExpression; public RewriteInfixExpressionOperator(final InfixExpression expression) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BooleanLiteralCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BooleanLiteralCleanUp.java index 0ede7fd9fbe..be1723136a4 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BooleanLiteralCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BooleanLiteralCleanUp.java @@ -36,7 +36,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; @@ -87,7 +87,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -115,7 +115,7 @@ public boolean visit(final QualifiedName node) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.BooleanLiteralCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -133,7 +133,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class BooleanLiteralOperation extends CompilationUnitRewriteOperation { + private static class BooleanLiteralOperation extends CompilationUnitRewriteOperationWithSourceRange { private final QualifiedName node; private final boolean value; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BreakLoopCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BreakLoopCleanUp.java index 1aaa8c45486..86924ce79f1 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BreakLoopCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/BreakLoopCleanUp.java @@ -56,7 +56,7 @@ import org.eclipse.jdt.internal.corext.dom.VarConflictVisitor; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -130,7 +130,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { final class DisturbingEffectVisitor extends InterruptibleVisitor { @@ -379,7 +379,7 @@ private boolean areAssignmentsValid(final Set allowedVars, final Lis } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.BreakLoopCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -392,7 +392,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class BreakLoopOperation extends CompilationUnitRewriteOperation { + private static class BreakLoopOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement ifStatement; public BreakLoopOperation(final IfStatement ifStatement) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/CollectionCloningCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/CollectionCloningCleanUp.java index 3c50efe6f5e..a16b387bc16 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/CollectionCloningCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/CollectionCloningCleanUp.java @@ -59,7 +59,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -111,7 +111,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -236,7 +236,7 @@ private boolean isValidCapacityParameter(final Expression sourceCollection, fina } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.CollectionCloningCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -249,7 +249,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class CollectionCloningOperation extends CompilationUnitRewriteOperation { + private static class CollectionCloningOperation extends CompilationUnitRewriteOperationWithSourceRange { private final ExpressionStatement nodeToRemove; private final ClassInstanceCreation classInstanceCreation; private final Expression arg0; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ComparingOnCriteriaCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ComparingOnCriteriaCleanUp.java index e03e227d931..5d0ee6df792 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ComparingOnCriteriaCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ComparingOnCriteriaCleanUp.java @@ -63,7 +63,7 @@ import org.eclipse.jdt.internal.corext.dom.OrderedInfixExpression; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.ControlWorkflowMatcher; @@ -73,7 +73,6 @@ import org.eclipse.jdt.ui.cleanup.CleanUpRequirements; import org.eclipse.jdt.ui.cleanup.ICleanUpFix; - import org.eclipse.jdt.ui.text.java.IProblemLocation; /** @@ -168,7 +167,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -479,7 +478,7 @@ private boolean isRefactorComparisonToRefactor(final AtomicReference } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.ComparingOnCriteriaCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -492,7 +491,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class ComparingOnCriteriaOperation extends CompilationUnitRewriteOperation { + private static class ComparingOnCriteriaOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Expression visited; private final ITypeBinding typeArgument; private final SimpleName name1; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ControlFlowMergeCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ControlFlowMergeCleanUp.java index 3e28ce5b888..e3c15952ec8 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ControlFlowMergeCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ControlFlowMergeCleanUp.java @@ -47,7 +47,7 @@ import org.eclipse.jdt.internal.corext.dom.VarConflictVisitor; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -111,7 +111,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -303,7 +303,7 @@ private boolean hasVariableConflict(final IfStatement visited, final List allCases; private final List> allCasesStatements; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/DoubleNegationCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/DoubleNegationCleanUp.java index 26ed841b59b..40916fd0598 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/DoubleNegationCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/DoubleNegationCleanUp.java @@ -36,7 +36,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -96,7 +96,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -133,7 +133,7 @@ public boolean visit(final InfixExpression visited) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.DoubleNegationCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -151,7 +151,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class DoubleNegationOperation extends CompilationUnitRewriteOperation { + private static class DoubleNegationOperation extends CompilationUnitRewriteOperationWithSourceRange { private final InfixExpression visited; private final Expression leftExpression; private final Expression rightExpression; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/EmbeddedIfCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/EmbeddedIfCleanUp.java index 8d2811b9050..dd9c70242f0 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/EmbeddedIfCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/EmbeddedIfCleanUp.java @@ -37,7 +37,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -95,7 +95,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -127,7 +127,7 @@ public boolean visit(final IfStatement visited) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.EmbeddedIfCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -145,7 +145,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class EmbeddedIfOperation extends CompilationUnitRewriteOperation { + private static class EmbeddedIfOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement visited; private final IfStatement innerIf; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/EvaluateNullableCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/EvaluateNullableCleanUp.java index c0cbf5e89ce..e6a12edb021 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/EvaluateNullableCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/EvaluateNullableCleanUp.java @@ -37,7 +37,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -98,7 +98,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -166,7 +166,7 @@ private boolean isNullCheckRedundant(final Expression nullCheckedExpression, fin } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.EvaluateNullableCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -184,7 +184,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class EvaluateNullableOperation extends CompilationUnitRewriteOperation { + private static class EvaluateNullableOperation extends CompilationUnitRewriteOperationWithSourceRange { private final InfixExpression visited; private final List operands; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ExtractIncrementCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ExtractIncrementCleanUp.java index a66311f5318..1e4c65b1946 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ExtractIncrementCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ExtractIncrementCleanUp.java @@ -48,7 +48,7 @@ import org.eclipse.jdt.internal.corext.dom.VarDefinitionsUsesVisitor; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -107,7 +107,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -286,7 +286,7 @@ private boolean maybeExtractIncrement(final Expression visited, final Expression } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.CodeStyleCleanUp_ExtractIncrement_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -299,7 +299,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class ExtractIncrementOperation extends CompilationUnitRewriteOperation { + private static class ExtractIncrementOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Expression visited; private final Expression variable; private final Statement statement; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/HashCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/HashCleanUp.java index ae957c4733e..bea1a510f4e 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/HashCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/HashCleanUp.java @@ -60,7 +60,7 @@ import org.eclipse.jdt.internal.corext.dom.OrderedInfixExpression; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; @@ -131,7 +131,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -510,7 +510,7 @@ private boolean isGivenVariable(final Expression expression, final SimpleName va } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.HashCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -528,7 +528,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class HashOperation extends CompilationUnitRewriteOperation { + private static class HashOperation extends CompilationUnitRewriteOperationWithSourceRange { private final MethodDeclaration node; private final CollectedData data; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/InstanceofCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/InstanceofCleanUp.java index 7eb2549d9bc..a7aa49e9618 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/InstanceofCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/InstanceofCleanUp.java @@ -36,7 +36,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -90,7 +90,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -116,7 +116,7 @@ public boolean visit(final MethodInvocation visited) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.CodeStyleCleanUp_Instanceof_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -129,7 +129,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class InstanceofOperation extends CompilationUnitRewriteOperation { + private static class InstanceofOperation extends CompilationUnitRewriteOperationWithSourceRange { private final MethodInvocation visited; private final TypeLiteral clazz; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/JoinCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/JoinCleanUp.java index 976095cbefa..c0854e2a821 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/JoinCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/JoinCleanUp.java @@ -66,7 +66,7 @@ import org.eclipse.jdt.internal.corext.dom.VarDefinitionsUsesVisitor; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; @@ -133,7 +133,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -684,7 +684,7 @@ private boolean isSameVariable(final ArrayAccess arrayAccess, final Expression c } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.JoinCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -702,7 +702,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class JoinOperation extends CompilationUnitRewriteOperation { + private static class JoinOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Statement node; private Expression containerVariable; private final Statement booleanStatement; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/LazyLogicalCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/LazyLogicalCleanUp.java index 372575ca618..83d5fa17e88 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/LazyLogicalCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/LazyLogicalCleanUp.java @@ -33,7 +33,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -92,7 +92,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -126,7 +126,7 @@ public boolean visit(InfixExpression node) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.CodeStyleCleanUp_LazyLogical_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[rewriteOperations.size()])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[rewriteOperations.size()])); } @Override @@ -139,7 +139,7 @@ protected ICleanUpFix createFix(CompilationUnit unit, IProblemLocation[] problem return null; } - private static class LazyLogicalInInfixExpressionOperation extends CompilationUnitRewriteOperation { + private static class LazyLogicalInInfixExpressionOperation extends CompilationUnitRewriteOperationWithSourceRange { private final InfixExpression node; public LazyLogicalInInfixExpressionOperation(InfixExpression node) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MapCloningCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MapCloningCleanUp.java index e11aa1984c8..a303d44e173 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MapCloningCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MapCloningCleanUp.java @@ -49,7 +49,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -100,7 +100,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -210,7 +210,7 @@ private boolean isValidCapacityParameter(final Expression sourceMap, final List< } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.MapCloningCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -223,7 +223,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class MapCloningOperation extends CompilationUnitRewriteOperation { + private static class MapCloningOperation extends CompilationUnitRewriteOperationWithSourceRange { private final ExpressionStatement nodeToRemove; private final ClassInstanceCreation classInstanceCreation; private final Expression arg0; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MapMethodCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MapMethodCleanUp.java index 7b71ca2562c..61acf1076ad 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MapMethodCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MapMethodCleanUp.java @@ -37,7 +37,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -108,7 +108,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -167,7 +167,7 @@ public boolean visit(MethodInvocation mi) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.UseDirectlyMapMethodCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[rewriteOperations.size()])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[rewriteOperations.size()])); } @Override @@ -180,7 +180,7 @@ protected ICleanUpFix createFix(CompilationUnit unit, IProblemLocation[] problem return null; } - private static class MapMethodOperation extends CompilationUnitRewriteOperation { + private static class MapMethodOperation extends CompilationUnitRewriteOperationWithSourceRange { private final MethodInvocation subAggregateMi; private final MethodInvocation globalMi; private final String methodName; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MergeConditionalBlocksCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MergeConditionalBlocksCleanUp.java index 85aa349c3d4..61eace5b93d 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MergeConditionalBlocksCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/MergeConditionalBlocksCleanUp.java @@ -38,7 +38,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -100,7 +100,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -178,7 +178,7 @@ private boolean addOneMoreIf(final List duplicateIfBlocks, final Li } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.MergeConditionalBlocksCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -191,7 +191,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class InnerIfOperation extends CompilationUnitRewriteOperation { + private static class InnerIfOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement visited; private final IfStatement innerIf; private final boolean isInnerMainFirst; @@ -229,7 +229,7 @@ public void rewriteASTInternal(final CompilationUnitRewrite cuRewrite, final Lin } } - private static class MergeConditionalBlocksOperation extends CompilationUnitRewriteOperation { + private static class MergeConditionalBlocksOperation extends CompilationUnitRewriteOperationWithSourceRange { private final List duplicateIfBlocks; private final List isThenStatement; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/NumberSuffixCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/NumberSuffixCleanUp.java index ece3d82770b..cbf4004d626 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/NumberSuffixCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/NumberSuffixCleanUp.java @@ -33,7 +33,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -90,7 +90,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -111,7 +111,7 @@ public boolean visit(NumberLiteral node) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.CodeStyleCleanUp_numberSuffix_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[rewriteOperations.size()])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[rewriteOperations.size()])); } @Override @@ -124,7 +124,7 @@ protected ICleanUpFix createFix(CompilationUnit unit, IProblemLocation[] problem return null; } - private static class NumberSuffixOperation extends CompilationUnitRewriteOperation { + private static class NumberSuffixOperation extends CompilationUnitRewriteOperationWithSourceRange { private final ASTNode node; private final String token; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ObjectsEqualsCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ObjectsEqualsCleanUp.java index 714248afd8f..a0fee7603f3 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ObjectsEqualsCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ObjectsEqualsCleanUp.java @@ -48,7 +48,7 @@ import org.eclipse.jdt.internal.corext.dom.OrderedInfixExpression; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; @@ -111,7 +111,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @@ -210,7 +210,7 @@ private boolean match(final Expression firstField, final Expression secondField, } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.ObjectsEqualsCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -228,7 +228,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class ObjectsEqualsOperation extends CompilationUnitRewriteOperation { + private static class ObjectsEqualsOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement node; private final Expression firstField; private final Expression secondField; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/OperandFactorizationCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/OperandFactorizationCleanUp.java index a33fcb5f4d2..10733274b97 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/OperandFactorizationCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/OperandFactorizationCleanUp.java @@ -36,7 +36,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTSemanticMatcher; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -107,7 +107,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -193,7 +193,7 @@ private boolean isPassiveWithoutBreak(final Expression disturbingExpression) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.OperandFactorizationCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -206,7 +206,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class OperandFactorizationOperation extends CompilationUnitRewriteOperation { + private static class OperandFactorizationOperation extends CompilationUnitRewriteOperationWithSourceRange { private final InfixExpression visited; private final InfixExpression.Operator innerOperator; private final Expression factor; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PatternCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PatternCleanUp.java index 2cc227f1c79..45f3ada3160 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PatternCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PatternCleanUp.java @@ -61,7 +61,7 @@ import org.eclipse.jdt.internal.corext.dom.VarDefinitionsUsesVisitor; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.FixMessages; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -135,7 +135,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); final Map> addedPatternFields= new HashMap<>(); unit.accept(new ASTVisitor() { @@ -275,7 +275,7 @@ private boolean isRegExUse(final SimpleName simpleName, final Expression initial } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.PatternCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -288,7 +288,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class PatternOperation extends CompilationUnitRewriteOperation { + private static class PatternOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Type type; private final Expression initializer; private final List regExUses; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PrimitiveParsingCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PrimitiveParsingCleanUp.java index 9ddc2873dc3..8c978521c4f 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PrimitiveParsingCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PrimitiveParsingCleanUp.java @@ -37,7 +37,7 @@ import org.eclipse.jdt.internal.corext.dom.Bindings; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; @@ -98,7 +98,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -208,7 +208,7 @@ private String getParsingMethodName(final String wrapperFullyQualifiedName, fina } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.PrimitiveParsingCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -221,7 +221,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class PrimitiveParsingWithTheSingleArgumentOperation extends CompilationUnitRewriteOperation { + private static class PrimitiveParsingWithTheSingleArgumentOperation extends CompilationUnitRewriteOperationWithSourceRange { private final MethodInvocation visited; public PrimitiveParsingWithTheSingleArgumentOperation(final MethodInvocation visited) { @@ -237,7 +237,7 @@ public void rewriteASTInternal(final CompilationUnitRewrite cuRewrite, final Lin } } - private static class PrimitiveParsingMethodNameOperation extends CompilationUnitRewriteOperation { + private static class PrimitiveParsingMethodNameOperation extends CompilationUnitRewriteOperationWithSourceRange { private final MethodInvocation visited; private final String methodName; @@ -256,7 +256,7 @@ public void rewriteASTInternal(final CompilationUnitRewrite cuRewrite, final Lin } } - private static class PrimitiveParsingReplaceByParsingOperation extends CompilationUnitRewriteOperation { + private static class PrimitiveParsingReplaceByParsingOperation extends CompilationUnitRewriteOperationWithSourceRange { private final MethodInvocation visited; private final ITypeBinding typeBinding; private final String methodName; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PrimitiveSerializationCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PrimitiveSerializationCleanUp.java index 29b62d8f085..689b3e6868b 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PrimitiveSerializationCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PrimitiveSerializationCleanUp.java @@ -36,7 +36,7 @@ import org.eclipse.jdt.internal.corext.dom.Bindings; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -99,7 +99,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -155,7 +155,7 @@ private boolean maybeRefactor(final MethodInvocation visited, final Class wra } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.PrimitiveSerializationCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -168,7 +168,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class PrimitiveSerializationOperation extends CompilationUnitRewriteOperation { + private static class PrimitiveSerializationOperation extends CompilationUnitRewriteOperationWithSourceRange { private final MethodInvocation visited; private final Expression primitiveValue; private final Class wrapperClass; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PullUpAssignmentCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PullUpAssignmentCleanUp.java index 49430e59113..8af73c7d097 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PullUpAssignmentCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PullUpAssignmentCleanUp.java @@ -51,7 +51,7 @@ import org.eclipse.jdt.internal.corext.dom.VarDefinitionsUsesVisitor; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -108,7 +108,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -283,7 +283,7 @@ private VariableDeclarationFragment findFragmentIfNotUsed(final VariableDeclarat } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.CodeStyleCleanUp_PullUpAssignment_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -296,7 +296,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class PullUpAssignmentOperation extends CompilationUnitRewriteOperation { + private static class PullUpAssignmentOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement visited; private final Assignment assignment; private final Expression leftHandSide; @@ -328,7 +328,7 @@ public void rewriteASTInternal(final CompilationUnitRewrite cuRewrite, final Lin } } - private static class MoveToDeclarationOperation extends CompilationUnitRewriteOperation { + private static class MoveToDeclarationOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Assignment assignment; private final Expression leftHandSide; private final VariableDeclarationFragment fragment; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PushDownNegationCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PushDownNegationCleanUp.java index 3fa201f8fa7..406543b6fa9 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PushDownNegationCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/PushDownNegationCleanUp.java @@ -37,7 +37,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -97,7 +97,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { PrefixExpression secondNotOperator= null; @@ -152,7 +152,7 @@ private boolean pushDown(final PrefixExpression node, Expression operand) { } RemoveDoubleNegationOperation lastDoubleNegation= null; - for (CompilationUnitRewriteOperation op : rewriteOperations) { + for (CompilationUnitRewriteOperationWithSourceRange op : rewriteOperations) { if (op instanceof ReplacementOperation) { ReplacementOperation chainedOp= (ReplacementOperation) op; if (lastDoubleNegation != null && chainedOp.getNode().subtreeMatch(new ASTMatcher(), lastDoubleNegation.getReplacementExpression())) { @@ -165,7 +165,7 @@ private boolean pushDown(final PrefixExpression node, Expression operand) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.PushDownNegationCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[rewriteOperations.size()])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[rewriteOperations.size()])); } @Override @@ -178,7 +178,7 @@ protected ICleanUpFix createFix(CompilationUnit unit, IProblemLocation[] problem return null; } - private abstract static class ReplacementOperation extends CompilationUnitRewriteOperation { + private abstract static class ReplacementOperation extends CompilationUnitRewriteOperationWithSourceRange { private ASTNode node; public void setNode(ASTNode node) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ReduceIndentationCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ReduceIndentationCleanUp.java index f91a106914e..8dad9b27ece 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ReduceIndentationCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/ReduceIndentationCleanUp.java @@ -44,7 +44,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -185,7 +185,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -239,7 +239,7 @@ private int getIndentation(final Statement statementInIf) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.CodeStyleCleanUp_ReduceIndentation_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -252,7 +252,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class ReduceIndentationThenOperation extends CompilationUnitRewriteOperation { + private static class ReduceIndentationThenOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement visited; public ReduceIndentationThenOperation(final IfStatement visited) { @@ -293,7 +293,7 @@ public void rewriteASTInternal(final CompilationUnitRewrite cuRewrite, final Lin } } - private static class ReduceIndentationElseOperation extends CompilationUnitRewriteOperation { + private static class ReduceIndentationElseOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement visited; public ReduceIndentationElseOperation(final IfStatement visited) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantComparisonStatementCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantComparisonStatementCleanUp.java index fd8453de3ff..57aa1eb5501 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantComparisonStatementCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantComparisonStatementCleanUp.java @@ -39,7 +39,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -101,7 +101,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -211,7 +211,7 @@ private boolean maybeReplace(final IfStatement node, final InfixExpression condi } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.RedundantComparisonStatementCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -229,7 +229,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class RedundantComparisonStatementOperation extends CompilationUnitRewriteOperation { + private static class RedundantComparisonStatementOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement node; private final Statement toMove; private final ReturnStatement toRemove; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantFallingThroughBlockEndCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantFallingThroughBlockEndCleanUp.java index 4a7d9d37559..e44baa20c78 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantFallingThroughBlockEndCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantFallingThroughBlockEndCleanUp.java @@ -49,7 +49,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTSemanticMatcher; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -117,7 +117,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -279,7 +279,7 @@ private boolean isIn(final Statement node, final Class... domClasses) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.RedundantFallingThroughBlockEndCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -297,7 +297,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class RedundantFallingThroughBlockEndOperation extends CompilationUnitRewriteOperation { + private static class RedundantFallingThroughBlockEndOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Statement redundantStatement; private final List stmtsToCompare; private final Statement lastStatement; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantIfConditionCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantIfConditionCleanUp.java index 70e57f30bf3..9e07e2d4b6d 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantIfConditionCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantIfConditionCleanUp.java @@ -34,7 +34,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTSemanticMatcher; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -97,7 +97,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -122,7 +122,7 @@ public boolean visit(final IfStatement node) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.RedundantIfConditionCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -140,7 +140,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class RedundantIfConditionOperation extends CompilationUnitRewriteOperation { + private static class RedundantIfConditionOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement secondIf; public RedundantIfConditionOperation(final IfStatement secondIf) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantModifiersCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantModifiersCleanUp.java index 34e55698093..1b0080e0648 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantModifiersCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantModifiersCleanUp.java @@ -38,7 +38,7 @@ import org.eclipse.jdt.internal.corext.dom.ModifierRewrite; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -132,7 +132,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { if (!isEnabled(CleanUpConstants.REMOVE_REDUNDANT_MODIFIERS)) { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -200,7 +200,7 @@ public boolean visit(EnumDeclaration node) { return null; } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.RedundantModifiersCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[rewriteOperations.size()])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[rewriteOperations.size()])); } @Override @@ -213,7 +213,7 @@ protected ICleanUpFix createFix(CompilationUnit unit, IProblemLocation[] problem return null; } - private static class RemoveModifiersOperation extends CompilationUnitRewriteOperation { + private static class RemoveModifiersOperation extends CompilationUnitRewriteOperationWithSourceRange { private final ASTNode node; private final int excludedModifiers; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantSuperCallCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantSuperCallCleanUp.java index a524e6c0d31..ee0b9157df7 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantSuperCallCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/RedundantSuperCallCleanUp.java @@ -33,7 +33,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -89,7 +89,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -108,7 +108,7 @@ public boolean visit(final SuperConstructorInvocation node) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.RedundantSuperCallCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -126,7 +126,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class RedundantSuperCallOperation extends CompilationUnitRewriteOperation { + private static class RedundantSuperCallOperation extends CompilationUnitRewriteOperationWithSourceRange { private final SuperConstructorInvocation node; public RedundantSuperCallOperation(final SuperConstructorInvocation node) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/SingleUsedFieldCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/SingleUsedFieldCleanUp.java index ccac211df3b..fc72b66a28a 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/SingleUsedFieldCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/SingleUsedFieldCleanUp.java @@ -54,7 +54,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -154,7 +154,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -369,7 +369,7 @@ private boolean hasAnnotation(final FieldDeclaration field) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.SingleUsedFieldCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -382,7 +382,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class SingleUsedFieldOperation extends CompilationUnitRewriteOperation { + private static class SingleUsedFieldOperation extends CompilationUnitRewriteOperationWithSourceRange { private final FieldDeclaration field; private final VariableDeclarationFragment fragment; private final SimpleName reassignment; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/StrictlyEqualOrDifferentCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/StrictlyEqualOrDifferentCleanUp.java index d1b25d36398..75b59d09858 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/StrictlyEqualOrDifferentCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/StrictlyEqualOrDifferentCleanUp.java @@ -40,7 +40,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTSemanticMatcher; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -104,7 +104,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -190,7 +190,7 @@ private Expression getBasisExpression(final Expression originalExpression, final } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.StrictlyEqualOrDifferentCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -208,7 +208,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class StrictlyEqualOrDifferentOperation extends CompilationUnitRewriteOperation { + private static class StrictlyEqualOrDifferentOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Expression visited; private final Expression firstExpression; private final Expression secondExpression; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/StringBuilderCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/StringBuilderCleanUp.java index 98e6d432cbe..fd0999f2084 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/StringBuilderCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/StringBuilderCleanUp.java @@ -67,7 +67,7 @@ import org.eclipse.jdt.internal.corext.dom.VarDefinitionsUsesVisitor; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; @@ -135,7 +135,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { class VarOccurrenceVisitor extends ASTVisitor { @@ -526,7 +526,7 @@ private void enoughConcatenationsIfInsideALoop(final SimpleName simpleName, fina } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.StringBuilderCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } private static InfixExpression asStringConcatenation(final Expression expression) { @@ -555,7 +555,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class StringBuilderOperation extends CompilationUnitRewriteOperation { + private static class StringBuilderOperation extends CompilationUnitRewriteOperationWithSourceRange { private static final String APPEND_METHOD= "append"; //$NON-NLS-1$ private static final String TO_STRING_METHOD= "toString"; //$NON-NLS-1$ private static final String VALUE_OF_METHOD= "valueOf"; //$NON-NLS-1$ diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/TernaryOperatorCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/TernaryOperatorCleanUp.java index 38aa0753699..430f2109694 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/TernaryOperatorCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/TernaryOperatorCleanUp.java @@ -37,7 +37,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTSemanticMatcher; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -90,7 +90,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -159,7 +159,7 @@ private boolean maybeReplaceDuplicateExpression(final InfixExpression visited, f } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.TernaryOperatorCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -172,7 +172,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class TernaryOperatorOperation extends CompilationUnitRewriteOperation { + private static class TernaryOperatorOperation extends CompilationUnitRewriteOperationWithSourceRange { private final InfixExpression visited; private final Expression oneCondition; private final Expression oneExpression; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnboxingCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnboxingCleanUp.java index fa18522b95c..7022821ec0a 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnboxingCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnboxingCleanUp.java @@ -40,7 +40,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; @@ -113,7 +113,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -200,7 +200,7 @@ private boolean hasConflictingMethodOrConstructor(final MethodInvocation visited } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.UnboxingCleanup_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[rewriteOperations.size()])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[rewriteOperations.size()])); } @Override @@ -213,7 +213,7 @@ protected ICleanUpFix createFix(CompilationUnit unit, IProblemLocation[] problem return null; } - private static class UnboxingOperation extends CompilationUnitRewriteOperation { + private static class UnboxingOperation extends CompilationUnitRewriteOperationWithSourceRange { private final MethodInvocation node; public UnboxingOperation(MethodInvocation node) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnloopedWhileCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnloopedWhileCleanUp.java index 98c48125ed7..16a31b72e5b 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnloopedWhileCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnloopedWhileCleanUp.java @@ -43,7 +43,7 @@ import org.eclipse.jdt.internal.corext.dom.InterruptibleVisitor; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -229,7 +229,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -258,7 +258,7 @@ public boolean visit(final WhileStatement visited) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.UnloopedWhileCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -271,7 +271,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class UnloopedWhileOperation extends CompilationUnitRewriteOperation { + private static class UnloopedWhileOperation extends CompilationUnitRewriteOperationWithSourceRange { private final WhileStatement visited; private final BreakVisitor breakVisitor; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnreachableBlockCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnreachableBlockCleanUp.java index 239e58a5b6b..bf144612d99 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnreachableBlockCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UnreachableBlockCleanUp.java @@ -31,7 +31,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -101,7 +101,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit) throws CoreException return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -143,7 +143,7 @@ public boolean visit(final IfStatement visited) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.UnreachableBlockCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -156,7 +156,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class UnreachableBlockOperation extends CompilationUnitRewriteOperation { + private static class UnreachableBlockOperation extends CompilationUnitRewriteOperationWithSourceRange { private final IfStatement duplicateIf; public UnreachableBlockOperation(final IfStatement duplicateIf) { diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UseStringIsBlankCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UseStringIsBlankCleanUp.java index dadae29a1b8..51e976cffc4 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UseStringIsBlankCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UseStringIsBlankCleanUp.java @@ -34,7 +34,7 @@ import org.eclipse.jdt.internal.corext.dom.OrderedInfixExpression; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.FixMessages; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -103,7 +103,7 @@ private static ICleanUpFix createCleanUp(final CompilationUnit compilationUnit) return null; } - CompilationUnitRewriteOperation[] ops= operations.toArray(new CompilationUnitRewriteOperation[0]); + CompilationUnitRewriteOperationWithSourceRange[] ops= operations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0]); return new CompilationUnitRewriteOperationsFixCore(FixMessages.UseStringIsBlankCleanUp_description, compilationUnit, ops); } @@ -203,7 +203,7 @@ private boolean isStringMethodInvocation(final Expression expression, final Stri } } - private static class UseStringIsBlankFixOperation extends CompilationUnitRewriteOperation { + private static class UseStringIsBlankFixOperation extends CompilationUnitRewriteOperationWithSourceRange { private final Expression visited; private final Expression trim; private final boolean isPositive; @@ -215,7 +215,7 @@ public UseStringIsBlankFixOperation(final Expression visited, final Expression t } @Override - public void rewriteAST(final CompilationUnitRewrite cuRewrite, final LinkedProposalModelCore linkedModel) throws CoreException { + public void rewriteASTInternal(final CompilationUnitRewrite cuRewrite, final LinkedProposalModelCore linkedModel) throws CoreException { ASTRewrite rewrite= cuRewrite.getASTRewrite(); AST ast= cuRewrite.getRoot().getAST(); TextEditGroup group= createTextEditGroup(FixMessages.UseStringIsBlankCleanUp_description, cuRewrite); diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UselessContinueCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UselessContinueCleanUp.java index 3f5cc284340..a11e66f25f9 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UselessContinueCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UselessContinueCleanUp.java @@ -41,7 +41,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -102,7 +102,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -169,7 +169,7 @@ private boolean isLastStatementInLoop(final Statement node) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.UselessContinueCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -182,7 +182,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class UselessContinueOperation extends CompilationUnitRewriteOperation { + private static class UselessContinueOperation extends CompilationUnitRewriteOperationWithSourceRange { private final ContinueStatement node; private final Block block; diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UselessReturnCleanUp.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UselessReturnCleanUp.java index 3f9b7e340a5..e12306238c6 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UselessReturnCleanUp.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/fix/UselessReturnCleanUp.java @@ -42,7 +42,7 @@ import org.eclipse.jdt.internal.corext.dom.ASTNodes; import org.eclipse.jdt.internal.corext.fix.CleanUpConstants; import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix; -import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFix.CompilationUnitRewriteOperation; +import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperationWithSourceRange; import org.eclipse.jdt.internal.corext.fix.LinkedProposalModelCore; import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite; @@ -98,7 +98,7 @@ protected ICleanUpFix createFix(CompilationUnit unit) throws CoreException { return null; } - final List rewriteOperations= new ArrayList<>(); + final List rewriteOperations= new ArrayList<>(); unit.accept(new ASTVisitor() { @Override @@ -164,7 +164,7 @@ private boolean isLastStatement(final Statement node) { } return new CompilationUnitRewriteOperationsFix(MultiFixMessages.UselessReturnCleanUp_description, unit, - rewriteOperations.toArray(new CompilationUnitRewriteOperation[0])); + rewriteOperations.toArray(new CompilationUnitRewriteOperationWithSourceRange[0])); } @Override @@ -177,7 +177,7 @@ protected ICleanUpFix createFix(final CompilationUnit unit, final IProblemLocati return null; } - private static class UselessReturnOperation extends CompilationUnitRewriteOperation { + private static class UselessReturnOperation extends CompilationUnitRewriteOperationWithSourceRange { private final ReturnStatement node; private final Block block;