Author: akazakov
Date: 2008-07-04 08:11:36 -0400 (Fri, 04 Jul 2008)
New Revision: 9074
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2429 Fixed for Eclipse 3.4
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-07-04
11:47:33 UTC (rev 9073)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-07-04
12:11:36 UTC (rev 9074)
@@ -333,10 +333,10 @@
refreshProject(project);
number = getMarkersNumber(abcEntityFile);
- assertFalse("Problem marker 'Entity component has wrong scope' not
found' not found' not found", number == 0);
+ assertFalse("Problem marker 'Entity component has wrong scope' was not
found'", number == 0);
String[] messages = getMarkersMessage(abcEntityFile);
- assertEquals("Problem marker 'Entity component has wrong scope' not
found", "Entity component \"abcEntity\" should not have
org.jboss.seam.ScopeType.STATELESS", messages[0]);
+ assertEquals("Problem marker 'Entity component has wrong scope' was not
found", "Entity component \"abcEntity\" should not have
org.jboss.seam.ScopeType.STATELESS", messages[0]);
int[] lineNumbers = getMarkersNumbersOfLine(abcEntityFile);
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-07-04
11:47:33 UTC (rev 9073)
+++
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-07-04
12:11:36 UTC (rev 9074)
@@ -28,7 +28,6 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor;
import org.eclipse.jdt.internal.corext.refactoring.reorg.IConfirmQuery;
import org.eclipse.jdt.internal.corext.refactoring.reorg.ICreateTargetQueries;
import org.eclipse.jdt.internal.corext.refactoring.reorg.ICreateTargetQuery;
@@ -37,8 +36,6 @@
import org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgDestinationFactory;
import org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgPolicyFactory;
import org.eclipse.jdt.internal.corext.refactoring.reorg.IReorgPolicy.IMovePolicy;
-import org.eclipse.jdt.internal.corext.refactoring.tagging.INameUpdating;
-import org.eclipse.jdt.internal.corext.refactoring.tagging.IReferenceUpdating;
import org.eclipse.jdt.internal.corext.refactoring.tagging.ITextUpdating;
import org.eclipse.jdt.internal.ui.refactoring.RefactoringExecutionHelper;
import org.eclipse.jdt.internal.ui.refactoring.RefactoringSaveHelper;
@@ -47,6 +44,7 @@
import org.eclipse.ltk.core.refactoring.RefactoringCore;
import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
+import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -275,13 +273,8 @@
// init refactoring
RenameResourceProcessor processor = new RenameResourceProcessor(resource);
RenameRefactoring refactoring = new RenameRefactoring(processor);
- INameUpdating nameUpdateingAdapter =
((INameUpdating)refactoring.getAdapter(INameUpdating.class));
- assertNotNull("Cannot get INameUpdating adapter for renaming '"
+resource.getFullPath().toString() + "'",nameUpdateingAdapter);
- nameUpdateingAdapter.setNewElementName(newFolderName);
- IReferenceUpdating reference =
(IReferenceUpdating)refactoring.getAdapter(IReferenceUpdating.class);
- if(reference != null) {
- reference.setUpdateReferences(true);
- }
+ processor.setNewResourceName(newFolderName);
+ processor.setUpdateReferences(true);
ITextUpdating text = (ITextUpdating)refactoring.getAdapter(ITextUpdating.class);
if(text != null) {
text.setUpdateTextualMatches(true);