[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codefolding CodeFoldingSetter.java,1.6,1.7

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

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

Modified Files:
	CodeFoldingSetter.java 
Log Message:
Changed search for bicycle repair man search and added a refactor
view to show which files are modified.

Index: CodeFoldingSetter.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codefolding/CodeFoldingSetter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CodeFoldingSetter.java	19 Aug 2004 17:50:46 -0000	1.6
--- CodeFoldingSetter.java	20 Sep 2004 19:08:43 -0000	1.7
***************
*** 133,152 ****
      private void addMarks(ArrayList nodes, ProjectionAnnotationModel model, ArrayList collapsed) {
          int i=0;
!         
!         IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
!         
!         for (Iterator iter = nodes.iterator(); iter.hasNext();++i) {
              
!             AbstractNode element = (AbstractNode) iter.next();
!             int end = findEnd(element, nodes, i, doc);
!             int start = element.getStart().line;
!             if (end == -1){
!                 end = start;
!             }
!             try {
!                 addFoldingMark(element, start, end, model, collapsed);
!             } catch (BadLocationException e) {
!                 e.printStackTrace();
              }
          }
      }
--- 133,155 ----
      private void addMarks(ArrayList nodes, ProjectionAnnotationModel model, ArrayList collapsed) {
          int i=0;
! 
!         try {
!             IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
              
!             for (Iterator iter = nodes.iterator(); iter.hasNext();++i) {
!                 
!                 AbstractNode element = (AbstractNode) iter.next();
!                 int end = findEnd(element, nodes, i, doc);
!                 int start = element.getStart().line;
!                 if (end == -1){
!                     end = start;
!                 }
!                 try {
!                     addFoldingMark(element, start, end, model, collapsed);
!                 } catch (BadLocationException e) {
!                     e.printStackTrace();
!                 }
              }
+         } catch (NullPointerException e) {
          }
      }