RefactoringRope/RefactoringClient.py

Mon, 10 May 2021 20:13:48 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 10 May 2021 20:13:48 +0200
changeset 360
2b35968f3d02
parent 354
a967ff16629a
child 362
792c2651fbd7
permissions
-rw-r--r--

Version 8.0.0
- bug fixes
- removed the included 'rope' library and have it as an external dependency installed during the plug-in installation (for eric > 21.5)

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

eric ide

mercurial