on full refresh, only refresh the non-completed bug reports (resolved)

2 files changed, 11 insertions, 8 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaAction.java
index d807e9fe2..180afd7cf 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaAction.java
@@ -46,7 +46,7 @@ public class RefreshBugzillaAction extends Action {
 	
 	public RefreshBugzillaAction(TaskListView view) {
 		this.view = view;
-		setText("Bugzilla Rrefresh");
+		setText("Bugzilla Refresh");
         setToolTipText("Bugzilla Refresh");
         setId(ID);
         setImageDescriptor(BugzillaImages.TASK_BUG_REFRESH);
@@ -56,7 +56,7 @@ public class RefreshBugzillaAction extends Action {
 		assert(cat != null);
 		this.view = view;
 		this.cat =  cat;
-		setText("Bugzilla Rrefresh");
+		setText("Bugzilla Refresh");
         setToolTipText("Bugzilla Refresh");
         setId(ID);
         setImageDescriptor(BugzillaImages.TASK_BUG_REFRESH);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java
index 5c3e29370..7592d47ac 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java
@@ -45,8 +45,8 @@ public class RefreshBugzillaReportsAction extends Action {
 
 	public RefreshBugzillaReportsAction(TaskListView view) {
 		this.view = view;
-		setText("Refresh Bugzilla reports");
-		setToolTipText("Refresh Bugzilla reports");
+		setText("Refresh Non-Resolved Bugzilla reports");
+		setToolTipText("Refresh Non-Resolved Bugzilla reports");
 		setId(ID);
 		setImageDescriptor(BugzillaImages.TASK_BUG_REFRESH);
 	}
@@ -134,7 +134,7 @@ public class RefreshBugzillaReportsAction extends Action {
 		List<ITask> tasks = MylarTasksPlugin.getTaskListManager().getTaskList().getRootTasks();
 
 		for (ITask task : tasks) {
-			if (task instanceof BugzillaTask) {
+			if (task instanceof BugzillaTask && !task.isCompleted()) {
 				((BugzillaTask) task).refresh();
 			}
 		}
@@ -142,13 +142,13 @@ public class RefreshBugzillaReportsAction extends Action {
 				.getTaskListManager().getTaskList().getCategories()) {
 			if (cat instanceof TaskCategory) {
 				for (ITask task : ((TaskCategory) cat).getChildren()) {
-					if (task instanceof BugzillaTask) {
+					if (task instanceof BugzillaTask && !task.isCompleted()) {
 						((BugzillaTask) task).refresh();
 					}
 				}
 				if (((TaskCategory) cat).getChildren() != null) {
 		            for (ITask child : ((TaskCategory) cat).getChildren()) {
-						if (child instanceof BugzillaTask) {
+						if (child instanceof BugzillaTask && !child.isCompleted()) {
 							((BugzillaTask)child).refresh();
 						}
 					}
@@ -161,7 +161,10 @@ public class RefreshBugzillaReportsAction extends Action {
 							bqc.refreshBugs();
 							for(BugzillaHit hit: bqc.getChildren()){
 								if(hit.hasCorrespondingActivatableTask()){
-									((BugzillaTask)hit.getOrCreateCorrespondingTask()).refresh();
+									BugzillaTask task = ((BugzillaTask)hit.getOrCreateCorrespondingTask());
+									if(!task.isCompleted()){
+										task.refresh();
+									}
 								}
 							}
 							RefreshBugzillaReportsAction.this.view.getViewer().refresh();