From 62a321e2e8b268aa819c2cd0d5c8d58ab5ac7e6e Mon Sep 17 00:00:00 2001 From: axelcl Date: Thu, 12 May 2005 06:02:14 +0000 Subject: [PATCH] Avoid message in 31M6: !MESSAGE The command ("net.sourceforge.phpeclipse.ui.edit.text.java.show.javadoc") is undefined --- .../java/hover/AbstractJavaEditorTextHover.java | 4 ++-- .../BasicJavaEditorActionContributor.java | 20 ++++++++++---------- .../phpeclipse/phpeditor/PHPEditor.java | 13 +++++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java index 1103c43..596b530 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java @@ -47,8 +47,8 @@ public abstract class AbstractJavaEditorTextHover implements IJavaEditorTextHove private ICommand fCommand; { ICommandManager commandManager= PlatformUI.getWorkbench().getCommandSupport().getCommandManager(); - fCommand= commandManager.getCommand(PHPEditorActionDefinitionIds.SHOW_JAVADOC); - if (!fCommand.isDefined()) +// fCommand= commandManager.getCommand(PHPEditorActionDefinitionIds.SHOW_JAVADOC); +// if (!fCommand.isDefined()) fCommand= null; } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/BasicJavaEditorActionContributor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/BasicJavaEditorActionContributor.java index c179005..5e432d3 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/BasicJavaEditorActionContributor.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/BasicJavaEditorActionContributor.java @@ -49,8 +49,8 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr // private RetargetTextEditorAction fOpenStructure; // private RetargetTextEditorAction fOpenHierarchy; - private RetargetAction fRetargetShowJavaDoc; - private RetargetTextEditorAction fShowJavaDoc; +// private RetargetAction fRetargetShowJavaDoc; +// private RetargetTextEditorAction fShowJavaDoc; // private RetargetTextEditorAction fStructureSelectEnclosingAction; // private RetargetTextEditorAction fStructureSelectNextAction; @@ -67,9 +67,9 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr ResourceBundle b= PHPEditorMessages.getResourceBundle(); - fRetargetShowJavaDoc= new RetargetAction(PHPdtActionConstants.SHOW_JAVA_DOC, PHPEditorMessages.getString("ShowJavaDoc.label")); //$NON-NLS-1$ - fRetargetShowJavaDoc.setActionDefinitionId(net.sourceforge.phpdt.ui.actions.PHPEditorActionDefinitionIds.SHOW_JAVADOC); - markAsPartListener(fRetargetShowJavaDoc); +// fRetargetShowJavaDoc= new RetargetAction(PHPdtActionConstants.SHOW_JAVA_DOC, PHPEditorMessages.getString("ShowJavaDoc.label")); //$NON-NLS-1$ +// fRetargetShowJavaDoc.setActionDefinitionId(net.sourceforge.phpdt.ui.actions.PHPEditorActionDefinitionIds.SHOW_JAVADOC); +// markAsPartListener(fRetargetShowJavaDoc); // actions that are "contributed" to editors, they are considered belonging to the active editor fTogglePresentation= new TogglePresentationAction(); @@ -81,8 +81,8 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr fGotoMatchingBracket= new RetargetTextEditorAction(b, "GotoMatchingBracket."); //$NON-NLS-1$ fGotoMatchingBracket.setActionDefinitionId(PHPEditorActionDefinitionIds.GOTO_MATCHING_BRACKET); - fShowJavaDoc= new RetargetTextEditorAction(b, "ShowJavaDoc."); //$NON-NLS-1$ - fShowJavaDoc.setActionDefinitionId(net.sourceforge.phpdt.ui.actions.PHPEditorActionDefinitionIds.SHOW_JAVADOC); +// fShowJavaDoc= new RetargetTextEditorAction(b, "ShowJavaDoc."); //$NON-NLS-1$ +// fShowJavaDoc.setActionDefinitionId(net.sourceforge.phpdt.ui.actions.PHPEditorActionDefinitionIds.SHOW_JAVADOC); // fShowOutline= new RetargetTextEditorAction(PHPEditorMessages.getResourceBundle(), "ShowOutline."); //$NON-NLS-1$ // fShowOutline.setActionDefinitionId(PHPEditorActionDefinitionIds.SHOW_OUTLINE); @@ -132,7 +132,7 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr // bars.setGlobalActionHandler(ITextEditorActionConstants.PREVIOUS, fPreviousAnnotation); bars.setGlobalActionHandler(ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY, fTogglePresentation); - bars.setGlobalActionHandler(PHPdtActionConstants.SHOW_JAVA_DOC, fShowJavaDoc); +// bars.setGlobalActionHandler(PHPdtActionConstants.SHOW_JAVA_DOC, fShowJavaDoc); } /* @@ -156,7 +156,7 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr // structureSelection.add(fStructureSelectHistoryAction); // editMenu.appendToGroup(IContextMenuConstants.GROUP_OPEN, structureSelection); - editMenu.appendToGroup(IContextMenuConstants.GROUP_GENERATE, fRetargetShowJavaDoc); +// editMenu.appendToGroup(IContextMenuConstants.GROUP_GENERATE, fRetargetShowJavaDoc); } // IMenuManager navigateMenu= menu.findMenuUsingPath(IWorkbenchActionConstants.M_NAVIGATE); @@ -195,7 +195,7 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr // fNextAnnotation.setEditor(textEditor); fGotoMatchingBracket.setAction(getAction(textEditor, GotoMatchingBracketAction.GOTO_MATCHING_BRACKET)); - fShowJavaDoc.setAction(getAction(textEditor, "ShowJavaDoc")); //$NON-NLS-1$ +// fShowJavaDoc.setAction(getAction(textEditor, "ShowJavaDoc")); //$NON-NLS-1$ // fShowOutline.setAction(getAction(textEditor, IJavaEditorActionDefinitionIds.SHOW_OUTLINE)); // fOpenHierarchy.setAction(getAction(textEditor, IJavaEditorActionDefinitionIds.OPEN_HIERARCHY)); // fOpenStructure.setAction(getAction(textEditor, IJavaEditorActionDefinitionIds.OPEN_STRUCTURE)); diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java index 1b2011c..32d4442 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java @@ -3185,12 +3185,13 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements I fFoldingGroup = new FoldingActionGroup(this, getViewer()); - ResourceAction resAction = new TextOperationAction(PHPEditorMessages.getResourceBundle(), - "ShowJavaDoc.", this, ISourceViewer.INFORMATION, true); //$NON-NLS-1$ - resAction = new InformationDispatchAction(PHPEditorMessages.getResourceBundle(), - "ShowJavaDoc.", (TextOperationAction) resAction); //$NON-NLS-1$ - resAction.setActionDefinitionId(net.sourceforge.phpdt.ui.actions.PHPEditorActionDefinitionIds.SHOW_JAVADOC); - setAction("ShowJavaDoc", resAction); //$NON-NLS-1$ +// ResourceAction resAction = new TextOperationAction(PHPEditorMessages.getResourceBundle(), +// "ShowJavaDoc.", this, ISourceViewer.INFORMATION, true); //$NON-NLS-1$ +// resAction = new InformationDispatchAction(PHPEditorMessages.getResourceBundle(), +// "ShowJavaDoc.", (TextOperationAction) resAction); //$NON-NLS-1$ +// resAction.setActionDefinitionId(net.sourceforge.phpdt.ui.actions.PHPEditorActionDefinitionIds.SHOW_JAVADOC); +// setAction("ShowJavaDoc", resAction); //$NON-NLS-1$ + // WorkbenchHelp.setHelp(resAction, // IJavaHelpContextIds.SHOW_JAVADOC_ACTION); -- 1.7.1