Progress on: 144998: create common offline report storage

https://bugs.eclipse.org/bugs/show_bug.cgi?id=144998

10 files changed, 47 insertions, 44 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 000000000..e9c914fef
--- /dev/null
+++ b/org.eclipse.mylyn.bugzilla.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Fri Jun 02 15:30:30 PDT 2006
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaCompareNode.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaCompareNode.java
index 60f3c81ad..6104c3c7c 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaCompareNode.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaCompareNode.java
@@ -20,7 +20,7 @@ import org.eclipse.compare.IStreamContentAccessor;
 import org.eclipse.compare.ITypedElement;
 import org.eclipse.compare.structuremergeviewer.IStructureComparator;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.mylar.internal.tasklist.AbstractRepositoryReportAttribute;
+import org.eclipse.mylar.internal.tasklist.AbstractRepositoryTaskAttribute;
 import org.eclipse.mylar.internal.tasklist.RepositoryReport;
 import org.eclipse.mylar.internal.tasklist.BugzillaReportElement;
 import org.eclipse.mylar.internal.tasklist.Comment;
@@ -195,7 +195,7 @@ public class BugzillaCompareNode implements IStreamContentAccessor, IStructureCo
 
 		Image attributeImage = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
 		BugzillaCompareNode attributes = new BugzillaCompareNode("Attributes", null, attributeImage);
-		for (AbstractRepositoryReportAttribute attribute : bug.getAttributes()) {
+		for (AbstractRepositoryTaskAttribute attribute : bug.getAttributes()) {
 			BugzillaCompareNode child = new BugzillaCompareNode(attribute.toString(), attribute.getValue(), defaultImage);
 			attributes.addChild(child);	
 		}
@@ -244,8 +244,8 @@ public class BugzillaCompareNode implements IStreamContentAccessor, IStructureCo
 //
 //		Image attributeImage = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
 //		BugzillaCompareNode attributes = new BugzillaCompareNode("Attributes", null, attributeImage);
-//		for (Iterator<AbstractRepositoryReportAttribute> iter = bug.getAttributes().iterator(); iter.hasNext();) {
-//			AbstractRepositoryReportAttribute attribute = iter.next();
+//		for (Iterator<AbstractRepositoryTaskAttribute> iter = bug.getAttributes().iterator(); iter.hasNext();) {
+//			AbstractRepositoryTaskAttribute attribute = iter.next();
 //			if (attribute.getName().compareTo("delta_ts") == 0 || attribute.getName().compareTo("Last Modified") == 0
 //					|| attribute.getName().compareTo("longdesclength") == 0)
 //				continue;
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java
index fd6a9e12d..7b4ace547 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java
@@ -352,7 +352,7 @@ public class BugzillaUiPlugin extends AbstractUIPlugin {
 // IPath offlineReportsPath = getOfflineReportsFilePath();
 //
 // try {
-// offlineReportsFile = new OfflineReportsFile(offlineReportsPath.toFile(),
+// offlineReportsFile = new OfflineTaskManager(offlineReportsPath.toFile(),
 // true);
 // } catch (Exception e) {
 // MylarStatusHandler.log(e,
@@ -361,7 +361,7 @@ public class BugzillaUiPlugin extends AbstractUIPlugin {
 // offlineReportsPath.toFile().delete();
 // // if (offlineReportsPath.toFile().delete()) {
 // try {
-// offlineReportsFile = new OfflineReportsFile(offlineReportsPath.toFile(),
+// offlineReportsFile = new OfflineTaskManager(offlineReportsPath.toFile(),
 // false);
 // } catch (Exception e1) {
 // MylarStatusHandler.fail(e, "could not reset offline Bugzilla reports
@@ -384,7 +384,7 @@ public class BugzillaUiPlugin extends AbstractUIPlugin {
 // return configFile;
 // }
 //
-// public OfflineReportsFile getOfflineReportsFile() {
+// public OfflineTaskManager getOfflineReportsFile() {
 // if (offlineReportsFile == null) {
 // MylarStatusHandler.fail(null, "Offline reports file not created, try
 // restarting.", true);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/AbstractBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/AbstractBugEditor.java
index 96045bf1b..2cb08b450 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/AbstractBugEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/AbstractBugEditor.java
@@ -52,7 +52,7 @@ import org.eclipse.mylar.internal.bugzilla.ui.IBugzillaReportSelection;
 import org.eclipse.mylar.internal.bugzilla.ui.tasklist.BugzillaRepositoryConnector;
 import org.eclipse.mylar.internal.core.util.MylarStatusHandler;
 import org.eclipse.mylar.internal.tasklist.AbstractRepositoryReport;
-import org.eclipse.mylar.internal.tasklist.AbstractRepositoryReportAttribute;
+import org.eclipse.mylar.internal.tasklist.AbstractRepositoryTaskAttribute;
 import org.eclipse.mylar.internal.tasklist.BugzillaReportElement;
 import org.eclipse.mylar.internal.tasklist.Comment;
 import org.eclipse.mylar.internal.tasklist.ReportAttachment;
@@ -283,7 +283,7 @@ public abstract class AbstractBugEditor extends EditorPart {
 
 	protected List<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
 
-	protected HashMap<CCombo, AbstractRepositoryReportAttribute> comboListenerMap = new HashMap<CCombo, AbstractRepositoryReportAttribute>();
+	protected HashMap<CCombo, AbstractRepositoryTaskAttribute> comboListenerMap = new HashMap<CCombo, AbstractRepositoryTaskAttribute>();
 
 	private IBugzillaReportSelection lastSelected = null;
 
@@ -335,7 +335,7 @@ public abstract class AbstractBugEditor extends EditorPart {
 			if (comboListenerMap.containsKey(combo)) {
 				if (combo.getSelectionIndex() > -1) {
 					String sel = combo.getItem(combo.getSelectionIndex());
-					AbstractRepositoryReportAttribute attribute = comboListenerMap.get(combo);
+					AbstractRepositoryTaskAttribute attribute = comboListenerMap.get(combo);
 					if (sel != null && !(sel.equals(attribute.getValue()))) {
 						attribute.setValue(sel);
 						for (IBugzillaAttributeListener client : attributesListeners) {
@@ -599,9 +599,9 @@ public abstract class AbstractBugEditor extends EditorPart {
 	// // String ccValue = null;
 	//
 	// // Populate Attributes
-	// for (Iterator<AbstractRepositoryReportAttribute> it =
+	// for (Iterator<AbstractRepositoryTaskAttribute> it =
 	// getReport().getAttributes().iterator(); it.hasNext();) {
-	// AbstractRepositoryReportAttribute attribute = it.next();
+	// AbstractRepositoryTaskAttribute attribute = it.next();
 	// String key = attribute.getID();
 	// String name = attribute.getName();
 	// String value = checkText(attribute.getValue());
@@ -815,7 +815,7 @@ public abstract class AbstractBugEditor extends EditorPart {
 	// assignedTo.addListener(SWT.KeyUp, new Listener() {
 	// public void handleEvent(Event event) {
 	// String sel = assignedTo.getText();
-	// AbstractRepositoryReportAttribute a = getReport().getAttribute(
+	// AbstractRepositoryTaskAttribute a = getReport().getAttribute(
 	// BugzillaReportElement.ASSIGNED_TO);
 	// if (!(a.getValue().equals(sel))) {
 	// a.setValue(sel);
@@ -951,7 +951,7 @@ public abstract class AbstractBugEditor extends EditorPart {
 
 		int currentCol = 1;
 
-		for (AbstractRepositoryReportAttribute attribute : getReport().getAttributes()) {
+		for (AbstractRepositoryTaskAttribute attribute : getReport().getAttributes()) {
 
 			// String key = attribute.getID();
 			String name = attribute.getName();
@@ -1014,7 +1014,7 @@ public abstract class AbstractBugEditor extends EditorPart {
 					text.addListener(SWT.KeyUp, new Listener() {
 						public void handleEvent(Event event) {
 							String sel = text.getText();
-							AbstractRepositoryReportAttribute a = (AbstractRepositoryReportAttribute) text.getData();
+							AbstractRepositoryTaskAttribute a = (AbstractRepositoryTaskAttribute) text.getData();
 							if (!(a.getValue().equals(sel))) {
 								a.setValue(sel);
 								changeDirtyStatus(true);
@@ -1095,7 +1095,7 @@ public abstract class AbstractBugEditor extends EditorPart {
 		urlText.addListener(SWT.KeyUp, new Listener() {
 			public void handleEvent(Event event) {
 				String sel = urlText.getText();
-				AbstractRepositoryReportAttribute a = getReport().getAttribute(BugzillaReportElement.BUG_FILE_LOC);
+				AbstractRepositoryTaskAttribute a = getReport().getAttribute(BugzillaReportElement.BUG_FILE_LOC);
 				if (!(a.getValue().equals(sel))) {
 					a.setValue(sel);
 					changeDirtyStatus(true);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/ExistingBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/ExistingBugEditor.java
index b939cd819..160ac445b 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/ExistingBugEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/ExistingBugEditor.java
@@ -43,8 +43,8 @@ import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryUtil;
 import org.eclipse.mylar.internal.bugzilla.ui.BugzillaCompareInput;
 import org.eclipse.mylar.internal.bugzilla.ui.BugzillaUiPlugin;
 import org.eclipse.mylar.internal.bugzilla.ui.tasklist.BugzillaRepositoryConnector;
-import org.eclipse.mylar.internal.tasklist.AbstractRepositoryReportAttribute;
-import org.eclipse.mylar.internal.tasklist.BugzillaReportAttribute;
+import org.eclipse.mylar.internal.tasklist.AbstractRepositoryTaskAttribute;
+import org.eclipse.mylar.internal.tasklist.RepositoryTaskAttribute;
 import org.eclipse.mylar.internal.tasklist.BugzillaReportElement;
 import org.eclipse.mylar.internal.tasklist.Comment;
 import org.eclipse.mylar.internal.tasklist.Operation;
@@ -662,20 +662,20 @@ public class ExistingBugEditor extends AbstractBugEditor {
 		// if they aren't already on the cc list create an add self check box
 		
 		
-		AbstractRepositoryReportAttribute owner = bug.getAttribute(BugzillaReportElement.ASSIGNED_TO);
+		AbstractRepositoryTaskAttribute owner = bug.getAttribute(BugzillaReportElement.ASSIGNED_TO);
 
 		// Don't add addselfcc check box if the user is the bug owner
 		if (owner != null && owner.getValue().indexOf(repository.getUserName()) != -1) {			
 			return;
 		}
 		// Don't add addselfcc if already there
-		AbstractRepositoryReportAttribute ccAttribute = bug.getAttribute(BugzillaReportElement.CC);
+		AbstractRepositoryTaskAttribute ccAttribute = bug.getAttribute(BugzillaReportElement.CC);
 		if (ccAttribute != null && ccAttribute.getValues().contains(repository.getUserName())) {
 			return;
 		}
-		AbstractRepositoryReportAttribute addselfcc = bug.getAttribute(BugzillaReportElement.ADDSELFCC);
+		AbstractRepositoryTaskAttribute addselfcc = bug.getAttribute(BugzillaReportElement.ADDSELFCC);
 		if (addselfcc == null) {
-			addselfcc = new BugzillaReportAttribute(BugzillaReportElement.ADDSELFCC);			
+			addselfcc = new RepositoryTaskAttribute(BugzillaReportElement.ADDSELFCC);			
 			bug.addAttribute(BugzillaReportElement.ADDSELFCC, addselfcc);
 		} 
 		
@@ -829,9 +829,9 @@ public class ExistingBugEditor extends AbstractBugEditor {
 		bug.setHasChanged(true);
 		// go through all of the attributes and update the main values to the
 		// new ones
-		// for (Iterator<AbstractRepositoryReportAttribute> it =
+		// for (Iterator<AbstractRepositoryTaskAttribute> it =
 		// bug.getAttributes().iterator(); it.hasNext();) {
-		// AbstractRepositoryReportAttribute a = it.next();
+		// AbstractRepositoryTaskAttribute a = it.next();
 		// if (a.getNewValue() != null &&
 		// a.getNewValue().compareTo(a.getValue()) != 0) {
 		// bug.setHasChanged(true);
@@ -857,9 +857,9 @@ public class ExistingBugEditor extends AbstractBugEditor {
 
 		// go through all of the attributes and restore the new values to the
 		// main ones
-		// for (Iterator<AbstractRepositoryReportAttribute> it =
+		// for (Iterator<AbstractRepositoryTaskAttribute> it =
 		// bug.getAttributes().iterator(); it.hasNext();) {
-		// AbstractRepositoryReportAttribute a = it.next();
+		// AbstractRepositoryTaskAttribute a = it.next();
 		// a.setNewValue(a.getValue());
 		// }
 
@@ -1103,7 +1103,7 @@ public class ExistingBugEditor extends AbstractBugEditor {
 	@Override
 	public void handleSummaryEvent() {
 		String sel = summaryText.getText();
-		AbstractRepositoryReportAttribute a = getReport().getAttribute(BugzillaReportElement.SHORT_DESC);
+		AbstractRepositoryTaskAttribute a = getReport().getAttribute(BugzillaReportElement.SHORT_DESC);
 		if (!(a.getValue().equals(sel))) {
 			a.setValue(sel);
 			changeDirtyStatus(true);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/ExistingBugEditorInput.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/ExistingBugEditorInput.java
index e1fe958ae..e3cf9f18e 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/ExistingBugEditorInput.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/ExistingBugEditorInput.java
@@ -15,7 +15,7 @@ import java.net.Proxy;
 import java.security.GeneralSecurityException;
 
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryUtil;
-import org.eclipse.mylar.internal.tasklist.OfflineReportsFile;
+import org.eclipse.mylar.internal.tasklist.OfflineTaskManager;
 import org.eclipse.mylar.internal.tasklist.RepositoryReport;
 import org.eclipse.mylar.provisional.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.provisional.tasklist.TaskRepository;
@@ -86,7 +86,7 @@ public class ExistingBugEditorInput extends AbstractBugEditorInput {
 	private RepositoryReport getCurrentBug(TaskRepository repository, Proxy proxySettings, int id)
 			throws IOException, GeneralSecurityException {
 		// Look among the offline reports for a bug with the given id.
-		OfflineReportsFile reportsFile = MylarTaskListPlugin.getDefault().getOfflineReportsFile();
+		OfflineTaskManager reportsFile = MylarTaskListPlugin.getDefault().getOfflineReportsFile();
 		if (reportsFile != null) {
 			int offlineId = reportsFile.find(repository.getUrl(), id);
 	
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugEditor.java
index b68b682aa..713c16aa1 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/NewBugEditor.java
@@ -225,8 +225,8 @@ public class NewBugEditor extends AbstractBugEditor {
 	protected void updateBug() {
 		// go through all of the attributes and update the main values to the
 		// new ones
-//		for (Iterator<AbstractRepositoryReportAttribute> it = bug.getAttributes().iterator(); it.hasNext();) {
-//			AbstractRepositoryReportAttribute a = it.next();
+//		for (Iterator<AbstractRepositoryTaskAttribute> it = bug.getAttributes().iterator(); it.hasNext();) {
+//			AbstractRepositoryTaskAttribute a = it.next();
 //			a.setValue(a.getNewValue());
 //		}
 
@@ -239,8 +239,8 @@ public class NewBugEditor extends AbstractBugEditor {
 	protected void restoreBug() {
 		// go through all of the attributes and restore the new values to the
 		// main ones
-//		for (Iterator<AbstractRepositoryReportAttribute> it = bug.getAttributes().iterator(); it.hasNext();) {
-//			AbstractRepositoryReportAttribute a = it.next();
+//		for (Iterator<AbstractRepositoryTaskAttribute> it = bug.getAttributes().iterator(); it.hasNext();) {
+//			AbstractRepositoryTaskAttribute a = it.next();
 //			a.setNewValue(a.getValue());
 //		}
 	}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryConnector.java
index a4313d9e8..67fa0e511 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryConnector.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryConnector.java
@@ -394,7 +394,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector {
 								} else if (throwable.getCause() instanceof PossibleBugzillaFailureException) {
 									// String attributes = "";
 									// if (bugReport != null) {
-									// for (AbstractRepositoryReportAttribute
+									// for (AbstractRepositoryTaskAttribute
 									// attribute : bugReport.getAttributes()) {
 									// attributes += attribute.getID() + "=" +
 									// attribute.getValue() + " | ";
@@ -506,7 +506,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector {
 			} catch (CoreException e) {
 				MylarStatusHandler.fail(e, e.getMessage(), false);
 			}
-			// file.sort(OfflineReportsFile.lastSel);
+			// file.sort(OfflineTaskManager.lastSel);
 		}
 	}
 
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java
index 99a3ec113..5a13a2c1d 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java
@@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.bugzilla.ui.tasklist;
 import java.util.Date;
 
 import org.eclipse.mylar.internal.core.util.MylarStatusHandler;
-import org.eclipse.mylar.internal.tasklist.OfflineReportsFile;
+import org.eclipse.mylar.internal.tasklist.OfflineTaskManager;
 import org.eclipse.mylar.internal.tasklist.RepositoryReport;
 import org.eclipse.mylar.internal.tasklist.TaskExternalizationException;
 import org.eclipse.mylar.provisional.tasklist.AbstractRepositoryQuery;
@@ -190,7 +190,7 @@ public class BugzillaTaskExternalizer extends DelegatingTaskExternalizer {
 	 * TODO: move?
 	 */
 	public boolean readBugReport(BugzillaTask bugzillaTask) {		
-		RepositoryReport tempBug = OfflineReportsFile.findBug(bugzillaTask.getRepositoryUrl(), AbstractRepositoryTask.getTaskIdAsInt(bugzillaTask.getHandleIdentifier()));
+		RepositoryReport tempBug = OfflineTaskManager.findBug(bugzillaTask.getRepositoryUrl(), AbstractRepositoryTask.getTaskIdAsInt(bugzillaTask.getHandleIdentifier()));
 		if (tempBug == null) {
 			bugzillaTask.setBugReport(null);
 			return true;
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/AbstractBugzillaWizardPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/AbstractBugzillaWizardPage.java
index 1f9095fb6..5d8c90e8f 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/AbstractBugzillaWizardPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/AbstractBugzillaWizardPage.java
@@ -23,7 +23,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.mylar.internal.bugzilla.core.NewBugzillaReport;
 import org.eclipse.mylar.internal.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.internal.core.util.MylarStatusHandler;
-import org.eclipse.mylar.internal.tasklist.AbstractRepositoryReportAttribute;
+import org.eclipse.mylar.internal.tasklist.AbstractRepositoryTaskAttribute;
 import org.eclipse.mylar.internal.tasklist.BugzillaReportElement;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
@@ -312,8 +312,8 @@ public abstract class AbstractBugzillaWizardPage extends WizardPage implements L
 
 		// go through each of the attributes and sync their values with the
 		// combo boxes
-		for (Iterator<AbstractRepositoryReportAttribute> it = nbm.getAttributes().iterator(); it.hasNext();) {
-			AbstractRepositoryReportAttribute attribute = it.next();
+		for (Iterator<AbstractRepositoryTaskAttribute> it = nbm.getAttributes().iterator(); it.hasNext();) {
+			AbstractRepositoryTaskAttribute attribute = it.next();
 			String key = attribute.getName();
 			Map<String, String> values = attribute.getOptionValues();
 
@@ -418,8 +418,8 @@ public abstract class AbstractBugzillaWizardPage extends WizardPage implements L
 		newLayout(attributesComposite, 1, nbm.getProduct(), VALUE);
 
 		// Populate Attributes
-		for (Iterator<AbstractRepositoryReportAttribute> it = nbm.getAttributes().iterator(); it.hasNext();) {
-			AbstractRepositoryReportAttribute attribute = it.next();
+		for (Iterator<AbstractRepositoryTaskAttribute> it = nbm.getAttributes().iterator(); it.hasNext();) {
+			AbstractRepositoryTaskAttribute attribute = it.next();
 			String key = attribute.getID();
 			String name = attribute.getName();
 			String value = checkText(attribute.getValue());
@@ -726,8 +726,8 @@ public abstract class AbstractBugzillaWizardPage extends WizardPage implements L
 
 			// Get OS Lookup Map
 			// Check that the result is in Values, if it is not, set it to other
-			AbstractRepositoryReportAttribute opSysAttribute = newBugModel.getAttribute(BugzillaReportElement.OP_SYS);
-			AbstractRepositoryReportAttribute platformAttribute = newBugModel.getAttribute(BugzillaReportElement.REP_PLATFORM);
+			AbstractRepositoryTaskAttribute opSysAttribute = newBugModel.getAttribute(BugzillaReportElement.OP_SYS);
+			AbstractRepositoryTaskAttribute platformAttribute = newBugModel.getAttribute(BugzillaReportElement.REP_PLATFORM);
 
 			String OS = Platform.getOS();
 			String platform = Platform.getOSArch();