[jbosstools-commits] JBoss Tools SVN: r42517 - in trunk: common/plugins/org.jboss.tools.common/META-INF and 4 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Jul 11 16:41:24 EDT 2012
Author: dazarov
Date: 2012-07-11 16:41:24 -0400 (Wed, 11 Jul 2012)
New Revision: 42517
Added:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseJavaFileChange.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/FileChangeFactory.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java
trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseFileChange.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/AbstractRefactorTest.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java
Log:
Quick fix 'Delete annotations...' breaks quick fix hover https://issues.jboss.org/browse/JBIDE-12311
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java 2012-07-11 20:32:17 UTC (rev 42516)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -21,13 +21,14 @@
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
import org.eclipse.text.edits.MultiTextEdit;
import org.jboss.tools.cdi.core.CDICoreMessages;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.common.EclipseUtil;
-import org.jboss.tools.common.refactoring.BaseFileChange;
+import org.jboss.tools.common.refactoring.FileChangeFactory;
public class AddQualifiersToBeanProcessor extends CDIRefactoringProcessor {
protected IBean selectedBean;
@@ -90,7 +91,7 @@
ICompilationUnit compilationUnit = original.getWorkingCopy(pm);
- BaseFileChange fileChange = new BaseFileChange(file);
+ TextFileChange fileChange = FileChangeFactory.getFileChange(file);
MultiTextEdit edit = new MultiTextEdit();
@@ -106,7 +107,7 @@
fileChange.setEdit(edit);
rootChange.add(fileChange);
}
- fileChange = new BaseFileChange(file2);
+ fileChange = FileChangeFactory.getFileChange(file2);
edit = new MultiTextEdit();
}else{
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java 2012-07-11 20:32:17 UTC (rev 42516)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.text.edits.MultiTextEdit;
import org.jboss.tools.cdi.core.CDICoreMessages;
import org.jboss.tools.cdi.core.CDICoreNature;
@@ -25,12 +26,12 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
-import org.jboss.tools.common.refactoring.BaseFileChange;
+import org.jboss.tools.common.refactoring.FileChangeFactory;
public abstract class CDIRefactoringProcessor extends AbstractCDIProcessor {
protected IFile file;
- protected BaseFileChange change;
+ protected TextFileChange change;
protected IClassBean bean;
public CDIRefactoringProcessor(IFile file, String label){
@@ -44,7 +45,7 @@
protected void createRootChange(){
rootChange = new CompositeChange(getLabel());
- change = new BaseFileChange(file);
+ change = FileChangeFactory.getFileChange(file);
MultiTextEdit root = new MultiTextEdit();
change.setEdit(root);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java 2012-07-11 20:32:17 UTC (rev 42516)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.osgi.util.NLS;
import org.eclipse.text.edits.MultiTextEdit;
import org.eclipse.text.edits.ReplaceEdit;
@@ -28,14 +29,14 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
-import org.jboss.tools.common.refactoring.BaseFileChange;
+import org.jboss.tools.common.refactoring.FileChangeFactory;
import org.jboss.tools.jst.web.kb.refactoring.RefactorSearcher;
/**
* @author Daniel Azarov
*/
public abstract class CDIRenameProcessor extends AbstractCDIProcessor {
- protected BaseFileChange lastChange;
+ protected TextFileChange lastChange;
protected IFile declarationFile=null;
private String newName;
@@ -84,18 +85,18 @@
}
// lets collect all changes for the same files in one MultiTextEdit
- protected BaseFileChange getChange(IFile file){
+ protected TextFileChange getChange(IFile file){
if(lastChange != null && lastChange.getFile().equals(file))
return lastChange;
for(int i=0; i < rootChange.getChildren().length; i++){
- BaseFileChange change = (BaseFileChange)rootChange.getChildren()[i];
+ TextFileChange change = (TextFileChange)rootChange.getChildren()[i];
if(change.getFile().equals(file)){
lastChange = change;
return lastChange;
}
}
- lastChange = new BaseFileChange(file);
+ lastChange = FileChangeFactory.getFileChange(file);
MultiTextEdit root = new MultiTextEdit();
lastChange.setEdit(root);
@@ -115,7 +116,7 @@
protected void change(IFile file, int offset, int length, String text){
String key = file.getFullPath().toString()+" "+offset;
if(!keys.contains(key)){
- BaseFileChange change = getChange(file);
+ TextFileChange change = getChange(file);
TextEdit edit = new ReplaceEdit(offset, length, text);
change.addEdit(edit);
keys.add(key);
Modified: trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2012-07-11 20:32:17 UTC (rev 42516)
+++ trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2012-07-11 20:41:24 UTC (rev 42517)
@@ -42,7 +42,8 @@
org.eclipse.ui.editors;bundle-version="3.7.0",
org.eclipse.jpt.common.core;bundle-version="1.0.0",
org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
- org.eclipse.wst.sse.ui;bundle-version="1.3.100"
+ org.eclipse.wst.sse.ui;bundle-version="1.3.100",
+ org.eclipse.jdt.core.manipulation;bundle-version="1.5.0"
Bundle-Version: 3.4.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ManifestVersion: 2
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseFileChange.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseFileChange.java 2012-07-11 20:32:17 UTC (rev 42516)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseFileChange.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -11,27 +11,11 @@
package org.jboss.tools.common.refactoring;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.ContentStamp;
import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.ltk.core.refactoring.UndoTextFileChange;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.UndoEdit;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.UIJob;
import org.jboss.tools.common.CommonPlugin;
@@ -47,7 +31,7 @@
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
try {
- if(isOpenInEditor(getFile())){
+ if(FileChangeFactory.isOpenInEditor(getFile())){
setSaveMode(TextFileChange.LEAVE_DIRTY);
}else{
setSaveMode(TextFileChange.FORCE_SAVE);
@@ -61,55 +45,4 @@
job.setSystem(true);
job.schedule();
}
-
- private static boolean isOpenInEditor(IFile file) throws PartInitException{
- IEditorInput input = EditorUtility.getEditorInput(file);
- for(IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()){
- for(IWorkbenchPage page : window.getPages()){
- for(IEditorReference editorReference : page.getEditorReferences()){
- IEditorPart editor = editorReference.getEditor(true);
- if(editor != null && editor.getEditorInput().equals(input)){
- return true;
- }
- }
- }
- }
- return false;
- }
-
- @Override
- protected void releaseDocument(IDocument document, IProgressMonitor pm)
- throws CoreException {
- super.releaseDocument(document, pm);
- try {
- getFile().touch(new NullProgressMonitor());
- } catch (CoreException e) {
- // do nothing
- }
- }
-
- @Override
- protected Change createUndoChange(UndoEdit edit, ContentStamp stampToRestore) {
- return new UndoBaseFileChange(getName(), getFile(), edit, stampToRestore, getSaveMode());
- }
-
- class UndoBaseFileChange extends UndoTextFileChange{
-
- protected UndoBaseFileChange(String name, IFile file, UndoEdit undo,
- ContentStamp stamp, int saveMode) {
- super(name, file, undo, stamp, saveMode);
- }
-
- @Override
- public Change perform(IProgressMonitor pm) throws CoreException {
- Change change = super.perform(pm);
- try {
- getFile().touch(new NullProgressMonitor());
- } catch (CoreException e) {
- // do nothing
- }
- return change;
- }
-
- }
}
Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseJavaFileChange.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseJavaFileChange.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseJavaFileChange.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.refactoring;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.progress.UIJob;
+import org.jboss.tools.common.CommonPlugin;
+
+public class BaseJavaFileChange extends CompilationUnitChange {
+
+ public BaseJavaFileChange(String name, ICompilationUnit cunit) {
+ super(name, cunit);
+ setSaveMode();
+ }
+
+ private void setSaveMode(){
+ UIJob job = new UIJob("setSaveMode"){ //$NON-NLS-1$
+ @Override
+ public IStatus runInUIThread(IProgressMonitor monitor) {
+ try {
+ if(FileChangeFactory.isOpenInEditor(getFile())){
+ setSaveMode(TextFileChange.LEAVE_DIRTY);
+ }else{
+ setSaveMode(TextFileChange.FORCE_SAVE);
+ }
+ } catch (PartInitException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ return Status.OK_STATUS;
+ }};
+
+ job.setSystem(true);
+ job.schedule();
+ }
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/BaseJavaFileChange.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/FileChangeFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/FileChangeFactory.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/FileChangeFactory.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.refactoring;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.common.EclipseUtil;
+
+public class FileChangeFactory {
+ public static TextFileChange getFileChange(IFile file){
+ ICompilationUnit compilationUnit = EclipseUtil.getCompilationUnit(file);
+
+ if(compilationUnit != null){
+ return new BaseJavaFileChange("", compilationUnit);
+ }else{
+ return new BaseFileChange(file);
+ }
+ }
+
+ public static boolean isOpenInEditor(IFile file) throws PartInitException{
+ IEditorInput input = EditorUtility.getEditorInput(file);
+ for(IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()){
+ for(IWorkbenchPage page : window.getPages()){
+ for(IEditorReference editorReference : page.getEditorReferences()){
+ IEditorPart editor = editorReference.getEditor(true);
+ if(editor != null && editor.getEditorInput().equals(input)){
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/FileChangeFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-07-11 20:32:17 UTC (rev 42516)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -43,6 +43,7 @@
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.TextChange;
import org.eclipse.ltk.core.refactoring.TextEditBasedChange;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.text.edits.DeleteEdit;
import org.eclipse.text.edits.InsertEdit;
import org.eclipse.text.edits.MultiTextEdit;
@@ -703,8 +704,8 @@
}
private static TextEdit getEdit(Change change) throws CoreException{
- if(change instanceof BaseFileChange){
- return ((BaseFileChange) change).getEdit();
+ if(change instanceof TextFileChange){
+ return ((TextFileChange) change).getEdit();
}else if(change instanceof TextChange){
return ((TextChange) change).getEdit();
}else if(change instanceof CompositeChange){
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/AbstractRefactorTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/AbstractRefactorTest.java 2012-07-11 20:32:17 UTC (rev 42516)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/AbstractRefactorTest.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -34,7 +34,6 @@
import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
import org.eclipse.ltk.core.refactoring.participants.RenameProcessor;
import org.eclipse.text.edits.MultiTextEdit;
-import org.jboss.tools.common.refactoring.BaseFileChange;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.test.util.JobUtils;
@@ -179,9 +178,9 @@
MultiTextEdit edit = null;
IFile file = null;
- if(fileChange instanceof BaseFileChange){
- edit = (MultiTextEdit)((BaseFileChange)fileChange).getEdit();
- file = ((BaseFileChange)fileChange).getFile();
+ if(fileChange instanceof TextFileChange){
+ edit = (MultiTextEdit)((TextFileChange)fileChange).getEdit();
+ file = ((TextFileChange)fileChange).getFile();
//((JBDSFileChange)fileChange).setSaveMode(TextFileChange.FORCE_SAVE);
}else if(fileChange instanceof TextFileChange){
edit = (MultiTextEdit)((TextFileChange)fileChange).getEdit();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2012-07-11 20:32:17 UTC (rev 42516)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -23,6 +23,7 @@
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
import org.eclipse.ltk.core.refactoring.participants.ISharableParticipant;
import org.eclipse.ltk.core.refactoring.participants.RefactoringArguments;
@@ -31,7 +32,7 @@
import org.eclipse.text.edits.MultiTextEdit;
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.text.edits.TextEdit;
-import org.jboss.tools.common.refactoring.BaseFileChange;
+import org.jboss.tools.common.refactoring.FileChangeFactory;
import org.jboss.tools.common.util.BeanUtil;
import org.jboss.tools.jsf.ui.JsfUIMessages;
import org.jboss.tools.jst.web.kb.refactoring.ELProjectSetExtension;
@@ -45,7 +46,7 @@
private RenameMethodSearcher searcher;
private RefactoringStatus status;
private CompositeChange rootChange;
- private BaseFileChange lastChange;
+ private TextFileChange lastChange;
private ArrayList<String> keys = new ArrayList<String>();
private ArrayList<Object> otherElements = new ArrayList<Object>();
@@ -136,18 +137,18 @@
return false;
}
- protected BaseFileChange getChange(IFile file){
+ protected TextFileChange getChange(IFile file){
if(lastChange != null && lastChange.getFile().equals(file))
return lastChange;
for(int i=0; i < rootChange.getChildren().length; i++){
- BaseFileChange change = (BaseFileChange)rootChange.getChildren()[i];
+ TextFileChange change = (TextFileChange)rootChange.getChildren()[i];
if(change.getFile().equals(file)){
lastChange = change;
return lastChange;
}
}
- lastChange = new BaseFileChange(file);
+ lastChange = FileChangeFactory.getFileChange(file);
MultiTextEdit root = new MultiTextEdit();
lastChange.setEdit(root);
rootChange.add(lastChange);
@@ -158,7 +159,7 @@
private void change(IFile file, int offset, int length, String text){
String key = file.getFullPath().toString()+" "+offset;
if(!keys.contains(key)){
- BaseFileChange change = getChange(file);
+ TextFileChange change = getChange(file);
TextEdit edit = new ReplaceEdit(offset, length, text);
change.addEdit(edit);
keys.add(key);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java 2012-07-11 20:32:17 UTC (rev 42516)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/refactoring/ELReferencesRenameTest.java 2012-07-11 20:41:24 UTC (rev 42517)
@@ -12,8 +12,8 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.text.edits.MultiTextEdit;
-import org.jboss.tools.common.refactoring.BaseFileChange;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jsf.ui.el.refactoring.RenameMethodParticipant;
import org.jboss.tools.test.util.JobUtils;
@@ -61,7 +61,7 @@
assertEquals("There is unexpected number of changes",changeList.size(), rootChange.getChildren().length);
for(int i = 0; i < rootChange.getChildren().length;i++){
- BaseFileChange fileChange = (BaseFileChange)rootChange.getChildren()[i];
+ TextFileChange fileChange = (TextFileChange)rootChange.getChildren()[i];
IFile file = fileChange.getFile();
IMarker[] markers = file.findMarkers(null, true, IResource.DEPTH_INFINITE);
numberOfMarkers[i] = markers.length;
More information about the jbosstools-commits
mailing list