Thread: [Pydev-cvs] org.python.pydev/src/org/python/pydev/plugin PydevPlugin.java,1.46,1.47
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2005-08-30 17:59:32
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12012/src/org/python/pydev/plugin Modified Files: PydevPlugin.java Log Message: Index: PydevPlugin.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/PydevPlugin.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** PydevPlugin.java 30 Aug 2005 11:45:27 -0000 1.46 --- PydevPlugin.java 30 Aug 2005 17:59:17 -0000 1.47 *************** *** 292,295 **** --- 292,298 ---- } + public static IPath getLocationFromWorkspace(IPath path) { + return getLocationFromWorkspace(path, 0); + } /** * This one should only be used if the root (project) is unknown. *************** *** 299,308 **** * @return */ ! public static IPath getLocationFromWorkspace(IPath path) { IWorkspace workspace = ResourcesPlugin.getWorkspace(); IContainer root = workspace.getRoot(); ! return getLocation(path, root); } /** * Returns the location in the filesystem for the given path --- 302,316 ---- * @return */ ! public static IPath getLocationFromWorkspace(IPath path, int repetitions) { IWorkspace workspace = ResourcesPlugin.getWorkspace(); IContainer root = workspace.getRoot(); ! repetitions++; ! return getLocation(path, root, repetitions); } + public static IPath getLocation(IPath path, IContainer root) { + return getLocation(path, root, 0); + } + /** * Returns the location in the filesystem for the given path *************** *** 312,316 **** * @return */ ! public static IPath getLocation(IPath path, IContainer root) { IResource resource = root.findMember(path); IPath location = null; --- 320,328 ---- * @return */ ! public static IPath getLocation(IPath path, IContainer root, int repetitions) { ! if(repetitions > 3){ ! return null; ! } ! repetitions++; IResource resource = root.findMember(path); IPath location = null; *************** *** 320,324 **** if(location == null){ ! location = getLocationFromWorkspace(path); } return location; --- 332,336 ---- if(location == null){ ! location = getLocationFromWorkspace(path, repetitions); } return location; |