Author: dazarov
Date: 2010-08-31 13:13:31 -0400 (Tue, 31 Aug 2010)
New Revision: 24585
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
Log:
https://jira.jboss.org/browse/JBIDE-4064
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-08-31
16:54:03 UTC (rev 24584)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java 2010-08-31
17:13:31 UTC (rev 24585)
@@ -55,7 +55,7 @@
if(messageId == SeamCoreValidator.NONUNIQUE_COMPONENT_NAME_MESSAGE_ID)
return new IMarkerResolution[]{new
DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
"org.jboss.seam.annotations.Name",file, start, end)};
else if(messageId == SeamCoreValidator.DUPLICATE_REMOVE_MESSAGE_ID)
- return new IMarkerResolution[]{new
DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE,
"org.jboss.seam.annotations.Remove", file, start, end)};
+ return new IMarkerResolution[]{new
DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE,
"javax.ejb.Remove", file, start, end)};
else if(messageId == SeamCoreValidator.DUPLICATE_DESTROY_MESSAGE_ID)
return new IMarkerResolution[]{new
DeleteAnnotaionMarkerResolution(SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE,
"org.jboss.seam.annotations.Destroy", file, start, end)};
else if(messageId == SeamCoreValidator.DUPLICATE_CREATE_MESSAGE_ID)
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2010-08-31
16:54:03 UTC (rev 24584)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2010-08-31
17:13:31 UTC (rev 24585)
@@ -15,12 +15,10 @@
import junit.framework.TestSuite;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.validation.ValidationFramework;
import org.eclipse.wst.validation.internal.operations.ValidatorManager;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -43,10 +41,8 @@
import org.jboss.tools.seam.ui.test.wizard.SeamFormNewWizardTest;
import org.jboss.tools.seam.ui.test.wizard.SeamProjectNamesTest;
import org.jboss.tools.seam.ui.test.wizard.SeamProjectNewWizardTest;
-import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
-import org.jboss.tools.test.util.ResourcesUtils;
/**
* @author eskimo
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2010-08-31
16:54:03 UTC (rev 24584)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2010-08-31
17:13:31 UTC (rev 24585)
@@ -52,8 +52,6 @@
IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
- System.out.println("Markers - "+markers.length);
-
boolean found = false;
for (int i = 0; i < markers.length; i++) {
IMarker marker = markers[i];
@@ -62,7 +60,7 @@
for (int j = 0; j < resolutions.length; j++) {
IMarkerResolution resolution = resolutions[j];
if (resolution instanceof DeleteAnnotaionMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Remove",
((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName());
+ assertEquals("javax.ejb.Remove",
((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName());
found = true;
break;
}
@@ -82,8 +80,6 @@
IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
- System.out.println("Markers - "+markers.length);
-
boolean found = false;
for (int i = 0; i < markers.length; i++) {
IMarker marker = markers[i];
@@ -112,8 +108,6 @@
IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
- System.out.println("Markers - "+markers.length);
-
boolean found = false;
for (int i = 0; i < markers.length; i++) {
IMarker marker = markers[i];
@@ -142,8 +136,6 @@
IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
- System.out.println("Markers - "+markers.length);
-
boolean found = false;
for (int i = 0; i < markers.length; i++) {
IMarker marker = markers[i];