[jbosstools-commits] JBoss Tools SVN: r18789 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers.
Author: scabanovich
Date: 2009-11-23 12:43:57 -0500 (Mon, 23 Nov 2009)
New Revision: 18789
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5191
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java 2009-11-23
17:21:03 UTC (rev 18788)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java 2009-11-23
17:43:57 UTC (rev 18789)
@@ -36,29 +36,41 @@
private Set<XModelObject> warningObjects = new HashSet<XModelObject>();
private XMarkerManager() {
- reload();
+ reload(null);
ModelPlugin.getWorkspace().addResourceChangeListener(this);
}
public void resourceChanged(IResourceChangeEvent event) {
+ IProject project = null;
+ Object o = event.getSource();
+ if(o instanceof IWorkspace) {
+ IResourceDelta d = event.getDelta();
+ IResourceDelta[] cs = d.getAffectedChildren();
+ for (int i = 0; i < cs.length && project == null; i++) {
+ project = cs[i].getResource().getProject();
+ }
+ }
+ final IProject p = project;
if(ResourcesPlugin.getWorkspace().isTreeLocked()) {
XJob.addRunnable(new XRunnable() {
public String getId() {
return "XMarkerManager"; //$NON-NLS-1$
}
public void run() {
- reload();
+ reload(p);
}
});
} else {
- reload();
+ reload(p);
}
}
- public void reload() {
+ public void reload(IProject project) {
IMarker[] ms = new IMarker[0];
try {
- ms = ModelPlugin.getWorkspace().getRoot().findMarkers(IMarker.PROBLEM, true,
IResource.DEPTH_INFINITE);
+ ms = (project == null || !project.isAccessible())
+ ? ModelPlugin.getWorkspace().getRoot().findMarkers(IMarker.PROBLEM, true,
IResource.DEPTH_INFINITE)
+ : project.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
} catch (CoreException e) {
ModelPlugin.getPluginLog().logError(e);
}
@@ -79,7 +91,9 @@
if(o == null) continue;
es.add(o);
String attr = ms[i].getAttribute("attribute", null); //$NON-NLS-1$
- if(attr != null && attr.length() > 0)
((XModelObjectImpl)o).addErrorAttributeDirty(attr);
+ if(attr != null && attr.length() > 0) {
+ ((XModelObjectImpl)o).addErrorAttributeDirty(attr);
+ }
}
synchronized(objects) {
Iterator<XModelObject> it = objects.iterator();
@@ -93,6 +107,8 @@
} else if(es.contains(o)) {
if(severity > o.getErrorState()) {
o.setErrorState(severity);
+ } else {
+ ((XModelObjectImpl)o).commitErrorAttributes();
}
es.remove(o);
}
@@ -102,7 +118,9 @@
XModelObject o = (XModelObject)it.next();
if(severity > o.getErrorState()) {
o.setErrorState(severity);
- }
+ } else {
+ ((XModelObjectImpl)o).commitErrorAttributes();
+ }
if(!objects.contains(o)) {
objects.add(o);
}