Delete association of htmledit.gif for the PHPUnitEditor

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / BasicJavaEditorActionContributor.java

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 a6504c8..c179005 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/BasicJavaEditorActionContributor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/BasicJavaEditorActionContributor.java
@@ -15,6 +15,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ResourceBundle;
 
+import net.sourceforge.phpdt.internal.ui.actions.FoldingActionGroup;
 import net.sourceforge.phpdt.ui.IContextMenuConstants;
 import net.sourceforge.phpdt.ui.actions.GotoMatchingBracketAction;
 import net.sourceforge.phpdt.ui.actions.PHPdtActionConstants;
@@ -56,8 +57,8 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr
 //     private RetargetTextEditorAction fStructureSelectPreviousAction;
 //     private RetargetTextEditorAction fStructureSelectHistoryAction; 
 
-//     private RetargetTextEditorAction fGotoNextMemberAction; 
-//     private RetargetTextEditorAction fGotoPreviousMemberAction;
+       private RetargetTextEditorAction fGotoNextMemberAction; 
+       private RetargetTextEditorAction fGotoPreviousMemberAction;
 //
 //     private RetargetTextEditorAction fRemoveOccurrenceAnnotationsAction;    
        
@@ -67,7 +68,7 @@ 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(PHPEditorActionDefinitionIds.SHOW_JAVADOC);
+               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
@@ -81,7 +82,7 @@ public class BasicJavaEditorActionContributor extends BasicTextEditorActionContr
                fGotoMatchingBracket.setActionDefinitionId(PHPEditorActionDefinitionIds.GOTO_MATCHING_BRACKET);
                
                fShowJavaDoc= new RetargetTextEditorAction(b, "ShowJavaDoc."); //$NON-NLS-1$
-               fShowJavaDoc.setActionDefinitionId(PHPEditorActionDefinitionIds.SHOW_JAVADOC);
+               fShowJavaDoc.setActionDefinitionId(net.sourceforge.phpdt.ui.actions.PHPEditorActionDefinitionIds.SHOW_JAVADOC);
                
 //             fShowOutline= new RetargetTextEditorAction(PHPEditorMessages.getResourceBundle(), "ShowOutline."); //$NON-NLS-1$
 //             fShowOutline.setActionDefinitionId(PHPEditorActionDefinitionIds.SHOW_OUTLINE);
@@ -101,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);
@@ -167,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$
                }
        }
@@ -208,10 +209,12 @@ 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());
+                       FoldingActionGroup foldingActions= javaEditor.getFoldingActionGroup();
+                       if (foldingActions != null)
+                               foldingActions.updateActionBars();
                }
        }