Author: scabanovich
Date: 2010-10-26 06:10:28 -0400 (Tue, 26 Oct 2010)
New Revision: 26056
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintMarkers.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java
Log:
JBIDE-7405
https://jira.jboss.org/browse/JBIDE-7405
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java 2010-10-26
09:57:22 UTC (rev 26055)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java 2010-10-26
10:10:28 UTC (rev 26056)
@@ -147,7 +147,7 @@
public static void clear(XModelObject o) {
if(o == null || o.getFileType() == XModelObject.NONE) return;
if(o.getFileType() == XModelObject.FILE) {
- ResourceMarkers markers = new ResourceMarkers(ResourceMarkers.JST_WEB_PROBLEM);
+ ResourceMarkers markers = new ResourceMarkers(ResourceMarkers.JST_WEB_PROBLEM,
ResourceMarkers.OLD_JST_WEB_PROBLEM);
markers.setModelObject(o);
markers.update();
} else {
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintMarkers.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintMarkers.java 2010-10-26
09:57:22 UTC (rev 26055)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintMarkers.java 2010-10-26
10:10:28 UTC (rev 26056)
@@ -16,7 +16,7 @@
ResourceProblems p;
public ConstraintMarkers(ResourceProblems p) {
- super(ResourceMarkers.CONSTRAINT_PROBLEM);
+ super(ResourceMarkers.CONSTRAINT_PROBLEM, ResourceMarkers.OLD_CONSTRAINT_PROBLEM);
this.p = p;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java 2010-10-26
09:57:22 UTC (rev 26055)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java 2010-10-26
10:10:28 UTC (rev 26056)
@@ -30,16 +30,24 @@
public class ResourceMarkers {
public static String TEXT_PROBLEM =
"org.jboss.tools.common.model.textproblemmarker"; //$NON-NLS-1$
- public static String CONSTRAINT_PROBLEM =
"org.jboss.tools.jst.web.ui.constraintsmarker"; //$NON-NLS-1$
- public static String JST_WEB_PROBLEM =
"org.jboss.tools.jst.web.ui.strutsmarker"; //$NON-NLS-1$
+ public static String CONSTRAINT_PROBLEM =
"org.jboss.tools.jst.web.constraintsmarker"; //$NON-NLS-1$
+ public static String JST_WEB_PROBLEM = "org.jboss.tools.jst.web.strutsmarker";
//$NON-NLS-1$
+ public static String OLD_CONSTRAINT_PROBLEM =
"org.jboss.tools.jst.web.ui.constraintsmarker"; //$NON-NLS-1$
+ public static String OLD_JST_WEB_PROBLEM =
"org.jboss.tools.jst.web.ui.strutsmarker"; //$NON-NLS-1$
private XModelObject object;
- String type;
+ String type = null;
+ String oldType = null;
public ResourceMarkers(String type) {
this.type = type;
}
+ public ResourceMarkers(String type, String oldType) {
+ this.type = type;
+ this.oldType = oldType;
+ }
+
public void setModelObject(XModelObject object) {
this.object = object;
}
@@ -120,6 +128,7 @@
try {
if(!message.equals(m.getAttribute(IMarker.MESSAGE))) continue;
if(attr != null && !attr.equals(m.getAttribute("attribute")))
continue; //$NON-NLS-1$
+ if(oldType != null && oldType.equals(m.getType())) continue;
if(!path.equals(m.getAttribute("path"))) { //$NON-NLS-1$
m.setAttribute("path", path); //$NON-NLS-1$
}
@@ -201,7 +210,7 @@
String _type = m.getType();
if(_type == null) return true;
if(_type.startsWith("org.jboss.tools.")) { //$NON-NLS-1$
- return _type.equals(type);
+ return _type.equals(type) || (oldType != null && _type.equals(oldType));
}
return false;
}