X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/ProblemMarkerManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/ProblemMarkerManager.java
index 5ce6d58..a05ac16 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/ProblemMarkerManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/ProblemMarkerManager.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.viewsupport;
 
-
 import java.util.HashSet;
 
 import net.sourceforge.phpdt.internal.ui.util.SWTUtil;
@@ -30,35 +29,40 @@ import org.eclipse.jface.text.source.AnnotationModelEvent;
 import org.eclipse.jface.text.source.IAnnotationModel;
 import org.eclipse.jface.text.source.IAnnotationModelListener;
 import org.eclipse.jface.text.source.IAnnotationModelListenerExtension;
-import org.eclipse.jface.util.ListenerList;
+//incastrix
+//import org.eclipse.jface.util.ListenerList;
+import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.swt.widgets.Display;
 
-
-
 /**
- * Listens to resource deltas and filters for marker changes of type IMarker.PROBLEM
- * Viewers showing error ticks should register as listener to
+ * Listens to resource deltas and filters for marker changes of type
+ * IMarker.PROBLEM Viewers showing error ticks should register as listener to
  * this type.
  */
-public class ProblemMarkerManager implements IResourceChangeListener, IAnnotationModelListener , IAnnotationModelListenerExtension {
+public class ProblemMarkerManager implements IResourceChangeListener,
+		IAnnotationModelListener, IAnnotationModelListenerExtension {
 
 	/**
-	 * Visitors used to look if the element change delta containes a marker change.
+	 * Visitors used to look if the element change delta containes a marker
+	 * change.
 	 */
 	private static class ProjectErrorVisitor implements IResourceDeltaVisitor {
 
-		private HashSet fChangedElements; 
-		
+		private HashSet fChangedElements;
+
 		public ProjectErrorVisitor(HashSet changedElements) {
-			fChangedElements= changedElements;
+			fChangedElements = changedElements;
 		}
-			
+
 		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource res= delta.getResource();
-			if (res instanceof IProject && delta.getKind() == IResourceDelta.CHANGED) {
+			IResource res = delta.getResource();
+			if (res instanceof IProject
+					&& delta.getKind() == IResourceDelta.CHANGED) {
 				try {
-					IProject project= (IProject) res;
-					if (!project.isAccessible() || !project.hasNature(PHPeclipsePlugin.PHP_NATURE_ID)) {
+					IProject project = (IProject) res;
+					if (!project.isAccessible()
+							|| !project
+									.hasNature(PHPeclipsePlugin.PHP_NATURE_ID)) {
 						// only track open Java projects
 						return false;
 					}
@@ -70,29 +74,34 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio
 			checkInvalidate(delta, res);
 			return true;
 		}
-		
+
 		private void checkInvalidate(IResourceDelta delta, IResource resource) {
-			int kind= delta.getKind();
-			if (kind == IResourceDelta.REMOVED || kind == IResourceDelta.ADDED || (kind == IResourceDelta.CHANGED && isErrorDelta(delta))) {
+			int kind = delta.getKind();
+			if (kind == IResourceDelta.REMOVED || kind == IResourceDelta.ADDED
+					|| (kind == IResourceDelta.CHANGED && isErrorDelta(delta))) {
 				// invalidate the resource and all parents
-				while (resource.getType() != IResource.ROOT && fChangedElements.add(resource)) {
-					resource= resource.getParent();
+				while (resource.getType() != IResource.ROOT
+						&& fChangedElements.add(resource)) {
+					resource = resource.getParent();
 				}
-			} 
-		}	
-		
-		private boolean isErrorDelta(IResourceDelta delta) {	
+			}
+		}
+
+		private boolean isErrorDelta(IResourceDelta delta) {
 			if ((delta.getFlags() & IResourceDelta.MARKERS) != 0) {
-				IMarkerDelta[] markerDeltas= delta.getMarkerDeltas();
-				for (int i= 0; i < markerDeltas.length; i++) {
+				IMarkerDelta[] markerDeltas = delta.getMarkerDeltas();
+				for (int i = 0; i < markerDeltas.length; i++) {
 					if (markerDeltas[i].isSubtypeOf(IMarker.PROBLEM)) {
-						int kind= markerDeltas[i].getKind();
-						if (kind == IResourceDelta.ADDED || kind == IResourceDelta.REMOVED)
+						int kind = markerDeltas[i].getKind();
+						if (kind == IResourceDelta.ADDED
+								|| kind == IResourceDelta.REMOVED)
 							return true;
-						int severity= markerDeltas[i].getAttribute(IMarker.SEVERITY, -1);
-						int newSeverity= markerDeltas[i].getMarker().getAttribute(IMarker.SEVERITY, -1);
+						int severity = markerDeltas[i].getAttribute(
+								IMarker.SEVERITY, -1);
+						int newSeverity = markerDeltas[i].getMarker()
+								.getAttribute(IMarker.SEVERITY, -1);
 						if (newSeverity != severity)
-							return true; 
+							return true;
 					}
 				}
 			}
@@ -101,20 +110,19 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio
 	}
 
 	private ListenerList fListeners;
-	
-	
+
 	public ProblemMarkerManager() {
-		fListeners= new ListenerList(10);
+		fListeners = new ListenerList();
 	}
 
 	/*
 	 * @see IResourceChangeListener#resourceChanged
-	 */	
+	 */
 	public void resourceChanged(IResourceChangeEvent event) {
-		HashSet changedElements= new HashSet();
-		
+		HashSet changedElements = new HashSet();
+
 		try {
-			IResourceDelta delta= event.getDelta();
+			IResourceDelta delta = event.getDelta();
 			if (delta != null)
 				delta.accept(new ProjectErrorVisitor(changedElements));
 		} catch (CoreException e) {
@@ -122,65 +130,75 @@ public class ProblemMarkerManager implements IResourceChangeListener, IAnnotatio
 		}
 
 		if (!changedElements.isEmpty()) {
-			IResource[] changes= (IResource[]) changedElements.toArray(new IResource[changedElements.size()]);
+			IResource[] changes = (IResource[]) changedElements
+					.toArray(new IResource[changedElements.size()]);
 			fireChanges(changes, true);
 		}
 	}
-	/* (non-Javadoc)
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see IAnnotationModelListener#modelChanged(IAnnotationModel)
 	 */
 	public void modelChanged(IAnnotationModel model) {
 		// no action
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see IAnnotationModelListenerExtension#modelChanged(AnnotationModelEvent)
 	 */
 	public void modelChanged(AnnotationModelEvent event) {
 		if (event instanceof CompilationUnitAnnotationModelEvent) {
-			CompilationUnitAnnotationModelEvent cuEvent= (CompilationUnitAnnotationModelEvent) event;
+			CompilationUnitAnnotationModelEvent cuEvent = (CompilationUnitAnnotationModelEvent) event;
 			if (cuEvent.includesProblemMarkerAnnotationChanges()) {
-				IResource[] changes= new IResource[] { cuEvent.getUnderlyingResource() };
+				IResource[] changes = new IResource[] { cuEvent
+						.getUnderlyingResource() };
 				fireChanges(changes, false);
 			}
 		}
-	}	
-	
+	}
+
 	/**
 	 * Adds a listener for problem marker changes.
 	 */
 	public void addListener(IProblemChangedListener listener) {
-		if (fListeners.isEmpty()) { 
+		if (fListeners.isEmpty()) {
 			PHPeclipsePlugin.getWorkspace().addResourceChangeListener(this);
-			PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider().addGlobalAnnotationModelListener(this);
+			PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider()
+					.addGlobalAnnotationModelListener(this);
 		}
 		fListeners.add(listener);
 	}
 
 	/**
 	 * Removes a <code>IProblemChangedListener</code>.
-	 */	
+	 */
 	public void removeListener(IProblemChangedListener listener) {
 		fListeners.remove(listener);
 		if (fListeners.isEmpty()) {
 			PHPeclipsePlugin.getWorkspace().removeResourceChangeListener(this);
-			PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider().removeGlobalAnnotationModelListener(this);
+			PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider()
+					.removeGlobalAnnotationModelListener(this);
 		}
 	}
-	
-	private void fireChanges(final IResource[] changes, final boolean isMarkerChange) {
-		Display display= SWTUtil.getStandardDisplay();
+
+	private void fireChanges(final IResource[] changes,
+			final boolean isMarkerChange) {
+		Display display = SWTUtil.getStandardDisplay();
 		if (display != null && !display.isDisposed()) {
 			display.asyncExec(new Runnable() {
-				public void run() {		
-					Object[] listeners= fListeners.getListeners();
-					for (int i= 0; i < listeners.length; i++) {
-						IProblemChangedListener curr= (IProblemChangedListener) listeners[i];
+				public void run() {
+					Object[] listeners = fListeners.getListeners();
+					for (int i = 0; i < listeners.length; i++) {
+						IProblemChangedListener curr = (IProblemChangedListener) listeners[i];
 						curr.problemsChanged(changes, isMarkerChange);
-					}	
+					}
 				}
 			});
-		}	
+		}
 	}
 
 }