Show line numbers (other than 1) in problems view for errors and warnings

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / ui / actions / GenerateActionGroup.java

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..58bf8da 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java
@@ -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;
@@ -50,9 +49,15 @@ import org.eclipse.ui.texteditor.IUpdate;
  * @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;
@@ -79,9 +84,9 @@ public class GenerateActionGroup extends ActionGroup {
         */
        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();
 
@@ -216,7 +221,7 @@ 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();
@@ -235,42 +240,79 @@ public class GenerateActionGroup extends ActionGroup {
        /* (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);
+//    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
@@ -300,7 +342,7 @@ public class GenerateActionGroup extends ActionGroup {
                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);