Anonymous avatar Anonymous committed 9a1b8d0

refactor: using the new dialog for remaining refactorings

Comments (0)

Files changed (1)

ropemacs/refactor.py

 
 class _Extract(Refactoring):
     saveall = False
-    optionals = {'similar': dialog.Data('Extract similar pieces: ',
-                                        values=['yes', 'no'], default='yes'),
-                 'global_': dialog.Data('Make global: ',
-                                        values=['yes', 'no'], default='no')}
+    optionals = {'similar': dialog.Boolean('Extract similar pieces: ', True),
+                 'global_': dialog.Boolean('Make global: ')}
     kind = None
     constructor = None
 
                                           self.resource, start, end)
 
     def _calculate_changes(self, values, task_handle):
-        similar = values.get('similar', 'yes') == 'yes'
-        global_ = values.get('global_', 'no') == 'yes'
+        similar = values.get('similar')
+        global_ = values.get('global_')
         return self.extractor.get_changes(values['name'], similar=similar,
                                           global_=global_)
 
 class IntroduceFactory(Refactoring):
     saveall = True
     key = 'f'
-    optionals = {'global_factory': dialog.Data(
-            'Make global: ', values=['yes', 'no'], default='yes'),
-                 'resources': dialog.Data('Files to apply this refactoring on: ')}
 
     def _create_refactoring(self):
         self.factory = rope.refactor.introduce_factory.IntroduceFactory(
             self.project, self.resource, self.offset)
 
     def _calculate_changes(self, values, task_handle):
-        name = values.get('factory_name')
-        global_ = values.get('global_factory', 'yes') == 'yes'
-        resources = _resources(self.project, values.get('resources'))
-        return self.factory.get_changes(name, global_factory=global_,
-                                        resources=resources,
-                                        task_handle=task_handle)
+        return self.factory.get_changes(task_handle=task_handle, **values)
 
     def _get_confs(self):
         default = 'create_%s' % self.factory.old_name.lower()
         return {'factory_name': dialog.Data('Factory name: ', default)}
 
+    def _get_optionals(self):
+        return {'global_factory': dialog.Boolean('Make global: ', True),
+                'resources': self.resources_option}
+
 
 class ChangeSignature(Refactoring):
     saveall = True
     key = 's'
-    optionals = {
-        'resources': dialog.Data('Files to apply this refactoring on: ')}
 
     def _create_refactoring(self):
         self.changer = rope.refactor.change_signature.ChangeSignature(
         return {'signature': dialog.Data('Change the signature: ',
                                          default=signature)}
 
+    def _get_optionals(self):
+        return {'resources': self.resources_option}
+
 
 class _GenerateElement(Refactoring):
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.