[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2103] trunk/org.rubypeople.rdt.ui

[<caw...@us...>]

Revision: 2103
          http://svn.sourceforge.net/rubyeclipse/?rev=2103&view=rev
Author:   cawilliams
Date:     2007-03-07 08:40:53 -0800 (Wed, 07 Mar 2007)

Log Message:
-----------
try to fix format action...

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/plugin.properties
    trunk/org.rubypeople.rdt.ui/plugin.xml
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyEditorActionContributor.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/RubyActionIds.java

Modified: trunk/org.rubypeople.rdt.ui/plugin.properties
===================================================================
--- trunk/org.rubypeople.rdt.ui/plugin.properties	2007-03-07 13:36:17 UTC (rev 2102)
+++ trunk/org.rubypeople.rdt.ui/plugin.properties	2007-03-07 16:40:53 UTC (rev 2103)
@@ -85,6 +85,7 @@
 UncommentAction.label=&Uncomment@Ctrl+\\
 CommentAction.label=&Comment@Ctrl+/
 ToggleCommentAction.label=&Toggle Comment@Ctrl+Shift+C
+FormatAction.label=Format@Ctrl+Shift+f
 
 category.source.name=Ruby Source
 category.source.description=Ruby Source Actions
@@ -113,8 +114,8 @@
 ActionDefinition.gotoMatchingBracket.name= Go to Matching Bracket
 ActionDefinition.gotoMatchingBracket.description= Moves the cursor to the matching bracket
 
-ActionDefinition.gotoMatchingBracket.name=  Surround with begin/rescue Block
-ActionDefinition.gotoMatchingBracket.description= Surround the selected text with a begin/rescue block
+ActionDefinition.surroundWith.beginRescue.name=  Surround with begin/rescue Block
+ActionDefinition.surroundWith.beginRescue.description= Surround the selected text with a begin/rescue block
 
 #--- commands not assigned to a menu
 ActionDefinition.foldingCollapseMembers.name= Collapse Members

Modified: trunk/org.rubypeople.rdt.ui/plugin.xml
===================================================================
--- trunk/org.rubypeople.rdt.ui/plugin.xml	2007-03-07 13:36:17 UTC (rev 2102)
+++ trunk/org.rubypeople.rdt.ui/plugin.xml	2007-03-07 16:40:53 UTC (rev 2103)
@@ -389,7 +389,7 @@
             symbolicFontName="org.rubypeople.rdt.ui.editors.textfont"
             id="org.rubypeople.rdt.ui.ExternalRubyEditor">
       </editor>
-   </extension>
+   </extension> 
    
    <extension
          point="org.eclipse.ui.contexts">
@@ -620,6 +620,13 @@
             id="org.rubypeople.rdt.ui.actions.ToggleComment">
          </action>
          <action
+            definitionId="org.rubypeople.rdt.ui.edit.text.ruby.format"
+            label="%FormatAction.label"
+            retarget="true"
+            menubarPath="org.rubypeople.rdt.ui.ruby.menu/editGroup"
+            id="org.rubypeople.rdt.ui.actions.Format">
+         </action>
+         <action
                definitionId="org.rubypeople.rdt.ui.edit.text.ruby.surround.with.begin.rescue"
                label="%SurroundWithBeginRescueAction.label"
                retarget="true"

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyEditorActionContributor.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyEditorActionContributor.java	2007-03-07 13:36:17 UTC (rev 2102)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyEditorActionContributor.java	2007-03-07 16:40:53 UTC (rev 2103)
@@ -72,6 +72,8 @@
         actionBars.setGlobalActionHandler(RubyActionIds.COMMENT, getAction(textEditor, "Comment"));
         actionBars.setGlobalActionHandler(RubyActionIds.UNCOMMENT, getAction(textEditor,
                 "Uncomment"));
+        actionBars.setGlobalActionHandler(RubyActionIds.TOGGLE_COMMENT, getAction(textEditor, "ToggleComment")); //$NON-NLS-1$
+        actionBars.setGlobalActionHandler(RubyActionIds.FORMAT, getAction(textEditor, "Format")); //$NON-NLS-1$
 
         /** The global actions to be connected with editor actions */
         IAction action = getAction(textEditor, ITextEditorActionConstants.NEXT);

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/RubyActionIds.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/RubyActionIds.java	2007-03-07 13:36:17 UTC (rev 2102)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/RubyActionIds.java	2007-03-07 16:40:53 UTC (rev 2103)
@@ -11,4 +11,7 @@
 	 * (value <code>"org.rubypeople.rdt.ui.actions.Uncomment"</code>).
 	 */
 	public static final String UNCOMMENT = "org.rubypeople.rdt.ui.actions.Uncomment";
+	
+	public static final String TOGGLE_COMMENT = "org.rubypeople.rdt.ui.actions.ToggleComment";
+	public static final String FORMAT = "org.rubypeople.rdt.ui.actions.Format";
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.