Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2006-02-10 04:36:39 +0000
committermkersten2006-02-10 04:36:39 +0000
commit5f0b555bf47c1a53f3ec1b0c616c3e4c611644b0 (patch)
tree0423d0fea19da85814e93dcdce7843c1d9292a98 /org.eclipse.mylyn.bugzilla.ui
parent463ab748e344f140e5950a097235446ab4bcd1be (diff)
downloadorg.eclipse.mylyn.tasks-5f0b555bf47c1a53f3ec1b0c616c3e4c611644b0.tar.gz
org.eclipse.mylyn.tasks-5f0b555bf47c1a53f3ec1b0c616c3e4c611644b0.tar.xz
org.eclipse.mylyn.tasks-5f0b555bf47c1a53f3ec1b0c616c3e4c611644b0.zip
Progress on: Bug 126842: prototype JIRA support
https://bugs.eclipse.org/bugs/show_bug.cgi?id=126842
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.ui')
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/icons/etool16/category-query-new.gifbin349 -> 0 bytes
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/icons/etool16/category-query.gifbin332 -> 0 bytes
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/icons/etool16/task-remote.gif (renamed from org.eclipse.mylyn.bugzilla.ui/icons/etool16/report-repository.gif)bin89 -> 89 bytes
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/plugin.xml6
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java43
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/actions/AddFavoriteAction.java123
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/actions/AddToFavoritesAction.java48
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaOutlineNode.java4
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchResultView.java7
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryHit.java3
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTask.java11
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditor.java3
12 files changed, 17 insertions, 231 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/icons/etool16/category-query-new.gif b/org.eclipse.mylyn.bugzilla.ui/icons/etool16/category-query-new.gif
deleted file mode 100644
index 09fcacad3..000000000
--- a/org.eclipse.mylyn.bugzilla.ui/icons/etool16/category-query-new.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.bugzilla.ui/icons/etool16/category-query.gif b/org.eclipse.mylyn.bugzilla.ui/icons/etool16/category-query.gif
deleted file mode 100644
index 94e7d5d1c..000000000
--- a/org.eclipse.mylyn.bugzilla.ui/icons/etool16/category-query.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.bugzilla.ui/icons/etool16/report-repository.gif b/org.eclipse.mylyn.bugzilla.ui/icons/etool16/task-remote.gif
index d0d46a007..d0d46a007 100644
--- a/org.eclipse.mylyn.bugzilla.ui/icons/etool16/report-repository.gif
+++ b/org.eclipse.mylyn.bugzilla.ui/icons/etool16/task-remote.gif
Binary files differ
diff --git a/org.eclipse.mylyn.bugzilla.ui/plugin.xml b/org.eclipse.mylyn.bugzilla.ui/plugin.xml
index 0de94c085..7a81fac50 100644
--- a/org.eclipse.mylyn.bugzilla.ui/plugin.xml
+++ b/org.eclipse.mylyn.bugzilla.ui/plugin.xml
@@ -91,18 +91,18 @@
point="org.eclipse.ui.editors">
<editor
name="Bugzilla viewer"
- icon="icons/etool16/report-repository.gif"
+ icon="icons/etool16/task-remote.gif"
class="org.eclipse.mylar.internal.bugzilla.ui.editor.ExistingBugEditor"
id="org.eclipse.mylar.bugzilla.ui.existingBugEditor">
</editor>
<editor
name="Bugzilla viewer"
- icon="icons/etool16/report-repository.gif"
+ icon="icons/etool16/task-remote.gif"
class="org.eclipse.mylar.internal.bugzilla.ui.editor.NewBugEditor"
id="org.eclipse.mylar.bugzilla.ui.newBugEditor">
</editor>
<editor
- icon="icons/etool16/task-repository.gif"
+ icon="icons/etool16/task-repository.gif"
name="Bugzilla task viewer"
class="org.eclipse.mylar.internal.bugzilla.ui.tasklist.BugzillaTaskEditor"
id="org.eclipse.mylar.bugzilla.ui.tasklist.bugzillaTaskEditor"/>
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java
index 2aa4b6d78..16968732f 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java
@@ -15,7 +15,6 @@ import java.net.URL;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.mylar.internal.tasklist.ui.TaskListImages.MylarTasklistOverlayDescriptor;
import org.eclipse.swt.graphics.Image;
/**
@@ -34,43 +33,10 @@ public class BugzillaImages {
public static final ImageDescriptor IMG_TOOL_ADD_TO_FAVORITES = create(T_ELCL, "bug-favorite.gif");
- public static final ImageDescriptor REPORT_REPOSITORY = create(T_TOOL, "report-repository.gif");
-
public static final ImageDescriptor BUG = create(T_ELCL, "bug.gif");
-
- public static final ImageDescriptor BUG_HIT = create(T_TOOL, "report-repository.gif");
-
- public static final ImageDescriptor IMG_COMMENT = create(T_ELCL, "bug-comment.gif");
-
- public static final ImageDescriptor TASK_BUG = create(T_TOOL, "task-repository.gif");
-
- public static final ImageDescriptor OVERLAY_INCOMMING = create(T_ELCL, "overlay-incoming.gif");
-
- public static final ImageDescriptor OVERLAY_OUTGOING = create(T_ELCL, "overlay-outgoing.gif");
-
- public static final ImageDescriptor OVERLAY_CONFLICT = create(T_ELCL, "overlay-conflicting.gif");
-
- public static final ImageDescriptor TASK_BUGZILLA = createWithOverlay(TASK_BUG, null, true, false);
-
- public static final ImageDescriptor TASK_BUGZILLA_INCOMMING = createWithOverlay(TASK_BUGZILLA, OVERLAY_INCOMMING,
- true, false);
-
- public static final ImageDescriptor TASK_BUGZILLA_CONFLICT = createWithOverlay(TASK_BUGZILLA, OVERLAY_CONFLICT,
- true, false);
-
- public static final ImageDescriptor TASK_BUGZILLA_OUTGOING = createWithOverlay(TASK_BUGZILLA, OVERLAY_OUTGOING,
- true, false);
-
- public static final ImageDescriptor BUGZILLA_HIT = createWithOverlay(BUG_HIT, null, true, false);
-
- public static final ImageDescriptor BUGZILLA_HIT_INCOMMING = BUGZILLA_HIT;// createWithOverlay(BUGZILLA_HIT,
- // OVERLAY_INCOMMING);
- public static final ImageDescriptor CATEGORY_QUERY = create(T_TOOL, "category-query.gif");
-
- public static final ImageDescriptor CATEGORY_QUERY_NEW = create(T_TOOL, "category-query-new.gif");
-
- public static final ImageDescriptor TASK_BUG_REFRESH = create(T_TOOL, "task-bug-refresh.gif");
+ public static final ImageDescriptor BUG_COMMENT = create(T_ELCL, "bug-comment.gif");
+
public static final ImageDescriptor REMOVE_ALL = create("", "remove-all.gif");
public static final ImageDescriptor REMOVE = create("", "remove.gif");
@@ -87,11 +53,6 @@ public class BugzillaImages {
}
}
- private static ImageDescriptor createWithOverlay(ImageDescriptor base, ImageDescriptor overlay, boolean top,
- boolean left) {
- return new MylarTasklistOverlayDescriptor(base, overlay, top, left);
- }
-
private static URL makeIconFileURL(String prefix, String name) throws MalformedURLException {
if (baseURL == null)
throw new MalformedURLException();
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/actions/AddFavoriteAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/actions/AddFavoriteAction.java
deleted file mode 100644
index d23f355bc..000000000
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/actions/AddFavoriteAction.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * University Of British Columbia - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylar.internal.bugzilla.ui.actions;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylar.internal.bugzilla.core.BugzillaPlugin;
-import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
-import org.eclipse.mylar.internal.bugzilla.core.internal.Favorite;
-import org.eclipse.mylar.internal.bugzilla.ui.BugzillaImages;
-import org.eclipse.mylar.internal.bugzilla.ui.FavoritesView;
-import org.eclipse.mylar.internal.bugzilla.ui.search.BugzillaSearchResultView;
-
-/**
- * Bookmark a returned Bugzilla Search result.
- */
-public class AddFavoriteAction extends AbstractFavoritesAction {
-
- /** Selected objects */
- private List<Favorite> selected;
-
- /** The view where the Bugzilla search results are displayed */
- private BugzillaSearchResultView resultView;
-
- /**
- * Constructor
- *
- * @param text
- * The label for the context menu item
- * @param resultView
- * The view where the Bugzilla search results are displayed
- */
- public AddFavoriteAction(String text, BugzillaSearchResultView resultView) {
- setText(text);
- setImageDescriptor(BugzillaImages.IMG_TOOL_ADD_TO_FAVORITES);
- this.resultView = resultView;
- selected = null;
- }
-
- /**
- * Bookmark the selected items
- *
- * @see org.eclipse.ui.actions.ActionDelegate#run(IAction)
- */
- @Override
- public void run() {
- FavoritesView.checkWindow();
-
- selected = new ArrayList<Favorite>();
- buildSelection();
-
- // go through each of the selected items and add its data to the
- // favorites file
- for (int i = 0; i < selected.size(); i++) {
- BugzillaPlugin.getDefault().getFavorites().add(selected.get(i));
- }
- FavoritesView.add();
- FavoritesView.updateActionEnablement();
- }
-
- /**
- * Gets the entire selection and puts each bug report into a list. Only the
- * relevent parts of each bug report are put into the list.
- */
- @SuppressWarnings("unchecked")
- private void buildSelection() {
- ISelection s = resultView.getViewer().getSelection();
- if (s instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) s;
- for (Iterator<IMarker> it = selection.iterator(); it.hasNext();) {
- IMarker marker = it.next();
-
- try {
- // try to get the attribute for the marker
- Integer attributeId = (Integer) marker.getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_ID);
- String repositoryUrl = (String) marker.getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_REPOSITORY);
-
- // add the selected item to the list of items that are
- // selected
- String description = (String) marker.getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_DESC);
- String query = (String) marker.getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_QUERY);
-
- // create a map to add attributes to so that the favorites
- // file can sort
- HashMap<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(IBugzillaConstants.HIT_MARKER_ATTR_ID, attributeId);
- attributes.put(IBugzillaConstants.HIT_MARKER_ATTR_REPOSITORY, repositoryUrl);
- attributes.put(IBugzillaConstants.HIT_MARKER_ATTR_PRIORITY, marker
- .getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_PRIORITY));
- attributes.put(IBugzillaConstants.HIT_MARKER_ATTR_SEVERITY, marker
- .getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_SEVERITY));
- attributes.put(IBugzillaConstants.HIT_MARKER_ATTR_STATE, marker
- .getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_STATE));
- attributes.put(IBugzillaConstants.HIT_MARKER_ATTR_RESULT, marker
- .getAttribute(IBugzillaConstants.HIT_MARKER_ATTR_RESULT));
-
- Favorite favorite = new Favorite(repositoryUrl, attributeId.intValue(), description, query,
- attributes);
- selected.add(favorite);
- } catch (CoreException ignored) {
- // do nothing
- }
- }
- }
- }
-
-}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/actions/AddToFavoritesAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/actions/AddToFavoritesAction.java
deleted file mode 100644
index 32d3e067d..000000000
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/actions/AddToFavoritesAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 - 2006 University Of British Columbia and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * University Of British Columbia - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylar.internal.bugzilla.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.mylar.internal.bugzilla.core.BugzillaPlugin;
-import org.eclipse.mylar.internal.bugzilla.core.internal.Favorite;
-import org.eclipse.mylar.internal.bugzilla.ui.BugzillaImages;
-import org.eclipse.mylar.internal.bugzilla.ui.FavoritesView;
-import org.eclipse.mylar.internal.bugzilla.ui.editor.ExistingBugEditorInput;
-import org.eclipse.ui.part.EditorPart;
-
-/**
- * Action used to add the supplied editor's bug to the favorites list.
- */
-public class AddToFavoritesAction extends Action {
- private EditorPart editorPart;
-
- /**
- * Creates a new <code>AddToFavoritesAction</code>.
- *
- * @param editor
- * The editor for the bug that is being added to the favorites
- * list.
- */
- public AddToFavoritesAction(EditorPart editor) {
- editorPart = editor;
- setText("&Add to favorites");
- setImageDescriptor(BugzillaImages.IMG_TOOL_ADD_TO_FAVORITES);
- }
-
- @Override
- public void run() {
- ExistingBugEditorInput input = (ExistingBugEditorInput) editorPart.getEditorInput();
- Favorite entry = new Favorite(input.getBug());
- FavoritesView.checkWindow();
- BugzillaPlugin.getDefault().getFavorites().add(entry);
- FavoritesView.add();
- }
-}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaOutlineNode.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaOutlineNode.java
index ab290bca8..b18a6ea8f 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaOutlineNode.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaOutlineNode.java
@@ -218,7 +218,7 @@ public class BugzillaOutlineNode implements IBugzillaReportSelection {
int bugId = bug.getId();
String bugServer = bug.getRepositoryUrl();
Image bugImage = BugzillaImages.getImage(BugzillaImages.BUG);
- Image defaultImage = BugzillaImages.getImage(BugzillaImages.IMG_COMMENT);
+ Image defaultImage = BugzillaImages.getImage(BugzillaImages.BUG_COMMENT);
BugzillaOutlineNode topNode = new BugzillaOutlineNode(bugId, bugServer, bug.getLabel(), bugImage, bug, bug
.getSummary());
@@ -246,7 +246,7 @@ public class BugzillaOutlineNode implements IBugzillaReportSelection {
int bugId = bug.getId();
String bugServer = bug.getRepositoryUrl();
Image bugImage = BugzillaImages.getImage(BugzillaImages.BUG);
- Image defaultImage = BugzillaImages.getImage(BugzillaImages.IMG_COMMENT);
+ Image defaultImage = BugzillaImages.getImage(BugzillaImages.BUG_COMMENT);
BugzillaOutlineNode topNode = new BugzillaOutlineNode(bugId, bugServer, bug.getLabel(), bugImage, bug, bug
.getSummary());
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchResultView.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchResultView.java
index a18ce3a15..05bf3d411 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchResultView.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchResultView.java
@@ -31,7 +31,6 @@ import org.eclipse.mylar.internal.bugzilla.core.search.BugzillaSeveritySearchSor
import org.eclipse.mylar.internal.bugzilla.core.search.BugzillaStateSearchSorter;
import org.eclipse.mylar.internal.bugzilla.ui.BugzillaTableContentProvider;
import org.eclipse.mylar.internal.bugzilla.ui.BugzillaUITools;
-import org.eclipse.mylar.internal.bugzilla.ui.actions.AddFavoriteAction;
import org.eclipse.mylar.internal.bugzilla.ui.actions.BugzillaSortAction;
import org.eclipse.mylar.internal.bugzilla.ui.actions.OpenBugsAction;
import org.eclipse.search.internal.ui.SearchMessages;
@@ -78,7 +77,7 @@ public class BugzillaSearchResultView extends AbstractTextSearchViewPage impleme
private BugzillaSortAction bugSortByStatusAction;
- private AddFavoriteAction addToFavoritesAction;
+// private AddFavoriteAction addToFavoritesAction;
private OpenBugsAction openInEditorAction;
@@ -105,7 +104,7 @@ public class BugzillaSearchResultView extends AbstractTextSearchViewPage impleme
bugSortByStatusAction = new BugzillaSortAction("Bug status", this, ORDER_STATUS);
bugCurrentSortOrder = ORDER_DEFAULT;
- addToFavoritesAction = new AddFavoriteAction("Mark Result as Favorite", this);
+// addToFavoritesAction = new AddFavoriteAction("Mark Result as Favorite", this);
openInEditorAction = new OpenBugsAction("Open Bug in Editor", this);
bugPropertyChangeListener = new IPropertyChangeListener() {
@@ -246,7 +245,7 @@ public class BugzillaSearchResultView extends AbstractTextSearchViewPage impleme
// Add the new context menu items
mgr.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, sortMenu);
- mgr.appendToGroup(IContextMenuConstants.GROUP_ADDITIONS, addToFavoritesAction);
+// mgr.appendToGroup(IContextMenuConstants.GROUP_ADDITIONS, addToFavoritesAction);
mgr.appendToGroup(IContextMenuConstants.GROUP_OPEN, openInEditorAction);
}
}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryHit.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryHit.java
index db6589677..6f42038c4 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryHit.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryHit.java
@@ -13,7 +13,6 @@ package org.eclipse.mylar.internal.bugzilla.ui.tasklist;
import org.eclipse.mylar.internal.bugzilla.core.BugzillaPlugin;
import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryUtil;
-import org.eclipse.mylar.internal.bugzilla.ui.BugzillaImages;
import org.eclipse.mylar.internal.tasklist.AbstractRepositoryClient;
import org.eclipse.mylar.internal.tasklist.AbstractRepositoryTask;
import org.eclipse.mylar.internal.tasklist.IQueryHit;
@@ -66,7 +65,7 @@ public class BugzillaQueryHit implements IQueryHit {
if (task != null) {
return task.getIcon();
} else {
- return BugzillaImages.getImage(BugzillaImages.BUGZILLA_HIT_INCOMMING);
+ return TaskListImages.getImage(TaskListImages.TASK_REMOTE);
}
}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTask.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTask.java
index 2c6c89b58..02d7bcaee 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTask.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTask.java
@@ -23,7 +23,6 @@ import org.eclipse.mylar.internal.bugzilla.core.BugzillaPlugin;
import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryUtil;
import org.eclipse.mylar.internal.bugzilla.core.internal.HtmlStreamTokenizer;
import org.eclipse.mylar.internal.bugzilla.core.internal.OfflineReportsFile;
-import org.eclipse.mylar.internal.bugzilla.ui.BugzillaImages;
import org.eclipse.mylar.internal.tasklist.AbstractRepositoryTask;
import org.eclipse.mylar.internal.tasklist.TaskRepositoryManager;
import org.eclipse.mylar.internal.tasklist.ui.TaskListImages;
@@ -170,15 +169,15 @@ public class BugzillaTask extends AbstractRepositoryTask {
@Override
public Image getIcon() {
if (syncState == RepositoryTaskSyncState.SYNCHRONIZED) {
- return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA);
+ return TaskListImages.getImage(TaskListImages.TASK_REPOSITORY);
} else if (syncState == RepositoryTaskSyncState.OUTGOING) {
- return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA_OUTGOING);
+ return TaskListImages.getImage(TaskListImages.TASK_REPOSITORY_OUTGOING);
} else if (syncState == RepositoryTaskSyncState.INCOMING) {
- return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA_INCOMMING);
+ return TaskListImages.getImage(TaskListImages.TASK_REPOSITORY_INCOMMING);
} else if (syncState == RepositoryTaskSyncState.CONFLICT) {
- return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA_CONFLICT);
+ return TaskListImages.getImage(TaskListImages.TASK_REPOSITORY_CONFLICT);
} else {
- return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA);
+ return TaskListImages.getImage(TaskListImages.TASK_REPOSITORY);
}
}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditor.java
index 4f87ed384..9d178739e 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditor.java
@@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.mylar.bugzilla.core.BugReport;
import org.eclipse.mylar.internal.bugzilla.core.IBugzillaAttributeListener;
-import org.eclipse.mylar.internal.bugzilla.ui.BugzillaImages;
import org.eclipse.mylar.internal.bugzilla.ui.editor.AbstractBugEditor;
import org.eclipse.mylar.internal.bugzilla.ui.editor.ExistingBugEditor;
import org.eclipse.mylar.internal.tasklist.ui.MylarTaskEditor;
@@ -171,7 +170,7 @@ public class BugzillaTaskEditor extends MylarTaskEditor {
// Set the title on the editor's tab
// this.setPartName("Bug #" + bugzillaEditorInput.getBugId());
this.setPartName(bugTask.getDescription());
- this.setTitleImage(TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA));
+ this.setTitleImage(TaskListImages.getImage(TaskListImages.TASK_REPOSITORY));
}
@Override

Back to the top