[Pydev-cvs] org.python.pydev/src_navigator/org/python/pydev/navigator PythonModelProvider.java, 1.10, 1.11 PythonBaseModelProvider.java, 1.10, 1.11

[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-serv14736/src_navigator/org/python/pydev/navigator

Modified Files:
	PythonModelProvider.java PythonBaseModelProvider.java 
Log Message:
Fixes for integration problems in project explorer.

Index: PythonModelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/PythonModelProvider.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PythonModelProvider.java	22 Apr 2008 12:01:15 -0000	1.10
--- PythonModelProvider.java	27 Apr 2008 17:28:05 -0000	1.11
***************
*** 5,9 ****
  package org.python.pydev.navigator;
  
- import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Iterator;
--- 5,8 ----
***************
*** 48,51 ****
--- 47,51 ----
  
      private static final boolean DEBUG = false;
+ 
      
      /**
***************
*** 60,71 ****
              System.out.println("getPipelinedChildren");
          }
!         Object[] children = getChildren(parent);
!         //TODO: We cannot clear and re-add things unless we actually have something related to pydev here
!         //otherwise we may end up messing with elements from other plugins -- e.g.: CDT
!         //to reproduce: create CDT project and source folder for it: when it's expanded, if pydev is enabled,
!         //it won't show the source folder with the CDT icon (because we've just removed it and added a 
!         //regular folder element)
!         currentElements.clear();
!         currentElements.addAll(Arrays.asList(children));
      }
  
--- 60,65 ----
              System.out.println("getPipelinedChildren");
          }
!         PipelinedShapeModification modification = new PipelinedShapeModification(parent, currentElements);
!         convertToPythonElementsAddOrRemove(modification, true);
      }
  
***************
*** 81,92 ****
              System.out.println("getPipelinedElements");
          }
!         Object[] children = getElements(input);
!         //TODO: We cannot clear and re-add things unless we actually have something related to pydev here
!         //otherwise we may end up messing with elements from other plugins -- e.g.: CDT
!         //to reproduce: create CDT project and source folder for it: when it's expanded, if pydev is enabled,
!         //it won't show the source folder with the CDT icon (because we've just removed it and added a 
!         //regular folder element)
!         currentElements.clear();
!         currentElements.addAll(Arrays.asList(children));
      }
  
--- 75,79 ----
              System.out.println("getPipelinedElements");
          }
!         getPipelinedChildren(input, currentElements);
      }
  
***************
*** 101,105 ****
              System.out.println("getPipelinedParent");
          }
!         return getParent(object);
      }
  
--- 88,97 ----
              System.out.println("getPipelinedParent");
          }
!         if (object instanceof IWrappedResource){
!             return getParent(object);
!         }else{
!             return aSuggestedParent;
!         }
!         
      }
  

Index: PythonBaseModelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_navigator/org/python/pydev/navigator/PythonBaseModelProvider.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PythonBaseModelProvider.java	10 Mar 2008 02:07:38 -0000	1.10
--- PythonBaseModelProvider.java	27 Apr 2008 17:28:05 -0000	1.11
***************
*** 68,72 ****
   * @author Fabio
   */
! public class PythonBaseModelProvider extends BaseWorkbenchContentProvider implements IResourceChangeListener, IPythonNatureListener {
  
      /**
--- 68,72 ----
   * @author Fabio
   */
! public abstract class PythonBaseModelProvider extends BaseWorkbenchContentProvider implements IResourceChangeListener, IPythonNatureListener {
  
      /**
***************
*** 268,278 ****
       */
      public Object[] getChildren(Object parentElement) {
-         
-         //------------------------------------------- for the working set, just return the children directly
- //        if(parentElement instanceof IWorkingSet){
- //            IWorkingSet set = (IWorkingSet) parentElement;
- //            return set.getElements();
- //        }
-         
          Object[] childrenToReturn = null;
          
--- 268,271 ----