diff options
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal')
13 files changed, 33 insertions, 33 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java index fc46a3d05..7a06d62cc 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java @@ -65,7 +65,7 @@ public class OpenRepositoryTask extends Action implements IWorkbenchWindowAction } /** - * Selected a repository, so try to obtain the task using id + * Selected a repository, so try to obtain the task using taskId */ private void openRemoteTask(RemoteTaskSelectionDialog dlg) { String[] selectedIds = dlg.getSelectedIds(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/ContentOutlineTools.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/ContentOutlineTools.java index 3fda0da2d..20e85aa99 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/ContentOutlineTools.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/ContentOutlineTools.java @@ -21,7 +21,7 @@ public class ContentOutlineTools { public static final String OFFLINE_SERVER_DEFAULT = "[local]"; /** - * Returns a unique handle for the bugzilla selection. Contains the bug id, + * Returns a unique handle for the bugzilla selection. Contains the bug taskId, * the bug server, and (if applicable) the comment number. * * @param taskSelection @@ -57,8 +57,8 @@ public class ContentOutlineTools { // return getHandle(taskData.getRepositoryUrl(), taskData.getId()); // } // -// public static String getHandle(String server, String id) { -// return server + ";" + id; +// public static String getHandle(String server, String taskId) { +// return server + ";" + taskId; // } // public static String getName(RepositoryTaskData taskData) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/IRepositoryTaskSelection.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/IRepositoryTaskSelection.java index 9bd8531d6..759110d90 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/IRepositoryTaskSelection.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/IRepositoryTaskSelection.java @@ -51,15 +51,15 @@ public interface IRepositoryTaskSelection extends ISelection { public void setContents(String contents); /** - * @return The id of the Bugzilla object that the selection was on. + * @return The taskId of the Bugzilla object that the selection was on. */ public String getId(); /** - * Sets the id of the Bugzilla object that the selection was on. + * Sets the taskId of the Bugzilla object that the selection was on. * - * @param id - * The id of the bug. + * @param taskId + * The taskId of the bug. */ public void setId(String id); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java index 2b5ad959c..18911a865 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java @@ -411,7 +411,7 @@ public class TaskPlanningEditor extends TaskFormPage { // task = taskEditorInput.getTask(); // if (task == null) { // MessageDialog.openError(parent.getShell(), "No such task", "No task - // exists with this id"); + // exists with this taskId"); // return null; // } // diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java index 41c16380f..3c91d407e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java @@ -110,7 +110,7 @@ public class TaskSpellingReconcileStrategy implements IReconcilerExtension, IRec } } - /** The id of the problem */ + /** The taskId of the problem */ public static final int SPELLING_PROBLEM_ID = 0x80000000; /** The document to operate on. */ diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java index 171134873..c0cf8fac1 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java @@ -55,16 +55,16 @@ public class OpenSearchResultAction extends Action { // go through each of the selected items and show it in an editor for (Iterator<AbstractQueryHit> it = selection.iterator(); it.hasNext();) { AbstractQueryHit repositoryHit = it.next(); - TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getId(), repositoryHit.getUrl()); + TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getTaskId(), repositoryHit.getUrl()); // try { - // int id = Integer.parseInt(repositoryHit.getId()); + // int taskId = Integer.parseInt(repositoryHit.getId()); // String bugUrl = // BugzillaServerFacade.getBugUrlWithoutLogin(repositoryHit.getRepositoryUrl(), - // id); + // taskId); // TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), // "" + repositoryHit.getId(), bugUrl); // } catch (NumberFormatException e) { - // MylarStatusHandler.fail(e, "Could not open, malformed id: " + + // MylarStatusHandler.fail(e, "Could not open, malformed taskId: " + // repositoryHit.getId(), true); // } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java index dc4eda750..1dc0819d1 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java @@ -213,7 +213,7 @@ public class RepositorySearchResultView extends AbstractTextSearchViewPage imple throws PartInitException { AbstractQueryHit repositoryHit = (AbstractQueryHit) match.getElement(); - TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getId(), repositoryHit.getUrl()); + TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getTaskId(), repositoryHit.getUrl()); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java index a9ecda211..927430330 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterDescription.java @@ -40,9 +40,9 @@ public class SearchResultSorterDescription extends ViewerSorter { AbstractQueryHit entry1 = (AbstractQueryHit) e1; AbstractQueryHit entry2 = (AbstractQueryHit) e2; - // NOTE we just comparing ids here, once summary and id separated + // NOTE we just comparing ids here, once summary and taskId separated // they should have their own column/sorter. - return taskKeyComparator.compare(entry1.getId(), entry2.getId()); + return taskKeyComparator.compare(entry1.getTaskId(), entry2.getTaskId()); // return taskKeyComparator.compare(entry1.getDescription(), // entry2.getDescription()); } catch (Exception ignored) { @@ -66,7 +66,7 @@ public class SearchResultSorterDescription extends ViewerSorter { public int category(Object element) { try { AbstractQueryHit hit = (AbstractQueryHit) element; - return Integer.parseInt(hit.getId()); + return Integer.parseInt(hit.getTaskId()); } catch (Exception ignored) { // ignore if } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterId.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterId.java index bfc2e4095..fb7edc7a5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterId.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterId.java @@ -16,14 +16,14 @@ import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.mylar.tasks.core.AbstractQueryHit; /** - * Sorts search results (AbstractQueryHit) by id. + * Sorts search results (AbstractQueryHit) by taskId. */ public class SearchResultSorterId extends ViewerSorter { /** * Returns a negative, zero, or positive number depending on whether the - * first bug's id is less than, equal to, or greater than the second bug's - * id. + * first bug's taskId is less than, equal to, or greater than the second bug's + * taskId. * <p> * * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer, @@ -32,15 +32,15 @@ public class SearchResultSorterId extends ViewerSorter { @Override public int compare(Viewer viewer, Object e1, Object e2) { try { - // cast the object and get its bug id + // cast the object and get its bug taskId AbstractQueryHit entry1 = (AbstractQueryHit) e1; - Integer id1 = Integer.parseInt(entry1.getId()); + Integer id1 = Integer.parseInt(entry1.getTaskId()); - // cast the other object and get its bug id + // cast the other object and get its bug taskId AbstractQueryHit entry2 = (AbstractQueryHit) e2; - Integer id2 = Integer.parseInt(entry2.getId()); + Integer id2 = Integer.parseInt(entry2.getTaskId()); - // if neither is null, compare the bug id's + // if neither is null, compare the bug taskId's if (id1 != null && id2 != null) { return id1.compareTo(id2); } @@ -65,7 +65,7 @@ public class SearchResultSorterId extends ViewerSorter { public int category(Object element) { try { AbstractQueryHit hit = (AbstractQueryHit) element; - return Integer.parseInt(hit.getId()); + return Integer.parseInt(hit.getTaskId()); } catch (Exception ignored) { // ignore } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterPriority.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterPriority.java index 139a17180..82d1993de 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterPriority.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultSorterPriority.java @@ -76,7 +76,7 @@ public class SearchResultSorterPriority extends ViewerSorter { public int category(Object element) { try { AbstractQueryHit hit = (AbstractQueryHit) element; - return Integer.parseInt(hit.getId()); + return Integer.parseInt(hit.getTaskId()); } catch (Exception ignored) { // ignore if there is a problem } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java index 14afce5ae..9bf06bafb 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java @@ -115,7 +115,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro if (hit.getIdLabel() != null) { return hit.getIdLabel() + NO_SUMMARY_AVAILABLE; } else { - return hit.getId() + NO_SUMMARY_AVAILABLE; + return hit.getTaskId() + NO_SUMMARY_AVAILABLE; } } else if (!pattern.matcher(hit.getSummary()).matches() && hit.getIdLabel() != null && !hit.getIdLabel().equals("")) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskKeyComparator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskKeyComparator.java index d7decaca2..88e2868c6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskKeyComparator.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskKeyComparator.java @@ -5,7 +5,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * @author Eugene Kuleshov (https://bugs.eclipse.org/bugs/show_bug.cgi?id=129511) + * @author Eugene Kuleshov (https://bugs.eclipse.org/bugs/show_bug.cgi?taskId=129511) */ public class TaskKeyComparator implements Comparator<String> { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java index 63f9a86a1..b2ac5044f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java @@ -1151,14 +1151,14 @@ public class TaskListView extends ViewPart { } /** - * Recursive function that checks for the occurrence of a certain task id. + * Recursive function that checks for the occurrence of a certain task taskId. * All children of the supplied node will be checked. * * @param task * The <code>ITask</code> object that is to be searched. * @param taskId - * The id that is being searched for. - * @return <code>true</code> if the id was found in the node or any of its + * The taskId that is being searched for. + * @return <code>true</code> if the taskId was found in the node or any of its * children */ protected boolean lookForId(String taskId) { |