Attachment 127561 Details for Bug 244086 – patch for 3.0.4

[patch] patch for 3.0.4

244086.txt (text/plain), 5.81 KB, created by Jason Sholl

on 2009-03-04 16:37:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Sholl

Created: 2009-03-04 16:37:48 EST

Size: 5.81 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee
>Index: common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java,v
>retrieving revision 1.27.2.5.2.1
>diff -u -r1.27.2.5.2.1 J2EEComponentClasspathContainer.java
>--- common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java	25 Feb 2009 06:49:11 -0000	1.27.2.5.2.1
>+++ common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java	4 Mar 2009 21:37:21 -0000
>@@ -110,7 +110,7 @@
> 			return true;
> 		}
> 		
>-		IVirtualReference[] refs = component instanceof J2EEModuleVirtualComponent ? ((J2EEModuleVirtualComponent)component).getReferences(true, true): component.getReferences();
>+		IVirtualReference[] refs = component instanceof J2EEModuleVirtualComponent ? ((J2EEModuleVirtualComponent)component).getReferences(false, true): component.getReferences();
> 		IVirtualComponent comp = null;
> 
> 		// avoid updating the container if references haven't changed
>@@ -188,7 +188,7 @@
> 		IVirtualComponent comp = null;
> 		IVirtualReference ref = null;
> 		
>-		IVirtualReference[] refs = component instanceof J2EEModuleVirtualComponent ? ((J2EEModuleVirtualComponent)component).getReferences(true, true): component.getReferences();
>+		IVirtualReference[] refs = component instanceof J2EEModuleVirtualComponent ? ((J2EEModuleVirtualComponent)component).getReferences(false, true): component.getReferences();
> 
> 		List refsList = new ArrayList();
> 		Set refedComps = new HashSet();
>#P org.eclipse.wst.common.modulecore
>Index: modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java,v
>retrieving revision 1.3.2.4
>diff -u -r1.3.2.4 DependencyGraphImpl.java
>--- modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java	5 Sep 2008 17:53:27 -0000	1.3.2.4
>+++ modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java	4 Mar 2009 21:37:22 -0000
>@@ -25,6 +25,7 @@
> import org.eclipse.wst.common.componentcore.ComponentCore;
> import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
> import org.eclipse.wst.common.componentcore.internal.impl.WTPModulesResourceFactory;
>+import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
> import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
> import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
> 
>@@ -40,9 +41,12 @@
> 	 * {A, B} }
> 	 */
> 	private Map<IProject, Set<IProject>> graph = null;
>-
>+	
> 	private long modStamp = 0;
> 
>+	private Map<String, Object> referenceOptions = new HashMap<String, Object>();
>+	
>+	
> 	/**
> 	 * This is not public; only {@link IDependencyGraph#INSTANCE} should be
> 	 * used.
>@@ -153,18 +157,31 @@
> 	 */
> 	private void initGraph() {
> 		synchronized (graphLock) {
>+			referenceOptions.put("GET_JAVA_REFS", Boolean.FALSE);
> 			try {
> 				preUpdate();
> 				graph = new HashMap<IProject, Set<IProject>>();
> 				listener = new DependencyGraphResourceChangedListener();
> 				ResourcesPlugin.getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE);
>+				initAll();
>+			} finally {
>+				postUpdate();
>+			}
>+		}
>+	}
>+	
>+	private void initAll(){
>+		synchronized (graphLock) {
>+			try{
>+				preUpdate();
> 				IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
> 				for (IProject sourceProject : allProjects) {
> 					queueProjectAdded(sourceProject);
>-				}
>-			} finally {
>+				}	
>+			} finally{
> 				postUpdate();
> 			}
>+			
> 		}
> 	}
> 
>@@ -300,7 +317,12 @@
> 						for (IProject sourceProject : allProjects) {
> 							IVirtualComponent component = ComponentCore.createComponent(sourceProject);
> 							if (component != null) {
>-								IVirtualReference[] references = component.getReferences();
>+								IVirtualReference[] references = null;
>+								if(referenceOptions != null && component instanceof VirtualComponent) {
>+									references = ((VirtualComponent)component).getReferences(referenceOptions);
>+								} else {
>+									references = component.getReferences();
>+								}
> 								for (IVirtualReference ref : references) {
> 									IVirtualComponent targetComponent = ref.getReferencedComponent();
> 									if (targetComponent != null) {
>@@ -320,7 +342,12 @@
> 							IVirtualComponent component = ComponentCore.createComponent(sourceProject);
> 							if (component != null) {
> 								validRefs.clear();
>-								IVirtualReference[] references = component.getReferences();
>+								IVirtualReference[] references = null;
>+								if(referenceOptions != null && component instanceof VirtualComponent) {
>+									references = ((VirtualComponent)component).getReferences(referenceOptions);
>+								} else {
>+									references = component.getReferences();
>+								}
> 								for (IVirtualReference ref : references) {
> 									IVirtualComponent targetComponent = ref.getReferencedComponent();
> 									if (targetComponent != null) {
>@@ -349,6 +376,17 @@
> 							}
> 						}
> 					}
>+					boolean scheduleUpdate = false;
>+					synchronized (graphLock) {
>+						if(referenceOptions != null){
>+							scheduleUpdate = true;
>+							referenceOptions = null;
>+						}
>+					}
>+					if(scheduleUpdate){
>+						initAll();
>+					}
>+					
> 				}
> 			});
> 			// System.err.println(IDependencyGraph.INSTANCE);

Actions: View | Diff

Attachments on bug 244086: 109940 | 109941 | 109942 | 127561