Sat, 25 Jun 2022 17:55:41 +0200
Compatibility fixes for rope >= 1.2.0.
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
374
958f34e97952
Updated copyright for 2022.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
365
diff
changeset
|
3 | # Copyright (c) 2017 - 2022 Detlev Offenbach <detlev@die-offenbachs.de> |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the refactoring client interface to rope. |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | import sys |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | import os |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
12 | import contextlib |
251
4dcc73076100
Removed the Python3 only rope variant and introduced an extended error dialog showing a traceback for errors within the rope library.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
245
diff
changeset
|
13 | |
362
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
14 | modulePath = sys.argv[-1] # it is always the last parameter |
381
88ef06966203
Fixed two bugs causing a crash of the code assist and refactoring clients in certain situations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
375
diff
changeset
|
15 | sys.path.append(modulePath) |
362
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
16 | |
360 | 17 | try: |
362
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
18 | import rope.base.project |
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
19 | import rope.base.libutils |
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
20 | except ImportError: |
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
21 | sys.exit(42) |
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
22 | |
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
23 | from ProgressHandle import ProgressHandle |
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
24 | |
365
f740b50380df
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
362
diff
changeset
|
25 | from eric7.EricNetwork.EricJsonClient import EricJsonClient |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | |
163
6a9e7b37a18b
Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
162
diff
changeset
|
27 | |
365
f740b50380df
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
362
diff
changeset
|
28 | class RefactoringClient(EricJsonClient): |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | """ |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | Class implementing the refactoring client interface to rope. |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | """ |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | def __init__(self, host, port, projectPath): |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | """ |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | Constructor |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | @param host ip address the background service is listening |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | @type str |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | @param port port of the background service |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | @type int |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | @param projectPath path to the project |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | @type str |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | """ |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
43 | super().__init__(host, port) |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
45 | self.__methodMapping = { |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
46 | "AbortAction": self.__abortAction, |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
47 | "CloseProject": self.__closeProject, |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
48 | "Validate": self.__validate, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
49 | "QueryReferences": self.__queryReferences, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
50 | "QueryDefinition": self.__queryDefinition, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
51 | "QueryImplementations": self.__queryImplementations, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
52 | "GetConfig": self.__getConfig, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
53 | "ConfigChanged": self.__configChanged, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
54 | "PerformSoa": self.__performSOA, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
55 | "ReportChanged": self.__reportChanged, |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
56 | "History": self.__processHistory, |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
57 | "PreviewChanges": self.__previewChanges, |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
58 | "ApplyChanges": self.__applyChanges, |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
59 | "ClearChanges": self.__clearChanges, |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
60 | "CalculateRenameChanges": self.__calculateRenameChanges, |
174
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
61 | "CalculateChangeOccurrencesChanges": |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
62 | self.__calculateChangeOccurrencesChanges, |
175
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
63 | "CalculateExtractChanges": self.__calculateExtractChanges, |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
64 | "RequestInlineType": self.__requestInlineType, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
65 | "CalculateInlineChanges": self.__calculateInlineChanges, |
178
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
66 | "RequestMoveType": self.__requestMoveType, |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
67 | "CalculateMoveChanges": self.__calculateMoveChanges, |
179
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
68 | "RequestUseFunction": self.__requestUseFunction, |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
69 | "CalculateUseFunctionChanges": self.__calculateUseFunctionChanges, |
180
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
70 | "CalculateIntroduceFactoryChanges": |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
71 | self.__calculateIntroduceFactoryChanges, |
181
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
72 | "CalculateIntroduceParameterChanges": |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
73 | self.__calculateIntroduceParameterChanges, |
182
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
74 | "CalculateImportsChanges": self.__calculateImportsChanges, |
183
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
75 | "CalculateRestructureChanges": self.__calculateRestructureChanges, |
184
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
76 | "RequestSignature": self.__requestSignature, |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
77 | "CalculateSignatureChanges": self.__calculateSignatureChanges, |
185
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
78 | "CalculateInlineArgumentDefaultChanges": |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
79 | self.__calculateInlineArgumentDefaultChanges, |
186
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
80 | "CalculateModuleToPackageChanges": |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
81 | self.__calculateModuleToPackageChanges, |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
82 | "RequestFieldName": self.__requestFieldName, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
83 | "CalculateEncapsulateFieldChanges": |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
84 | self.__calculateEncapsulateFieldChanges, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
85 | "CalculateLocalToAttributeChanges": |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
86 | self.__calculateLocalToAttributeChanges, |
188
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
87 | "CalculateMethodObjectChanges": |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
88 | self.__calculateMethodObjectChanges, |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
89 | } |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
90 | |
162
55eaaed9d590
Implemented the distributed rope file system commands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
161
diff
changeset
|
91 | from FileSystemCommands import RefactoringClientFileSystemCommands |
55eaaed9d590
Implemented the distributed rope file system commands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
161
diff
changeset
|
92 | self.__fsCommands = RefactoringClientFileSystemCommands(self) |
55eaaed9d590
Implemented the distributed rope file system commands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
161
diff
changeset
|
93 | |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | self.__projectpath = projectPath |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | self.__project = rope.base.project.Project( |
162
55eaaed9d590
Implemented the distributed rope file system commands.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
161
diff
changeset
|
96 | self.__projectpath, fscommands=self.__fsCommands) |
164
121d426d4ed7
Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
163
diff
changeset
|
97 | |
121d426d4ed7
Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
163
diff
changeset
|
98 | self.__progressHandle = None |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
99 | |
170
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
100 | self.__changes = {} |
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
101 | # dict storing the retrieved changes for various refactorings |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | |
163
6a9e7b37a18b
Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
162
diff
changeset
|
103 | def handleCall(self, method, params): |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | """ |
163
6a9e7b37a18b
Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
162
diff
changeset
|
105 | Public method to handle a method call from the server. |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | |
163
6a9e7b37a18b
Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
162
diff
changeset
|
107 | @param method requested method name |
6a9e7b37a18b
Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
162
diff
changeset
|
108 | @type str |
6a9e7b37a18b
Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
162
diff
changeset
|
109 | @param params dictionary with method specific parameters |
6a9e7b37a18b
Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
162
diff
changeset
|
110 | @type dict |
6a9e7b37a18b
Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
162
diff
changeset
|
111 | """ |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
112 | self.__methodMapping[method](params) |
165
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
113 | |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
114 | def __handleRopeError(self, err): |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
115 | """ |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
116 | Private method to process a rope error. |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
117 | |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
118 | @param err rope exception object |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
119 | @type Exception |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
120 | @return dictionary containing the error information |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
121 | @rtype dict |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
122 | """ |
251
4dcc73076100
Removed the Python3 only rope variant and introduced an extended error dialog showing a traceback for errors within the rope library.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
245
diff
changeset
|
123 | import traceback |
4dcc73076100
Removed the Python3 only rope variant and introduced an extended error dialog showing a traceback for errors within the rope library.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
245
diff
changeset
|
124 | tb = traceback.format_tb(sys.exc_info()[2]) |
165
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
125 | ropeError = str(type(err)).split()[-1] |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
126 | ropeError = ropeError[1:-2].split('.')[-1] |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
127 | errorDict = { |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
128 | "Error": ropeError, |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
129 | "ErrorString": str(err), |
251
4dcc73076100
Removed the Python3 only rope variant and introduced an extended error dialog showing a traceback for errors within the rope library.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
245
diff
changeset
|
130 | "Traceback": tb, |
165
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
131 | } |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
132 | if ropeError == 'ModuleSyntaxError': |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
133 | errorDict["ErrorFile"] = err.filename |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
134 | errorDict["ErrorLine"] = err.lineno |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
135 | |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
136 | return errorDict |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
137 | |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
138 | def __abortAction(self, params): |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
139 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
140 | Private method to abort the current action. |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
141 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
142 | @param params dictionary containing the method parameters sent by |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
143 | the server |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
144 | @type dict |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
145 | """ |
320
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
146 | if ( |
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
147 | self.__progressHandle is not None and |
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
148 | not self.__progressHandle.is_stopped() |
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
149 | ): |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
150 | self.__progressHandle.stop() |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
151 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
152 | def __validate(self, params): |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
153 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
154 | Private slot to validate the project. |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
155 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
156 | @param params dictionary containing the method parameters sent by |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
157 | the server |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
158 | @type dict |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
159 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
160 | self.__project.validate(self.__project.root) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
161 | |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
162 | def __closeProject(self, params): |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
163 | """ |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
164 | Private slot to validate the project. |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
165 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
166 | @param params dictionary containing the method parameters sent by |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
167 | the server |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
168 | @type dict |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
169 | """ |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
170 | self.__project.close() |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
171 | |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
172 | def __getConfig(self, params): |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
173 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
174 | Private method to send some configuration data to the server. |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
175 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
176 | @param params dictionary containing the method parameters sent by |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
177 | the server |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
178 | @type dict |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
179 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
180 | result = { |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
181 | "RopeFolderName": self.__project.ropefolder.real_path, |
167
3c8e875d0326
Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
166
diff
changeset
|
182 | "RopeHelpFile": os.path.join( |
375
c61a2f18ed78
Updated version info to indicate relation to eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
374
diff
changeset
|
183 | os.path.dirname(__file__), "Documentation", "rope", |
c61a2f18ed78
Updated version info to indicate relation to eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
374
diff
changeset
|
184 | "overview.rst"), |
167
3c8e875d0326
Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
166
diff
changeset
|
185 | "RopeInfo": rope.INFO, |
3c8e875d0326
Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
166
diff
changeset
|
186 | "RopeVersion": rope.VERSION, |
3c8e875d0326
Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
166
diff
changeset
|
187 | "RopeCopyright": rope.COPYRIGHT, |
212
f05681349336
Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
204
diff
changeset
|
188 | "PythonVersion": "Python{0}".format(sys.version_info[0]), |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
189 | } |
385
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
190 | try: |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
191 | # rope version < 1.2.0 |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
192 | result["DefaultConfig"] = self.__project._default_config() |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
193 | except AttributeError: |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
194 | # rope version >= 1.2.0 |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
195 | # read our own copy of default_config derived from the default |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
196 | # settings in rope.base.prefs.Prefs |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
197 | with open( |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
198 | os.path.join(os.path.dirname(__file__), "default_config.py"), |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
199 | "r", |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
200 | encoding="utf-8" |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
201 | ) as f: |
9bbd74b51d88
Compatibility fixes for rope >= 1.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
381
diff
changeset
|
202 | result["DefaultConfig"] = f.read() |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
203 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
204 | self.sendJson("Config", result) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
205 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
206 | def __configChanged(self, params): |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
207 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
208 | Private method to handle a change of the configuration file. |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
209 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
210 | @param params dictionary containing the method parameters sent by |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
211 | the server |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
212 | @type dict |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
213 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
214 | self.__project.close() |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
215 | self.__project = rope.base.project.Project( |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
216 | self.__projectpath, fscommands=self.__fsCommands) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
217 | |
165
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
218 | def __queryReferences(self, params): |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
219 | """ |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
220 | Private method to handle the Find References action. |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
221 | |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
222 | @param params dictionary containing the method parameters sent by |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
223 | the server |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
224 | @type dict |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
225 | """ |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
226 | title = params["Title"] |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
227 | filename = params["FileName"] |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
228 | offset = params["Offset"] |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
229 | |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
230 | errorDict = {} |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
231 | occurrences = [] |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
232 | |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
233 | import rope.contrib.findit |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
234 | resource = rope.base.libutils.path_to_resource( |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
235 | self.__project, filename) |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
236 | self.__progressHandle = ProgressHandle(self, title, True) |
165
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
237 | try: |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
238 | occurrences = rope.contrib.findit.find_occurrences( |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
239 | self.__project, resource, offset, |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
240 | unsure=True, in_hierarchy=True, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
241 | task_handle=self.__progressHandle) |
165
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
242 | except Exception as err: |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
243 | errorDict = self.__handleRopeError(err) |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
244 | self.__progressHandle.reset() |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
245 | self.__progressHandle = None |
165
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
246 | |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
247 | result = { |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
248 | "Title": title, |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
249 | "EntriesCount": len(occurrences), |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
250 | "Entries": [ |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
251 | [occurrence.resource.real_path, occurrence.lineno, |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
252 | occurrence.unsure] for occurrence in occurrences |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
253 | ], |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
254 | } |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
255 | result.update(errorDict) |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
256 | |
ea41742015af
Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
164
diff
changeset
|
257 | self.sendJson("QueryReferencesResult", result) |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
258 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
259 | def __queryDefinition(self, params): |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
260 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
261 | Private method to handle the Find Definition action. |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
262 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
263 | @param params dictionary containing the method parameters sent by |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
264 | the server |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
265 | @type dict |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
266 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
267 | title = params["Title"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
268 | filename = params["FileName"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
269 | offset = params["Offset"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
270 | source = params["Source"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
271 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
272 | errorDict = {} |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
273 | location = None |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
274 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
275 | import rope.contrib.findit |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
276 | resource = rope.base.libutils.path_to_resource( |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
277 | self.__project, filename) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
278 | try: |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
279 | location = rope.contrib.findit.find_definition( |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
280 | self.__project, source, offset, resource) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
281 | except Exception as err: |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
282 | errorDict = self.__handleRopeError(err) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
283 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
284 | result = { |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
285 | "Title": title, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
286 | } |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
287 | if location is not None: |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
288 | result["Location"] = [ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
289 | location.resource.real_path, location.lineno |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
290 | ] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
291 | result.update(errorDict) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
292 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
293 | self.sendJson("QueryDefinitionResult", result) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
294 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
295 | def __queryImplementations(self, params): |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
296 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
297 | Private method to handle the Find Implementations action. |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
298 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
299 | @param params dictionary containing the method parameters sent by |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
300 | the server |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
301 | @type dict |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
302 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
303 | title = params["Title"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
304 | filename = params["FileName"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
305 | offset = params["Offset"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
306 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
307 | errorDict = {} |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
308 | occurrences = [] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
309 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
310 | import rope.contrib.findit |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
311 | resource = rope.base.libutils.path_to_resource( |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
312 | self.__project, filename) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
313 | self.__progressHandle = ProgressHandle(self, title, True) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
314 | try: |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
315 | occurrences = rope.contrib.findit.find_implementations( |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
316 | self.__project, resource, offset, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
317 | task_handle=self.__progressHandle) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
318 | except Exception as err: |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
319 | errorDict = self.__handleRopeError(err) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
320 | self.__progressHandle.reset() |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
321 | self.__progressHandle = None |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
322 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
323 | result = { |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
324 | "Title": title, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
325 | "EntriesCount": len(occurrences), |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
326 | "Entries": [ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
327 | [occurrence.resource.real_path, occurrence.lineno, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
328 | occurrence.unsure] for occurrence in occurrences |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
329 | ], |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
330 | } |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
331 | result.update(errorDict) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
332 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
333 | self.sendJson("QueryImplementationsResult", result) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
334 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
335 | def __performSOA(self, params): |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
336 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
337 | Private method to perform SOA on all modules. |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
338 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
339 | @param params dictionary containing the method parameters sent by |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
340 | the server |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
341 | @type dict |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
342 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
343 | title = params["Title"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
344 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
345 | errorDict = {} |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
346 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
347 | self.__progressHandle = ProgressHandle(self, title, True) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
348 | try: |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
349 | rope.base.libutils.analyze_modules( |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
350 | self.__project, task_handle=self.__progressHandle) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
351 | except Exception as err: |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
352 | errorDict = self.__handleRopeError(err) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
353 | self.__progressHandle.reset() |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
354 | self.__progressHandle = None |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
355 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
356 | result = { |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
357 | "Title": title, |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
358 | } |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
359 | result.update(errorDict) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
360 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
361 | self.sendJson("SoaFinished", result) |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
362 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
363 | def __reportChanged(self, params): |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
364 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
365 | Private method to register some changed sources. |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
366 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
367 | @param params dictionary containing the method parameters sent by |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
368 | the server |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
369 | @type dict |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
370 | """ |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
371 | filename = params["FileName"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
372 | oldSource = params["OldSource"] |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
373 | |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
374 | with contextlib.suppress(Exception): |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
375 | rope.base.libutils.report_change( |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
376 | self.__project, filename, oldSource) |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
377 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
378 | def __processHistory(self, params): |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
379 | """ |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
380 | Private method to process the various history related requests. |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
381 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
382 | @param params dictionary containing the method parameters sent by |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
383 | the server |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
384 | @type dict |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
385 | """ |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
386 | subcommand = params["Subcommand"] |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
387 | if subcommand == "Get": |
170
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
388 | changes = {} |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
389 | if params["Filename"]: |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
390 | # file history |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
391 | resource = rope.base.libutils.path_to_resource( |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
392 | self.__project, params["Filename"]) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
393 | undoList = [] |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
394 | for change in reversed(self.__project.history.undo_list): |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
395 | if resource in change.get_changed_resources(): |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
396 | undoList.append(change) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
397 | redoList = [] |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
398 | for change in self.__project.history.redo_list: |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
399 | if resource in change.get_changed_resources(): |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
400 | redoList.append(change) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
401 | else: |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
402 | # project history |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
403 | undoList = list(reversed(self.__project.history.undo_list)) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
404 | redoList = self.__project.history.redo_list |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
405 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
406 | result = {"Subcommand": "Histories"} |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
407 | result["Undo"] = [] |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
408 | for change in undoList: |
170
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
409 | changes[id(change)] = change |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
410 | result["Undo"].append([str(change), id(change)]) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
411 | result["Redo"] = [] |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
412 | for change in redoList: |
170
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
413 | changes[id(change)] = change |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
414 | result["Redo"].append([str(change), id(change)]) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
415 | |
170
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
416 | self.__changes["History"] = changes |
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
417 | |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
418 | self.sendJson("HistoryResult", result) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
419 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
420 | elif subcommand == "GetChange": |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
421 | result = { |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
422 | "Subcommand": "ChangeDescription", |
203
c38750e1bafd
Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
190
diff
changeset
|
423 | "Description": |
174
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
424 | self.__changes["History"][params["Id"]].get_description() |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
425 | } |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
426 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
427 | self.sendJson("HistoryResult", result) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
428 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
429 | elif subcommand in ["Undo", "Redo"]: |
170
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
430 | change = self.__changes["History"][params["Id"]] |
168
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
431 | self.__progressHandle = ProgressHandle(self, change.description, |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
432 | False) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
433 | if subcommand == "Undo": |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
434 | self.__project.history.undo( |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
435 | change, task_handle=self.__progressHandle) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
436 | else: |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
437 | self.__project.history.redo( |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
438 | change, task_handle=self.__progressHandle) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
439 | self.__progressHandle.reset() |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
440 | self.__progressHandle = None |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
441 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
442 | result = { |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
443 | "Subcommand": subcommand, |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
444 | "ChangedFiles": [ |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
445 | res.real_path for res in change.get_changed_resources() |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
446 | ], |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
447 | } |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
448 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
449 | self.sendJson("HistoryResult", result) |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
450 | |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
451 | elif subcommand == "Clear": |
53d76b4fc1ac
Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
167
diff
changeset
|
452 | self.__project.history.clear() |
170
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
453 | |
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
454 | elif subcommand == "ClearChanges": |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
455 | with contextlib.suppress(KeyError): |
170
05ef7c12a6d4
Modified the client side to keep multiple change caches.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
168
diff
changeset
|
456 | del self.__changes["History"] |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
457 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
458 | def __clearChanges(self, params): |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
459 | """ |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
460 | Private method to clear the changes cache of a given change group. |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
461 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
462 | @param params dictionary containing the method parameters sent by |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
463 | the server |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
464 | @type dict |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
465 | """ |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
466 | with contextlib.suppress(KeyError): |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
467 | del self.__changes[params["ChangeGroup"]] |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
468 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
469 | def __applyChanges(self, params): |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
470 | """ |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
471 | Private method to apply the changes of a given change group. |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
472 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
473 | @param params dictionary containing the method parameters sent by |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
474 | the server |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
475 | @type dict |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
476 | """ |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
477 | errorDict = {} |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
478 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
479 | self.__progressHandle = ProgressHandle(self, params["Title"], False) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
480 | try: |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
481 | changes = self.__changes[params["ChangeGroup"]] |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
482 | if changes is not None: |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
483 | self.__project.do(changes, self.__progressHandle) |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
484 | except Exception as err: |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
485 | errorDict = self.__handleRopeError(err) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
486 | self.__progressHandle.reset() |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
487 | self.__progressHandle = None |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
488 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
489 | result = { |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
490 | "Subcommand": "ChangesApplied", |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
491 | "ChangeGroup": params["ChangeGroup"], |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
492 | "Title": params["Title"], |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
493 | "ChangedFiles": [ |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
494 | res.real_path for res in changes.get_changed_resources() |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
495 | ], |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
496 | } |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
497 | result.update(errorDict) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
498 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
499 | self.sendJson("Changes", result) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
500 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
501 | def __previewChanges(self, params): |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
502 | """ |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
503 | Private method to determine the changes data for a preview. |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
504 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
505 | @param params dictionary containing the method parameters sent by |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
506 | the server |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
507 | @type dict |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
508 | """ |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
509 | try: |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
510 | changes = self.__changes[params["ChangeGroup"]] |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
511 | description = changes.description |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
512 | except KeyError: |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
513 | changes = None |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
514 | description = "" |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
515 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
516 | changesData = [] |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
517 | if changes is not None: |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
518 | for change in changes.changes: |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
519 | changeTitle = str(change) |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
520 | try: |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
521 | changeText = change.get_description() |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
522 | except AttributeError: |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
523 | changeText = None |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
524 | changesData.append([changeTitle, changeText]) |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
525 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
526 | result = { |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
527 | "Subcommand": "PreviewChanges", |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
528 | "ChangeGroup": params["ChangeGroup"], |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
529 | "Description": description, |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
530 | "Changes": changesData, |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
531 | } |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
532 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
533 | self.sendJson("Changes", result) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
534 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
535 | def __calculateRenameChanges(self, params): |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
536 | """ |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
537 | Private method to calculate the rename changes based on the parameters |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
538 | sent by the server. |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
539 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
540 | @param params dictionary containing the method parameters sent by |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
541 | the server |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
542 | @type dict |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
543 | """ |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
544 | changeGroup = params["ChangeGroup"] |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
545 | title = params["Title"] |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
546 | filename = params["FileName"] |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
547 | offset = params["Offset"] |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
548 | isLocal = params["LocalRename"] |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
549 | newName = params["NewName"] |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
550 | renameHierarchy = params["RenameHierarchy"] |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
551 | renameInStrings = params["RenameInStrings"] |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
552 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
553 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
554 | changes = None |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
555 | result = { |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
556 | "ChangeGroup": changeGroup, |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
557 | "Title": title, |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
558 | } |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
559 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
560 | import rope.refactor.rename |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
561 | resource = rope.base.libutils.path_to_resource( |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
562 | self.__project, filename) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
563 | |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
564 | resources = [resource] if isLocal else None |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
565 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
566 | self.__progressHandle = ProgressHandle(self, title, True) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
567 | try: |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
568 | renamer = rope.refactor.rename.Rename( |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
569 | self.__project, resource, offset) |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
570 | changes = renamer.get_changes( |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
571 | newName, |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
572 | resources=resources, |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
573 | in_hierarchy=renameHierarchy, |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
574 | unsure=lambda o: self.__confirmUnsure(o, changeGroup), |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
575 | docs=renameInStrings, |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
576 | task_handle=self.__progressHandle) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
577 | except Exception as err: |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
578 | errorDict = self.__handleRopeError(err) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
579 | self.__progressHandle.reset() |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
580 | self.__progressHandle = None |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
581 | |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
582 | self.__changes[changeGroup] = changes |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
583 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
584 | result["Subcommand"] = "ChangesCalculated" |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
585 | result.update(errorDict) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
586 | |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
587 | self.sendJson("Changes", result) |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
588 | |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
589 | def __confirmUnsure(self, occurrence, changeGroup): |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
590 | """ |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
591 | Private method to confirm unsure occurrences. |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
592 | |
204
b4bf79b956bc
Regenerated source documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
593 | @param occurrence reference to the occurrence object |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
594 | @type rope.refactor.occurrences.Occurrence |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
595 | @param changeGroup name of the change group |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
596 | @type str |
172
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
597 | @return flag indicating an occurrence |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
598 | @rtype bool |
c8890f852917
Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
170
diff
changeset
|
599 | """ |
173
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
600 | filename = occurrence.resource.real_path |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
601 | start, end = occurrence.get_primary_range() |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
602 | |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
603 | self.sendJson("Changes", { |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
604 | "Subcommand": "ConfirmUnsure", |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
605 | "ChangeGroup": changeGroup, |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
606 | "FileName": filename, |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
607 | "StartOffset": start, |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
608 | "EndOffset": end, |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
609 | }) |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
610 | |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
611 | answer = self.poll(waitMethod="ConfirmUnsure") |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
612 | |
2cdb7c48b719
Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
172
diff
changeset
|
613 | return answer["Answer"] |
174
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
614 | |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
615 | def __calculateChangeOccurrencesChanges(self, params): |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
616 | """ |
175
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
617 | Private method to calculate the 'Change Occurrences' changes based on |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
618 | the parameters sent by the server. |
174
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
619 | |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
620 | @param params dictionary containing the method parameters sent by |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
621 | the server |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
622 | @type dict |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
623 | """ |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
624 | changeGroup = params["ChangeGroup"] |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
625 | title = params["Title"] |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
626 | filename = params["FileName"] |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
627 | offset = params["Offset"] |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
628 | newName = params["NewName"] |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
629 | onlyCalls = params["OnlyCalls"] |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
630 | reads = params["Reads"] |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
631 | writes = params["Writes"] |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
632 | |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
633 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
634 | changes = None |
174
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
635 | result = { |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
636 | "ChangeGroup": changeGroup, |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
637 | "Title": title, |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
638 | } |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
639 | |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
640 | import rope.refactor.rename |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
641 | resource = rope.base.libutils.path_to_resource( |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
642 | self.__project, filename) |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
643 | try: |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
644 | renamer = rope.refactor.rename.ChangeOccurrences( |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
645 | self.__project, resource, offset) |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
646 | changes = renamer.get_changes( |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
647 | newName, only_calls=onlyCalls, reads=reads, writes=writes) |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
648 | except Exception as err: |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
649 | errorDict = self.__handleRopeError(err) |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
650 | |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
651 | self.__changes[changeGroup] = changes |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
652 | |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
653 | result["Subcommand"] = "ChangesCalculated" |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
654 | result.update(errorDict) |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
655 | |
04583cac110f
Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
173
diff
changeset
|
656 | self.sendJson("Changes", result) |
175
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
657 | |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
658 | def __calculateExtractChanges(self, params): |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
659 | """ |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
660 | Private method to calculate the 'Extract' changes based on the |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
661 | parameters sent by the server. |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
662 | |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
663 | @param params dictionary containing the method parameters sent by |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
664 | the server |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
665 | @type dict |
203
c38750e1bafd
Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
190
diff
changeset
|
666 | @exception Exception raised to indicate an invalid extraction type |
175
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
667 | """ |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
668 | changeGroup = params["ChangeGroup"] |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
669 | title = params["Title"] |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
670 | filename = params["FileName"] |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
671 | startOffset = params["StartOffset"] |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
672 | endOffset = params["EndOffset"] |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
673 | kind = params["Kind"] |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
674 | newName = params["NewName"] |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
675 | similar = params["Similar"] |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
676 | global_ = params["Global"] |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
677 | |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
678 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
679 | changes = None |
175
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
680 | result = { |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
681 | "ChangeGroup": changeGroup, |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
682 | "Title": title, |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
683 | } |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
684 | |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
685 | import rope.refactor.extract |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
686 | resource = rope.base.libutils.path_to_resource( |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
687 | self.__project, filename) |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
688 | try: |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
689 | if kind not in ("variable", "method"): |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
690 | raise Exception("Invalid extraction kind <{0}>.".format(kind)) |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
691 | elif kind == "variable": |
175
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
692 | extractor = rope.refactor.extract.ExtractVariable( |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
693 | self.__project, resource, startOffset, endOffset) |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
694 | elif kind == "method": |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
695 | extractor = rope.refactor.extract.ExtractMethod( |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
696 | self.__project, resource, startOffset, endOffset) |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
697 | changes = extractor.get_changes( |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
698 | newName, similar=similar, global_=global_) |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
699 | except Exception as err: |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
700 | errorDict = self.__handleRopeError(err) |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
701 | |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
702 | self.__changes[changeGroup] = changes |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
703 | |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
704 | result["Subcommand"] = "ChangesCalculated" |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
705 | result.update(errorDict) |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
706 | |
72a1d9030d67
Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
174
diff
changeset
|
707 | self.sendJson("Changes", result) |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
708 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
709 | def __requestInlineType(self, params): |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
710 | """ |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
711 | Private method to determine the 'Inline' changes type based on the |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
712 | parameters sent by the server. |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
713 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
714 | @param params dictionary containing the method parameters sent by |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
715 | the server |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
716 | @type dict |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
717 | """ |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
718 | changeGroup = params["ChangeGroup"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
719 | title = params["Title"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
720 | filename = params["FileName"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
721 | offset = params["Offset"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
722 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
723 | errorDict = {} |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
724 | result = { |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
725 | "Subcommand": "InlineType", |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
726 | "ChangeGroup": changeGroup, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
727 | "Title": title, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
728 | } |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
729 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
730 | import rope.refactor.inline |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
731 | resource = rope.base.libutils.path_to_resource( |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
732 | self.__project, filename) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
733 | try: |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
734 | inliner = rope.refactor.inline.create_inline( |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
735 | self.__project, resource, offset) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
736 | result.update({ |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
737 | "Name": inliner.name, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
738 | "Kind": inliner.get_kind(), |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
739 | }) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
740 | except Exception as err: |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
741 | errorDict = self.__handleRopeError(err) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
742 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
743 | result.update(errorDict) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
744 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
745 | self.sendJson("Changes", result) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
746 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
747 | def __calculateInlineChanges(self, params): |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
748 | """ |
178
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
749 | Private method to calculate the 'Inline' changes based on the |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
750 | parameters sent by the server. |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
751 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
752 | @param params dictionary containing the method parameters sent by |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
753 | the server |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
754 | @type dict |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
755 | """ |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
756 | changeGroup = params["ChangeGroup"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
757 | title = params["Title"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
758 | filename = params["FileName"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
759 | offset = params["Offset"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
760 | kind = params["Kind"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
761 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
762 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
763 | changes = None |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
764 | result = { |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
765 | "ChangeGroup": changeGroup, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
766 | "Title": title, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
767 | } |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
768 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
769 | import rope.refactor.extract |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
770 | resource = rope.base.libutils.path_to_resource( |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
771 | self.__project, filename) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
772 | self.__progressHandle = ProgressHandle(self, title, True) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
773 | try: |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
774 | inliner = rope.refactor.inline.create_inline( |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
775 | self.__project, resource, offset) |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
776 | opts = ( |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
777 | {"in_hierarchy": params["Hierarchy"], } |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
778 | if kind == "parameter" else |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
779 | {"remove": params["Remove"], |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
780 | "only_current": params["OnlyCurrent"], } |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
781 | ) |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
782 | changes = inliner.get_changes( |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
783 | task_handle=self.__progressHandle, **opts) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
784 | except Exception as err: |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
785 | errorDict = self.__handleRopeError(err) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
786 | self.__progressHandle.reset() |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
787 | self.__progressHandle = None |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
788 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
789 | self.__changes[changeGroup] = changes |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
790 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
791 | result["Subcommand"] = "ChangesCalculated" |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
792 | result.update(errorDict) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
793 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
175
diff
changeset
|
794 | self.sendJson("Changes", result) |
178
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
795 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
796 | def __requestMoveType(self, params): |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
797 | """ |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
798 | Private method to determine the 'Move Method' changes type based on the |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
799 | parameters sent by the server. |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
800 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
801 | @param params dictionary containing the method parameters sent by |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
802 | the server |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
803 | @type dict |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
804 | """ |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
805 | changeGroup = params["ChangeGroup"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
806 | title = params["Title"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
807 | filename = params["FileName"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
808 | offset = params["Offset"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
809 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
810 | errorDict = {} |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
811 | result = { |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
812 | "Subcommand": "MoveType", |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
813 | "ChangeGroup": changeGroup, |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
814 | "Title": title, |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
815 | } |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
816 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
817 | import rope.refactor.move |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
818 | resource = rope.base.libutils.path_to_resource( |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
819 | self.__project, filename) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
820 | try: |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
821 | mover = rope.refactor.move.create_move( |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
822 | self.__project, resource, offset) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
823 | if isinstance(mover, rope.refactor.move.MoveGlobal): |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
824 | result.update({ |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
825 | "Kind": "move_global_method", |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
826 | "Method": "", |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
827 | }) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
828 | else: |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
829 | result.update({ |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
830 | "Kind": "move_method", |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
831 | "Method": mover.get_method_name(), |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
832 | }) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
833 | except Exception as err: |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
834 | errorDict = self.__handleRopeError(err) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
835 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
836 | result.update(errorDict) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
837 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
838 | self.sendJson("Changes", result) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
839 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
840 | def __calculateMoveChanges(self, params): |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
841 | """ |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
842 | Private method to calculate the 'Move ...' changes based on the |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
843 | parameters sent by the server. |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
844 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
845 | @param params dictionary containing the method parameters sent by |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
846 | the server |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
847 | @type dict |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
848 | """ |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
849 | changeGroup = params["ChangeGroup"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
850 | title = params["Title"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
851 | filename = params["FileName"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
852 | offset = params["Offset"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
853 | kind = params["Kind"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
854 | newName = params["NewName"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
855 | attribute = params["Attribute"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
856 | destination = params["DestinationModule"] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
857 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
858 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
859 | changes = None |
178
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
860 | result = { |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
861 | "ChangeGroup": changeGroup, |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
862 | "Title": title, |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
863 | } |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
864 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
865 | import rope.refactor.move |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
866 | resource = rope.base.libutils.path_to_resource( |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
867 | self.__project, filename) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
868 | self.__progressHandle = ProgressHandle(self, title, True) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
869 | try: |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
870 | mover = rope.refactor.move.create_move( |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
871 | self.__project, resource, offset) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
872 | if kind == "move_method": |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
873 | changes = mover.get_changes( |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
874 | attribute, newName, task_handle=self.__progressHandle) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
875 | else: |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
876 | if kind == "move_global_method": |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
877 | dest = self.__project.get_pycore().find_module( |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
878 | os.path.splitext(destination)[0]) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
879 | else: |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
880 | # move_module |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
881 | if destination.endswith(os.sep): |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
882 | destination = destination[:-1] |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
883 | dest = self.__project.get_pycore().find_module( |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
884 | destination) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
885 | changes = mover.get_changes( |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
886 | dest, task_handle=self.__progressHandle) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
887 | except Exception as err: |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
888 | errorDict = self.__handleRopeError(err) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
889 | self.__progressHandle.reset() |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
890 | self.__progressHandle = None |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
891 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
892 | self.__changes[changeGroup] = changes |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
893 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
894 | result["Subcommand"] = "ChangesCalculated" |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
895 | result.update(errorDict) |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
896 | |
70b4fb448811
Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
897 | self.sendJson("Changes", result) |
179
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
898 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
899 | def __requestUseFunction(self, params): |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
900 | """ |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
901 | Private method to determine the 'Use Function' function name based on |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
902 | the parameters sent by the server. |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
903 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
904 | @param params dictionary containing the method parameters sent by |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
905 | the server |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
906 | @type dict |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
907 | """ |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
908 | changeGroup = params["ChangeGroup"] |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
909 | title = params["Title"] |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
910 | filename = params["FileName"] |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
911 | offset = params["Offset"] |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
912 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
913 | errorDict = {} |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
914 | result = { |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
915 | "Subcommand": "UseFunctionName", |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
916 | "ChangeGroup": changeGroup, |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
917 | "Title": title, |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
918 | } |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
919 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
920 | import rope.refactor.usefunction |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
921 | resource = rope.base.libutils.path_to_resource( |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
922 | self.__project, filename) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
923 | try: |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
924 | user = rope.refactor.usefunction.UseFunction( |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
925 | self.__project, resource, offset) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
926 | result["FunctionName"] = user.get_function_name() |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
927 | except Exception as err: |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
928 | errorDict = self.__handleRopeError(err) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
929 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
930 | result.update(errorDict) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
931 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
932 | self.sendJson("Changes", result) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
933 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
934 | def __calculateUseFunctionChanges(self, params): |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
935 | """ |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
936 | Private method to calculate the 'Use Function' changes based on the |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
937 | parameters sent by the server. |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
938 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
939 | @param params dictionary containing the method parameters sent by |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
940 | the server |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
941 | @type dict |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
942 | """ |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
943 | changeGroup = params["ChangeGroup"] |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
944 | title = params["Title"] |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
945 | filename = params["FileName"] |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
946 | offset = params["Offset"] |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
947 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
948 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
949 | changes = None |
179
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
950 | result = { |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
951 | "ChangeGroup": changeGroup, |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
952 | "Title": title, |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
953 | } |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
954 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
955 | import rope.refactor.usefunction |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
956 | resource = rope.base.libutils.path_to_resource( |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
957 | self.__project, filename) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
958 | self.__progressHandle = ProgressHandle(self, title, True) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
959 | try: |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
960 | user = rope.refactor.usefunction.UseFunction( |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
961 | self.__project, resource, offset) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
962 | changes = user.get_changes(task_handle=self.__progressHandle) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
963 | except Exception as err: |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
964 | errorDict = self.__handleRopeError(err) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
965 | self.__progressHandle.reset() |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
966 | self.__progressHandle = None |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
967 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
968 | self.__changes[changeGroup] = changes |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
969 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
970 | result["Subcommand"] = "ChangesCalculated" |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
971 | result.update(errorDict) |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
972 | |
8ae4e95f5fa6
Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
178
diff
changeset
|
973 | self.sendJson("Changes", result) |
180
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
974 | |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
975 | def __calculateIntroduceFactoryChanges(self, params): |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
976 | """ |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
977 | Private method to calculate the 'Introduce Factory' changes based on |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
978 | the parameters sent by the server. |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
979 | |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
980 | @param params dictionary containing the method parameters sent by |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
981 | the server |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
982 | @type dict |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
983 | """ |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
984 | changeGroup = params["ChangeGroup"] |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
985 | title = params["Title"] |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
986 | filename = params["FileName"] |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
987 | offset = params["Offset"] |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
988 | factoryName = params["Name"] |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
989 | globalFactory = params["GlobalFactory"] |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
990 | |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
991 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
992 | changes = None |
180
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
993 | result = { |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
994 | "ChangeGroup": changeGroup, |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
995 | "Title": title, |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
996 | } |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
997 | |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
998 | import rope.refactor.introduce_factory |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
999 | resource = rope.base.libutils.path_to_resource( |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1000 | self.__project, filename) |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1001 | self.__progressHandle = ProgressHandle(self, title, True) |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1002 | try: |
320
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
1003 | introducer = ( |
180
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1004 | rope.refactor.introduce_factory.IntroduceFactoryRefactoring( |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1005 | self.__project, resource, offset) |
320
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
1006 | ) |
180
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1007 | changes = introducer.get_changes( |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1008 | factoryName, global_factory=globalFactory, |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1009 | task_handle=self.__progressHandle) |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1010 | except Exception as err: |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1011 | errorDict = self.__handleRopeError(err) |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1012 | self.__progressHandle.reset() |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1013 | self.__progressHandle = None |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1014 | |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1015 | self.__changes[changeGroup] = changes |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1016 | |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1017 | result["Subcommand"] = "ChangesCalculated" |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1018 | result.update(errorDict) |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1019 | |
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1020 | self.sendJson("Changes", result) |
181
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1021 | |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1022 | def __calculateIntroduceParameterChanges(self, params): |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1023 | """ |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1024 | Private method to calculate the 'Introduce Parameter' changes based on |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1025 | the parameters sent by the server. |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1026 | |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1027 | @param params dictionary containing the method parameters sent by |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1028 | the server |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1029 | @type dict |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1030 | """ |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1031 | changeGroup = params["ChangeGroup"] |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1032 | title = params["Title"] |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1033 | filename = params["FileName"] |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1034 | offset = params["Offset"] |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1035 | parameterName = params["Name"] |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1036 | |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1037 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1038 | changes = None |
181
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1039 | result = { |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1040 | "ChangeGroup": changeGroup, |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1041 | "Title": title, |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1042 | } |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1043 | |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1044 | import rope.refactor.introduce_parameter |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1045 | resource = rope.base.libutils.path_to_resource( |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1046 | self.__project, filename) |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1047 | try: |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1048 | introducer = rope.refactor.introduce_parameter.IntroduceParameter( |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1049 | self.__project, resource, offset) |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1050 | changes = introducer.get_changes(parameterName) |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1051 | except Exception as err: |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1052 | errorDict = self.__handleRopeError(err) |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1053 | |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1054 | self.__changes[changeGroup] = changes |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1055 | |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1056 | result["Subcommand"] = "ChangesCalculated" |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1057 | result.update(errorDict) |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1058 | |
3e3d6de2f0ca
Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
180
diff
changeset
|
1059 | self.sendJson("Changes", result) |
182
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1060 | |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1061 | def __calculateImportsChanges(self, params): |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1062 | """ |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1063 | Private method to calculate the 'Import' changes based on the |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1064 | parameters sent by the server. |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1065 | |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1066 | @param params dictionary containing the method parameters sent by |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1067 | the server |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1068 | @type dict |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1069 | """ |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1070 | changeGroup = params["ChangeGroup"] |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1071 | title = params["Title"] |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1072 | filename = params["FileName"] |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1073 | offset = params["Offset"] |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1074 | methodName = params["MethodName"] |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1075 | |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1076 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1077 | changes = None |
182
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1078 | result = { |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1079 | "ChangeGroup": changeGroup, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1080 | "Title": title, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1081 | } |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1082 | |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1083 | from rope.refactor.importutils import ImportOrganizer |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1084 | method = { |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1085 | "organize_imports": ImportOrganizer.organize_imports, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1086 | "expand_star_imports": ImportOrganizer.expand_star_imports, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1087 | "relatives_to_absolutes": ImportOrganizer.relatives_to_absolutes, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1088 | "froms_to_imports": ImportOrganizer.froms_to_imports, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1089 | "handle_long_imports": ImportOrganizer.handle_long_imports, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1090 | }[methodName] |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1091 | importOrganizer = ImportOrganizer(self.__project) |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1092 | resource = rope.base.libutils.path_to_resource( |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1093 | self.__project, filename) |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1094 | try: |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1095 | changes = method(importOrganizer, resource, offset=offset) |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1096 | except Exception as err: |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1097 | errorDict = self.__handleRopeError(err) |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1098 | |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1099 | self.__changes[changeGroup] = changes |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1100 | |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1101 | # send the change description first |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
1102 | description = changes.description if changes else "" |
182
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1103 | self.sendJson("Changes", { |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1104 | "ChangeGroup": changeGroup, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1105 | "Title": title, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1106 | "Subcommand": "ChangeDescription", |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1107 | "Description": description, |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1108 | }) |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1109 | |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1110 | result["Subcommand"] = "ChangesCalculated" |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1111 | result.update(errorDict) |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1112 | |
f7f2834dc8d9
Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
181
diff
changeset
|
1113 | self.sendJson("Changes", result) |
183
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1114 | |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1115 | def __calculateRestructureChanges(self, params): |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1116 | """ |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1117 | Private method to calculate the 'Restructure' changes based on the |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1118 | parameters sent by the server. |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1119 | |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1120 | @param params dictionary containing the method parameters sent by |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1121 | the server |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1122 | @type dict |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1123 | """ |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1124 | changeGroup = params["ChangeGroup"] |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1125 | title = params["Title"] |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1126 | pattern = params["Pattern"] |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1127 | goal = params["Goal"] |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1128 | args = params["Args"] |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1129 | imports = params["Imports"] |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1130 | |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1131 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1132 | changes = None |
183
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1133 | result = { |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1134 | "ChangeGroup": changeGroup, |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1135 | "Title": title, |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1136 | } |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1137 | |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1138 | import rope.refactor.restructure |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1139 | self.__project.validate(self.__project.root) |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1140 | self.__progressHandle = ProgressHandle(self, title, True) |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1141 | try: |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1142 | restructuring = rope.refactor.restructure.Restructure( |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1143 | self.__project, pattern, goal, args=args, imports=imports) |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1144 | changes = restructuring.get_changes( |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1145 | task_handle=self.__progressHandle) |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1146 | except Exception as err: |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1147 | errorDict = self.__handleRopeError(err) |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1148 | self.__progressHandle.reset() |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1149 | self.__progressHandle = None |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1150 | |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1151 | self.__changes[changeGroup] = changes |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1152 | |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1153 | result["Subcommand"] = "ChangesCalculated" |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1154 | result.update(errorDict) |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1155 | |
bac69c80d5f4
Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
182
diff
changeset
|
1156 | self.sendJson("Changes", result) |
184
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1157 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1158 | def __requestSignature(self, params): |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1159 | """ |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1160 | Private method to calculate the 'Signature' based on the parameters |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1161 | sent by the server. |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1162 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1163 | @param params dictionary containing the method parameters sent by |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1164 | the server |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1165 | @type dict |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1166 | """ |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1167 | changeGroup = params["ChangeGroup"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1168 | title = params["Title"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1169 | filename = params["FileName"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1170 | offset = params["Offset"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1171 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1172 | errorDict = {} |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1173 | result = { |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1174 | "Subcommand": "Signature", |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1175 | "ChangeGroup": changeGroup, |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1176 | "Title": title, |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1177 | } |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1178 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1179 | import rope.refactor.change_signature |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1180 | resource = rope.base.libutils.path_to_resource( |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1181 | self.__project, filename) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1182 | try: |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1183 | changer = rope.refactor.change_signature.ChangeSignature( |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1184 | self.__project, resource, offset) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1185 | result["DefinitionInfo"] = changer.get_args() |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1186 | except Exception as err: |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1187 | errorDict = self.__handleRopeError(err) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1188 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1189 | result.update(errorDict) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1190 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1191 | self.sendJson("Changes", result) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1192 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1193 | def __calculateSignatureChanges(self, params): |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1194 | """ |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1195 | Private method to calculate the 'Signature' changes based on the |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1196 | parameters sent by the server. |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1197 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1198 | @param params dictionary containing the method parameters sent by |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1199 | the server |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1200 | @type dict |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1201 | """ |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1202 | changeGroup = params["ChangeGroup"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1203 | title = params["Title"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1204 | filename = params["FileName"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1205 | offset = params["Offset"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1206 | removals = params["Removals"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1207 | additions = params["Additions"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1208 | newOrdering = params["Ordering"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1209 | autodef = params["AutoDef"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1210 | doHierarchy = params["Hierarchy"] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1211 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1212 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1213 | changes = None |
184
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1214 | result = { |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1215 | "ChangeGroup": changeGroup, |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1216 | "Title": title, |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1217 | } |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1218 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1219 | changers = [] |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1220 | import rope.refactor.change_signature |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1221 | # removals |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1222 | for index in removals: |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1223 | remover = rope.refactor.change_signature.ArgumentRemover(index) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1224 | changers.append(remover) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1225 | # additions |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1226 | for index, name, default, value in additions: |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1227 | adder = rope.refactor.change_signature.ArgumentAdder( |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1228 | index, name, default, value) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1229 | changers.append(adder) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1230 | # new ordering |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1231 | changers.append(rope.refactor.change_signature.ArgumentReorderer( |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1232 | newOrdering, autodef=autodef)) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1233 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1234 | resource = rope.base.libutils.path_to_resource( |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1235 | self.__project, filename) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1236 | self.__progressHandle = ProgressHandle(self, title, True) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1237 | try: |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1238 | changer = rope.refactor.change_signature.ChangeSignature( |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1239 | self.__project, resource, offset) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1240 | changes = changer.get_changes( |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1241 | changers, in_hierarchy=doHierarchy, |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1242 | task_handle=self.__progressHandle) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1243 | except Exception as err: |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1244 | errorDict = self.__handleRopeError(err) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1245 | self.__progressHandle.reset() |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1246 | self.__progressHandle = None |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1247 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1248 | self.__changes[changeGroup] = changes |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1249 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1250 | result["Subcommand"] = "ChangesCalculated" |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1251 | result.update(errorDict) |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1252 | |
4a806271f0b9
Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
183
diff
changeset
|
1253 | self.sendJson("Changes", result) |
185
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1254 | |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1255 | def __calculateInlineArgumentDefaultChanges(self, params): |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1256 | """ |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1257 | Private method to calculate the 'Inline Argument Default' changes |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1258 | based on the parameters sent by the server. |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1259 | |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1260 | @param params dictionary containing the method parameters sent by |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1261 | the server |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1262 | @type dict |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1263 | """ |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1264 | changeGroup = params["ChangeGroup"] |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1265 | title = params["Title"] |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1266 | filename = params["FileName"] |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1267 | offset = params["Offset"] |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1268 | argumentIndex = params["Index"] |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1269 | |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1270 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1271 | changes = None |
185
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1272 | result = { |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1273 | "ChangeGroup": changeGroup, |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1274 | "Title": title, |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1275 | } |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1276 | |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1277 | resource = rope.base.libutils.path_to_resource( |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1278 | self.__project, filename) |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1279 | self.__progressHandle = ProgressHandle(self, title, True) |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1280 | try: |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1281 | changer = rope.refactor.change_signature.ChangeSignature( |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1282 | self.__project, resource, offset) |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1283 | inliner = rope.refactor.change_signature.ArgumentDefaultInliner( |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1284 | argumentIndex) |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1285 | changes = changer.get_changes( |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1286 | [inliner], task_handle=self.__progressHandle) |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1287 | except Exception as err: |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1288 | errorDict = self.__handleRopeError(err) |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1289 | self.__progressHandle.reset() |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1290 | self.__progressHandle = None |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1291 | |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1292 | self.__changes[changeGroup] = changes |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1293 | |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1294 | result["Subcommand"] = "ChangesCalculated" |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1295 | result.update(errorDict) |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1296 | |
3336637a673b
Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
184
diff
changeset
|
1297 | self.sendJson("Changes", result) |
186
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1298 | |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1299 | def __calculateModuleToPackageChanges(self, params): |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1300 | """ |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1301 | Private method to calculate the 'Module to Package' changes |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1302 | based on the parameters sent by the server. |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1303 | |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1304 | @param params dictionary containing the method parameters sent by |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1305 | the server |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1306 | @type dict |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1307 | """ |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1308 | changeGroup = params["ChangeGroup"] |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1309 | title = params["Title"] |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1310 | filename = params["FileName"] |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1311 | |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1312 | errorDict = {} |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1313 | changes = None |
186
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1314 | result = { |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1315 | "ChangeGroup": changeGroup, |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1316 | "Title": title, |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1317 | } |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1318 | |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1319 | import rope.refactor.topackage |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1320 | resource = rope.base.libutils.path_to_resource( |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1321 | self.__project, filename) |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1322 | try: |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1323 | changes = rope.refactor.topackage.ModuleToPackage( |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1324 | self.__project, resource).get_changes() |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1325 | except Exception as err: |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1326 | errorDict = self.__handleRopeError(err) |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1327 | |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1328 | self.__changes[changeGroup] = changes |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1329 | |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1330 | # send the change description first |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
1331 | description = changes.description if changes else "" |
186
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1332 | self.sendJson("Changes", { |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1333 | "ChangeGroup": changeGroup, |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1334 | "Title": title, |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1335 | "Subcommand": "ChangeDescription", |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1336 | "Description": description, |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1337 | }) |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1338 | |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1339 | result["Subcommand"] = "ChangesCalculated" |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1340 | result.update(errorDict) |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1341 | |
d547caa795d7
Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
185
diff
changeset
|
1342 | self.sendJson("Changes", result) |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1343 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1344 | def __requestFieldName(self, params): |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1345 | """ |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1346 | Private method to calculate the 'Field Name' based on the parameters |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1347 | sent by the server. |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1348 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1349 | @param params dictionary containing the method parameters sent by |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1350 | the server |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1351 | @type dict |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1352 | """ |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1353 | changeGroup = params["ChangeGroup"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1354 | title = params["Title"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1355 | filename = params["FileName"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1356 | offset = params["Offset"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1357 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1358 | errorDict = {} |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1359 | result = { |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1360 | "Subcommand": "FieldName", |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1361 | "ChangeGroup": changeGroup, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1362 | "Title": title, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1363 | } |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1364 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1365 | import rope.refactor.encapsulate_field |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1366 | resource = rope.base.libutils.path_to_resource( |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1367 | self.__project, filename) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1368 | try: |
320
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
1369 | encapsulateField = ( |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1370 | rope.refactor.encapsulate_field.EncapsulateField( |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1371 | self.__project, resource, offset) |
320
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
1372 | ) |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1373 | result["Name"] = encapsulateField.get_field_name() |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1374 | except Exception as err: |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1375 | errorDict = self.__handleRopeError(err) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1376 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1377 | result.update(errorDict) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1378 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1379 | self.sendJson("Changes", result) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1380 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1381 | def __calculateEncapsulateFieldChanges(self, params): |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1382 | """ |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1383 | Private method to calculate the 'Encapsulate Field' changes based on |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1384 | the parameters sent by the server. |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1385 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1386 | @param params dictionary containing the method parameters sent by |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1387 | the server |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1388 | @type dict |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1389 | """ |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1390 | changeGroup = params["ChangeGroup"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1391 | title = params["Title"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1392 | filename = params["FileName"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1393 | offset = params["Offset"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1394 | getter = params["Getter"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1395 | setter = params["Setter"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1396 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1397 | errorDict = {} |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1398 | changes = None |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1399 | result = { |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1400 | "ChangeGroup": changeGroup, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1401 | "Title": title, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1402 | } |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1403 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1404 | import rope.refactor.encapsulate_field |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1405 | resource = rope.base.libutils.path_to_resource( |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1406 | self.__project, filename) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1407 | self.__progressHandle = ProgressHandle(self, title, True) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1408 | try: |
320
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
1409 | encapsulateField = ( |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1410 | rope.refactor.encapsulate_field.EncapsulateField( |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1411 | self.__project, resource, offset) |
320
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
1412 | ) |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1413 | changes = encapsulateField.get_changes( |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1414 | getter=getter, setter=setter, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1415 | task_handle=self.__progressHandle) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1416 | except Exception as err: |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1417 | errorDict = self.__handleRopeError(err) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1418 | self.__progressHandle.reset() |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1419 | self.__progressHandle = None |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1420 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1421 | self.__changes[changeGroup] = changes |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1422 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1423 | result["Subcommand"] = "ChangesCalculated" |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1424 | result.update(errorDict) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1425 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1426 | self.sendJson("Changes", result) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1427 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1428 | def __calculateLocalToAttributeChanges(self, params): |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1429 | """ |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1430 | Private method to calculate the 'Local Variabe to Attribute' changes |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1431 | based on the parameters sent by the server. |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1432 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1433 | @param params dictionary containing the method parameters sent by |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1434 | the server |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1435 | @type dict |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1436 | """ |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1437 | changeGroup = params["ChangeGroup"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1438 | title = params["Title"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1439 | filename = params["FileName"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1440 | offset = params["Offset"] |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1441 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1442 | errorDict = {} |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1443 | changes = None |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1444 | result = { |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1445 | "ChangeGroup": changeGroup, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1446 | "Title": title, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1447 | } |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1448 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1449 | import rope.refactor.localtofield |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1450 | resource = rope.base.libutils.path_to_resource( |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1451 | self.__project, filename) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1452 | try: |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1453 | changes = rope.refactor.localtofield.LocalToField( |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1454 | self.__project, resource, offset).get_changes() |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1455 | except Exception as err: |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1456 | errorDict = self.__handleRopeError(err) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1457 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1458 | self.__changes[changeGroup] = changes |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1459 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1460 | # send the change description first |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
1461 | description = changes.description if changes else "" |
187
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1462 | self.sendJson("Changes", { |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1463 | "ChangeGroup": changeGroup, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1464 | "Title": title, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1465 | "Subcommand": "ChangeDescription", |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1466 | "Description": description, |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1467 | }) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1468 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1469 | result["Subcommand"] = "ChangesCalculated" |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1470 | result.update(errorDict) |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1471 | |
c7600eee9047
Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
186
diff
changeset
|
1472 | self.sendJson("Changes", result) |
188
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1473 | |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1474 | def __calculateMethodObjectChanges(self, params): |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1475 | """ |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1476 | Private method to calculate the 'Method to Method Object' changes |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1477 | based on the parameters sent by the server. |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1478 | |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1479 | @param params dictionary containing the method parameters sent by |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1480 | the server |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1481 | @type dict |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1482 | """ |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1483 | changeGroup = params["ChangeGroup"] |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1484 | title = params["Title"] |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1485 | filename = params["FileName"] |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1486 | offset = params["Offset"] |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1487 | name = params["Name"] |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1488 | |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1489 | errorDict = {} |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1490 | changes = None |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1491 | result = { |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1492 | "ChangeGroup": changeGroup, |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1493 | "Title": title, |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1494 | } |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1495 | |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1496 | import rope.refactor.method_object |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1497 | resource = rope.base.libutils.path_to_resource( |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1498 | self.__project, filename) |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1499 | try: |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1500 | converter = rope.refactor.method_object.MethodObject( |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1501 | self.__project, resource, offset) |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1502 | changes = converter.get_changes(name) |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1503 | except Exception as err: |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1504 | errorDict = self.__handleRopeError(err) |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1505 | |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1506 | self.__changes[changeGroup] = changes |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1507 | |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1508 | result["Subcommand"] = "ChangesCalculated" |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1509 | result.update(errorDict) |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1510 | |
05fb0977ce1b
Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
187
diff
changeset
|
1511 | self.sendJson("Changes", result) |
180
a33ef7ab8c54
Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
179
diff
changeset
|
1512 | |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1513 | |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1514 | if __name__ == '__main__': |
360 | 1515 | if len(sys.argv) != 5: |
1516 | print('Host, port, project path and module path parameters are' | |
1517 | ' missing. Abort.') | |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1518 | sys.exit(1) |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1519 | |
362
792c2651fbd7
Moved the sys.path manipulation to the beginning of the ...Client.py files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
360
diff
changeset
|
1520 | host, port, projectPath = sys.argv[1:-1] |
360 | 1521 | |
365
f740b50380df
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
362
diff
changeset
|
1522 | # Create a Qt6 application object in order to allow the processing of |
190
a1b9b4975806
Modified the refactoring client to be able to process modules containing Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
188
diff
changeset
|
1523 | # modules containing Qt stuff. |
a1b9b4975806
Modified the refactoring client to be able to process modules containing Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
188
diff
changeset
|
1524 | try: |
365
f740b50380df
Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
362
diff
changeset
|
1525 | from PyQt6.QtCore import QCoreApplication |
381
88ef06966203
Fixed two bugs causing a crash of the code assist and refactoring clients in certain situations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
375
diff
changeset
|
1526 | except (ImportError, RuntimeError): |
360 | 1527 | QCoreApplication = None |
190
a1b9b4975806
Modified the refactoring client to be able to process modules containing Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
188
diff
changeset
|
1528 | if QCoreApplication is not None: |
381
88ef06966203
Fixed two bugs causing a crash of the code assist and refactoring clients in certain situations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
375
diff
changeset
|
1529 | app = QCoreApplication([]) |
190
a1b9b4975806
Modified the refactoring client to be able to process modules containing Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
188
diff
changeset
|
1530 | |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1531 | client = RefactoringClient(host, int(port), projectPath) |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1532 | # Start the main loop |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1533 | client.run() |
166
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
1534 | |
6fc202183b3b
Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
165
diff
changeset
|
1535 | sys.exit(0) |
161
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1536 | |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1537 | # |
f5d6fb1a009b
Added the client file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1538 | # eflag: noqa = M801 |