X-Git-Url: http://git.phpeclipse.com

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 d79c30d..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,16 +49,16 @@ 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;
 //	private RetargetTextEditorAction fStructureSelectPreviousAction;
 //	private RetargetTextEditorAction fStructureSelectHistoryAction;	
 
-//	private RetargetTextEditorAction fGotoNextMemberAction;	
-//	private RetargetTextEditorAction fGotoPreviousMemberAction;
+	private RetargetTextEditorAction fGotoNextMemberAction;	
+	private RetargetTextEditorAction fGotoPreviousMemberAction;
 //
 //	private RetargetTextEditorAction fRemoveOccurrenceAnnotationsAction;	
 	
@@ -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);
@@ -102,10 +102,10 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr
 //		fStructureSelectHistoryAction= new RetargetTextEditorAction(b, "StructureSelectHistory."); //$NON-NLS-1$
 //		fStructureSelectHistoryAction.setActionDefinitionId(PHPEditorActionDefinitionIds.SELECT_LAST);
 //		
-//		fGotoNextMemberAction= new RetargetTextEditorAction(b, "GotoNextMember."); //$NON-NLS-1$
-//		fGotoNextMemberAction.setActionDefinitionId(PHPEditorActionDefinitionIds.GOTO_NEXT_MEMBER);
-//		fGotoPreviousMemberAction= new RetargetTextEditorAction(b, "GotoPreviousMember."); //$NON-NLS-1$
-//		fGotoPreviousMemberAction.setActionDefinitionId(PHPEditorActionDefinitionIds.GOTO_PREVIOUS_MEMBER);		
+		fGotoNextMemberAction= new RetargetTextEditorAction(b, "GotoNextMember."); //$NON-NLS-1$
+		fGotoNextMemberAction.setActionDefinitionId(PHPEditorActionDefinitionIds.GOTO_NEXT_MEMBER);
+		fGotoPreviousMemberAction= new RetargetTextEditorAction(b, "GotoPreviousMember."); //$NON-NLS-1$
+		fGotoPreviousMemberAction.setActionDefinitionId(PHPEditorActionDefinitionIds.GOTO_PREVIOUS_MEMBER);		
 //
 //		fRemoveOccurrenceAnnotationsAction= new RetargetTextEditorAction(b, "RemoveOccurrenceAnnotations."); //$NON-NLS-1$
 //		fRemoveOccurrenceAnnotationsAction.setActionDefinitionId(PHPEditorActionDefinitionIds.REMOVE_OCCURRENCE_ANNOTATIONS);
@@ -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);
@@ -168,8 +168,8 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr
 		IMenuManager gotoMenu= menu.findMenuUsingPath("navigate/goTo"); //$NON-NLS-1$
 		if (gotoMenu != null) {
 			gotoMenu.add(new Separator("additions2"));  //$NON-NLS-1$
-//			gotoMenu.appendToGroup("additions2", fGotoPreviousMemberAction); //$NON-NLS-1$
-//			gotoMenu.appendToGroup("additions2", fGotoNextMemberAction); //$NON-NLS-1$
+			gotoMenu.appendToGroup("additions2", fGotoPreviousMemberAction); //$NON-NLS-1$
+			gotoMenu.appendToGroup("additions2", fGotoNextMemberAction); //$NON-NLS-1$
 			gotoMenu.appendToGroup("additions2", fGotoMatchingBracket); //$NON-NLS-1$
 		}
 	}
@@ -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));
@@ -209,7 +209,6 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr
 //		fGotoPreviousMemberAction.setAction(getAction(textEditor, GoToNextPreviousMemberAction.PREVIOUS_MEMBER));
 		
 //		fRemoveOccurrenceAnnotationsAction.setAction(getAction(textEditor, "RemoveOccurrenceAnnotations")); //$NON-NLS-1$
-		
 		if (part instanceof PHPEditor) {
 		    PHPEditor javaEditor= (PHPEditor) part;
 			javaEditor.getActionGroup().fillActionBars(getActionBars());