Mercurial Repositories > Rope Refactoring / file comparison
comparison: RefactoringRope/RefactoringClient.py
RefactoringRope/RefactoringClient.py
- changeset 320
- 91b171fdd85f
- parent 303
- 313fbf9c86d9
- child 326
- 67bcde9c65b9
equal
deleted
inserted
replaced
| 319:1d71264692ef | 320:91b171fdd85f |
|---|---|
| 148 | 148 |
| 149 @param params dictionary containing the method parameters sent by | 149 @param params dictionary containing the method parameters sent by |
| 150 the server | 150 the server |
| 151 @type dict | 151 @type dict |
| 152 """ | 152 """ |
| 153 if self.__progressHandle is not None and \ | 153 if ( |
| 154 not self.__progressHandle.is_stopped(): | 154 self.__progressHandle is not None and |
| 155 not self.__progressHandle.is_stopped() | |
| 156 ): | |
| 155 self.__progressHandle.stop() | 157 self.__progressHandle.stop() |
| 156 | 158 |
| 157 def __validate(self, params): | 159 def __validate(self, params): |
| 158 """ | 160 """ |
| 159 Private slot to validate the project. | 161 Private slot to validate the project. |
| 1003 import rope.refactor.introduce_factory | 1005 import rope.refactor.introduce_factory |
| 1004 resource = rope.base.libutils.path_to_resource( | 1006 resource = rope.base.libutils.path_to_resource( |
| 1005 self.__project, filename) | 1007 self.__project, filename) |
| 1006 self.__progressHandle = ProgressHandle(self, title, True) | 1008 self.__progressHandle = ProgressHandle(self, title, True) |
| 1007 try: | 1009 try: |
| 1008 introducer = \ | 1010 introducer = ( |
| 1009 rope.refactor.introduce_factory.IntroduceFactoryRefactoring( | 1011 rope.refactor.introduce_factory.IntroduceFactoryRefactoring( |
| 1010 self.__project, resource, offset) | 1012 self.__project, resource, offset) |
| 1013 ) | |
| 1011 changes = introducer.get_changes( | 1014 changes = introducer.get_changes( |
| 1012 factoryName, global_factory=globalFactory, | 1015 factoryName, global_factory=globalFactory, |
| 1013 task_handle=self.__progressHandle) | 1016 task_handle=self.__progressHandle) |
| 1014 except Exception as err: | 1017 except Exception as err: |
| 1015 errorDict = self.__handleRopeError(err) | 1018 errorDict = self.__handleRopeError(err) |
| 1374 | 1377 |
| 1375 import rope.refactor.encapsulate_field | 1378 import rope.refactor.encapsulate_field |
| 1376 resource = rope.base.libutils.path_to_resource( | 1379 resource = rope.base.libutils.path_to_resource( |
| 1377 self.__project, filename) | 1380 self.__project, filename) |
| 1378 try: | 1381 try: |
| 1379 encapsulateField = \ | 1382 encapsulateField = ( |
| 1380 rope.refactor.encapsulate_field.EncapsulateField( | 1383 rope.refactor.encapsulate_field.EncapsulateField( |
| 1381 self.__project, resource, offset) | 1384 self.__project, resource, offset) |
| 1385 ) | |
| 1382 result["Name"] = encapsulateField.get_field_name() | 1386 result["Name"] = encapsulateField.get_field_name() |
| 1383 except Exception as err: | 1387 except Exception as err: |
| 1384 errorDict = self.__handleRopeError(err) | 1388 errorDict = self.__handleRopeError(err) |
| 1385 | 1389 |
| 1386 result.update(errorDict) | 1390 result.update(errorDict) |
| 1413 import rope.refactor.encapsulate_field | 1417 import rope.refactor.encapsulate_field |
| 1414 resource = rope.base.libutils.path_to_resource( | 1418 resource = rope.base.libutils.path_to_resource( |
| 1415 self.__project, filename) | 1419 self.__project, filename) |
| 1416 self.__progressHandle = ProgressHandle(self, title, True) | 1420 self.__progressHandle = ProgressHandle(self, title, True) |
| 1417 try: | 1421 try: |
| 1418 encapsulateField = \ | 1422 encapsulateField = ( |
| 1419 rope.refactor.encapsulate_field.EncapsulateField( | 1423 rope.refactor.encapsulate_field.EncapsulateField( |
| 1420 self.__project, resource, offset) | 1424 self.__project, resource, offset) |
| 1425 ) | |
| 1421 changes = encapsulateField.get_changes( | 1426 changes = encapsulateField.get_changes( |
| 1422 getter=getter, setter=setter, | 1427 getter=getter, setter=setter, |
| 1423 task_handle=self.__progressHandle) | 1428 task_handle=self.__progressHandle) |
| 1424 except Exception as err: | 1429 except Exception as err: |
| 1425 errorDict = self.__handleRopeError(err) | 1430 errorDict = self.__handleRopeError(err) |
