Sun, 30 Jan 2011 17:02:15 +0100
Added these refactoring functions:
- import organization
- restructure
- change signature
- inline argument default
11
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
3 | # Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the Restructure dialog. |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | from PyQt4.QtCore import pyqtSlot |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | from PyQt4.QtGui import QDialogButtonBox, QAbstractButton |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | import rope.refactor.restructure |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | from Ui_RestructureDialog import Ui_RestructureDialog |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | from RefactoringDialogBase import RefactoringDialogBase |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | class RestructureDialog(RefactoringDialogBase, Ui_RestructureDialog): |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | Class implementing the Restructure dialog. |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | history = None |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | def __init__(self, refactoring, title, parent = None): |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | Constructor |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | @param refactoring reference to the main refactoring object |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | (Refactoring) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | @param title title of the dialog (string) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | @param parent reference to the parent widget (QWidget) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | RefactoringDialogBase.__init__(self, refactoring, title, parent) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | self.setupUi(self) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | self.__okButton.setEnabled(False) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | self.__previewButton = self.buttonBox.addButton( |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | self.trUtf8("Preview"), QDialogButtonBox.ActionRole) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | self.__previewButton.setDefault(True) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | self.__loadData() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | def __updateUI(self): |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | Private slot to update the UI. |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | self.__okButton.setEnabled(self.patternEdit.toPlainText() != "" and \ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | self.goalEdit.toPlainText() != "") |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | @pyqtSlot() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | def on_patternEdit_textChanged(self): |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | Private slot to react to changes of the pattern. |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | self.__updateUI() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | @pyqtSlot() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | def on_goalEdit_textChanged(self): |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | Private slot to react to changes of the goal. |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | self.__updateUI() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | @pyqtSlot(QAbstractButton) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | def on_buttonBox_clicked(self, button): |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | Private slot to act on the button pressed. |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | @param button reference to the button pressed (QAbstractButton) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | if button == self.__previewButton: |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | self.previewChanges() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | elif button == self.__okButton: |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | self.applyChanges() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | def _calculateChanges(self, handle): |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | Protected method to calculate the changes. |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
80 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
81 | @param handle reference to the task handle |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | (rope.base.taskhandle.TaskHandle) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | @return reference to the Changes object (rope.base.change.ChangeSet) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | self.__saveData() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | pattern = self.patternEdit.toPlainText() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | goal = self.goalEdit.toPlainText() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | imports = [line for line in self.importsEdit.toPlainText().splitlines() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | if line.strip()] |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | args = {} |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | checks = self.argsEdit.toPlainText().splitlines() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | for check in checks: |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | if ':' in check: |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | splitted = check.split(':', 1) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | name = splitted[0].strip() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | value = splitted[1].strip() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | args[name] = value |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
100 | self._refactoring.getProject().validate( |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | self._refactoring.getProject().root) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | try: |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | restructuring = rope.refactor.restructure.Restructure( |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | self._refactoring.getProject(), pattern, goal, |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
105 | args=args, imports=imports) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | changes = restructuring.get_changes(task_handle=handle) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | except Exception as err: |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | self._refactoring.handleRopeError(err, self._title) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
109 | return None |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | return changes |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | def __saveData(self): |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | Private slot to save the data for later reuse. |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | data = {'pattern' : self.patternEdit.toPlainText(), |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | 'goal' : self.goalEdit.toPlainText(), |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | 'checks' : self.argsEdit.toPlainText(), |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | 'imports' : self.importsEdit.toPlainText() |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | } |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
122 | RestructureDialog.history = data |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | def __loadData(self): |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
125 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | Private slot to load the history data into the dialog. |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | """ |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | if RestructureDialog.history is not None: |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | data = RestructureDialog.history |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | self.patternEdit.setPlainText(data['pattern']) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | self.goalEdit.setPlainText(data['goal']) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | self.argsEdit.setPlainText(data['checks']) |
562f9758d2e1
Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
133 | self.importsEdit.setPlainText(data['imports']) |