Attachment 187232 Details for Bug 333903 – Fix Patch - Update 1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix Patch - Update 1

333903_class_path.txt (text/plain), 40.47 KB, created by Ian Tewksbury

on 2011-01-20 14:44:52 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Tewksbury

Created: 2011-01-20 14:44:52 EST

Size: 40.47 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.jsdt.web.core
>Index: src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties,v
>retrieving revision 1.5
>diff -u -r1.5 JSPCorePluginResources.properties
>--- src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties	30 Apr 2008 19:06:22 -0000	1.5
>+++ src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties	20 Jan 2011 19:44:37 -0000
>@@ -22,3 +22,6 @@
> JSPDirectiveValidator_2=The prefix {0} is used more than once
> JSPDirectiveValidator_3=A {0} value is required in this directive
> JSPBatchValidator_0=Gathering files in {0}
>+
>+JSWebResourceEventManager=JavaScript Web Resource Event Manager
>+JsCorePlugin_Initializing_JS_Web_Tools=Initializing JavaScript Web Tools
>Index: src/org/eclipse/wst/jsdt/web/core/internal/JSWebResourceEventManager.java
>===================================================================
>RCS file: src/org/eclipse/wst/jsdt/web/core/internal/JSWebResourceEventManager.java
>diff -N src/org/eclipse/wst/jsdt/web/core/internal/JSWebResourceEventManager.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/jsdt/web/core/internal/JSWebResourceEventManager.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,249 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ * 
>+ *******************************************************************************/
>+package org.eclipse.wst.jsdt.web.core.internal;
>+
>+import java.io.File;
>+import java.util.ArrayList;
>+import java.util.List;
>+
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.Path;
>+import org.eclipse.wst.common.componentcore.ComponentCore;
>+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
>+import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
>+import org.eclipse.wst.jsdt.core.IIncludePathAttribute;
>+import org.eclipse.wst.jsdt.core.IIncludePathEntry;
>+import org.eclipse.wst.jsdt.core.JavaScriptCore;
>+import org.eclipse.wst.jsdt.internal.core.ClasspathEntry;
>+import org.eclipse.wst.jsdt.internal.core.JavaProject;
>+import org.eclipse.wst.jsdt.web.core.internal.project.ModuleSourcePathProvider;
>+import org.eclipse.wst.sse.core.indexing.AbstractIndexManager;
>+
>+/**
>+ * This is an implementation of the {@link AbstractIndexManager} for the JavaScript Web core plugin.
>+ * 
>+ * Current Uses:
>+ * <ul>
>+ * <li>listen for .project changes so that JavaScript class paths can be updated
>+ * if the module core nature is added to a project</li>
>+ * </ul>
>+ * 
>+ * NOTE: If any other file resource change listening needs to take place in the future
>+ * in this plugin it should be done here.
>+ */
>+public class JSWebResourceEventManager extends AbstractIndexManager {
>+	/** the singleton instance of the {@link JSWebResourceEventManager} */
>+	private static JSWebResourceEventManager INSTANCE;
>+	
>+	/** the name of the ".project" file where natures are stored */
>+	private static final String DOT_PROJECT_FILE_NAME = ".project"; //$NON-NLS-1$
>+	
>+	/** the location to store state */
>+	private IPath fWorkingLocation;
>+	
>+	/**
>+	 * Private constructor for the resource event manager
>+	 */
>+	private JSWebResourceEventManager() {
>+		super(JsCoreMessages.JSWebResourceEventManager);
>+	}
>+	
>+	/**
>+	 * @return the singleton instance of the {@link JSWebResourceEventManager}
>+	 */
>+	public static JSWebResourceEventManager getDefault() {
>+		return INSTANCE != null ? INSTANCE : (INSTANCE = new JSWebResourceEventManager());
>+	}
>+
>+	/**
>+	 * @see org.eclipse.wst.sse.core.indexing.AbstractIndexManager#isResourceToIndex(int, org.eclipse.core.runtime.IPath)
>+	 */
>+	protected boolean isResourceToIndex(int type, IPath path) {
>+		String name = path.lastSegment();
>+		return 
>+			type == IResource.ROOT ||
>+			type == IResource.PROJECT || 
>+			(type == IResource.FILE && name.equals(DOT_PROJECT_FILE_NAME));
>+	}
>+
>+	/**
>+	 * @see org.eclipse.wst.sse.core.indexing.AbstractIndexManager#performAction(byte, byte, org.eclipse.core.resources.IResource, org.eclipse.core.runtime.IPath)
>+	 */
>+	protected void performAction(byte source, byte action, IResource resource,
>+			IPath movePath) {
>+		
>+		switch(action) {
>+			case(AbstractIndexManager.ACTION_ADD): {
>+				if(resource.getName().equals(DOT_PROJECT_FILE_NAME)) {
>+					updateClassPathEntires(resource.getProject());
>+				}
>+				break;
>+			}
>+		}
>+
>+	}
>+
>+	/**
>+	 * @see org.eclipse.wst.sse.core.indexing.AbstractIndexManager#getWorkingLocation()
>+	 */
>+	protected IPath getWorkingLocation() {
>+		if(this.fWorkingLocation == null) {
>+			//create path to working area
>+ 		IPath workingLocation =
>+ 			JsCorePlugin.getDefault().getStateLocation().append("JSWebResourceEventManager"); //$NON-NLS-1$
>+
>+ // ensure that it exists on disk
>+ File folder = new File(workingLocation.toOSString());
>+ 		if (!folder.isDirectory()) {
>+ 			try {
>+ 				folder.mkdir();
>+ 			}
>+ 			catch (SecurityException e) {
>+ 				Logger.logException(this.getName() +
>+ 						": Error while creating state location: " + folder + //$NON-NLS-1$
>+ 						" This renders the index manager irrevocably broken for this workspace session", //$NON-NLS-1$
>+ 						e);
>+ 			}
>+ 		}
>+ 		
>+ 		this.fWorkingLocation = workingLocation;
>+ 	}
>+ 	
>+ return this.fWorkingLocation;
>+	}
>+	
>+	/**
>+	 * Updates the JavaScript class path entries for the given project if
>+	 * both the Module core and JavaScript natures are installed on that project.
>+	 *
>+	 * @param project {@link IProject} to update the JavaScript class path entires for
>+	 */
>+	private static void updateClassPathEntires(IProject project) {
>+		try {
>+			//if a JS project with Module core check if class path needs to be updated
>+			if (project.hasNature(JavaScriptCore.NATURE_ID) &&
>+					ModuleCoreNature.isFlexibleProject(project)) {
>+				
>+				JavaProject jsProject = (JavaProject) JavaScriptCore.create(project);
>+				
>+				IIncludePathEntry[] oldEntries = jsProject.getRawIncludepath();
>+				List updatedEntries = new ArrayList();
>+				boolean foundDefault = false;
>+				
>+				List preExistingExclusionPatterns = new ArrayList();
>+				List preExistingInclusionPatterns = new ArrayList();
>+				for(int oldEntry = 0; oldEntry < oldEntries.length; ++oldEntry) {
>+					IIncludePathAttribute[] attrs = oldEntries[oldEntry].getExtraAttributes();
>+					
>+					for(int atter = 0; atter < attrs.length; ++atter) {
>+						if(attrs[atter].getName().equals(ModuleSourcePathProvider.PROVIDER_ATTRIBUTE_KEY_NAME) && 
>+								attrs[atter].getValue().equals(ModuleSourcePathProvider.PROVIDER_ATTRIBUTE_KEY_VALUE)) {
>+							foundDefault = true;
>+							
>+							//create exclusion paths that are not relative to the parent entry
>+							IPath[] exclusionPaths = oldEntries[oldEntry].getExclusionPatterns();
>+							for(int i = 0; i < exclusionPaths.length; ++i) {
>+								preExistingExclusionPatterns.add(
>+										oldEntries[oldEntry].getPath().append(exclusionPaths[i]));
>+							}
>+							
>+							//create inclusion paths that are not relative to the parent entry
>+							IPath[]inclusionPaths = oldEntries[oldEntry].getInclusionPatterns();
>+							for(int i = 0; i < inclusionPaths.length; ++i) {
>+								preExistingInclusionPatterns.add(
>+										oldEntries[oldEntry].getPath().append(inclusionPaths[i]));
>+							}
>+						} else {
>+							updatedEntries.add(oldEntries[oldEntry]);
>+						}
>+					}
>+					
>+				}
>+				
>+				//if found that a default path was added, replace with module core determined path
>+				if(foundDefault) {
>+					IResource[] roots = getRoots(project);
>+					for(int root = 0; root < roots.length; ++root) {
>+						IPath rootPath = roots[root].getFullPath();
>+
>+						//find matching pre-existing exclusion patterns
>+						List exclusionPatterns = new ArrayList();
>+						for(int i = 0; i < preExistingExclusionPatterns.size(); ++i) {
>+							IPath parentRelativeExclusionPattern = PathUtils.makePatternRelativeToParent(
>+									(IPath)preExistingExclusionPatterns.get(i), rootPath);
>+							
>+							if(parentRelativeExclusionPattern != null) {
>+								exclusionPatterns.add(parentRelativeExclusionPattern);
>+							}
>+						}
>+						
>+						//find matching pre-existing inclusion patterns
>+						List inclusionPatterns = new ArrayList();
>+						for(int i = 0; i < preExistingInclusionPatterns.size(); ++i) {
>+							IPath parentRelativeInclusionPattern = PathUtils.makePatternRelativeToParent(
>+									(IPath)preExistingInclusionPatterns.get(i), rootPath);
>+							
>+							if(parentRelativeInclusionPattern != null) {
>+								inclusionPatterns.add(parentRelativeInclusionPattern);
>+							}
>+						}
>+						
>+						//create new entry entry
>+						IPath[] exclusionPaths = ClasspathEntry.EXCLUDE_NONE;
>+						if(exclusionPatterns.size() > 0) {
>+							exclusionPaths = (IPath[])exclusionPatterns.toArray(
>+									new IPath[exclusionPatterns.size()]);
>+						}
>+						IPath[] inclusionPaths = ClasspathEntry.INCLUDE_ALL;
>+						if(inclusionPatterns.size() > 0) {
>+							inclusionPaths = (IPath[])inclusionPatterns.toArray(
>+									new IPath[inclusionPatterns.size()]);
>+						}
>+						IIncludePathEntry newEntry = JavaScriptCore.newSourceEntry(
>+								rootPath,
>+								inclusionPaths,
>+								exclusionPaths,
>+								null);
>+						updatedEntries.add(newEntry);
>+					}
>+					
>+					//set include path
>+					jsProject.setRawIncludepath(
>+							(IIncludePathEntry[])updatedEntries.toArray(
>+									new IIncludePathEntry[updatedEntries.size()]),
>+							project.getLocation(), null);
>+				}
>+			}
>+		} catch(CoreException e) {
>+			Logger.logException("Error while updating JavaScript classpath.", e); //$NON-NLS-1$
>+		}
>+	}
>+	
>+	/**
>+	 * Uses module core to get the roots of the given project.
>+	 *
>+	 * @param project find the module core roots for this {@link IProject}
>+	 * @return the module core roots for the given {@link IProject
>+	 */
>+	private static IResource[] getRoots(IProject project) {
>+		IVirtualFile root = ComponentCore.createFile(project, Path.ROOT);
>+		IResource[] underlyingResources = root.getUnderlyingResources();
>+		if (underlyingResources == null || underlyingResources.length == 0) {
>+			underlyingResources = new IResource[]{root.getUnderlyingResource()};
>+		}
>+		
>+		return underlyingResources;
>+	}
>+}
>\ No newline at end of file
>Index: src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java,v
>retrieving revision 1.3
>diff -u -r1.3 JsCoreMessages.java
>--- src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java	30 Apr 2008 19:06:22 -0000	1.3
>+++ src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java	20 Jan 2011 19:44:37 -0000
>@@ -33,6 +33,10 @@
> 	public static String JSPFContentPropertiesManager_Updating;
> 	public static String JSPIndexManager_0;
> 	public static String JSPIndexManager_2;
>+	
>+	public static String JSWebResourceEventManager;
>+	public static String JsCorePlugin_Initializing_JS_Web_Tools;
>+	
> 	/**
> 	 * @deprecated
> 	 */
>Index: src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java,v
>retrieving revision 1.5
>diff -u -r1.5 JsCorePlugin.java
>--- src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java	30 Apr 2008 19:06:22 -0000	1.5
>+++ src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java	20 Jan 2011 19:44:37 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2008 IBM Corporation and others.
>+ * Copyright (c) 2004, 2011 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -10,7 +10,20 @@
> *******************************************************************************/
> package org.eclipse.wst.jsdt.web.core.internal;
> 
>+import org.eclipse.core.resources.IResourceChangeEvent;
>+import org.eclipse.core.resources.IResourceChangeListener;
>+import org.eclipse.core.resources.ISaveContext;
>+import org.eclipse.core.resources.ISaveParticipant;
>+import org.eclipse.core.resources.ISavedState;
>+import org.eclipse.core.resources.IWorkspace;
>+import org.eclipse.core.resources.IWorkspaceRunnable;
>+import org.eclipse.core.resources.ResourcesPlugin;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Plugin;
>+import org.eclipse.core.runtime.Status;
>+import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.wst.jsdt.web.core.javascript.search.JsIndexManager;
> import org.osgi.framework.BundleContext;
> 
>@@ -27,12 +40,14 @@
> 	public static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.core"; //$NON-NLS-1$
> 	
> 	/**
>+	 * Job used to finish tasks needed to start up the plugin but that did not have
>+	 * to block the plugin start up process.
>+	 */
>+	private Job fPluginInitializerJob;
>+	
>+	/**
> 	 * Returns the shared instance.
>-	 * 
>-	 * @deprecated - will be removed. Currently used to get "model preferences",
>-	 * but there are other, better ways.
> 	 */
>-
> 	public static JsCorePlugin getDefault() {
> 		return JsCorePlugin.plugin;
> 	}
>@@ -43,6 +58,7 @@
> 	public JsCorePlugin() {
> 		super();
> 		JsCorePlugin.plugin = this;
>+		this.fPluginInitializerJob = new PluginInitializerJob();
> 	}
> 	
> 	/*
>@@ -58,6 +74,10 @@
> 		// listen for classpath changes
> 		JsIndexManager.getInstance().initialize();
> 		// listen for resource changes to update content properties keys
>+		
>+		//schedule delayed initialization
>+		this.fPluginInitializerJob.schedule(2000);
>+
> 	}
> 	
> 	/*
>@@ -71,6 +91,123 @@
> 		// keys
> 		// stop any indexing
> 		JsIndexManager.getInstance().shutdown();
>+		
>+		//Stop the resource event manager
>+		JSWebResourceEventManager.getDefault().stop();
>+		
> 		super.stop(context);
> 	}
>+	
>+	/**
>+	 * A {@link Job} used to perform delayed initialization for the plugin
>+	 */
>+	private static class PluginInitializerJob extends Job {
>+		/**
>+		 * Default constructor to set up this {@link Job} as a
>+		 * long running system {@link Job}
>+		 */
>+		protected PluginInitializerJob() {
>+			super(JsCoreMessages.JsCorePlugin_Initializing_JS_Web_Tools);
>+			
>+			this.setUser(false);
>+			this.setSystem(true);
>+			this.setPriority(Job.LONG);
>+		}
>+		
>+		/**
>+		 * Perform delayed initialization for the plugin
>+		 * 
>+		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
>+		 */
>+		protected IStatus run(IProgressMonitor monitor) {
>+			IStatus status = Status.OK_STATUS;
>+			final IWorkspace workspace = ResourcesPlugin.getWorkspace();
>+			try {
>+				/*
>+				 * Restore save state and process any events that happened before
>+				 * plug-in loaded. Don't do it immediately since adding the save
>+				 * participant requires a lock on the workspace to compute the
>+				 * accumulated deltas, and if the tree is not already locked it
>+				 * becomes a blocking call.
>+				 */
>+				workspace.run(new IWorkspaceRunnable() {
>+					public void run(final IProgressMonitor worspaceMonitor) throws CoreException {
>+						ISavedState savedState = null;
>+						
>+						try {
>+							//add the save participant for this bundle
>+							savedState = ResourcesPlugin.getWorkspace().addSaveParticipant(
>+									JsCorePlugin.plugin.getBundle().getSymbolicName(), new SaveParticipant());
>+						} catch (CoreException e) {
>+							Logger.logException("JSP Core Plugin failed at loading previously saved state." + //$NON-NLS-1$
>+									" All componenets dependent on this state will start as if first workspace load.", e); //$NON-NLS-1$
>+						}
>+						
>+						//if there is a saved state start up using that, else start up cold
>+						if(savedState != null) {
>+							try {
>+								Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
>+							} finally {
>+								savedState.processResourceChangeEvents(new IResourceChangeListener() {
>+									/**
>+									 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
>+									 */
>+									public void resourceChanged(IResourceChangeEvent event) {
>+										JSWebResourceEventManager.getDefault().start(event.getDelta(), worspaceMonitor);
>+									}
>+								});
>+							}
>+						} else {
>+							JSWebResourceEventManager.getDefault().start(null, worspaceMonitor);
>+						}
>+					}
>+				}, monitor);
>+			} catch(CoreException e) {
>+				status = e.getStatus();
>+			}
>+			
>+			return status;
>+		}
>+		
>+	}
>+	
>+	/**
>+	 * Used so that all of the IResourceChangeEvents that occurred before
>+	 * this plugin loaded can be processed.
>+	 */
>+	private static class SaveParticipant implements ISaveParticipant {
>+		/**
>+		 * Default constructor
>+		 */
>+		protected SaveParticipant() {
>+		}
>+		
>+		/**
>+		 * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext)
>+		 */
>+		public void doneSaving(ISaveContext context) {
>+			//ignore
>+		}
>+	
>+		/**
>+		 * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext)
>+		 */
>+		public void prepareToSave(ISaveContext context) throws CoreException {
>+			//ignore
>+		}
>+	
>+		/**
>+		 * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext)
>+		 */
>+		public void rollback(ISaveContext context) {
>+			//ignore
>+		}
>+	
>+		/**
>+		 * @see org.eclipse.core.resources.ISaveParticipant#saving(org.eclipse.core.resources.ISaveContext)
>+		 */
>+		public void saving(ISaveContext context) throws CoreException {
>+			context.needDelta();
>+		}
>+	}
> }
>Index: src/org/eclipse/wst/jsdt/web/core/internal/PathUtils.java
>===================================================================
>RCS file: src/org/eclipse/wst/jsdt/web/core/internal/PathUtils.java
>diff -N src/org/eclipse/wst/jsdt/web/core/internal/PathUtils.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/jsdt/web/core/internal/PathUtils.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,146 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ * 
>+ *******************************************************************************/
>+package org.eclipse.wst.jsdt.web.core.internal;
>+
>+import java.io.File;
>+
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.wst.jsdt.core.compiler.CharOperation;
>+
>+/**
>+ * Utility class dealing with {@link IPath}s.
>+ */
>+public class PathUtils {
>+	/** represents the * pattern in a path pattern */
>+	private static final String STAR = "*"; //$NON-NLS-1$
>+	
>+	/** represents the ** pattern in a path pattern */
>+	private static final String STAR_STAR = "**"; //$NON-NLS-1$
>+	
>+	/**
>+	 * Counts the number of segments in a given pattern that match segments in a given parent path.
>+	 * This counting takes place from the beginning of both the pattern and parent and stops when
>+	 * they no longer match. The pattern can contain **, * and ? wild cards.
>+	 *
>+	 * @param pattern count the number of segments of this pattern that match the given <code>parent</code>
>+	 * @param parent count the number of segments in the given <code>pattern</code> that match this path
>+	 * @return the number of segments from the beginning of the given <code>pattern</code> {@link IPath}
>+	 * that match the beginning segments of the given <code>parent</code> {@link IPath}
>+	 */
>+	public static int countPatternSegmentsThatMatchParent(IPath pattern, IPath parent) {
>+		int matchingSegments = 0;
>+		
>+		//ignore a pattern that is just ** or *
>+		if(!(pattern.segmentCount() == 1 &&
>+				(pattern.segment(0).equals(STAR_STAR) || pattern.segment(0).equals(STAR)))) {
>+			
>+			int patternSegmentIndex = 0;
>+			int parentSegmentIndex = 0;
>+			boolean starStarMode = false;
>+			while(patternSegmentIndex < pattern.segmentCount() &&
>+					parentSegmentIndex < parent.segmentCount()) {
>+				
>+				String patternSegment = pattern.segment(patternSegmentIndex);
>+				String parentSegment = parent.segment(parentSegmentIndex);
>+				
>+				/* if matching on wild
>+				 * else if wild match on multiple path segments
>+				 * else if wild match on one path segment or path segments are equal
>+				 * else not equal so stop comparing
>+				 */
>+				if(starStarMode) {
>+					/* if parent segment equals first pattern segment after a ** stop matching on it
>+					 * else still matching on **
>+					 */
>+					if(pathSegmentMatchesPattern(patternSegment, parentSegment)) {
>+						starStarMode = false;
>+						matchingSegments++;
>+						patternSegmentIndex++;
>+						parentSegmentIndex++;
>+					} else {
>+						parentSegmentIndex++;
>+					}
>+				
>+				} else if(patternSegment.equals(STAR_STAR)) { //$NON-NLS-1$
>+					starStarMode = true;
>+					
>+					//find the first pattern segment after the ** that is not another ** or *
>+					matchingSegments++;
>+					parentSegmentIndex++;
>+					
>+					for(int i = patternSegmentIndex+1; i < pattern.segmentCount(); ++i) {
>+						
>+						if(!(pattern.segment(i).equals(STAR_STAR) || //$NON-NLS-1$
>+								pattern.segment(i).equals(STAR))) { //$NON-NLS-1$
>+							
>+							patternSegmentIndex = i;
>+							break;
>+						}
>+					}
>+				} else if(patternSegment.equals("*") || //$NON-NLS-1$
>+						pathSegmentMatchesPattern(patternSegment, parentSegment)){
>+					
>+					matchingSegments++;
>+					patternSegmentIndex++;
>+					parentSegmentIndex++;
>+				} else {
>+					break;
>+				}
>+			}
>+		}
>+		
>+		return matchingSegments;
>+	}
>+	
>+	/**
>+	 * Given a pattern path and a parent path attempts to truncate the given pattern path such
>+	 * that it is relative to the given parent path.
>+	 *
>+	 * @param pattern attempt to truncate this {@link IPath} such that it is relative to the given
>+	 * <code>parent</code> {@link IPath}
>+	 * @param parent attempt to truncate the given <code>pattern</code> {@link IPath} such that it
>+	 * is relative to this {@link IPath}
>+	 * @return either a truncated version of the given <code>pattern</code> {@link IPath} that is
>+	 * relative to the given <code>parent</code> {@link IPath}, or <code>null</code> if the given
>+	 * <code>pattern</code> {@link IPath} could not be truncated to be relative to the given
>+	 * <code>parent</code> {@link IPath}
>+	 */
>+	public static IPath makePatternRelativeToParent(IPath pattern, IPath parent) {
>+		int matchedSegments = countPatternSegmentsThatMatchParent(pattern, parent);
>+		
>+		IPath relativePattern = null;
>+		if(matchedSegments != 0) {
>+			relativePattern = pattern.removeFirstSegments(matchedSegments);
>+			
>+			if(relativePattern.segmentCount() == 0) {
>+				relativePattern = null;
>+			} else {
>+				relativePattern.makeRelative();
>+			}
>+		}
>+		
>+		return relativePattern;
>+	}
>+	
>+	/**
>+	 * A convenience method for checking the matching of one segment from a pattern path with
>+	 * one segment from a path.
>+	 *Bug 334922 - CharOperation#match does not work as expected when isCaseSensitive is passed as false
>+	 * @param patternSegment check if this pattern segment is a match with the given path segment.
>+	 * @param segment check if this path segment matches with the given pattern segment
>+	 * @return <code>true</code> if the segments match, <code>false</code> otherwise
>+	 */
>+	private static boolean pathSegmentMatchesPattern(String patternSegment, String segment) {
>+		return CharOperation.pathMatch(patternSegment.toCharArray(), segment.toCharArray(),
>+				false, File.separatorChar);
>+	}
>+}
>Index: src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleSourcePathProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleSourcePathProvider.java,v
>retrieving revision 1.2
>diff -u -r1.2 ModuleSourcePathProvider.java
>--- src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleSourcePathProvider.java	28 Sep 2010 01:57:54 -0000	1.2
>+++ src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleSourcePathProvider.java	20 Jan 2011 19:44:37 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2010 IBM Corporation and others.
>+ * Copyright (c) 2010, 2011 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -21,13 +21,17 @@
> import org.eclipse.wst.jsdt.core.IIncludePathAttribute;
> import org.eclipse.wst.jsdt.core.IIncludePathEntry;
> import org.eclipse.wst.jsdt.core.JavaScriptCore;
>+import org.eclipse.wst.jsdt.internal.core.ClasspathEntry;
> import org.eclipse.wst.jsdt.internal.core.util.DefaultSourcePathProvider;
> 
> public class ModuleSourcePathProvider extends DefaultSourcePathProvider {
> 
>+	public static final String PROVIDER_ATTRIBUTE_KEY_NAME = "provider"; //$NON-NLS-1$
>+	public static final String PROVIDER_ATTRIBUTE_KEY_VALUE = ModuleSourcePathProvider.class.getName(); //$NON-NLS-1$
>+	
> 	static final IPath VIRTUAL_CONTAINER_PATH = new Path("org.eclipse.wst.jsdt.launching.WebProject"); //$NON-NLS-1$
> 	static final IIncludePathEntry VIRTUAL_SCOPE_ENTRY = JavaScriptCore.newContainerEntry(VIRTUAL_CONTAINER_PATH, new IAccessRule[0], new IIncludePathAttribute[]{IIncludePathAttribute.HIDE}, false);
>-
>+	
> 	public ModuleSourcePathProvider() {
> 	}
> 
>@@ -53,6 +57,9 @@
> 				}
> 			}
> 		}
>-		return super.getDefaultSourcePaths(p);
>+		
>+		return new IIncludePathEntry[]{JavaScriptCore.newSourceEntry(p.getFullPath(),
>+				ClasspathEntry.INCLUDE_ALL,ClasspathEntry.EXCLUDE_NONE,null,
>+				new IIncludePathAttribute[]{JavaScriptCore.newIncludepathAttribute(PROVIDER_ATTRIBUTE_KEY_NAME, PROVIDER_ATTRIBUTE_KEY_VALUE)})};
> 	}
> }
>#P org.eclipse.wst.jsdt.web.core.tests
>Index: src/org/eclipse/wst/jsdt/web/core/tests/AllWebCoreTests.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/tests/org.eclipse.wst.jsdt.web.core.tests/src/org/eclipse/wst/jsdt/web/core/tests/AllWebCoreTests.java,v
>retrieving revision 1.3
>diff -u -r1.3 AllWebCoreTests.java
>--- src/org/eclipse/wst/jsdt/web/core/tests/AllWebCoreTests.java	16 Oct 2010 04:17:13 -0000	1.3
>+++ src/org/eclipse/wst/jsdt/web/core/tests/AllWebCoreTests.java	20 Jan 2011 19:44:38 -0000
>@@ -1,3 +1,14 @@
>+/*******************************************************************************
>+ * Copyright (c) 2009, 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ * 
>+ *******************************************************************************/
> package org.eclipse.wst.jsdt.web.core.tests;
> 
> import junit.framework.Test;
>@@ -17,6 +28,7 @@
> 
> 		//$JUnit-END$
> 		suite.addTestSuite(TestHtmlTranslation.class);
>+		suite.addTestSuite(PathUtilsTests.class);
> 		return suite;
> 	}
> 
>Index: src/org/eclipse/wst/jsdt/web/core/tests/PathUtilsTests.java
>===================================================================
>RCS file: src/org/eclipse/wst/jsdt/web/core/tests/PathUtilsTests.java
>diff -N src/org/eclipse/wst/jsdt/web/core/tests/PathUtilsTests.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/wst/jsdt/web/core/tests/PathUtilsTests.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,310 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ * 
>+ *******************************************************************************/
>+package org.eclipse.wst.jsdt.web.core.tests;
>+
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.Path;
>+import org.eclipse.wst.jsdt.web.core.internal.PathUtils;
>+
>+import junit.framework.Assert;
>+import junit.framework.TestCase;
>+
>+/**
>+ * Unit tests for the {@link PathUtils} class.
>+ *
>+ */
>+public class PathUtilsTests extends TestCase {
>+
>+	/**
>+	 * Default constructor
>+	 */
>+	public PathUtilsTests() {
>+		super("Path Utils Tests");
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_SegmentCountTest_0() {
>+		runCountPatternSegmentsThatMatchParentTest("foo", "foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_SegmentCountTest_1() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo", "foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_SegmentCountTest_2() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo", "foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_SegmentCountTest_3() {
>+		runCountPatternSegmentsThatMatchParentTest("foo", "/foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_SegmentCountTest_4() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo", "/foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_0() {
>+		runCountPatternSegmentsThatMatchParentTest("foo/bar", "foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_1() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/bar", "foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_2() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/bar", "foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_3() {
>+		runCountPatternSegmentsThatMatchParentTest("foo/bar", "/foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_4() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/bar", "/foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_5() {
>+		runCountPatternSegmentsThatMatchParentTest("foo/bar/", "foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_6() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/bar/", "foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_7() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/bar/", "foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_8() {
>+		runCountPatternSegmentsThatMatchParentTest("foo/bar/", "/foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_9() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/bar/", "/foo", 1);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_SegmentCountTest_10() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/bar/", "/boo", 0);
>+	}
>+	
>+	public void testTwoSegmentParentWithThreeSegmentPattern_SegmentCountTest_0() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/bar/blarg", "/foo/bar", 2);
>+	}
>+	
>+	public void testStar_SegmentCountTest_0() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/*/blarg", "foo/bar", 2);
>+	}
>+	
>+	public void testStar_SegmentCountTest_1() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/*", "foo", 1);
>+	}
>+	
>+	public void testStar_SegmentCountTest_2() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/*", "foo/blarg", 2);
>+	}
>+	
>+	public void testStar_SegmentCountTest_3() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/*", "foo", 1);
>+	}
>+	
>+	public void testStarStar_SegmentCountTest_0() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/**", "foo", 1);
>+	}
>+	
>+	public void testStarStar_SegmentCountTest_1() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/**", "foo/bar", 2);
>+	}
>+	
>+	public void testStarStar_SegmentCountTest_2() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/**", "foo/bar/blarg", 3);
>+	}
>+	
>+	public void testStarStar_SegmentCountTest_3() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/**/blarg", "foo/bar/blarg", 3);
>+	}
>+	
>+	public void testStarStar_SegmentCountTest_4() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/**/blarg", "foo/bar/boo/blarg", 3);
>+	}
>+	
>+	public void testStarStar_SegmentCountTest_5() {
>+		runCountPatternSegmentsThatMatchParentTest("/foo/**/blarg/nerg", "foo/bar/boo/blarg", 3);
>+	}
>+	
>+	public void testQuestionMark_SegmentCountTest_0() {
>+		runCountPatternSegmentsThatMatchParentTest("foo?bar", "/fooZbar", 1);
>+	}
>+	
>+	public void testQuestionMark_SegmentCountTest_1() {
>+		runCountPatternSegmentsThatMatchParentTest("foo?bar", "/foobar", 0);
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_TransformPatternTest_0() {
>+		runMakePatternRelativeToParentTest("foo", "foo", null);
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_TransformPatternTest_1() {
>+		runMakePatternRelativeToParentTest("/foo", "foo", null);
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_TransformPatternTest_2() {
>+		runMakePatternRelativeToParentTest("/foo", "foo", null);
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_TransformPatternTest_3() {
>+		runMakePatternRelativeToParentTest("foo", "foo", null);
>+	}
>+	
>+	public void testOneSegmentParentWithOneSegmentPattern_TransformPatternTest_4() {
>+		runMakePatternRelativeToParentTest("/foo", "foo", null);
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_0() {
>+		runMakePatternRelativeToParentTest("foo/bar", "foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_1() {
>+		runMakePatternRelativeToParentTest("/foo/bar", "foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_2() {
>+		runMakePatternRelativeToParentTest("/foo/bar", "foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_3() {
>+		runMakePatternRelativeToParentTest("foo/bar", "/foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_4() {
>+		runMakePatternRelativeToParentTest("/foo/bar", "/foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_5() {
>+		runMakePatternRelativeToParentTest("foo/bar/", "foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_6() {
>+		runMakePatternRelativeToParentTest("/foo/bar/", "foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_7() {
>+		runMakePatternRelativeToParentTest("/foo/bar/", "foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_8() {
>+		runMakePatternRelativeToParentTest("foo/bar/", "/foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_9() {
>+		runMakePatternRelativeToParentTest("/foo/bar/", "/foo", "bar/");
>+	}
>+	
>+	public void testOneSegmentParentWithTwoSegmentPattern_TransformPatternTest_10() {
>+		runMakePatternRelativeToParentTest("/foo/bar/", "/boo", null);
>+	}
>+	
>+	public void testTwoSegmentParentWithThreeSegmentPattern_TransformPatternTest_0() {
>+		runMakePatternRelativeToParentTest("/foo/bar/blarg", "/foo/bar", "blarg/");
>+	}
>+	
>+	public void testStar_TransformPatternTest_0() {
>+		runMakePatternRelativeToParentTest("/foo/*/blarg", "foo/bar", "blarg/");
>+	}
>+	
>+	public void testStar_TransformPatternTest_1() {
>+		runMakePatternRelativeToParentTest("/foo/*", "foo", "*/");
>+	}
>+	
>+	public void testStar_TransformPatternTest_2() {
>+		runMakePatternRelativeToParentTest("/foo/*", "foo/blarg/", null);
>+	}
>+	
>+	public void testStar_TransformPatternTest_3() {
>+		runMakePatternRelativeToParentTest("/foo/*", "foo", "*/");
>+	}
>+	
>+	public void testStarStar_TransformPatternTest_0() {
>+		runMakePatternRelativeToParentTest("/foo/**", "foo", "**/");
>+	}
>+	
>+	public void testStarStar_TransformPatternTest_1() {
>+		runMakePatternRelativeToParentTest("/foo/**", "foo/bar/", null);
>+	}
>+	
>+	public void testStarStar_TransformPatternTest_2() {
>+		runMakePatternRelativeToParentTest("/foo/**", "foo/bar/blarg/", null);
>+	}
>+	
>+	public void testStarStar_TransformPatternTest_3() {
>+		runMakePatternRelativeToParentTest("/foo/**/blarg", "foo/bar/blarg/", null);
>+	}
>+	
>+	public void testStarStar_TransformPatternTest_4() {
>+		runMakePatternRelativeToParentTest("/foo/**/blarg", "foo/bar/boo/blarg/", null);
>+	}
>+	
>+	public void testStarStar_TransformPatternTest_5() {
>+		runMakePatternRelativeToParentTest("/foo/**/blarg/nerg", "foo/bar/boo/blarg", "nerg/");
>+	}
>+	
>+	public void testQuestionMark_TransformPatternTest_0() {
>+		runMakePatternRelativeToParentTest("foo?bar", "/fooZbar", null);
>+	}
>+	
>+	public void testQuestionMark_TransformPatternTest_1() {
>+		runMakePatternRelativeToParentTest("foo?bar", "/foobar", null);
>+	}
>+	
>+	public void testQuestionMark_TransformPatternTest_2() {
>+		runMakePatternRelativeToParentTest("foo?bar/awesome", "/fooZbar", "awesome/");
>+	}
>+	
>+	public void testQuestionMark_TransformPatternTest_3() {
>+		runMakePatternRelativeToParentTest("foo?bar/awesome", "/foobar", null);
>+	}
>+	
>+	/**
>+	 * Runs a test on {@link PathUtils#countPatternSegmentsThatMatchParent(IPath, IPath)}
>+	 *
>+	 * @param pattern the pattern path to test
>+	 * @param parentPath the parent path to test
>+	 * @param expectedMatchedSegments the expected number of segments in the pattern that match the parent
>+	 */
>+	private static void runCountPatternSegmentsThatMatchParentTest(String pattern, String parentPath,
>+			int expectedMatchedSegments) {
>+		int matchedSegments = PathUtils.countPatternSegmentsThatMatchParent(
>+				new Path(pattern), new Path(parentPath));
>+		
>+		Assert.assertEquals("Number of matched path segments does not equal expected.", //$NON-NLS-1$
>+				expectedMatchedSegments, matchedSegments);
>+	}
>+	
>+	/**
>+	 * 
>+	 * Runs a test on {@link PathUtils#makePatternRelativeToParent(IPath, IPath)}
>+	 *
>+	 * @param pattern the pattern path to test
>+	 * @param parent the parent path to test
>+	 * @param expected the expected pattern path made relative to the parent path
>+	 */
>+	private static void runMakePatternRelativeToParentTest(String pattern, String parent, String expected) {
>+		IPath transformedPattern = PathUtils.makePatternRelativeToParent(
>+				new Path(pattern), new Path(parent));
>+		
>+		IPath expectedPath = null;
>+		if(expected != null) {
>+			expectedPath = new Path(expected);
>+		}
>+		
>+		Assert.assertEquals("Transformed pattern does not match expected.",
>+				expectedPath, transformedPattern);
>+	}
>+}

Actions: View | Diff

Attachments on bug 333903: 186431 | 187232