[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/actions/refactoring PyExtractMethod.java,1.2,1.3 PyRefactorAction.java,1.2,1.3 PyRename.java,1.2,1.3

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

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

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

Index: PyRename.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/refactoring/PyRename.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyRename.java	16 Sep 2004 15:33:32 -0000	1.2
--- PyRename.java	20 Sep 2004 19:08:42 -0000	1.3
***************
*** 31,36 ****
          if(name.equals("") == false){
  	        res = PyRefactoring.getPyRefactoring().rename(editorFile, beginLine, beginCol, name, operation);
- 
- 	        refreshEditors(getPyEdit());
          }
          return res;
--- 31,34 ----

Index: PyExtractMethod.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/refactoring/PyExtractMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyExtractMethod.java	16 Sep 2004 15:33:32 -0000	1.2
--- PyExtractMethod.java	20 Sep 2004 19:08:42 -0000	1.3
***************
*** 42,47 ****
          if(name.equals("") == false){
  	        res = PyRefactoring.getPyRefactoring().extract(editorFile, beginLine, beginCol, endLine, endCol, name, operation);
- 
- 	        refreshEditors(getPyEdit());
          }
          return res;
--- 42,45 ----

Index: PyRefactorAction.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/refactoring/PyRefactorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyRefactorAction.java	16 Sep 2004 15:33:32 -0000	1.2
--- PyRefactorAction.java	20 Sep 2004 19:08:42 -0000	1.3
***************
*** 22,26 ****
--- 22,28 ----
  import org.eclipse.ui.IEditorPart;
  import org.eclipse.ui.IEditorReference;
+ import org.eclipse.ui.IViewReference;
  import org.eclipse.ui.IWorkbenchPage;
+ import org.eclipse.ui.IWorkbenchPart;
  import org.eclipse.ui.IWorkbenchWindow;
  import org.eclipse.ui.PlatformUI;
***************
*** 32,35 ****
--- 34,38 ----
  import org.python.pydev.editor.refactoring.PyRefactoring;
  import org.python.pydev.plugin.PydevPlugin;
+ import org.python.pydev.views.PyRefactorView;
  
  /**
***************
*** 38,42 ****
  public abstract class PyRefactorAction extends PyAction {
  
!     private IWorkbenchWindow workbenchWindow;
  
      public final class Operation extends WorkspaceModifyOperation {
--- 41,45 ----
  public abstract class PyRefactorAction extends PyAction {
  
!     protected IWorkbenchWindow workbenchWindow;
  
      public final class Operation extends WorkspaceModifyOperation {
***************
*** 104,117 ****
                      .getEditorReferences();
  
              for (int j = 0; j < editorReferences.length; j++) {
!                 if (editorReferences[j] instanceof PyEdit) {
!                     PyEdit e = (PyEdit) editorReferences[j];
                      if (e != edit) {
-                         System.out.println("REFRESHING OTHER");
                          refreshEditor(e);
                      }
                  }
              }
          }
      }
  
--- 107,134 ----
                      .getEditorReferences();
  
+             IViewReference[] viewReferences = pages[i].getViewReferences();
+             
              for (int j = 0; j < editorReferences.length; j++) {
!                 IEditorPart ed = editorReferences[j].getEditor(false);
!                 if (ed instanceof PyEdit) {
!                     PyEdit e = (PyEdit) ed;
                      if (e != edit) {
                          refreshEditor(e);
                      }
                  }
              }
+ 
+         
+             for (int j = 0; j < viewReferences.length; j++) {
+                 IWorkbenchPart view = viewReferences[j].getPart(false);
+                 if(view instanceof PyRefactorView){
+                   view = viewReferences[j].getPart(true);
+                   PyRefactorView e = (PyRefactorView) view;
+                     e.refresh();
+                 }
+             }
+ 
          }
+         
      }
  
***************
*** 207,210 ****
--- 224,232 ----
              e.printStackTrace();
          }
+         try {
+             refreshEditors(getPyEdit());
+         } catch (CoreException e1) {
+             e1.printStackTrace();
+         }
  
          if (operation.statusOfOperation.startsWith("ERROR:")) {