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