[Pydev-cvs] org.python.pydev/src_navigator/org/python/pydev/navigator PythonLabelProvider.java, 1.1, 1.2 ModelAdapter.java, 1.1, 1.2 PythonModelProvider.java, 1.4, 1.5 PyPackageStateSaver.java, 1.4, 1.5 PythonBaseModelProvider.java, 1.5, 1.6 IWrappedResource.java, 1.1, NONE PythonResource.java, 1.1, NONE PythonFolder.java, 1.1, NONE PythonFile.java, 1.1, NONE PythonModelSorter.java, 1.1, NONE PythonNode.java, 1.2, NONE WrappedResource.java, 1.1, NONE PythonSourceFolder.java, 1.1, NONE

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15756/src_navigator/org/python/pydev/navigator

Modified Files:
	PythonLabelProvider.java ModelAdapter.java 
	PythonModelProvider.java PyPackageStateSaver.java 
	PythonBaseModelProvider.java 
Removed Files:
	IWrappedResource.java PythonResource.java PythonFolder.java 
	PythonFile.java PythonModelSorter.java PythonNode.java 
	WrappedResource.java PythonSourceFolder.java 
Log Message:
Refactoring the navigator structure.

Index: PythonModelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/PythonModelProvider.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PythonModelProvider.java	5 Jul 2007 00:32:12 -0000	1.4
--- PythonModelProvider.java	7 Jul 2007 12:06:01 -0000	1.5
***************
*** 24,27 ****
--- 24,32 ----
  import org.eclipse.ui.navigator.PipelinedViewerUpdate;
  import org.python.pydev.core.structure.FastStack;
+ import org.python.pydev.navigator.elements.IWrappedResource;
+ import org.python.pydev.navigator.elements.PythonFile;
+ import org.python.pydev.navigator.elements.PythonFolder;
+ import org.python.pydev.navigator.elements.PythonResource;
+ import org.python.pydev.navigator.elements.PythonSourceFolder;
  import org.python.pydev.plugin.PydevPlugin;
  import org.python.pydev.plugin.nature.PythonNature;

Index: PyPackageStateSaver.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/PyPackageStateSaver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PyPackageStateSaver.java	6 Jul 2007 17:45:23 -0000	1.4
--- PyPackageStateSaver.java	7 Jul 2007 12:06:01 -0000	1.5
***************
*** 17,20 ****
--- 17,21 ----
  import org.eclipse.jface.viewers.Viewer;
  import org.eclipse.ui.IMemento;
+ import org.python.pydev.navigator.elements.IWrappedResource;
  import org.python.pydev.plugin.PydevPlugin;
  

--- PythonFile.java DELETED ---

--- PythonResource.java DELETED ---

--- PythonSourceFolder.java DELETED ---

--- IWrappedResource.java DELETED ---

Index: PythonLabelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/PythonLabelProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PythonLabelProvider.java	10 Mar 2007 14:32:44 -0000	1.1
--- PythonLabelProvider.java	7 Jul 2007 12:06:01 -0000	1.2
***************
*** 9,12 ****
--- 9,15 ----
  import org.eclipse.swt.graphics.Image;
  import org.eclipse.ui.model.WorkbenchLabelProvider;
+ import org.python.pydev.navigator.elements.IWrappedResource;
+ import org.python.pydev.navigator.elements.PythonNode;
+ import org.python.pydev.navigator.elements.PythonSourceFolder;
  import org.python.pydev.plugin.PydevPlugin;
  import org.python.pydev.ui.UIConstants;

--- PythonModelSorter.java DELETED ---

--- PythonFolder.java DELETED ---

--- PythonNode.java DELETED ---

Index: PythonBaseModelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/PythonBaseModelProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PythonBaseModelProvider.java	6 Jul 2007 17:45:23 -0000	1.5
--- PythonBaseModelProvider.java	7 Jul 2007 12:06:01 -0000	1.6
***************
*** 40,43 ****
--- 40,49 ----
  import org.python.pydev.editor.codecompletion.revisited.PythonPathHelper;
  import org.python.pydev.editor.codecompletion.revisited.modules.SourceModule;
+ import org.python.pydev.navigator.elements.IWrappedResource;
+ import org.python.pydev.navigator.elements.PythonFile;
+ import org.python.pydev.navigator.elements.PythonFolder;
+ import org.python.pydev.navigator.elements.PythonNode;
+ import org.python.pydev.navigator.elements.PythonResource;
+ import org.python.pydev.navigator.elements.PythonSourceFolder;
  import org.python.pydev.outline.ParsedItem;
  import org.python.pydev.parser.visitors.scope.ASTEntryWithChildren;

Index: ModelAdapter.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/ModelAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ModelAdapter.java	10 Mar 2007 14:32:44 -0000	1.1
--- ModelAdapter.java	7 Jul 2007 12:06:01 -0000	1.2
***************
*** 8,12 ****
--- 8,19 ----
  import org.eclipse.core.runtime.IAdapterFactory;
  import org.eclipse.ui.IContributorResourceAdapter;
+ import org.python.pydev.navigator.elements.IWrappedResource;
  
+ /**
+  * This adapter factory is needed for the pydev package explorer (no, it's not enough that the objects themselves are
+  * adaptable, there must be a factory to make that visible to it).
+  * 
+  * @author Fabio
+  */
  public class ModelAdapter implements IAdapterFactory{
  

--- WrappedResource.java DELETED ---