Progress on: minor tasklit refactoring

6 files changed, 36 insertions, 38 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskHistoryTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskHistoryTest.java
index bc5198fb5..7ee1a5d06 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskHistoryTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskHistoryTest.java
@@ -24,7 +24,7 @@ import org.eclipse.mylar.tasklist.ui.actions.NextTaskDropDownAction;
 import org.eclipse.mylar.tasklist.ui.actions.PreviousTaskDropDownAction;
 import org.eclipse.mylar.tasklist.ui.actions.TaskActivateAction;
 import org.eclipse.mylar.tasklist.ui.actions.TaskDeactivateAction;
-import org.eclipse.mylar.tasklist.ui.actions.DropDownTaskNavigateAction.TaskNavigateAction;
+import org.eclipse.mylar.tasklist.ui.actions.TaskNavigateDropDownAction.TaskNavigateAction;
 import org.eclipse.mylar.tasklist.ui.views.TaskActivationHistory;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.ui.PartInitException;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/CopyDescriptionAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/CopyDescriptionAction.java
index 372d72917..28bf84703 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/CopyDescriptionAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/CopyDescriptionAction.java
@@ -45,7 +45,7 @@ public class CopyDescriptionAction extends Action {
 	    	String description = DESCRIPTION_PREFIX + element.getDescription(true);
 	    	
 	    	// HACK: this should be done using proper copying
-	    	StyledText styledText = new StyledText(view.getFakeComposite(), SWT.NULL);
+	    	StyledText styledText = new StyledText(view.getDummyComposite(), SWT.NULL);
 	    	styledText.setText(description);
 	    	styledText.selectAll();
 	    	styledText.copy();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/NextTaskDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/NextTaskDropDownAction.java
index 6a73191a0..fdba115fa 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/NextTaskDropDownAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/NextTaskDropDownAction.java
@@ -22,7 +22,7 @@ import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 /**
  * @author Wesley Coelho
  */
-public class NextTaskDropDownAction extends DropDownTaskNavigateAction {
+public class NextTaskDropDownAction extends TaskNavigateDropDownAction {
 	public static final String ID = "org.eclipse.mylar.tasklist.actions.navigate.next";
 
 	public NextTaskDropDownAction(TaskListView view, TaskActivationHistory history){
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/PreviousTaskDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/PreviousTaskDropDownAction.java
index d45a7f7d3..e1d49d46b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/PreviousTaskDropDownAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/PreviousTaskDropDownAction.java
@@ -22,7 +22,7 @@ import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 /**
  * @author Wesley Coelho
  */
-public class PreviousTaskDropDownAction extends DropDownTaskNavigateAction {
+public class PreviousTaskDropDownAction extends TaskNavigateDropDownAction {
 	public static final String ID = "org.eclipse.mylar.tasklist.actions.navigate.previous";
 
 	public PreviousTaskDropDownAction(TaskListView view, TaskActivationHistory history){
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/DropDownTaskNavigateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskNavigateDropDownAction.java
index b19ec7934..b63bc377d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/DropDownTaskNavigateAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/actions/TaskNavigateDropDownAction.java
@@ -22,41 +22,45 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
 
 /**
- * This abstract class contains some common code used by
- * NextTaskDropDownAction and PreviousTaskDropDownAction
+ * This abstract class contains some common code used by NextTaskDropDownAction
+ * and PreviousTaskDropDownAction
  * 
  * @author Wesley Coelho
+ * @author Mik Kersten
  */
-public abstract class DropDownTaskNavigateAction extends Action implements IMenuCreator{
+public abstract class TaskNavigateDropDownAction extends Action implements IMenuCreator {
 	protected final TaskListView view;
+
 	protected TaskActivationHistory taskHistory;
+
 	protected Menu dropDownMenu = null;
+
 	protected TasklistLabelProvider labelProvider = new TasklistLabelProvider();
 
 	/** Maximum number of items to appear in the drop-down menu */
-	protected final static int MAX_ITEMS_TO_DISPLAY = 10;
-		
-	public DropDownTaskNavigateAction(TaskListView view, TaskActivationHistory history){
-    	super();
+	protected final static int MAX_ITEMS_TO_DISPLAY = 12;
+
+	public TaskNavigateDropDownAction(TaskListView view, TaskActivationHistory history) {
+		super();
 		this.view = view;
-    	taskHistory = history;
-        setMenuCreator(this);
+		taskHistory = history;
+		setMenuCreator(this);
 	}
-	
+
 	/**
-	 * Action for navigating to a specified task.
-	 * This class should be protected but has been
-	 * made public for testing only
+	 * Action for navigating to a specified task. This class should be protected
+	 * but has been made public for testing only
 	 */
 	public class TaskNavigateAction extends Action {
-		
+
 		private ITask targetTask;
+
 		private static final int MAX_LABEL_LENGTH = 40;
-		
-		public TaskNavigateAction(ITask task){
+
+		public TaskNavigateAction(ITask task) {
 			targetTask = task;
 			String taskDescription = task.getDescription(true);
-			if(taskDescription.length() > MAX_LABEL_LENGTH){
+			if (taskDescription.length() > MAX_LABEL_LENGTH) {
 				taskDescription = taskDescription.subSequence(0, MAX_LABEL_LENGTH - 3) + "...";
 			}
 			setText(taskDescription);
@@ -65,23 +69,23 @@ public abstract class DropDownTaskNavigateAction extends Action implements IMenu
 			Image image = labelProvider.getColumnImage(task, 1);
 			setImageDescriptor(ImageDescriptor.createFromImage(image));
 		}
-		
-		public void run(){
+
+		public void run() {
 			new TaskActivateAction().run(targetTask);
-			taskHistory.navigatedToTask(targetTask); //Notify the task history of arbitrary history navigation
+			taskHistory.navigatedToTask(targetTask); 
 			setButtonStatus();
 			view.getViewer().refresh();
 		}
 	}
-	
-	public void dispose() {			
+
+	public void dispose() {
 		if (dropDownMenu != null) {
 			dropDownMenu.dispose();
 			dropDownMenu = null;
 		}
 	}
 
-	public Menu getMenu(Control parent) {			
+	public Menu getMenu(Control parent) {
 		if (dropDownMenu != null) {
 			dropDownMenu.dispose();
 		}
@@ -99,11 +103,11 @@ public abstract class DropDownTaskNavigateAction extends Action implements IMenu
 		return dropDownMenu;
 	}
 
-	protected void setButtonStatus(){
+	protected void setButtonStatus() {
 		view.getPreviousTaskAction().setEnabled(taskHistory.hasPrevious());
-		view.getNextTaskAction().setEnabled(taskHistory.hasNext());		
+		view.getNextTaskAction().setEnabled(taskHistory.hasNext());
 	}
-	
+
 	protected abstract void addActionsToMenu();
-	
+
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
index 437178bc8..bbfa0b3c4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
@@ -1264,18 +1264,12 @@ public class TaskListView extends ViewPart {
 		} else {
 			goUpAction.setEnabled(false);
 		}
-		//		if(drillDownAdapter.canGoInto()){
-		//			canEnableGoInto = true;
-		//		} else {
-		//			canEnableGoInto  = false;
-		//		}
 	}
 
 	/**
 	 * HACK: This is used for the copy action 
-	 * @return
 	 */
-	public Composite getFakeComposite() {
+	public Composite getDummyComposite() {
 		return tree;
 	}