Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2332] trunk/org.rubypeople.rdt.refactoring
|
From: <caw...@us...> - 2007-04-18 19:14:41
|
Revision: 2332
http://svn.sourceforge.net/rubyeclipse/?rev=2332&view=rev
Author: cawilliams
Date: 2007-04-18 12:14:40 -0700 (Wed, 18 Apr 2007)
Log Message:
-----------
include two new refactorings - Extract Constant and Pull Up method
Modified Paths:
--------------
trunk/org.rubypeople.rdt.refactoring/plugin.xml
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringActionGroup.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/classnodeprovider/ClassNodeProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractedMethodDef.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/refactoring/
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/refactoring/RefactoringMessages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/refactoring/RefactoringMessages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/ExtractConstantAction.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/PullUpAction.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractconstant/
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractconstant/ConstantExtractor.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractconstant/ExtractConstantConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractconstant/ExtractConstantConfig.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractconstant/ExtractConstantRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractconstant/ExtractedConstantCall.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractconstant/ExtractedConstantDef.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/pullup/
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/ExtractConstantPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/MethodUpPullerSelectionPage.java
Modified: trunk/org.rubypeople.rdt.refactoring/plugin.xml
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/plugin.xml 2007-04-18 17:10:10 UTC (rev 2331)
+++ trunk/org.rubypeople.rdt.refactoring/plugin.xml 2007-04-18 19:14:40 UTC (rev 2332)
@@ -1,385 +1,401 @@
-<plugin>
- <extension
- point="org.rubypeople.rdt.ui.editorPopupExtender">
- <rubyEditorPopupMenuExtension
- class="org.rubypeople.rdt.refactoring.action.RefactoringActionGroup">
- </rubyEditorPopupMenuExtension>
- </extension>
-<extension
- point="org.eclipse.ui.editorActions">
-
-
-
- <editorContribution
- id="org.rubypeople.rdt.refactoring.refactoringEditorActions"
- targetID="org.rubypeople.rdt.ui.EditorRubyFile">
- <menu
- id="org.rubypeople.rdt.refactoring.refactoringMenu"
- label="%rubyRefactoring.refactoringMenuLabel"
- path="edit">
- <separator name="org.rubypeople.rdt.refactoring.refactoringGroup"/>
- </menu>
- <menu
- id="org.rubypeople.rdt.refactoring.sourceMenu"
- label="%rubyRefactoring.sourceMenuLabel"
- path="edit">
- <separator name="org.rubypeople.rdt.refactoring.sourceGeneratorGroup"/>
- </menu>
-<!-- Source: -->
- <action
- class="org.rubypeople.rdt.refactoring.action.OverrideMethodAction"
- definitionId="org.rubypeople.rdt.refactoring.command.OverrideMethod"
- id="org.rubypeople.rdt.refactoring.overrideMethodAction"
- label="%rubyRefactoring.OverrideMethodLabel"
- menubarPath="org.rubypeople.rdt.refactoring.sourceMenu/org.rubypeople.rdt.refactoring.sourceGeneratorGroup"
- tooltip="Add Constructor from Superclass"/>
- <action
- class="org.rubypeople.rdt.refactoring.action.GenerateConstructorAction"
- definitionId="org.rubypeople.rdt.refactoring.command.GenerateConstructor"
- id="org.rubypeople.rdt.refactoring.generateConstructorAction"
- label="%rubyRefactoring.GenerateConstructorLabel"
- menubarPath="org.rubypeople.rdt.refactoring.sourceMenu/org.rubypeople.rdt.refactoring.sourceGeneratorGroup"
- tooltip="Generate Constructor"/>
- <action
- class="org.rubypeople.rdt.refactoring.action.GenerateAccessorsAction"
- definitionId="org.rubypeople.rdt.refactoring.command.GenerateAccessors"
- id="org.rubypeople.rdt.refactoring.generateaccessors"
- label="%rubyRefactoring.GenerateAccessorLabel"
- menubarPath="org.rubypeople.rdt.refactoring.sourceMenu/org.rubypeople.rdt.refactoring.sourceGeneratorGroup"
- tooltip="Generate Accessors"/>
-<!-- experimental
- <action
- class="org.rubypeople.rdt.refactoring.action.FormatSourceAction"
- enablesFor="*"
- id="org.rubypeople.rdt.refactoring.renameFormatSourceAction"
- label="%rubyRefactoring.FormatSourceLabel"
- menubarPath="org.rubypeople.rdt.refactoring.sourceMenu/org.rubypeople.rdt.refactoring.sourceGeneratorGroup"
- style="push"
- tooltip="Formats the Sourcecode"/> -->
-<!-- Refactorings: -->
- <action
- class="org.rubypeople.rdt.refactoring.action.SplitTempAction"
- definitionId="org.rubypeople.rdt.refactoring.command.SplitTemp"
- id="org.rubypeople.rdt.refactoring.splitTempAction"
- label="%rubyRefactoring.SplitTempLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- tooltip="Split Temporary Variable"/>
- <action
- class="org.rubypeople.rdt.refactoring.action.RenameAction"
- definitionId="org.rubypeople.rdt.refactoring.command.Rename"
- id="org.rubypeople.rdt.refactoring.renameAction"
- label="%rubyRefactoring.RenameLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- tooltip="Renames the selected element..."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.PushDownAction"
- definitionId="org.rubypeople.rdt.refactoring.command.PushDown"
- id="org.rubypeople.rdt.refactoring.pushDownAction"
- label="%rubyRefactoring.PushDownLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Pushes down a method"/>
- <action
- class="org.rubypeople.rdt.refactoring.action.MoveMethodAction"
- definitionId="org.rubypeople.rdt.refactoring.command.MoveMethod"
- id="org.rubypeople.rdt.refactoring.MoveMethod"
- label="%rubyRefactoring.MoveMethodLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Moves the selected method into another class."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
- definitionId="org.rubypeople.rdt.refactoring.command.MoveField"
- id="org.rubypeople.rdt.refactoring.MoveField"
- label="%rubyRefactoring.MoveFieldLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Moves the selected field into another class."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.MergeWithExternalClassPartsAction"
- definitionId="org.rubypeople.rdt.refactoring.command.MergeWithExternalClassParts"
- id="org.rubypeople.rdt.refactoring.mergeWithExternalClassParts"
- label="%rubyRefactoring.MergeWithExternalClassPartsLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Merges different class parts of the same class in different files."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.MergeClassPartsInFileAction"
- definitionId="org.rubypeople.rdt.refactoring.command.MergeClassPartsInFile"
- id="org.rubypeople.rdt.refactoring.mergeClassPartsInFile"
- label="%rubyRefactoring.MergeClassPartsInFileLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Merges different class parts of the same class in the current file."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.InlineMethodAction"
- definitionId="org.rubypeople.rdt.refactoring.command.InlineMethod"
- id="org.rubypeople.rdt.refactoring.inlineMethod"
- label="%rubyRefactoring.InlineMethodLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Replaces the selected method call with the methods body."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.InlineTempAction"
- definitionId="org.rubypeople.rdt.refactoring.command.InlineTemp"
- id="org.rubypeople.rdt.refactoring.inlineTemp"
- label="%rubyRefactoring.InlineTempLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Replaces the occurences fo a local variable with its value."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.InlineClassAction"
- definitionId="org.rubypeople.rdt.refactoring.command.InlineClass"
- id="org.rubypeople.rdt.refactoring.inlineClassAction"
- label="%rubyRefactoring.InlineClassLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Inlines the selected class into another one."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.ExtractMethodAction"
- definitionId="org.rubypeople.rdt.refactoring.command.ExtractMethod"
- id="org.rubypeople.rdt.refactoring.extractMethodAction"
- label="%rubyRefactoring.ExtractMethodLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Extracts the selected code into a new method."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
- definitionId="org.rubypeople.rdt.refactoring.command.EncapsulateField"
- id="org.rubypeople.rdt.refactoring.extractMethod"
- label="%rubyRefactoring.EncapsulateField"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Encapsulates a field. A field (accessor) will be removed and getter and setter methods will be added."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.ConvertTempToFieldAction"
- definitionId="org.rubypeople.rdt.refactoring.command.ConvertTempToField"
- id="org.rubypeople.rdt.refactoring.convertTempToFieldAction"
- label="%rubyRefactoring.ConvertTempToFieldLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Converts a local variable to a field."/>
- </editorContribution>
-</extension>
-<extension
- point="org.eclipse.ui.commands">
- <category
- description="Refactorings"
- id="org.rubypeople.rdt.refactoring.commands.refactoring"
- name="Refactor - Ruby"/>
- <category
- description="Source Generators"
- id="org.rubypeople.rdt.refactoring.commands.source"
- name="Source - Ruby"/>
-<!-- Source: -->
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.source"
- id="org.rubypeople.rdt.refactoring.command.GenerateAccessors"
- name="%rubyRefactoring.GenerateAccessorLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.source"
- id="org.rubypeople.rdt.refactoring.command.GenerateConstructor"
- name="%rubyRefactoring.GenerateConstructorLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.source"
- id="org.rubypeople.rdt.refactoring.command.OverrideMethod"
- name="%rubyRefactoring.OverrideMethodLabel"/>
-<!-- Refactorings: -->
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.Rename"
- name="%rubyRefactoring.RenameLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.SplitTemp"
- name="%rubyRefactoring.SplitTempLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.MergeClassPartsInFile"
- name="%rubyRefactoring.MergeClassPartsInFileLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.ConvertTempToField"
- name="%rubyRefactoring.ConvertTempToFieldLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.PushDown"
- name="%rubyRefactoring.PushDownLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.ExtractMethod"
- name="%rubyRefactoring.ExtractMethodLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.InlineMethod"
- name="%rubyRefactoring.InlineMethodLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.EncapsulateField"
- name="%rubyRefactoring.EncapsulateField"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.MergeWithExternalClassParts"
- name="%rubyRefactoring.MergeWithExternalClassPartsLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.InlineTemp"
- name="%rubyRefactoring.InlineTempLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.MoveMethod"
- name="%rubyRefactoring.MoveMethodLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.MoveField"
- name="%rubyRefactoring.MoveFieldLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.InlineClass"
- name="%rubyRefactoring.InlineClassLabel"/>
-</extension>
-
-<extension
- point="org.eclipse.ui.bindings"> <!-- M1 == Ctrl, M2 == Shift M3 == Alt -->
- <key
- commandId="org.rubypeople.rdt.refactoring.command.ExtractMethod"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+M "/>
- <key
- commandId="org.rubypeople.rdt.refactoring.command.MoveField"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+V F"/>
- <key
- commandId="org.rubypeople.rdt.refactoring.command.MoveMethod"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+V M"/>
- <key
- commandId="org.rubypeople.rdt.refactoring.command.InlineClass"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+I C"/>
- <key
- commandId="org.rubypeople.rdt.refactoring.command.InlineTemp"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+I L"/>
- <key
- commandId="org.rubypeople.rdt.refactoring.command.InlineMethod"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+I M"/>
- <key
- commandId="org.rubypeople.rdt.refactoring.command.Rename"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+R"/>
-</extension>
-<extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- id="org.rubypeople.rdt.refactoring.refactoringContext"
- objectClass="org.rubypeople.rdt.internal.core.RubyLocalVar">
- <action
- class="org.rubypeople.rdt.refactoring.action.ConvertTempToFieldAction"
- id="org.rubypeople.rdt.refactoring.action.ConvertTempToFieldAction"
- label="%rubyRefactoring.ConvertTempToFieldLabel"
- menubarPath="additions" />
- <action
- class="org.rubypeople.rdt.refactoring.action.InlineTempAction"
- id="org.rubypeople.rdt.refactoring.action.InlineTempAction"
- label="%rubyRefactoring.InlineTempLabel"
- menubarPath="additions" />
- <action
- class="org.rubypeople.rdt.refactoring.action.SplitTempAction"
- id="org.rubypeople.rdt.refactoring.action.SplitTempAction"
- label="%rubyRefactoring.SplitTempLabel"
- menubarPath="additions" />
- <action
- class="org.rubypeople.rdt.refactoring.action.RenameAction"
- id="org.rubypeople.rdt.refactoring.action.RenameAction"
- label="%rubyRefactoring.RenameLabel"
- menubarPath="additions" />
- </objectContribution>
-
- <objectContribution
- id="org.rubypeople.rdt.refactoring.refactoringContext"
- objectClass="org.rubypeople.rdt.internal.core.RubyType">
- <action
- class="org.rubypeople.rdt.refactoring.action.RenameAction"
- id="org.rubypeople.rdt.refactoring.action.RenameAction"
- label="%rubyRefactoring.RenameLabel"
- menubarPath="additions" />
- </objectContribution>
-
- <objectContribution
- id="org.rubypeople.rdt.refactoring.refactoringContext"
- objectClass="org.rubypeople.rdt.internal.core.RubyInstVar">
- <action
- class="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
- id="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
- label="%rubyRefactoring.EncapsulateField"
- menubarPath="additions" />
- <action
- class="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
- id="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
- label="%rubyRefactoring.MoveFieldLabel"
- menubarPath="additions" />
- <action
- class="org.rubypeople.rdt.refactoring.action.RenameAction"
- id="org.rubypeople.rdt.refactoring.action.RenameAction"
- label="%rubyRefactoring.RenameLabel"
- menubarPath="additions" />
- </objectContribution>
-
- <objectContribution
- id="org.rubypeople.rdt.refactoring.refactoringContext"
- objectClass="org.rubypeople.rdt.internal.core.RubyClassVar">
- <action
- class="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
- id="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
- label="%rubyRefactoring.EncapsulateField"
- menubarPath="additions" />
- <action
- class="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
- id="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
- label="%rubyRefactoring.MoveFieldLabel"
- menubarPath="additions" />
- <action
- class="org.rubypeople.rdt.refactoring.action.RenameAction"
- id="org.rubypeople.rdt.refactoring.action.RenameAction"
- label="%rubyRefactoring.RenameLabel"
- menubarPath="additions" />
- </objectContribution>
-
- <objectContribution
- id="org.rubypeople.rdt.refactoring.refactoringContext"
- objectClass="org.rubypeople.rdt.internal.core.RubyMethod">
- <action
- class="org.rubypeople.rdt.refactoring.action.MoveMethodAction"
- id="org.rubypeople.rdt.refactoring.action.MoveMethodAction"
- label="%rubyRefactoring.MoveMethodLabel"
- menubarPath="additions" />
- <action
- class="org.rubypeople.rdt.refactoring.action.RenameAction"
- id="org.rubypeople.rdt.refactoring.action.RenameAction"
- label="%rubyRefactoring.RenameLabel"
- menubarPath="additions" />
- </objectContribution>
-
-</extension>
-
-<extension
- point="org.eclipse.ltk.ui.refactoring.changePreviewViewers">
- <changePreviewViewer
- class="org.rubypeople.rdt.refactoring.preview.RubyTextEditChangePreviewViewer"
- id="org.rubypeople.rdt.refactoring.preview.RubyTextEditChangePreviewViewer">
- <enablement>
- <instanceof value="org.rubypeople.rdt.refactoring.preview.RubyTextFileChange"/>
- </enablement>
- </changePreviewViewer>
- </extension>
-</plugin>
+<plugin>
+ <extension
+ point="org.rubypeople.rdt.ui.editorPopupExtender">
+ <rubyEditorPopupMenuExtension
+ class="org.rubypeople.rdt.refactoring.action.RefactoringActionGroup">
+ </rubyEditorPopupMenuExtension>
+ </extension>
+<extension
+ point="org.eclipse.ui.editorActions">
+
+
+
+ <editorContribution
+ id="org.rubypeople.rdt.refactoring.refactoringEditorActions"
+ targetID="org.rubypeople.rdt.ui.EditorRubyFile">
+ <menu
+ id="org.rubypeople.rdt.refactoring.refactoringMenu"
+ label="%rubyRefactoring.refactoringMenuLabel"
+ path="edit">
+ <separator name="org.rubypeople.rdt.refactoring.refactoringGroup"/>
+ </menu>
+ <menu
+ id="org.rubypeople.rdt.refactoring.sourceMenu"
+ label="%rubyRefactoring.sourceMenuLabel"
+ path="edit">
+ <separator name="org.rubypeople.rdt.refactoring.sourceGeneratorGroup"/>
+ </menu>
+<!-- Source: -->
+ <action
+ class="org.rubypeople.rdt.refactoring.action.OverrideMethodAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.OverrideMethod"
+ id="org.rubypeople.rdt.refactoring.overrideMethodAction"
+ label="%rubyRefactoring.OverrideMethodLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.sourceMenu/org.rubypeople.rdt.refactoring.sourceGeneratorGroup"
+ tooltip="Add Constructor from Superclass"/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.GenerateConstructorAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.GenerateConstructor"
+ id="org.rubypeople.rdt.refactoring.generateConstructorAction"
+ label="%rubyRefactoring.GenerateConstructorLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.sourceMenu/org.rubypeople.rdt.refactoring.sourceGeneratorGroup"
+ tooltip="Generate Constructor"/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.GenerateAccessorsAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.GenerateAccessors"
+ id="org.rubypeople.rdt.refactoring.generateaccessors"
+ label="%rubyRefactoring.GenerateAccessorLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.sourceMenu/org.rubypeople.rdt.refactoring.sourceGeneratorGroup"
+ tooltip="Generate Accessors"/>
+<!-- experimental
+ <action
+ class="org.rubypeople.rdt.refactoring.action.FormatSourceAction"
+ enablesFor="*"
+ id="org.rubypeople.rdt.refactoring.renameFormatSourceAction"
+ label="%rubyRefactoring.FormatSourceLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.sourceMenu/org.rubypeople.rdt.refactoring.sourceGeneratorGroup"
+ style="push"
+ tooltip="Formats the Sourcecode"/> -->
+<!-- Refactorings: -->
+ <action
+ class="org.rubypeople.rdt.refactoring.action.SplitTempAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.SplitTemp"
+ id="org.rubypeople.rdt.refactoring.splitTempAction"
+ label="%rubyRefactoring.SplitTempLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ tooltip="Split Temporary Variable"/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.Rename"
+ id="org.rubypeople.rdt.refactoring.renameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ tooltip="Renames the selected element..."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.PushDownAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.PushDown"
+ id="org.rubypeople.rdt.refactoring.pushDownAction"
+ label="%rubyRefactoring.PushDownLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Pushes down a method"/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.PullUpAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.PullUp"
+ id="org.rubypeople.rdt.refactoring.pullUpAction"
+ label="%rubyRefactoring.PullUpLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Pulls up a method into it's supperclass"/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.MoveMethodAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.MoveMethod"
+ id="org.rubypeople.rdt.refactoring.MoveMethod"
+ label="%rubyRefactoring.MoveMethodLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Moves the selected method into another class."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.MoveField"
+ id="org.rubypeople.rdt.refactoring.MoveField"
+ label="%rubyRefactoring.MoveFieldLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Moves the selected field into another class."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.MergeWithExternalClassPartsAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.MergeWithExternalClassParts"
+ id="org.rubypeople.rdt.refactoring.mergeWithExternalClassParts"
+ label="%rubyRefactoring.MergeWithExternalClassPartsLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Merges different class parts of the same class in different files."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.MergeClassPartsInFileAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.MergeClassPartsInFile"
+ id="org.rubypeople.rdt.refactoring.mergeClassPartsInFile"
+ label="%rubyRefactoring.MergeClassPartsInFileLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Merges different class parts of the same class in the current file."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.InlineMethodAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.InlineMethod"
+ id="org.rubypeople.rdt.refactoring.inlineMethod"
+ label="%rubyRefactoring.InlineMethodLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Replaces the selected method call with the methods body."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.InlineTempAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.InlineTemp"
+ id="org.rubypeople.rdt.refactoring.inlineTemp"
+ label="%rubyRefactoring.InlineTempLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Replaces the occurences fo a local variable with its value."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.InlineClassAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.InlineClass"
+ id="org.rubypeople.rdt.refactoring.inlineClassAction"
+ label="%rubyRefactoring.InlineClassLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Inlines the selected class into another one."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.ExtractMethodAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.ExtractMethod"
+ id="org.rubypeople.rdt.refactoring.extractMethodAction"
+ label="%rubyRefactoring.ExtractMethodLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Extracts the selected code into a new method."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.ExtractConstantAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.ExtractConstant"
+ id="org.rubypeople.rdt.refactoring.extractConstantAction"
+ label="%rubyRefactoring.ExtractConstantLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Extracts the selected value into a new constant."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.EncapsulateField"
+ id="org.rubypeople.rdt.refactoring.extractMethod"
+ label="%rubyRefactoring.EncapsulateField"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Encapsulates a field. A field (accessor) will be removed and getter and setter methods will be added."/>
+ <action
+ class="org.rubypeople.rdt.refactoring.action.ConvertTempToFieldAction"
+ definitionId="org.rubypeople.rdt.refactoring.command.ConvertTempToField"
+ id="org.rubypeople.rdt.refactoring.convertTempToFieldAction"
+ label="%rubyRefactoring.ConvertTempToFieldLabel"
+ menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
+ style="push"
+ tooltip="Converts a local variable to a field."/>
+ </editorContribution>
+</extension>
+<extension
+ point="org.eclipse.ui.commands">
+ <category
+ description="Refactorings"
+ id="org.rubypeople.rdt.refactoring.commands.refactoring"
+ name="Refactor - Ruby"/>
+ <category
+ description="Source Generators"
+ id="org.rubypeople.rdt.refactoring.commands.source"
+ name="Source - Ruby"/>
+<!-- Source: -->
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.source"
+ id="org.rubypeople.rdt.refactoring.command.GenerateAccessors"
+ name="%rubyRefactoring.GenerateAccessorLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.source"
+ id="org.rubypeople.rdt.refactoring.command.GenerateConstructor"
+ name="%rubyRefactoring.GenerateConstructorLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.source"
+ id="org.rubypeople.rdt.refactoring.command.OverrideMethod"
+ name="%rubyRefactoring.OverrideMethodLabel"/>
+<!-- Refactorings: -->
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.Rename"
+ name="%rubyRefactoring.RenameLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.SplitTemp"
+ name="%rubyRefactoring.SplitTempLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.MergeClassPartsInFile"
+ name="%rubyRefactoring.MergeClassPartsInFileLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.ConvertTempToField"
+ name="%rubyRefactoring.ConvertTempToFieldLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.PushDown"
+ name="%rubyRefactoring.PushDownLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.ExtractMethod"
+ name="%rubyRefactoring.ExtractMethodLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.InlineMethod"
+ name="%rubyRefactoring.InlineMethodLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.EncapsulateField"
+ name="%rubyRefactoring.EncapsulateField"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.MergeWithExternalClassParts"
+ name="%rubyRefactoring.MergeWithExternalClassPartsLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.InlineTemp"
+ name="%rubyRefactoring.InlineTempLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.MoveMethod"
+ name="%rubyRefactoring.MoveMethodLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.MoveField"
+ name="%rubyRefactoring.MoveFieldLabel"/>
+ <command
+ categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
+ id="org.rubypeople.rdt.refactoring.command.InlineClass"
+ name="%rubyRefactoring.InlineClassLabel"/>
+</extension>
+
+<extension
+ point="org.eclipse.ui.bindings"> <!-- M1 == Ctrl, M2 == Shift M3 == Alt -->
+ <key
+ commandId="org.rubypeople.rdt.refactoring.command.ExtractMethod"
+ contextId="org.rubypeople.rdt.ui.rubyEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+M "/>
+ <key
+ commandId="org.rubypeople.rdt.refactoring.command.MoveField"
+ contextId="org.rubypeople.rdt.ui.rubyEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+V F"/>
+ <key
+ commandId="org.rubypeople.rdt.refactoring.command.MoveMethod"
+ contextId="org.rubypeople.rdt.ui.rubyEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+V M"/>
+ <key
+ commandId="org.rubypeople.rdt.refactoring.command.InlineClass"
+ contextId="org.rubypeople.rdt.ui.rubyEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+I C"/>
+ <key
+ commandId="org.rubypeople.rdt.refactoring.command.InlineTemp"
+ contextId="org.rubypeople.rdt.ui.rubyEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+I L"/>
+ <key
+ commandId="org.rubypeople.rdt.refactoring.command.InlineMethod"
+ contextId="org.rubypeople.rdt.ui.rubyEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+I M"/>
+ <key
+ commandId="org.rubypeople.rdt.refactoring.command.Rename"
+ contextId="org.rubypeople.rdt.ui.rubyEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+R"/>
+</extension>
+<extension
+ point="org.eclipse.ui.popupMenus">
+
+ <objectContribution
+ id="org.rubypeople.rdt.refactoring.refactoringContext"
+ objectClass="org.rubypeople.rdt.internal.core.RubyLocalVar">
+ <action
+ class="org.rubypeople.rdt.refactoring.action.ConvertTempToFieldAction"
+ id="org.rubypeople.rdt.refactoring.action.ConvertTempToFieldAction"
+ label="%rubyRefactoring.ConvertTempToFieldLabel"
+ menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.InlineTempAction"
+ id="org.rubypeople.rdt.refactoring.action.InlineTempAction"
+ label="%rubyRefactoring.InlineTempLabel"
+ menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.SplitTempAction"
+ id="org.rubypeople.rdt.refactoring.action.SplitTempAction"
+ label="%rubyRefactoring.SplitTempLabel"
+ menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
+ </objectContribution>
+
+ <objectContribution
+ id="org.rubypeople.rdt.refactoring.refactoringContext"
+ objectClass="org.rubypeople.rdt.internal.core.RubyType">
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
+ </objectContribution>
+
+ <objectContribution
+ id="org.rubypeople.rdt.refactoring.refactoringContext"
+ objectClass="org.rubypeople.rdt.internal.core.RubyInstVar">
+ <action
+ class="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
+ id="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
+ label="%rubyRefactoring.EncapsulateField"
+ menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
+ id="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
+ label="%rubyRefactoring.MoveFieldLabel"
+ menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
+ </objectContribution>
+
+ <objectContribution
+ id="org.rubypeople.rdt.refactoring.refactoringContext"
+ objectClass="org.rubypeople.rdt.internal.core.RubyClassVar">
+ <action
+ class="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
+ id="org.rubypeople.rdt.refactoring.action.EncapsulateFieldAction"
+ label="%rubyRefactoring.EncapsulateField"
+ menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
+ id="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
+ label="%rubyRefactoring.MoveFieldLabel"
+ menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
+ </objectContribution>
+
+ <objectContribution
+ id="org.rubypeople.rdt.refactoring.refactoringContext"
+ objectClass="org.rubypeople.rdt.internal.core.RubyMethod">
+ <action
+ class="org.rubypeople.rdt.refactoring.action.MoveMethodAction"
+ id="org.rubypeople.rdt.refactoring.action.MoveMethodAction"
+ label="%rubyRefactoring.MoveMethodLabel"
+ menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
+ </objectContribution>
+
+</extension>
+
+<extension
+ point="org.eclipse.ltk.ui.refactoring.changePreviewViewers">
+ <changePreviewViewer
+ class="org.rubypeople.rdt.refactoring.preview.RubyTextEditChangePreviewViewer"
+ id="org.rubypeople.rdt.refactoring.preview.RubyTextEditChangePreviewViewer">
+ <enablement>
+ <instanceof value="org.rubypeople.rdt.refactoring.preview.RubyTextFileChange"/>
+ </enablement>
+ </changePreviewViewer>
+ </extension>
+</plugin>
Added: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/refactoring/RefactoringMessages.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/refactoring/RefactoringMessages.java (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/refactoring/RefactoringMessages.java 2007-04-18 19:14:40 UTC (rev 2332)
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2007 Aptana, Inc.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl -v10.html. If redistributing this code,
+ * this entire header must remain intact.
+ */
+package org.rubypeople.rdt.internal.refactoring;
+
+import org.eclipse.osgi.util.NLS;
+
+public class RefactoringMessages extends NLS {
+
+ private static final String BUNDLE_NAME = RefactoringMessages.class.getName();
+
+ public static String Refactor;
+ public static String ExtractConstantAction_extract_constant;
+ public static String ExtractConstantAction_label;
+ public static String ExtractConstantInputPage_constant_name;
+ public static String ExtractConstantWizard_defaultPageTitle;
+
+ private RefactoringMessages() {}
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, RefactoringMessages.class);
+ }
+}
Added: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/refactoring/RefactoringMessages.properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/refactoring/RefactoringMessages.properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/internal/refactoring/RefactoringMessages.properties 2007-04-18 19:14:40 UTC (rev 2332)
@@ -0,0 +1,15 @@
+#########################################
+# (c) Copyright Aptana, Inc. 2007.
+# All Rights Reserved.
+#########################################
+Refactor=Refactor
+
+ExtractConstantAction_label=Extr&act Constant...
+ExtractConstantAction_extract_constant=Extract Constant
+
+ExtractConstantInputPage_enter_name=Enter a name for the new constant
+ExtractConstantInputPage_constant_name=&Constant name:
+ExtractConstantInputPage_signature_preview=Signature Preview:
+ExtractConstantInputPage_exception=An unexpected exception occurred. See the error log for more details
+
+ExtractConstantWizard_defaultPageTitle=Extract Constant
Added: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/ExtractConstantAction.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/ExtractConstantAction.java (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/ExtractConstantAction.java 2007-04-18 19:14:40 UTC (rev 2332)
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2007 Aptana, Inc.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl -v10.html. If redistributing this code,
+ * this entire header must remain intact.
+ */
+package org.rubypeople.rdt.refactoring.action;
+
+import org.rubypeople.rdt.internal.refactoring.RefactoringMessages;
+import org.rubypeople.rdt.refactoring.core.extractconstant.ExtractConstantRefactoring;
+
+public class ExtractConstantAction extends WorkbenchWindowActionDelegate {
+
+ @Override
+ public void run() {
+ run(ExtractConstantRefactoring.class, RefactoringMessages.ExtractConstantAction_label);
+ }
+}
Added: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/PullUpAction.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/PullUpAction.java (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/PullUpAction.java 2007-04-18 19:14:40 UTC (rev 2332)
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2007 Aptana, Inc.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl -v10.html. If redistributing this code,
+ * this entire header must remain intact.
+ */
+package org.rubypeople.rdt.refactoring.action;
+
+import org.rubypeople.rdt.refactoring.core.pullup.PullUpRefactoring;
+
+public class PullUpAction extends WorkbenchWindowActionDelegate {
+
+ public void run() {
+ run(PullUpRefactoring.class, PullUpRefactoring.NAME);
+ }
+}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringActionGroup.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringActionGroup.java 2007-04-18 17:10:10 UTC (rev 2331)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringActionGroup.java 2007-04-18 19:14:40 UTC (rev 2332)
@@ -1,91 +1,76 @@
-/***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/cpl-v10.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2006 Lukas Felber <lf...@hs...>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the CPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the CPL, the GPL or the LGPL.
- ***** END LICENSE BLOCK *****/
-
-package org.rubypeople.rdt.refactoring.action;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.ui.actions.ActionGroup;
-import org.rubypeople.rdt.refactoring.core.TextSelectionProvider;
-import org.rubypeople.rdt.refactoring.core.convertlocaltofield.ConvertLocalToFieldRefactoring;
-import org.rubypeople.rdt.refactoring.core.encapsulatefield.EncapsulateFieldRefactoring;
-import org.rubypeople.rdt.refactoring.core.extractmethod.ExtractMethodRefactoring;
-import org.rubypeople.rdt.refactoring.core.generateaccessors.GenerateAccessorsRefactoring;
-import org.rubypeople.rdt.refactoring.core.generateconstructor.GenerateConstructorRefactoring;
-import org.rubypeople.rdt.refactoring.core.inlineclass.InlineClassRefactoring;
-import org.rubypeople.rdt.refactoring.core.inlinelocal.InlineLocalRefactoring;
-import org.rubypeople.rdt.refactoring.core.inlinemethod.InlineMethodRefactoring;
-import org.rubypeople.rdt.refactoring.core.mergeclasspartsinfile.MergeClassPartsInFileRefactoring;
-import org.rubypeople.rdt.refactoring.core.mergewithexternalclassparts.MergeWithExternalClassPartsRefactoring;
-import org.rubypeople.rdt.refactoring.core.movefield.MoveFieldRefactoring;
-import org.rubypeople.rdt.refactoring.core.movemethod.MoveMethodRefactoring;
-import org.rubypeople.rdt.refactoring.core.overridemethod.OverrideMethodRefactoring;
-import org.rubypeople.rdt.refactoring.core.pushdown.PushDownRefactoring;
-import org.rubypeople.rdt.refactoring.core.rename.RenameRefactoring;
-import org.rubypeople.rdt.refactoring.core.splitlocal.SplitTempRefactoring;
-import org.rubypeople.rdt.ui.actions.RubyActionGroup;
-
-public class RefactoringActionGroup extends ActionGroup {
-
- private static final String INSERT_AFTER_GROUP_NAME = "group.edit"; //$NON-NLS-1$
-
- public void fillContextMenu(IMenuManager menu) {
- TextSelectionProvider selectionProvider = new TextSelectionProvider(null);
- menu.insertAfter(INSERT_AFTER_GROUP_NAME, new Separator());
- menu.insertAfter(INSERT_AFTER_GROUP_NAME, getSourceMenu(menu, selectionProvider));
- menu.insertAfter(INSERT_AFTER_GROUP_NAME, getRefactorMenu(selectionProvider));
- menu.insertAfter(INSERT_AFTER_GROUP_NAME, new Separator());
- }
-
- private IMenuManager getRefactorMenu(TextSelectionProvider selectionProvider) {
- IMenuManager submenu = new MenuManager(Messages.RefactoringActionGroup);
- submenu.add(new RefactoringAction(ConvertLocalToFieldRefactoring.class, ConvertLocalToFieldRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(EncapsulateFieldRefactoring.class, EncapsulateFieldRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(ExtractMethodRefactoring.class, ExtractMethodRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(InlineClassRefactoring.class, InlineClassRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(InlineLocalRefactoring.class, InlineLocalRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(InlineMethodRefactoring.class, InlineMethodRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(MergeClassPartsInFileRefactoring.class, MergeClassPartsInFileRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(MergeWithExternalClassPartsRefactoring.class, MergeWithExternalClassPartsRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(MoveFieldRefactoring.class, MoveFieldRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(MoveMethodRefactoring.class, MoveMethodRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(PushDownRefactoring.class, PushDownRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(RenameRefactoring.class, RenameRefactoring.NAME, selectionProvider));
- submenu.add(new RefactoringAction(SplitTempRefactoring.class, SplitTempRefactoring.NAME, selectionProvider));
- return submenu;
- }
-
- private IMenuManager getSourceMenu(IMenuManager menu, TextSelectionProvider selectionProvider) {
- IMenuManager submenu = RubyActionGroup.getRubySourceMenu(menu) ;
- submenu.insertAfter(RubyActionGroup.RUBY_SOURCE_SEPARATOR, new RefactoringAction(GenerateAccessorsRefactoring.class, GenerateAccessorsRefactoring.NAME, selectionProvider));
- submenu.insertAfter(RubyActionGroup.RUBY_SOURCE_SEPARATOR, new RefactoringAction(GenerateConstructorRefactoring.class, GenerateConstructorRefactoring.NAME, selectionProvider));
- submenu.insertAfter(RubyActionGroup.RUBY_SOURCE_SEPARATOR, new RefactoringAction(OverrideMethodRefactoring.class, OverrideMethodRefactoring.NAME, selectionProvider));
- return submenu;
- }
-}
+/**
+ * Copyright (c) 2007 Aptana, Inc.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl -v10.html. If redistributing this code,
+ * this entire header must remain intact.
+ */
+package org.rubypeople.rdt.refactoring.action;
+
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.ui.actions.ActionGroup;
+import org.rubypeople.rdt.refactoring.core.TextSelectionProvider;
+import org.rubypeople.rdt.refactoring.core.convertlocaltofield.ConvertLocalToFieldRefactoring;
+import org.rubypeople.rdt.refactoring.core.encapsulatefield.EncapsulateFieldRefactoring;
+import org.rubypeople.rdt.refactoring.core.extractconstant.ExtractConstantRefactoring;
+import org.rubypeople.rdt.refactoring.core.extractmethod.ExtractMethodRefactoring;
+import org.rubypeople.rdt.refactoring.core.generateaccessors.GenerateAccessorsRefactoring;
+import org.rubypeople.rdt.refactoring.core.generateconstructor.GenerateConstructorRefactoring;
+import org.rubypeople.rdt.refactoring.core.inlineclass.InlineClassRefactoring;
+import org.rubypeople.rdt.refactoring.core.inlinelocal.InlineLocalRefactoring;
+import org.rubypeople.rdt.refactoring.core.inlinemethod.InlineMethodRefactoring;
+import org.rubypeople.rdt.refactoring.core.mergeclasspartsinfile.MergeClassPartsInFileRefactoring;
+import org.rubypeople.rdt.refactoring.core.mergewithexternalclassparts.MergeWithExternalClassPartsRefactoring;
+import org.rubypeople.rdt.refactoring.core.movefield.MoveFieldRefactoring;
+import org.rubypeople.rdt.refactoring.core.movemethod.MoveMethodRefactoring;
+import org.rubypeople.rdt.refactoring.core.overridemethod.OverrideMethodRefactoring;
+import org.rubypeople.rdt.refactoring.core.pullup.PullUpRefactoring;
+import org.rubypeople.rdt.refactoring.core.pushdown.PushDownRefactoring;
+import org.rubypeople.rdt.refactoring.core.rename.RenameRefactoring;
+import org.rubypeople.rdt.refactoring.core.splitlocal.SplitTempRefactoring;
+import org.rubypeople.rdt.ui.actions.RubyActionGroup;
+
+public class RefactoringActionGroup extends ActionGroup {
+
+ private static final String INSERT_AFTER_GROUP_NAME = "group.edit"; //$NON-NLS-1$
+
+ public void fillContextMenu(IMenuManager menu) {
+ TextSelectionProvider selectionProvider = new TextSelectionProvider(null);
+ menu.insertAfter(INSERT_AFTER_GROUP_NAME, new Separator());
+ menu.insertAfter(INSERT_AFTER_GROUP_NAME, getSourceMenu(menu, selectionProvider));
+ menu.insertAfter(INSERT_AFTER_GROUP_NAME, getRefactorMenu(selectionProvider));
+ menu.insertAfter(INSERT_AFTER_GROUP_NAME, new Separator());
+ }
+
+ private IMenuManager getRefactorMenu(TextSelectionProvider selectionProvider) {
+ IMenuManager submenu = new MenuManager(Messages.RefactoringActionGroup);
+ submenu.add(new RefactoringAction(ConvertLocalToFieldRefactoring.class, ConvertLocalToFieldRefactoring.NAME, selectionProvider));
+ submenu.add(new RefactoringAction(EncapsulateFieldRefactoring.class, EncapsulateFieldRefactoring.NAME, selectionProvider));
+ submenu.add(new RefactoringAction(ExtractMethodRefactoring.class, ExtractMethodRefactoring.NAME, selectionProvider));
+ submenu.add(new RefactoringAction(ExtractConstantRefactoring.class, ExtractConstantRefactoring.NAME, selectionProvider));
+ submenu.add(new RefactoringAction(InlineClassRefactoring.class, InlineClassRefactoring.NAME, selectionProvider));
+ submenu.add(new RefactoringAction(InlineLocalRefactoring.class, InlineLocalRefactoring.NAME, selectionProvider));
+ submenu.add(new RefactoringAction(InlineMethodRefactoring.class, InlineMethodRefactoring.NAME, selec...
[truncated message content] |
