Remove old rename key action and replace it with refactoring functionality
diff --git a/org.eclipse.babel.editor/src/org/eclipse/babel/editor/tree/actions/RefactorKeyAction.java b/org.eclipse.babel.editor/src/org/eclipse/babel/editor/tree/actions/RefactorKeyAction.java index 062ef06..6d40292 100644 --- a/org.eclipse.babel.editor/src/org/eclipse/babel/editor/tree/actions/RefactorKeyAction.java +++ b/org.eclipse.babel.editor/src/org/eclipse/babel/editor/tree/actions/RefactorKeyAction.java
@@ -35,7 +35,7 @@ public RefactorKeyAction(AbstractMessagesEditor editor, TreeViewer treeViewer) { super(editor, treeViewer); - setText(MessagesEditorPlugin.getString("key.refactor") + " ..."); //$NON-NLS-1$ + setText(MessagesEditorPlugin.getString("key.rename") + " ..."); //$NON-NLS-1$ setImageDescriptor(UIUtils .getImageDescriptor(UIUtils.IMAGE_REFACTORING)); setToolTipText("Refactor the name of the key");
diff --git a/org.eclipse.babel.editor/src/org/eclipse/babel/editor/tree/internal/KeyTreeContributor.java b/org.eclipse.babel.editor/src/org/eclipse/babel/editor/tree/internal/KeyTreeContributor.java index 162b47f..c45a543 100644 --- a/org.eclipse.babel.editor/src/org/eclipse/babel/editor/tree/internal/KeyTreeContributor.java +++ b/org.eclipse.babel.editor/src/org/eclipse/babel/editor/tree/internal/KeyTreeContributor.java
@@ -52,7 +52,7 @@ /** * @author Pascal Essiembre - * + * */ public class KeyTreeContributor implements IKeyTreeContributor { @@ -61,7 +61,7 @@ private TreeType treeType; /** - * + * */ public KeyTreeContributor(final AbstractMessagesEditor editor) { super(); @@ -71,7 +71,7 @@ } /** - * + * */ public void contribute(final TreeViewer treeViewer) { @@ -116,7 +116,7 @@ /* * (non-Javadoc) - * + * * @see * org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers * .Viewer, java.lang.Object, java.lang.Object) @@ -167,7 +167,7 @@ /** * Contributes markers. - * + * * @param treeViewer * tree viewer */ @@ -221,7 +221,7 @@ /** * Contributes double-click support, expanding/collapsing nodes. - * + * * @param treeViewer * tree viewer */ @@ -244,7 +244,7 @@ /** * Contributes key synchronization between editor and tree selected keys. - * + * * @param treeViewer * tree viewer */ @@ -292,7 +292,7 @@ /** * Contributes key synchronization between editor and tree selected keys. - * + * * @param treeViewer * tree viewer */ @@ -338,7 +338,7 @@ /** * Contributes actions to the tree. - * + * * @param treeViewer * tree viewer */ @@ -355,21 +355,6 @@ // Delete final IAction deleteAction = new DeleteKeyAction(editor, treeViewer); menuManager.add(deleteAction); - // Rename - // final IAction renameAction = new RenameKeyAction(editor, treeViewer); - AbstractRenameKeyAction renameKeyAction = null; - try { - Class<?> clazz = Class - .forName(AbstractRenameKeyAction.INSTANCE_CLASS); - Constructor<?> cons = clazz.getConstructor( - AbstractMessagesEditor.class, TreeViewer.class); - renameKeyAction = (AbstractRenameKeyAction) cons.newInstance( - editor, treeViewer); - } catch (Exception e) { - e.printStackTrace(); - } - final IAction renameAction = renameKeyAction; - menuManager.add(renameAction); // Refactor final IAction refactorAction = new RefactorKeyAction(editor, treeViewer); @@ -383,8 +368,6 @@ public void keyReleased(KeyEvent event) { if (event.character == SWT.DEL) { deleteAction.run(); - } else if (event.keyCode == SWT.F2) { - renameAction.run(); } } });