[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/actions/codefolding PyFoldingAction.java,1.1,1.2 PyCollapse.java,1.4,1.5 PyCollapseAll.java,1.4,1.5 PyUnCollapseAll.java,1.4,1.5

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

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/codefolding
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23848/src/org/python/pydev/editor/actions/codefolding

Modified Files:
	PyFoldingAction.java PyCollapse.java PyCollapseAll.java 
	PyUnCollapseAll.java 
Log Message:
making compatible to 3.1

Index: PyFoldingAction.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/codefolding/PyFoldingAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyFoldingAction.java	18 Jun 2005 21:13:43 -0000	1.1
--- PyFoldingAction.java	9 Jul 2005 01:05:56 -0000	1.2
***************
*** 85,89 ****
          
          int p1Offset = p1.getOffset();
-         int p1Len = p1Offset + p1.getLength();
      
          int pTopoffset = pTop.getOffset();
--- 85,88 ----

Index: PyCollapse.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/codefolding/PyCollapse.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PyCollapse.java	12 Apr 2005 16:29:43 -0000	1.4
--- PyCollapse.java	9 Jul 2005 01:05:56 -0000	1.5
***************
*** 6,10 ****
  package org.python.pydev.editor.actions.codefolding;
  
- import java.util.ArrayList;
  import java.util.Iterator;
  
--- 6,9 ----
***************
*** 36,40 ****
          try {
              if (model != null) {
-                 ArrayList collapsed = new ArrayList();
                  //put annotations in array list.
                  Iterator iter = model.getAnnotationIterator();
--- 35,38 ----

Index: PyUnCollapseAll.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/codefolding/PyUnCollapseAll.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PyUnCollapseAll.java	18 Jun 2005 21:13:43 -0000	1.4
--- PyUnCollapseAll.java	9 Jul 2005 01:05:56 -0000	1.5
***************
*** 12,16 ****
  import org.eclipse.jface.action.IAction;
  import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
- import org.python.pydev.editor.actions.PySelection;
  import org.python.pydev.editor.codefolding.PyProjectionAnnotation;
  
--- 12,15 ----
***************
*** 24,29 ****
       */
      public void run(IAction action) {
- 		PySelection ps = new PySelection ( getTextEditor ( ) );
- 
  		final ProjectionAnnotationModel model = getModel();
          
--- 23,26 ----

Index: PyCollapseAll.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/codefolding/PyCollapseAll.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PyCollapseAll.java	18 Jun 2005 21:13:43 -0000	1.4
--- PyCollapseAll.java	9 Jul 2005 01:05:56 -0000	1.5
***************
*** 12,16 ****
  import org.eclipse.jface.action.IAction;
  import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
- import org.python.pydev.editor.actions.PySelection;
  import org.python.pydev.editor.codefolding.PyProjectionAnnotation;
  
--- 12,15 ----
***************
*** 26,31 ****
       */
      public void run(IAction action) {
- 		PySelection ps = new PySelection ( getTextEditor ( ) );
- 
  		final ProjectionAnnotationModel model = getModel();
          
--- 25,28 ----