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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java
index 0607a3e..e5f593a 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v0.5
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v05.html
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  ******************************************************************************/
@@ -14,15 +14,14 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import net.sourceforge.phpdt.internal.ui.actions.ActionMessages;
 import net.sourceforge.phpdt.internal.ui.actions.AddTaskAction;
 import net.sourceforge.phpdt.ui.IContextMenuConstants;
 import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
 
-import org.eclipse.debug.internal.ui.actions.ActionMessages;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.util.Assert;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -30,33 +29,37 @@ import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchSite;
 import org.eclipse.ui.actions.ActionGroup;
 import org.eclipse.ui.actions.AddBookmarkAction;
+import org.eclipse.ui.ide.IDEActionFactory;
 import org.eclipse.ui.part.Page;
-import org.eclipse.ui.texteditor.ConvertLineDelimitersAction;
-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
 import org.eclipse.ui.texteditor.IUpdate;
 
 /**
  * Action group that adds the source and generate actions to a part's context
  * menu and installs handlers for the corresponding global menu actions.
- * 
+ *
  * <p>
  * This class may be instantiated; it is not intended to be subclassed.
  * </p>
- * 
+ *
  * @since 2.0
  */
 public class GenerateActionGroup extends ActionGroup {
-	
+  /**
+	 * Pop-up menu: id of the source sub menu (value <code>net.sourceforge.phpdt.ui.source.menu</code>).
+	 *
+	 * @since 3.0
+	 */
+	public static final String MENU_ID= "net.sourceforge.pheclipse.ui.source.menu"; //$NON-NLS-1$
+
   private PHPEditor fEditor;
-	private boolean fEditorIsOwner;
+//	private boolean fEditorIsOwner;
 	private IWorkbenchSite fSite;
 	private String fGroupName= IContextMenuConstants.GROUP_SOURCE;
 	private List fRegisteredSelectionListeners;
-	
+
 //	private AddImportOnSelectionAction fAddImport;
 //	private OverrideMethodsAction fOverrideMethods;
 //	private AddGetterSetterAction fAddGetterSetter;
@@ -67,21 +70,17 @@ public class GenerateActionGroup extends ActionGroup {
 //	private ExternalizeStringsAction fExternalizeStrings;
 //	private FindStringsToExternalizeAction fFindStringsToExternalize;
 //	private SurroundWithTryCatchAction fSurroundWithTryCatch;
-	
+
 	// private OrganizeImportsAction fOrganizeImports;
 
-	private ConvertLineDelimitersAction fConvertToWindows;
-	private ConvertLineDelimitersAction fConvertToUNIX;
-	private ConvertLineDelimitersAction fConvertToMac;
-	
 	/**
 	 * Note: This constructor is for internal use only. Clients should not call this constructor.
 	 */
 	public GenerateActionGroup(PHPEditor editor, String groupName) {
 		fSite= editor.getSite();
-    fEditor= editor;
-		fEditorIsOwner= true;
+		fEditor= editor;
 		fGroupName= groupName;
+
 		ISelectionProvider provider= fSite.getSelectionProvider();
 		ISelection selection= provider.getSelection();
 
@@ -89,7 +88,7 @@ public class GenerateActionGroup extends ActionGroup {
 //		fAddImport.setActionDefinitionId(IJavaEditorActionDefinitionIds.ADD_IMPORT);
 //		fAddImport.update();
 //		editor.setAction("AddImport", fAddImport); //$NON-NLS-1$
-		
+
 //		fOrganizeImports= new OrganizeImportsAction(editor);
 //		fOrganizeImports.setActionDefinitionId(IJavaEditorActionDefinitionIds.ORGANIZE_IMPORTS);
 //		fOrganizeImports.editorStateChanged();
@@ -99,49 +98,38 @@ public class GenerateActionGroup extends ActionGroup {
 //		fOverrideMethods.setActionDefinitionId(IJavaEditorActionDefinitionIds.OVERRIDE_METHODS);
 //		fOverrideMethods.editorStateChanged();
 //		editor.setAction("OverrideMethods", fOverrideMethods); //$NON-NLS-1$
-		
+
 //		fAddGetterSetter= new AddGetterSetterAction(editor);
 //		fAddGetterSetter.setActionDefinitionId(IJavaEditorActionDefinitionIds.CREATE_GETTER_SETTER);
 //		fAddGetterSetter.editorStateChanged();
 //		editor.setAction("AddGetterSetter", fAddGetterSetter); //$NON-NLS-1$
-		
+
 //		fAddUnimplementedConstructors= new AddUnimplementedConstructorsAction(editor);
 //		fAddUnimplementedConstructors.setActionDefinitionId(IJavaEditorActionDefinitionIds.ADD_UNIMPLEMENTED_CONTRUCTORS);
 //		fAddUnimplementedConstructors.editorStateChanged();
-//		editor.setAction("AddUnimplementedConstructors", fAddUnimplementedConstructors); //$NON-NLS-1$		
-		
+//		editor.setAction("AddUnimplementedConstructors", fAddUnimplementedConstructors); //$NON-NLS-1$
+
 //		fAddJavaDocStub= new AddJavaDocStubAction(editor);
 //		fAddJavaDocStub.editorStateChanged();
-//		
+//
 //		fSurroundWithTryCatch= new SurroundWithTryCatchAction(editor);
 //		fSurroundWithTryCatch.setActionDefinitionId(IJavaEditorActionDefinitionIds.SURROUND_WITH_TRY_CATCH);
 //		fSurroundWithTryCatch.update(selection);
 //		provider.addSelectionChangedListener(fSurroundWithTryCatch);
-//		editor.setAction("SurroundWithTryCatch", fSurroundWithTryCatch); //$NON-NLS-1$		
-//		
+//		editor.setAction("SurroundWithTryCatch", fSurroundWithTryCatch); //$NON-NLS-1$
+//
 //		fExternalizeStrings= new ExternalizeStringsAction(editor);
 //		fExternalizeStrings.setActionDefinitionId(IJavaEditorActionDefinitionIds.EXTERNALIZE_STRINGS);
 //		fExternalizeStrings.editorStateChanged();
-//		editor.setAction("ExternalizeStrings", fExternalizeStrings); //$NON-NLS-1$		
-		
-		fConvertToWindows= new ConvertLineDelimitersAction(editor, "\r\n"); //$NON-NLS-1$
-		fConvertToWindows.setActionDefinitionId( ITextEditorActionDefinitionIds .CONVERT_LINE_DELIMITERS_TO_WINDOWS);
-		editor.setAction("ConvertLineDelimitersToWindows", fConvertToWindows); //$NON-NLS-1$		
-		
-		fConvertToUNIX= new ConvertLineDelimitersAction(editor, "\n"); //$NON-NLS-1$
-		fConvertToUNIX.setActionDefinitionId( ITextEditorActionDefinitionIds .CONVERT_LINE_DELIMITERS_TO_UNIX);
-		editor.setAction("ConvertLineDelimitersToUNIX", fConvertToUNIX); //$NON-NLS-1$		
+//		editor.setAction("ExternalizeStrings", fExternalizeStrings); //$NON-NLS-1$
 
-		fConvertToMac= new ConvertLineDelimitersAction(editor, "\r"); //$NON-NLS-1$
-		fConvertToMac.setActionDefinitionId( ITextEditorActionDefinitionIds .CONVERT_LINE_DELIMITERS_TO_MAC);
-		editor.setAction("ConvertLineDelimitersToMac", fConvertToMac); //$NON-NLS-1$		
 	}
-	
+
 	/**
-	 * Creates a new <code>GenerateActionGroup</code>. The group 
-	 * requires that the selection provided by the page's selection provider 
+	 * Creates a new <code>GenerateActionGroup</code>. The group
+	 * requires that the selection provided by the page's selection provider
 	 * is of type <code>org.eclipse.jface.viewers.IStructuredSelection</code>.
-	 * 
+	 *
 	 * @param page the page that owns this action group
 	 */
 	public GenerateActionGroup(Page page) {
@@ -149,21 +137,21 @@ public class GenerateActionGroup extends ActionGroup {
 	}
 
 	/**
-	 * Creates a new <code>GenerateActionGroup</code>. The group 
-	 * requires that the selection provided by the part's selection provider 
+	 * Creates a new <code>GenerateActionGroup</code>. The group
+	 * requires that the selection provided by the part's selection provider
 	 * is of type <code>org.eclipse.jface.viewers.IStructuredSelection</code>.
-	 * 
+	 *
 	 * @param part the view part that owns this action group
 	 */
 	public GenerateActionGroup(IViewPart part) {
 		this(part.getSite());
 	}
-	
+
 	private GenerateActionGroup(IWorkbenchSite site) {
 		fSite= site;
 		ISelectionProvider provider= fSite.getSelectionProvider();
 		ISelection selection= provider.getSelection();
-		
+
 //		fOverrideMethods= new OverrideMethodsAction(site);
 //		fAddGetterSetter= new AddGetterSetterAction(site);
 //		fAddUnimplementedConstructors= new AddUnimplementedConstructorsAction(site);
@@ -173,10 +161,10 @@ public class GenerateActionGroup extends ActionGroup {
 //		fExternalizeStrings= new ExternalizeStringsAction(site);
 //		fFindStringsToExternalize= new FindStringsToExternalizeAction(site);
 //		fOrganizeImports= new OrganizeImportsAction(site);
-//		
+//
 //		fOverrideMethods.update(selection);
 //		fAddGetterSetter.update(selection);
-//		fAddUnimplementedConstructors.update(selection);	
+//		fAddUnimplementedConstructors.update(selection);
 //		fAddJavaDocStub.update(selection);
 //		fExternalizeStrings.update(selection);
 //		fFindStringsToExternalize.update(selection);
@@ -188,7 +176,7 @@ public class GenerateActionGroup extends ActionGroup {
 		} else {
 			fAddBookmark.setEnabled(false);
 		}
-		
+
 //		registerSelectionListener(provider, fOverrideMethods);
 //		registerSelectionListener(provider, fAddGetterSetter);
 //		registerSelectionListener(provider, fAddUnimplementedConstructors);
@@ -199,16 +187,16 @@ public class GenerateActionGroup extends ActionGroup {
 //		registerSelectionListener(provider, fOrganizeImports);
 		registerSelectionListener(provider, fAddTaskAction);
 	}
-	
+
 	private void registerSelectionListener(ISelectionProvider provider, ISelectionChangedListener listener) {
 		if (fRegisteredSelectionListeners == null)
 			fRegisteredSelectionListeners= new ArrayList(12);
 		provider.addSelectionChangedListener(listener);
 		fRegisteredSelectionListeners.add(listener);
 	}
-	
+
 	/*
-	 * The state of the editor owning this action group has changed. 
+	 * The state of the editor owning this action group has changed.
 	 * This method does nothing if the group's owner isn't an
 	 * editor.
 	 */
@@ -216,12 +204,9 @@ public class GenerateActionGroup extends ActionGroup {
 	 * Note: This method is for internal use only. Clients should not call this method.
 	 */
 	public void editorStateChanged() {
-		Assert.isTrue(fEditorIsOwner);
-		
+		Assert.isTrue(isEditorOwner());
+
 		// http://dev.eclipse.org/bugs/show_bug.cgi?id=17709
-		fConvertToMac.update();
-		fConvertToUNIX.update();
-		fConvertToWindows.update();
 	}
 
 	/* (non-Javadoc)
@@ -231,46 +216,83 @@ public class GenerateActionGroup extends ActionGroup {
 		super.fillActionBars(actionBar);
 		setGlobalActionHandlers(actionBar);
 	}
-	
+
+	/* (non-Javadoc)
+	 * Method declared in ActionGroup
+	 */
+//	public void fillContextMenu(IMenuManager menu) {
+//		super.fillContextMenu(menu);
+//		if (fEditorIsOwner) {
+//			IMenuManager subMenu= createEditorSubMenu(menu);
+//			if (subMenu != null)
+//				menu.appendToGroup(fGroupName, subMenu);
+//		} else {
+////			appendToGroup(menu, fOrganizeImports);
+////			appendToGroup(menu, fOverrideMethods);
+////			appendToGroup(menu, fAddGetterSetter);
+////			appendToGroup(menu, fAddUnimplementedConstructors);
+////			appendToGroup(menu, fAddJavaDocStub);
+//			appendToGroup(menu, fAddBookmark);
+//		}
+//	}
 	/* (non-Javadoc)
 	 * Method declared in ActionGroup
 	 */
+//	public void fillContextMenu(IMenuManager menu) {
+//		super.fillContextMenu(menu);
+//		IMenuManager subMenu= null;
+//		if (isEditorOwner()) {
+//			subMenu= fillEditorSubMenu(menu);
+//		} else {
+//	//		subMenu= createViewSubMenu(menu);
+//		}
+//		if (subMenu != null)
+//			menu.appendToGroup(fGroupName, subMenu);
+//	}
 	public void fillContextMenu(IMenuManager menu) {
 		super.fillContextMenu(menu);
-		if (fEditorIsOwner) {
-			IMenuManager subMenu= createEditorSubMenu(menu);
-			if (subMenu != null)
-				menu.appendToGroup(fGroupName, subMenu);
-		} else {
-//			appendToGroup(menu, fOrganizeImports);
-//			appendToGroup(menu, fOverrideMethods);
-//			appendToGroup(menu, fAddGetterSetter);
-//			appendToGroup(menu, fAddUnimplementedConstructors);
-//			appendToGroup(menu, fAddJavaDocStub);
-			appendToGroup(menu, fAddBookmark);
+		String shortCut= null; //$NON-NLS-1$
+//		if (fQuickAccessAction != null) {
+//			shortCut= fQuickAccessAction.getShortCutString(); //$NON-NLS-1$
+//		}
+		IMenuManager subMenu= new MenuManager(
+			ActionMessages.getString("SourceMenu.label") + (shortCut != null ? "\t" + shortCut : ""), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			MENU_ID);
+		int added= 0;
+		if (isEditorOwner()) {
+			added= fillEditorSubMenu(subMenu);
 		}
+//		else {
+//			added= fillViewSubMenu(subMenu);
+//		}
+		if (added > 0)
+			menu.appendToGroup(fGroupName, subMenu);
 	}
-	
-  private IMenuManager createEditorSubMenu(IMenuManager mainMenu) {
-    IMenuManager result= new MenuManager(ActionMessages.getString("SourceMenu.label")); //$NON-NLS-1$
+  private int fillEditorSubMenu(IMenuManager source) {
+//    IMenuManager result= new MenuManager(ActionMessages.getString("SourceMenu.label")); //$NON-NLS-1$
     int added= 0;
-    added+= addEditorAction(result, "Comment"); //$NON-NLS-1$
-    added+= addEditorAction(result, "Uncomment"); //$NON-NLS-1$
+    added+= addEditorAction(source, "Comment"); //$NON-NLS-1$
+    added+= addEditorAction(source, "Uncomment"); //$NON-NLS-1$
+    added+= addEditorAction(source, "ToggleComment"); //$NON-NLS-1$
+	added+= addEditorAction(source, "AddBlockComment"); //$NON-NLS-1$
+	added+= addEditorAction(source, "RemoveBlockComment"); //$NON-NLS-1$
+	added+= addEditorAction(source, "Format"); //$NON-NLS-1$
+	added+= addEditorAction(source, "Indent"); //$NON-NLS-1$
 //    result.add(new Separator());
 //    added+= addAction(result, fOrganizeImports);
 //    added+= addAction(result, fAddImport);
-    result.add(new Separator());
+//    result.add(new Separator());
 //    added+= addAction(result, fOverrideMethods);
 //    added+= addAction(result, fAddGetterSetter);
 //    added+= addAction(result, fAddUnimplementedConstructors);
 //    added+= addAction(result, fAddJavaDocStub);
-    added+= addAction(result, fAddBookmark);
-//    result.add(new Separator());		
+//    added+= addAction(result, fAddBookmark);
+//    result.add(new Separator());
 //    added+= addAction(result, fSurroundWithTryCatch);
 //    added+= addAction(result, fExternalizeStrings);
-    if (added == 0)
-      result= null;
-    return result;
+//    if (added == 0)
+//      result= null;
+    return added;
   }
 	/* (non-Javadoc)
 	 * Method declared in ActionGroup
@@ -286,7 +308,7 @@ public class GenerateActionGroup extends ActionGroup {
     fEditor= null;
 		super.dispose();
 	}
-	
+
 	private void setGlobalActionHandlers(IActionBars actionBar) {
 //		actionBar.setGlobalActionHandler(JdtActionConstants.ADD_IMPORT, fAddImport);
 //		actionBar.setGlobalActionHandler(JdtActionConstants.SURROUND_WITH_TRY_CATCH, fSurroundWithTryCatch);
@@ -297,23 +319,20 @@ public class GenerateActionGroup extends ActionGroup {
 //		actionBar.setGlobalActionHandler(JdtActionConstants.EXTERNALIZE_STRINGS, fExternalizeStrings);
 //		actionBar.setGlobalActionHandler(JdtActionConstants.FIND_STRINGS_TO_EXTERNALIZE, fFindStringsToExternalize);
 //		actionBar.setGlobalActionHandler(JdtActionConstants.ORGANIZE_IMPORTS, fOrganizeImports);
-		actionBar.setGlobalActionHandler(PHPdtActionConstants.CONVERT_LINE_DELIMITERS_TO_WINDOWS, fConvertToWindows);
-		actionBar.setGlobalActionHandler(PHPdtActionConstants.CONVERT_LINE_DELIMITERS_TO_UNIX, fConvertToUNIX);
-		actionBar.setGlobalActionHandler(PHPdtActionConstants.CONVERT_LINE_DELIMITERS_TO_MAC, fConvertToMac);
-		if (!fEditorIsOwner) {
+		if (!isEditorOwner()) {
 			// editor provides its own implementation of these actions.
-			actionBar.setGlobalActionHandler(IWorkbenchActionConstants.BOOKMARK, fAddBookmark);
-			actionBar.setGlobalActionHandler(IWorkbenchActionConstants.ADD_TASK, fAddTaskAction);
+			actionBar.setGlobalActionHandler(IDEActionFactory.BOOKMARK.getId(), fAddBookmark);
+			actionBar.setGlobalActionHandler(IDEActionFactory.ADD_TASK.getId(), fAddTaskAction);
 		}
 	}
-	
+
 	private int appendToGroup(IMenuManager menu, IAction action) {
 		if (action != null && action.isEnabled()) {
 			menu.appendToGroup(fGroupName, action);
 			return 1;
 		}
 		return 0;
-	}	
+	}
 
 	private int addAction(IMenuManager menu, IAction action) {
 		if (action != null && action.isEnabled()) {
@@ -321,8 +340,8 @@ public class GenerateActionGroup extends ActionGroup {
 			return 1;
 		}
 		return 0;
-	}	
-	
+	}
+
   private int addEditorAction(IMenuManager menu, String actionID) {
     if (fEditor == null)
       return 0;
@@ -337,8 +356,8 @@ public class GenerateActionGroup extends ActionGroup {
     }
     return 0;
   }
-  
+
   private boolean isEditorOwner() {
     return fEditor != null;
-  }	
+  }
 }