[Pydev-cvs] org.python.pydev/src_navigator/org/python/pydev/navigator/ui PydevPackageExplorer.java, 1.3, 1.4

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

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

Modified Files:
	PydevPackageExplorer.java 
Log Message:
Changed from mylar to mylyn.

Index: PydevPackageExplorer.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/ui/PydevPackageExplorer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PydevPackageExplorer.java	26 May 2007 13:30:48 -0000	1.3
--- PydevPackageExplorer.java	6 Jul 2007 00:24:43 -0000	1.4
***************
*** 34,37 ****
--- 34,41 ----
  import org.python.pydev.navigator.PythonFile;
  
+ /**
+  * This class is the package explorer for pydev. It uses the CNF (Common Navigator Framework) to show
+  * the resources as python elements.
+  */
  public class PydevPackageExplorer extends CommonNavigator implements IShowInTarget {
  
***************
*** 71,75 ****
  
      /**
!      * Overriden to keep the memento to be used later (it's private in the superclass).
       */
  	public void init(IViewSite aSite, IMemento aMemento) throws PartInitException {
--- 75,79 ----
  
      /**
!      * Overridden to keep the memento to be used later (it's private in the superclass).
       */
  	public void init(IViewSite aSite, IMemento aMemento) throws PartInitException {
***************
*** 79,95 ****
  
      /**
!      * Overriden to create our viewer and not the superclass CommonViewer.
       * 
!      * (unfortunatelly, the superclass does a little more than creating it, so, we have to do those operations here 
       * too -- that's why we have to keep the memento object in the init method).
       */
  	protected CommonViewer createCommonViewer(Composite aParent) {
          //super.createCommonViewer(aParent); -- don't even call the super class
  		CommonViewer aViewer = new PydevCommonViewer(getViewSite().getId(), aParent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
  		initListeners(aViewer);
! 		aViewer.getNavigatorContentService().restoreState(memento);
  		return aViewer;
  	}
! 	
  	
  	/**
--- 83,109 ----
  
      /**
!      * Overridden to create our viewer and not the superclass CommonViewer.
       * 
!      * (Unfortunately, the superclass does a little more than creating it, so, we have to do those operations here 
       * too -- that's why we have to keep the memento object in the init method).
       */
+ 	@Override
  	protected CommonViewer createCommonViewer(Composite aParent) {
          //super.createCommonViewer(aParent); -- don't even call the super class
  		CommonViewer aViewer = new PydevCommonViewer(getViewSite().getId(), aParent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
  		initListeners(aViewer);
! 		//we do that only after the part is completely created (because otherwise the state is reverted later)
! 		//aViewer.getNavigatorContentService().restoreState(memento);
  		return aViewer;
  	}
! 
! 	/**
! 	 * Overridden because if the state is not restored as the last thing, it is reverted back to the previous state.
! 	 */
! 	@Override
! 	public void createPartControl(Composite aParent) {
! 	    super.createPartControl(aParent);
! 	    getCommonViewer().getNavigatorContentService().restoreState(memento);
! 	}
  	
  	/**
***************
*** 151,154 ****
--- 165,172 ----
  	}
  
+ 	/**
+ 	 * @param element the element that should be gotten as an element from the pydev model
+ 	 * @return a pydev element or the same element passed as a parameter.
+ 	 */
      private Object getPythonModelElement(Object element) {
          if(element instanceof IWrappedResource){