Author: dazarov Date: 2009-07-29 09:16:46 -0400 (Wed, 29 Jul 2009) New Revision: 16871 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-1077 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-07-29 12:43:46 UTC (rev 16870) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-07-29 13:16:46 UTC (rev 16871) @@ -699,8 +699,8 @@ for (IProject project : projects) { ISeamProject sProject = SeamCorePlugin.getSeamProject(project, true); if(sProject != null){ - findAnnotations(sProject, BijectedAttributeType.OUT, ISeamXmlComponentDeclaration.NAME/*SeamAnnotations.OUT_ANNOTATION_TYPE*/); - findAnnotations(sProject, BijectedAttributeType.DATA_BINDER, ISeamXmlComponentDeclaration.NAME/*SeamAnnotations.DATA_MODEL_ANNOTATION_TYPE*/); + findAnnotations(sProject, BijectedAttributeType.OUT, SeamAnnotations.OUT_ANNOTATION_TYPE); + findAnnotations(sProject, BijectedAttributeType.DATA_BINDER, SeamAnnotations.DATA_MODEL_ANNOTATION_TYPE); findFactories(sProject); } } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-07-29 12:43:46 UTC (rev 16870) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-07-29 13:16:46 UTC (rev 16871) @@ -94,7 +94,7 @@ } private void renameComponent(ISeamProject seamProject, String componentName, String newName, List<TestChangeStructure> changeList, boolean fromJar) throws CoreException{ - JobUtils.waitForIdle(2000); + JobUtils.waitForIdle(3000); // Test before renaming ISeamComponent component = seamProject.getComponent(componentName); Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java 2009-07-29 12:43:46 UTC (rev 16870) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamContextVariableRefactoringTest.java 2009-07-29 13:16:46 UTC (rev 16871) @@ -174,11 +174,11 @@ renameContextVariable(seamEjbProject, "/WebContent/out.jsp", "aaa", "bbb", list); } - public void t_estSeamContextVariable_Out2_Rename() throws CoreException { + public void testSeamContextVariable_Out2_Rename() throws CoreException { ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>(); TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableOut.java"); - TestTextChange change = new TestTextChange(528, 5, "\"eee\""); + TestTextChange change = new TestTextChange(516, 5, "\"eee\""); structure.addTextChange(change); list.add(structure); @@ -206,16 +206,16 @@ renameContextVariable(seamEjbProject, "/WebContent/datamodel.jsp", "data", "dada", list); } - public void t_estSeamContextVariable_DataModel2_Rename() throws CoreException { + public void testSeamContextVariable_DataModel2_Rename() throws CoreException { ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>(); TestChangeStructure structure = new TestChangeStructure(ejbProject.getProject(), "/ejbModule/org/domain/"+warProjectName+"/session/TestContextVariableDataModel.java"); - TestTextChange change = new TestTextChange(528, 7, "\"modal\""); + TestTextChange change = new TestTextChange(551, 7, "\"modal\""); structure.addTextChange(change); list.add(structure); structure = new TestChangeStructure(warProject, "/WebContent/datamodel.jsp"); - change = new TestTextChange(283, 5, "modal"); + change = new TestTextChange(284, 5, "modal"); structure.addTextChange(change); list.add(structure);