Merge lp:~craighewetson-deactivatedaccount/qbzr-eclipse/menuActions into lp:qbzr-eclipse

[Craig Hewetson]

[Craig Hewetson (craighewetson-deactivatedaccount)]

The log and the diff action from the Main Menu will now behave slightly differently:
If a file or project is selected it will not make use of the selected resource by rather the branch that it is found in.

So if the user wants to do a log <dir> or log <file>, he needs to right click on it and then execute the log action.

The same was done for Diff. The other actions are already branch based.

[Nicholas Allen (nick-allen)]

Hi Craig,

There was no need to introduce the ignoreSelectedFilesOverBranch() method so I have removed it. Instead the LogMenuCommandHandler and the DiffMenuCommandHandler can simply override useSelectedFilesAsArguments() to return false to make themselves work on the branch and not the selected files.

Also I renamed LogMenuCommandHandler to LogBranchCommandHandler and likewise for the diff one.

I have merged it onto trunk now. Thanks for the patch.

Cheers,

Nick

review: Approve

[Craig Hewetson (craighewetson-deactivatedaccount)]

>
> There was no need to introduce the ignoreSelectedFilesOverBranch() method
> so I have removed it. Instead the LogMenuCommandHandler and the
> DiffMenuCommandHandler can simply override useSelectedFilesAsArguments() to
> return false to make themselves work on the branch and not the selected
> files.
>
>
Oh yes that make sense. Thanks alot.

=== modified file 'qbzr-eclipse/plugin.xml'
--- qbzr-eclipse/plugin.xml	2009-10-01 07:02:04 +0000
+++ qbzr-eclipse/plugin.xml	2009-10-21 06:35:19 +0000
@@ -126,12 +126,24 @@
       </command>
       <command
             categoryId="qbzr_eclipse.commands.category"
+            description="Show differences that will be committed"
+            id="qbzr_eclipse.commands.diffMenuCommand"
+            name="Show Differences...">
+      </command>      
+      <command
+            categoryId="qbzr_eclipse.commands.category"
             description="Browse revisions in the history log"
             id="qbzr_eclipse.commands.logCommand"
             name="Log History...">
       </command>
       <command
             categoryId="qbzr_eclipse.commands.category"
+            description="Browse revisions in the history log"
+            id="qbzr_eclipse.commands.logMenuCommand"
+            name="Log History...">
+      </command>
+      <command
+            categoryId="qbzr_eclipse.commands.category"
             description="Browse files, directory etc in a branch"
             id="qbzr_eclipse.commands.browseCommand"
             name="Browse Items...">
@@ -248,10 +260,18 @@
             commandId="qbzr_eclipse.commands.diffCommand">
       </handler>
       <handler
+            class="org.bazaar_vcs.qbzr_eclipse.handlers.DiffMenuCommandHandler"
+            commandId="qbzr_eclipse.commands.diffMenuCommand">
+      </handler>
+      <handler
             class="org.bazaar_vcs.qbzr_eclipse.handlers.LogCommandHandler"
             commandId="qbzr_eclipse.commands.logCommand">
       </handler>
       <handler
+            class="org.bazaar_vcs.qbzr_eclipse.handlers.LogMenuCommandHandler"
+            commandId="qbzr_eclipse.commands.logMenuCommand">
+      </handler>
+      <handler
             class="org.bazaar_vcs.qbzr_eclipse.handlers.BrowseCommandHandler"
             commandId="qbzr_eclipse.commands.browseCommand">
       </handler>
@@ -337,11 +357,11 @@
                   mnemonic="A">
             </command>
             <command
-                  commandId="qbzr_eclipse.commands.diffCommand"
+                  commandId="qbzr_eclipse.commands.diffMenuCommand"
                   icon="icons/diff.png"
-                  id="qbzr_eclipse.menus.diffCommand"
+                  id="qbzr_eclipse.menus.diffMenuCommand"
                   mnemonic="D">
-            </command>
+            </command>            
             <command
                   commandId="qbzr_eclipse.commands.commitCommand"
                   icon="icons/commit.png"
@@ -411,9 +431,9 @@
 		           mnemonic="x"
 		           icon="icons/explore.png">
 		        <command
-	                  commandId="qbzr_eclipse.commands.logCommand"
+	                  commandId="qbzr_eclipse.commands.logMenuCommand"
 	                  icon="icons/log.png"
-	                  id="qbzr_eclipse.menus.logCommand"
+	                  id="qbzr_eclipse.menus.logMenuCommand"
 	                  mnemonic="L">
 	            </command>
 	            <command

=== modified file 'qbzr-eclipse/src/org/bazaar_vcs/qbzr_eclipse/handlers/BazaarCommandHandler.java'
--- qbzr-eclipse/src/org/bazaar_vcs/qbzr_eclipse/handlers/BazaarCommandHandler.java	2009-10-11 16:45:03 +0000
+++ qbzr-eclipse/src/org/bazaar_vcs/qbzr_eclipse/handlers/BazaarCommandHandler.java	2009-10-21 06:35:19 +0000
@@ -72,7 +72,7 @@
 		File branchDirectory = null;
 		File fileBeingEdited = null;
 
-		if (selection != null && selection instanceof ITreeSelection)
+		if (selection != null && !selection.isEmpty() && selection instanceof ITreeSelection)
 		{
 			selectedFiles = EclipseUtilities
 					.getSelectedFiles((ITreeSelection) selection);
@@ -88,10 +88,10 @@
 		}
 
 		// Check that the command can run on the selection.
-
+       final boolean ignoreSelectedFiles=ignoreSelectedFilesOverBranch();
 		try
 		{
-			checkCommandCanRunOnSelection(selectedFiles, fileBeingEdited,
+			checkCommandCanRunOnSelection(ignoreSelectedFiles?Collections.EMPTY_LIST:selectedFiles, fileBeingEdited,
 					branchDirectory);
 		}
 		catch (CannotRunCommandOnSelectionException e)
@@ -106,9 +106,9 @@
 				.getLocation();
 
 		final File directoryToRunIn = getDirectoryToRunIn(workspaceRoot
-				.toFile(), branchDirectory, selectedFiles, fileBeingEdited);
+				.toFile(), branchDirectory, ignoreSelectedFiles?Collections.EMPTY_LIST:selectedFiles, fileBeingEdited);
 
-		List<String> commandElements = getCommand(selectedFiles,
+		List<String> commandElements = getCommand(ignoreSelectedFiles?Collections.EMPTY_LIST:selectedFiles,
 				fileBeingEdited, branchDirectory, directoryToRunIn);
 		final String[] command = commandElements
 				.toArray(new String[commandElements.size()]);
@@ -229,6 +229,16 @@
 	}
 
 	/**
+	 * This is one way of indicating that the action occurred from menu item,
+	 * and therefore it should be run on the entire branch and not the last selected
+	 * files.
+	 * The popup action will always try to work on the last selected resource.
+	 * @return
+	 */
+	protected boolean ignoreSelectedFilesOverBranch(){
+		return false;
+	}
+	/**
 	 * Checks if the list of selected files should be passed on to the Bazaar
 	 * command.
 	 */

=== added file 'qbzr-eclipse/src/org/bazaar_vcs/qbzr_eclipse/handlers/DiffMenuCommandHandler.java'
--- qbzr-eclipse/src/org/bazaar_vcs/qbzr_eclipse/handlers/DiffMenuCommandHandler.java	1970-01-01 00:00:00 +0000
+++ qbzr-eclipse/src/org/bazaar_vcs/qbzr_eclipse/handlers/DiffMenuCommandHandler.java	2009-10-21 06:35:19 +0000
@@ -0,0 +1,10 @@
+package org.bazaar_vcs.qbzr_eclipse.handlers;
+
+public class DiffMenuCommandHandler extends DiffCommandHandler
+{
+
+	@Override
+	protected boolean ignoreSelectedFilesOverBranch() {		
+		return true;
+	}
+}

=== added file 'qbzr-eclipse/src/org/bazaar_vcs/qbzr_eclipse/handlers/LogMenuCommandHandler.java'
--- qbzr-eclipse/src/org/bazaar_vcs/qbzr_eclipse/handlers/LogMenuCommandHandler.java	1970-01-01 00:00:00 +0000
+++ qbzr-eclipse/src/org/bazaar_vcs/qbzr_eclipse/handlers/LogMenuCommandHandler.java	2009-10-21 06:35:19 +0000
@@ -0,0 +1,10 @@
+package org.bazaar_vcs.qbzr_eclipse.handlers;
+
+public class LogMenuCommandHandler extends LogCommandHandler {
+
+	@Override
+	protected boolean ignoreSelectedFilesOverBranch() {
+		return true;
+	}
+
+}