RefactoringRope/Refactoring.py

branch
server_client_variant
changeset 188
05fb0977ce1b
parent 187
c7600eee9047
diff -r c7600eee9047 -r 05fb0977ce1b RefactoringRope/Refactoring.py
--- a/RefactoringRope/Refactoring.py	Sun Sep 24 11:56:11 2017 +0200
+++ b/RefactoringRope/Refactoring.py	Sun Sep 24 13:42:01 2017 +0200
@@ -1508,7 +1508,6 @@
             lambda: self.__refactoringDialogClosed(changeGroup))
         dlg.show()
     
-    # TODO: continue from here
     def __methodToMethodObject(self):
         """
         Private slot to change the signature of a method or function.
@@ -1534,20 +1533,14 @@
         line, index, line1, index1 = aw.getSelection()
         offset = self.__getOffset(aw, line, index)
         
-        import rope.refactor.method_object
-        resource = rope.base.libutils.path_to_resource(
-            self.__project, filename)
-        try:
-            converter = rope.refactor.method_object.MethodObject(
-                self.__project, resource, offset)
-        except Exception as err:
-            self.handleRopeError(err, title)
-            return
-        
         from MethodToMethodObjectDialog import MethodToMethodObjectDialog
-        self.dlg = MethodToMethodObjectDialog(self, title, converter,
-                                              parent=self.__ui)
-        self.dlg.show()
+        dlg = MethodToMethodObjectDialog(self, title, filename, offset,
+                                         parent=self.__ui)
+        changeGroup = dlg.getChangeGroupName()
+        self.__refactoringDialogs[changeGroup] = dlg
+        dlg.finished.connect(
+            lambda: self.__refactoringDialogClosed(changeGroup))
+        dlg.show()
     
     #####################################################
     ## Refactoring History

eric ide

mercurial