diff options
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui')
20 files changed, 352 insertions, 259 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java index b31cfa9c5..659b3470d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java @@ -81,10 +81,10 @@ class CustomTaskListDecorationDrawer implements Listener { useStrikethroughForCompleted = TasksUiPlugin.getDefault().getPluginPreferences().getBoolean( ITasksUiPreferenceConstants.USE_STRIKETHROUGH_FOR_COMPLETED); TasksUiPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(PROPERTY_LISTENER); - if (SWT.getPlatform().equals("gtk")) { + if (SWT.getPlatform().equals("gtk")) { //$NON-NLS-1$ this.platformSpecificSquish = 8; this.tweakClipping = true; - } else if (SWT.getPlatform().equals("carbon")) { + } else if (SWT.getPlatform().equals("carbon")) { //$NON-NLS-1$ this.platformSpecificSquish = 3; this.tweakClipping = false; } else { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/DisconnectRepositoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/DisconnectRepositoryAction.java deleted file mode 100644 index f5d714ad9..000000000 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/DisconnectRepositoryAction.java +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies 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: - * Tasktop Technologies - initial API and implementation - *******************************************************************************/ - -package org.eclipse.mylyn.internal.tasks.ui.views; - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; -import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; -import org.eclipse.mylyn.tasks.core.TaskRepository; -import org.eclipse.mylyn.tasks.ui.TasksUi; - -/** - * @author Steffen Pingel - */ -public class DisconnectRepositoryAction extends Action implements ISelectionChangedListener { - - public static final String LABEL = "Disconnected"; - - private static final String ID = "org.eclipse.mylyn.tasklist.repositories.offline"; - - private TaskRepository repository; - - public DisconnectRepositoryAction() { - super(LABEL, IAction.AS_CHECK_BOX); - setId(ID); - setEnabled(false); - } - - @Override - public void run() { - repository.setOffline(isChecked()); - TasksUiPlugin.getRepositoryManager().notifyRepositorySettingsChanged(repository); - } - - public void selectionChanged(IAction action, ISelection selection) { - } - - public void selectionChanged(SelectionChangedEvent event) { - ISelection selection = event.getSelection(); - if (selection instanceof IStructuredSelection) { - Object selectedObject = ((IStructuredSelection) selection).getFirstElement(); - if (selectedObject instanceof TaskRepository) { - AbstractRepositoryConnector connector = TasksUi.getRepositoryManager().getRepositoryConnector( - ((TaskRepository) selectedObject).getConnectorKind()); - if (connector.isUserManaged()) { - this.repository = (TaskRepository) selectedObject; - setChecked(this.repository.isOffline()); - setEnabled(true); - return; - } - } - } - this.repository = null; - setChecked(false); - setEnabled(false); - } - -} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java new file mode 100644 index 000000000..e470f9b49 --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java @@ -0,0 +1,123 @@ +/******************************************************************************* + * Copyright (c) 2004, 2008 Tasktop Technologies 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: + * Tasktop Technologies - initial API and implementation + *******************************************************************************/ + +package org.eclipse.mylyn.internal.tasks.ui.views; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.tasks.ui.views.messages"; //$NON-NLS-1$ + + static { + // load message values from bundle file + reloadMessages(); + } + + public static void reloadMessages() { + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + public static String DisconnectRepositoryAction_Disconnected; + + public static String PriorityDropDownAction_Filter_Priority_Lower_Than; + + public static String SortyByDropDownAction_Date_Created; + + public static String SortyByDropDownAction_Descending; + + public static String SortyByDropDownAction_Priority; + + public static String SortyByDropDownAction_Sort_by; + + public static String SortyByDropDownAction_Summary; + + public static String TaskInputDialog_Clear; + + public static String TaskInputDialog_Description; + + public static String TaskInputDialog_Get_Description; + + public static String TaskInputDialog_New_Task; + + public static String TaskInputDialog_Web_Link; + + public static String TaskListDropAdapter__retrieving_from_URL_; + + public static String TaskListFilteredTree_Activate; + + public static String TaskListFilteredTree_Edit_Task_Working_Sets_; + + public static String TaskListFilteredTree_Estimated_hours; + + public static String TaskListFilteredTree__multiple_; + + public static String TaskListFilteredTree_Scheduled_tasks; + + public static String TaskListFilteredTree_Search_repository_for_key_or_summary_; + + public static String TaskListFilteredTree_Select_Active_Task; + + public static String TaskListFilteredTree_Select_Working_Set; + + public static String TaskListFilteredTree_Workweek_Progress; + + public static String TaskListTableSorter_Manual_sorting_is_disabled_in_focused_mode; + + public static String TaskListTableSorter_Task_Sorting; + + public static String TaskListToolTip_Automatic_container_for_all_local_tasks; + + public static String TaskListToolTip_Automatic_container_for_repository_tasks; + + public static String TaskListToolTip__Complete_; + + public static String TaskListToolTip_Due_; + + public static String TaskListToolTip_Elapsed_; + + public static String TaskListToolTip_Estimate_; + + public static String TaskListToolTip_hours; + + public static String TaskListToolTip_Incomplete; + + public static String TaskListToolTip_Please_synchronize_manually_for_full_error_message; + + public static String TaskListToolTip_Scheduled_; + + public static String TaskListToolTip_Some_incoming_elements_may_be_filtered; + + public static String TaskListToolTip_Synchronized; + + public static String TaskListToolTip_Total_; + + public static String TaskListView_Mylyn_context_capture_paused; + + public static String TaskListView__paused_; + + public static String TaskListView_Repository; + + public static String TaskListView_Summary; + + public static String TaskListView_Task_List; + + public static String TaskScheduleContentProvider_Future; + + public static String TaskScheduleContentProvider_Two_Weeks; + + public static String TaskScheduleContentProvider_Unscheduled; + + public static String UpdateRepositoryConfigurationAction_Error_updating_repository_configuration; + + public static String UpdateRepositoryConfigurationAction_Update_Repository_Configuration; + + public static String UpdateRepositoryConfigurationAction_Updating_repository_configuration_for_; +} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java index 04e99ef67..327595819 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java @@ -31,8 +31,6 @@ class PriorityDropDownAction extends Action implements IMenuCreator { */ private final TaskListView taskListView; - private static final String FILTER_PRIORITY_LABEL = "Filter Priority Lower Than"; - private Action priority1; private Action priority2; @@ -48,8 +46,8 @@ class PriorityDropDownAction extends Action implements IMenuCreator { public PriorityDropDownAction(TaskListView taskListView) { super(); this.taskListView = taskListView; - setText(FILTER_PRIORITY_LABEL); - setToolTipText(FILTER_PRIORITY_LABEL); + setText(Messages.PriorityDropDownAction_Filter_Priority_Lower_Than); + setToolTipText(Messages.PriorityDropDownAction_Filter_Priority_Lower_Than); setImageDescriptor(CommonImages.FILTER_PRIORITY); setMenuCreator(this); } @@ -80,7 +78,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { } public void addActionsToMenu() { - priority1 = new Action("", AS_CHECK_BOX) { + priority1 = new Action("", AS_CHECK_BOX) { //$NON-NLS-1$ @Override public void run() { TasksUiPlugin.getDefault().getPreferenceStore().setValue(ITasksUiPreferenceConstants.FILTER_PRIORITY, @@ -94,7 +92,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { ActionContributionItem item = new ActionContributionItem(priority1); item.fill(dropDownMenu, -1); - priority2 = new Action("", AS_CHECK_BOX) { + priority2 = new Action("", AS_CHECK_BOX) { //$NON-NLS-1$ @Override public void run() { TasksUiPlugin.getDefault().getPreferenceStore().setValue(ITasksUiPreferenceConstants.FILTER_PRIORITY, @@ -108,7 +106,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { item = new ActionContributionItem(priority2); item.fill(dropDownMenu, -1); - priority3 = new Action("", AS_CHECK_BOX) { + priority3 = new Action("", AS_CHECK_BOX) { //$NON-NLS-1$ @Override public void run() { TasksUiPlugin.getDefault().getPreferenceStore().setValue(ITasksUiPreferenceConstants.FILTER_PRIORITY, @@ -122,7 +120,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { item = new ActionContributionItem(priority3); item.fill(dropDownMenu, -1); - priority4 = new Action("", AS_CHECK_BOX) { + priority4 = new Action("", AS_CHECK_BOX) { //$NON-NLS-1$ @Override public void run() { TasksUiPlugin.getDefault().getPreferenceStore().setValue(ITasksUiPreferenceConstants.FILTER_PRIORITY, @@ -136,7 +134,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { item = new ActionContributionItem(priority4); item.fill(dropDownMenu, -1); - priority5 = new Action("", AS_CHECK_BOX) { + priority5 = new Action("", AS_CHECK_BOX) { //$NON-NLS-1$ @Override public void run() { TasksUiPlugin.getDefault().getPreferenceStore().setValue(ITasksUiPreferenceConstants.FILTER_PRIORITY, @@ -193,4 +191,4 @@ class PriorityDropDownAction extends Action implements IMenuCreator { public void run() { this.setChecked(isChecked()); } -}
\ No newline at end of file +} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/SortyByDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/SortyByDropDownAction.java index bca39096f..b9d4926e4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/SortyByDropDownAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/SortyByDropDownAction.java @@ -27,7 +27,7 @@ class SortyByDropDownAction extends Action implements IMenuCreator { private final TaskListView taskListView; - private static final String LABEL = "Sort by"; + private static final String LABEL = Messages.SortyByDropDownAction_Sort_by; private Action byPriority; @@ -71,7 +71,7 @@ class SortyByDropDownAction extends Action implements IMenuCreator { } public void addActionsToMenu() { - byPriority = new Action("", AS_CHECK_BOX) { + byPriority = new Action("", AS_CHECK_BOX) { //$NON-NLS-1$ @Override public void run() { taskListView.getSorter().setSortByIndex(SortByIndex.PRIORITY); @@ -81,11 +81,11 @@ class SortyByDropDownAction extends Action implements IMenuCreator { } }; byPriority.setEnabled(true); - byPriority.setText("Priority"); + byPriority.setText(Messages.SortyByDropDownAction_Priority); byPriority.setImageDescriptor(CommonImages.PRIORITY_1); new ActionContributionItem(byPriority).fill(dropDownMenu, -1); - bySummary = new Action("", AS_CHECK_BOX) { + bySummary = new Action("", AS_CHECK_BOX) { //$NON-NLS-1$ @Override public void run() { taskListView.getSorter().setSortByIndex(SortByIndex.SUMMARY); @@ -95,10 +95,10 @@ class SortyByDropDownAction extends Action implements IMenuCreator { } }; bySummary.setEnabled(true); - bySummary.setText("Summary"); + bySummary.setText(Messages.SortyByDropDownAction_Summary); new ActionContributionItem(bySummary).fill(dropDownMenu, -1); - byDateCreated = new Action("", AS_CHECK_BOX) { + byDateCreated = new Action("", AS_CHECK_BOX) { //$NON-NLS-1$ @Override public void run() { taskListView.getSorter().setSortByIndex(SortByIndex.DATE_CREATED); @@ -108,13 +108,13 @@ class SortyByDropDownAction extends Action implements IMenuCreator { } }; byDateCreated.setEnabled(true); - byDateCreated.setText("Date Created"); + byDateCreated.setText(Messages.SortyByDropDownAction_Date_Created); byDateCreated.setImageDescriptor(CommonImages.CALENDAR_SMALL); new ActionContributionItem(byDateCreated).fill(dropDownMenu, -1); new Separator().fill(dropDownMenu, -1); - Action reverse = new Action("", AS_CHECK_BOX) { + Action reverse = new Action("", AS_CHECK_BOX) { //$NON-NLS-1$ @Override public void run() { taskListView.getSorter().setSortDirection(taskListView.getSorter().getSortDirection() * -1); @@ -122,7 +122,7 @@ class SortyByDropDownAction extends Action implements IMenuCreator { } }; reverse.setEnabled(true); - reverse.setText("Descending"); + reverse.setText(Messages.SortyByDropDownAction_Descending); reverse.setChecked(taskListView.getSorter().getSortDirection() < 0); new ActionContributionItem(reverse).fill(dropDownMenu, -1); @@ -143,4 +143,4 @@ class SortyByDropDownAction extends Action implements IMenuCreator { public void run() { this.setChecked(isChecked()); } -}
\ No newline at end of file +} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskInputDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskInputDialog.java index 4fc8142c0..717fa0541 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskInputDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskInputDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Ken Sueda 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 @@ -49,23 +49,19 @@ import org.eclipse.swt.widgets.Text; */ public class TaskInputDialog extends Dialog { - public static final String LABEL_SHELL = "New Task"; + private String taskName = ""; //$NON-NLS-1$ - private static final String LABEL_DESCRIPTION = "Description:"; + private String priority = "P3"; //$NON-NLS-1$ - private String taskName = ""; + private String taskURL = "http://"; //$NON-NLS-1$ - private String priority = "P3"; + private Date reminderDate; - private String taskURL = "http://"; + private Text taskNameTextWidget; - private Date reminderDate = null; + private Text issueURLTextWidget; - Text taskNameTextWidget = null; - - private Text issueURLTextWidget = null; - - private Button getDescButton = null; + private Button getDescButton; public TaskInputDialog(Shell parentShell) { super(parentShell); @@ -82,7 +78,7 @@ public class TaskInputDialog extends Dialog { composite.setLayoutData(data); Label taskNameLabel = new Label(composite, SWT.WRAP); - taskNameLabel.setText(LABEL_DESCRIPTION); + taskNameLabel.setText(Messages.TaskInputDialog_Description); taskNameLabel.setFont(parent.getFont()); taskNameTextWidget = new Text(composite, SWT.SINGLE | SWT.BORDER); @@ -136,7 +132,7 @@ public class TaskInputDialog extends Dialog { }); Button removeReminder = new Button(composite, SWT.PUSH | SWT.CENTER); - removeReminder.setText("Clear"); + removeReminder.setText(Messages.TaskInputDialog_Clear); removeReminder.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -152,7 +148,7 @@ public class TaskInputDialog extends Dialog { // scheduledForDate.setLayoutData(datePickerGD); Label urlLabel = new Label(composite, SWT.WRAP); - urlLabel.setText("Web Link:"); + urlLabel.setText(Messages.TaskInputDialog_Web_Link); urlLabel.setFont(parent.getFont()); issueURLTextWidget = new Text(composite, SWT.SINGLE | SWT.BORDER); @@ -163,7 +159,7 @@ public class TaskInputDialog extends Dialog { issueURLTextWidget.setLayoutData(urlData); getDescButton = new Button(composite, SWT.PUSH); - getDescButton.setText("Get Description"); + getDescButton.setText(Messages.TaskInputDialog_Get_Description); getDescButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END)); setButtonStatus(); @@ -195,7 +191,7 @@ public class TaskInputDialog extends Dialog { protected void setButtonStatus() { String url = issueURLTextWidget.getText(); - if (url.length() > 10 && (url.startsWith("http://") || url.startsWith("https://"))) { + if (url.length() > 10 && (url.startsWith("http://") || url.startsWith("https://"))) { //$NON-NLS-1$ //$NON-NLS-2$ // String defaultPrefix = ContextCore.getPreferenceStore().getString( // TaskListPreferenceConstants.DEFAULT_URL_PREFIX); // if (url.equals(defaultPrefix)) { @@ -215,7 +211,7 @@ public class TaskInputDialog extends Dialog { protected String getDefaultIssueUrl() { String clipboardText = getClipboardText(); - if ((clipboardText.startsWith("http://") || clipboardText.startsWith("https://") && clipboardText.length() > 10)) { + if ((clipboardText.startsWith("http://") || clipboardText.startsWith("https://") && clipboardText.length() > 10)) { //$NON-NLS-1$ //$NON-NLS-2$ return clipboardText; } else { return taskURL; @@ -241,7 +237,7 @@ public class TaskInputDialog extends Dialog { job.schedule(); } catch (RuntimeException e) { // FIXME which exception is caught here? - StatusHandler.fail(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not open task web page", e)); + StatusHandler.fail(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not open task web page", e)); //$NON-NLS-1$ } } @@ -255,7 +251,7 @@ public class TaskInputDialog extends Dialog { if (contents != null) { return contents; } else { - return ""; + return ""; //$NON-NLS-1$ } } @@ -289,6 +285,6 @@ public class TaskInputDialog extends Dialog { @Override protected void configureShell(Shell shell) { super.configureShell(shell); - shell.setText(LABEL_SHELL); + shell.setText(Messages.TaskInputDialog_New_Task); } } 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 b10e7407f..43cbc0a52 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 @@ -21,11 +21,11 @@ import java.util.regex.Pattern; */ public class TaskKeyComparator implements Comparator<String[]> { - private static final String MODULE_TASK_PATTERN = "(?:([A-Za-z]*[:_\\-]?)(\\d+))?"; + private static final String MODULE_TASK_PATTERN = "(?:([A-Za-z]*[:_\\-]?)(\\d+))?"; //$NON-NLS-1$ private static final Pattern ID_PATTERN = Pattern.compile(MODULE_TASK_PATTERN); - public static final Pattern PATTERN = Pattern.compile(MODULE_TASK_PATTERN + "(.*)"); + public static final Pattern PATTERN = Pattern.compile(MODULE_TASK_PATTERN + "(.*)"); //$NON-NLS-1$ public int compare2(String o1, String o2) { String[] a1 = split(o1); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java index af64651bd..2cbb7a2f6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java @@ -40,7 +40,7 @@ class TaskListCellModifier implements ICellModifier { TaskListCellModifier(TaskListView taskListView) { this.taskListView = taskListView; - if (SWT.getPlatform().equals("gtk")) { + if (SWT.getPlatform().equals("gtk")) { //$NON-NLS-1$ disableActivateForParentTasks = true; } } @@ -58,15 +58,15 @@ class TaskListCellModifier implements ICellModifier { case 0: return taskListElement.getSummary(); case 1: - return ""; + return ""; //$NON-NLS-1$ case 2: - return ""; + return ""; //$NON-NLS-1$ } } } catch (Exception e) { StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, e.getMessage(), e)); } - return ""; + return ""; //$NON-NLS-1$ } public void modify(Object element, String property, Object value) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java index 7b3063d7e..5e35b7973 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java @@ -137,9 +137,9 @@ public class TaskListDropAdapter extends ViewerDropAdapter { repositories.addAll(TasksUiPlugin.getTaskListWriter().readRepositories(file)); } } catch (IOException e) { - StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, "The specified file \"" + StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, "The specified file \"" //$NON-NLS-1$ + file.getName() - + "\" is not an exported query. Please, check that you have provided the correct file.")); + + "\" is not an exported query. Please, check that you have provided the correct file.")); //$NON-NLS-1$ // PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { // public void run() { // MessageDialog.openError(null, "Query Import Error", @@ -234,10 +234,10 @@ public class TaskListDropAdapter extends ViewerDropAdapter { * @return true if string is a http(s) url */ public boolean isUrl(Object data) { - String uri = ""; + String uri = ""; //$NON-NLS-1$ if (data instanceof String) { uri = (String) data; - if ((uri.startsWith("http://") || uri.startsWith("https://"))) { + if ((uri.startsWith("http://") || uri.startsWith("https://"))) { //$NON-NLS-1$ //$NON-NLS-2$ return true; } } @@ -254,10 +254,10 @@ public class TaskListDropAdapter extends ViewerDropAdapter { return false; } - String[] urlTransfer = ((String) data).split("\n"); + String[] urlTransfer = ((String) data).split("\n"); //$NON-NLS-1$ - String url = ""; - String urlTitle = "<retrieving from URL>"; + String url = ""; //$NON-NLS-1$ + String urlTitle = Messages.TaskListDropAdapter__retrieving_from_URL_; if (urlTransfer.length > 0) { url = urlTransfer[0]; @@ -365,7 +365,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter { job.schedule(); } catch (RuntimeException e) { // FIXME what exception is caught here? - StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not open task web page", e)); + StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not open task web page", e)); //$NON-NLS-1$ } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java index ccd6df2b9..e721c0016 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java @@ -11,6 +11,7 @@ package org.eclipse.mylyn.internal.tasks.ui.views; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -74,13 +75,7 @@ import org.eclipse.ui.internal.ObjectActionContributorManager; */ public class TaskListFilteredTree extends AbstractFilteredTree { - private static final String LABEL_ACTIVE_NONE = "Activate... "; - - private static final String LABEL_SETS_EDIT = "Edit Task Working Sets..."; - - private static final String LABEL_SETS_MULTIPLE = "<multiple>"; - - public static final String LABEL_SEARCH = "Search repository for key or summary..."; + public static final String LABEL_SEARCH = Messages.TaskListFilteredTree_Search_repository_for_key_or_summary_; private TaskHyperlink workingSetLink; @@ -123,7 +118,7 @@ public class TaskListFilteredTree extends AbstractFilteredTree { } private void hookContextMenu() { - activeTaskMenuManager = new MenuManager("#PopupMenu"); + activeTaskMenuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$ activeTaskMenuManager.setRemoveAllWhenShown(true); activeTaskMenuManager.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) { @@ -255,9 +250,13 @@ public class TaskListFilteredTree extends AbstractFilteredTree { if (PlatformUI.isWorkbenchRunning() && !taskProgressBar.isDisposed()) { taskProgressBar.reset(completeTime, (completeTime + incompleteTime)); - taskProgressBar.setToolTipText("Workweek Progress" + "\n Estimated hours: " + completeTime - + " of " + (completeTime + incompleteTime) + " estimated" + "\n Scheduled tasks: " - + completeTasks + " of " + totalTasks + " scheduled"); + taskProgressBar.setToolTipText(Messages.TaskListFilteredTree_Workweek_Progress + + "\n" //$NON-NLS-1$ + + MessageFormat.format(Messages.TaskListFilteredTree_Estimated_hours, completeTime, + completeTime + incompleteTime) + + "\n" //$NON-NLS-1$ + + MessageFormat.format(Messages.TaskListFilteredTree_Scheduled_tasks, completeTasks, + totalTasks)); } } }); @@ -267,7 +266,7 @@ public class TaskListFilteredTree extends AbstractFilteredTree { protected Composite createActiveWorkingSetComposite(Composite container) { final ImageHyperlink workingSetButton = new ImageHyperlink(container, SWT.FLAT); workingSetButton.setImage(CommonImages.getImage(CommonImages.TOOLBAR_ARROW_RIGHT)); - workingSetButton.setToolTipText("Select Working Set"); + workingSetButton.setToolTipText(Messages.TaskListFilteredTree_Select_Working_Set); workingSetLink = new TaskHyperlink(container, SWT.LEFT); workingSetLink.setText(TaskWorkingSetAction.LABEL_SETS_NONE); @@ -308,7 +307,7 @@ public class TaskListFilteredTree extends AbstractFilteredTree { protected Composite createActiveTaskComposite(final Composite container) { final ImageHyperlink activeTaskButton = new ImageHyperlink(container, SWT.LEFT);// SWT.ARROW | SWT.RIGHT); activeTaskButton.setImage(CommonImages.getImage(CommonImages.TOOLBAR_ARROW_RIGHT)); - activeTaskButton.setToolTipText("Select Active Task"); + activeTaskButton.setToolTipText(Messages.TaskListFilteredTree_Select_Active_Task); activeTaskLink = new TaskHyperlink(container, SWT.LEFT); @@ -340,9 +339,9 @@ public class TaskListFilteredTree extends AbstractFilteredTree { }; TasksUiInternal.getTaskList().addChangeListener(changeListener); - activeTaskLink.setText(LABEL_ACTIVE_NONE); + activeTaskLink.setText(Messages.TaskListFilteredTree_Activate); // avoid having the Hyperlink class show a native tooltip when it shortens the text which would overlap with the task list tooltip - activeTaskLink.setToolTipText(""); + activeTaskLink.setToolTipText(""); //$NON-NLS-1$ taskListToolTip = new TaskListToolTip(activeTaskLink); @@ -415,7 +414,7 @@ public class TaskListFilteredTree extends AbstractFilteredTree { @Override protected void textChanged() { super.textChanged(); - if (getFilterString() != null && !getFilterString().trim().equals("")) { + if (getFilterString() != null && !getFilterString().trim().equals("")) { //$NON-NLS-1$ setShowSearch(true); } else { setShowSearch(false); @@ -431,17 +430,17 @@ public class TaskListFilteredTree extends AbstractFilteredTree { if (activeSets.size() == 0) { workingSetLink.setText(TaskWorkingSetAction.LABEL_SETS_NONE); - workingSetLink.setToolTipText(LABEL_SETS_EDIT); + workingSetLink.setToolTipText(Messages.TaskListFilteredTree_Edit_Task_Working_Sets_); currentWorkingSet = null; } else if (activeSets.size() > 1) { - workingSetLink.setText(LABEL_SETS_MULTIPLE); - workingSetLink.setToolTipText(LABEL_SETS_EDIT); + workingSetLink.setText(Messages.TaskListFilteredTree__multiple_); + workingSetLink.setToolTipText(Messages.TaskListFilteredTree_Edit_Task_Working_Sets_); currentWorkingSet = null; } else { Object[] array = activeSets.toArray(); IWorkingSet workingSet = (IWorkingSet) array[0]; workingSetLink.setText(workingSet.getLabel()); - workingSetLink.setToolTipText(LABEL_SETS_EDIT); + workingSetLink.setToolTipText(Messages.TaskListFilteredTree_Edit_Task_Working_Sets_); currentWorkingSet = workingSet; } filterComposite.layout(); @@ -470,8 +469,8 @@ public class TaskListFilteredTree extends AbstractFilteredTree { } activeTaskLink.setTask(null); - activeTaskLink.setText(LABEL_ACTIVE_NONE); - activeTaskLink.setToolTipText(""); + activeTaskLink.setText(Messages.TaskListFilteredTree_Activate); + activeTaskLink.setToolTipText(""); //$NON-NLS-1$ filterComposite.layout(); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java index 37a19ede6..be3dbc59a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java @@ -69,7 +69,7 @@ public class TaskListInterestFilter extends AbstractTaskListFilter { } } catch (Throwable t) { - StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Interest filter failed", t)); + StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Interest filter failed", t)); //$NON-NLS-1$ } return false; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java index 6c6c16367..55769f557 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java @@ -64,8 +64,8 @@ public class TaskListTableSorter extends ViewerSorter { public void setColumn(String column) { if (view.isFocusedMode()) { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - "Task Sorting", - "Manual sorting is disabled in focused mode, sort order will not take effect until focused mode is disabled."); + Messages.TaskListTableSorter_Task_Sorting, + Messages.TaskListTableSorter_Manual_sorting_is_disabled_in_focused_mode); } } @@ -246,7 +246,7 @@ public class TaskListTableSorter extends ViewerSorter { * @return String array[component, taskId, summary] */ public static String[] getSortableFromElement(IRepositoryElement element) { - final String a[] = new String[] { "", null, element.getSummary() }; + final String a[] = new String[] { "", null, element.getSummary() }; //$NON-NLS-1$ if (element instanceof ITask) { ITask task1 = (ITask) element; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java index a4d7bff3c..e1cc86094 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java @@ -86,7 +86,7 @@ public class TaskListToolTip extends ToolTip { private final static int X_SHIFT; static { - if ("gtk".equals(SWT.getPlatform()) || "carbon".equals(SWT.getPlatform())) { + if ("gtk".equals(SWT.getPlatform()) || "carbon".equals(SWT.getPlatform())) { //$NON-NLS-1$ //$NON-NLS-2$ X_SHIFT = -26; } else { X_SHIFT = -23; @@ -155,17 +155,17 @@ public class TaskListToolTip extends ToolTip { StringBuilder sb = new StringBuilder(); sb.append(element.getSummary()); Calendar start = ((ScheduledTaskContainer) element).getDateRange().getStartDate(); - sb.append(" ["); + sb.append(" ["); //$NON-NLS-1$ sb.append(DateFormat.getDateInstance(DateFormat.LONG).format(start.getTime())); - sb.append("]"); + sb.append("]"); //$NON-NLS-1$ return sb.toString(); } else if (element instanceof IRepositoryQuery) { IRepositoryQuery query = (IRepositoryQuery) element; StringBuilder sb = new StringBuilder(); sb.append(element.getSummary()); - sb.append(" ["); + sb.append(" ["); //$NON-NLS-1$ sb.append(getRepositoryLabel(query.getConnectorKind(), query.getRepositoryUrl())); - sb.append("]"); + sb.append("]"); //$NON-NLS-1$ return sb.toString(); } else { return new TaskElementLabelProvider(false).getText(element); @@ -185,13 +185,13 @@ public class TaskListToolTip extends ToolTip { } } StringBuilder sb = new StringBuilder(); - sb.append("Estimate: "); + sb.append(Messages.TaskListToolTip_Estimate_); sb.append(estimateTotal); - sb.append(" hours"); - sb.append("\n"); - sb.append("Elapsed: "); + sb.append(Messages.TaskListToolTip_hours); + sb.append("\n"); //$NON-NLS-1$ + sb.append(Messages.TaskListToolTip_Elapsed_); sb.append(DateUtil.getFormattedDurationShort(elapsedTotal)); - sb.append("\n"); + sb.append("\n"); //$NON-NLS-1$ return sb.toString(); } else if (element instanceof ITask) { ITask task = (ITask) element; @@ -204,21 +204,21 @@ public class TaskListToolTip extends ToolTip { } String key = task.getTaskKey(); if (key != null) { - sb.append(" "); + sb.append(" "); //$NON-NLS-1$ sb.append(key); } String taskKind = task.getTaskKind(); if (taskKind != null && taskKind.length() > 0 && !taskKind.equals(kindLabel)) { - sb.append(" ("); + sb.append(" ("); //$NON-NLS-1$ sb.append(taskKind); - sb.append(") "); + sb.append(") "); //$NON-NLS-1$ } - sb.append(", "); + sb.append(", "); //$NON-NLS-1$ sb.append(task.getPriority()); - sb.append(" ["); + sb.append(" ["); //$NON-NLS-1$ sb.append(getRepositoryLabel(task.getConnectorKind(), task.getRepositoryUrl())); - sb.append("]"); - sb.append("\n"); + sb.append("]"); //$NON-NLS-1$ + sb.append("\n"); //$NON-NLS-1$ return sb.toString(); } else { return null; @@ -229,12 +229,12 @@ public class TaskListToolTip extends ToolTip { TaskRepository repository = TasksUi.getRepositoryManager().getRepository(repositoryKind, repositoryUrl); if (repository != null) { String label = repository.getRepositoryLabel(); - if (label.indexOf("//") != -1) { - return label.substring((repository.getRepositoryUrl().indexOf("//") + 2)); + if (label.indexOf("//") != -1) { //$NON-NLS-1$ + return label.substring((repository.getRepositoryUrl().indexOf("//") + 2)); //$NON-NLS-1$ } - return label + ""; + return label + ""; //$NON-NLS-1$ } - return ""; + return ""; //$NON-NLS-1$ } private String getActivityText(IRepositoryElement element) { @@ -267,16 +267,16 @@ public class TaskListToolTip extends ToolTip { Date dueDate = task.getDueDate(); if (dueDate != null) { - sb.append("Due: "); - sb.append(new SimpleDateFormat("E").format(dueDate)).append(", "); + sb.append(Messages.TaskListToolTip_Due_); + sb.append(new SimpleDateFormat("E").format(dueDate)).append(", "); //$NON-NLS-1$ //$NON-NLS-2$ sb.append(DateFormat.getDateInstance(DateFormat.LONG).format(dueDate)); - sb.append(" (").append(DateFormat.getTimeInstance(DateFormat.SHORT).format(dueDate)).append(')'); + sb.append(" (").append(DateFormat.getTimeInstance(DateFormat.SHORT).format(dueDate)).append(')'); //$NON-NLS-1$ sb.append('\n'); } DateRange scheduledDate = task.getScheduledForDate(); if (scheduledDate != null) { - sb.append("Scheduled: "); + sb.append(Messages.TaskListToolTip_Scheduled_); sb.append(scheduledDate.toString()); // sb.append(new SimpleDateFormat("E").format(scheduledDate)).append(", "); // sb.append(DateFormat.getDateInstance(DateFormat.LONG).format(scheduledDate)); @@ -285,9 +285,9 @@ public class TaskListToolTip extends ToolTip { long elapsed = TasksUiPlugin.getTaskActivityManager().getElapsedTime(task); String elapsedTimeString = DateUtil.getFormattedDurationShort(elapsed); - sb.append("Elapsed: "); + sb.append(Messages.TaskListToolTip_Elapsed_); sb.append(elapsedTimeString); - sb.append("\n"); + sb.append("\n"); //$NON-NLS-1$ return sb.toString(); } @@ -327,7 +327,7 @@ public class TaskListToolTip extends ToolTip { StringBuilder sb = new StringBuilder(); sb.append(status.getMessage()); if (status instanceof RepositoryStatus && ((RepositoryStatus) status).isHtmlMessage()) { - sb.append(" Please synchronize manually for full error message."); + sb.append(Messages.TaskListToolTip_Please_synchronize_manually_for_full_error_message); } return sb.toString(); } @@ -361,7 +361,8 @@ public class TaskListToolTip extends ToolTip { } } - String text = "Total: " + total + " (Complete: " + completed + ", Incomplete: " + (total - completed) + ")"; + String text = Messages.TaskListToolTip_Total_ + total + Messages.TaskListToolTip__Complete_ + completed + + Messages.TaskListToolTip_Incomplete + (total - completed) + ")"; //$NON-NLS-1$ return new ProgressData(completed, total, text); } else { return null; @@ -553,7 +554,7 @@ public class TaskListToolTip extends ToolTip { } } if (!hasIncoming) { - return "Some incoming elements may be filtered,\nfocus the view to see all incomings"; + return Messages.TaskListToolTip_Some_incoming_elements_may_be_filtered; } } } @@ -561,9 +562,9 @@ public class TaskListToolTip extends ToolTip { // if has incoming but no top level children have incoming, suggest incoming tasks may be filtered } if (element instanceof UncategorizedTaskContainer) { - return "Automatic container for all local tasks\nwith no category set"; + return Messages.TaskListToolTip_Automatic_container_for_all_local_tasks; } else if (element instanceof UnmatchedTaskContainer) { - return "Automatic container for repository tasks\nnot matched by any query"; + return Messages.TaskListToolTip_Automatic_container_for_repository_tasks; } return null; } @@ -583,14 +584,14 @@ public class TaskListToolTip extends ToolTip { if (element instanceof IRepositoryQuery) { String syncStamp = ((RepositoryQuery) element).getLastSynchronizedTimeStamp(); if (syncStamp != null) { - return "Synchronized: " + syncStamp; + return Messages.TaskListToolTip_Synchronized + syncStamp; } } return null; } private String removeTrailingNewline(String text) { - if (text.endsWith("\n")) { + if (text.endsWith("\n")) { //$NON-NLS-1$ return text.substring(0, text.length() - 1); } return text; 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 101eefdd6..82dc41630 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 @@ -35,7 +35,6 @@ import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; -import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.layout.TreeColumnLayout; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; @@ -58,7 +57,6 @@ import org.eclipse.jface.viewers.TreeExpansionEvent; import org.eclipse.jface.viewers.TreePath; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.window.Window; import org.eclipse.mylyn.commons.core.StatusHandler; import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages; import org.eclipse.mylyn.internal.provisional.commons.ui.CommonThemes; @@ -244,7 +242,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { } } } catch (SWTException e) { - StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Failed to refresh viewer: " + StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Failed to refresh viewer: " //$NON-NLS-1$ + viewer, e)); } } @@ -292,46 +290,44 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { // TODO e3.4 replace with SWT.NO_SCROLL constant public static final int SWT_NO_SCROLL = 1 << 4; - public static final String ID = "org.eclipse.mylyn.tasks.ui.views.tasks"; + public static final String ID = "org.eclipse.mylyn.tasks.ui.views.tasks"; //$NON-NLS-1$ - public static final String LABEL_VIEW = "Task List"; + public static final String LABEL_VIEW = Messages.TaskListView_Task_List; - private static final String MEMENTO_KEY_SORT_DIRECTION = "sortDirection"; + private static final String MEMENTO_KEY_SORT_DIRECTION = "sortDirection"; //$NON-NLS-1$ - private static final String MEMENTO_KEY_SORTER = "sorter"; + private static final String MEMENTO_KEY_SORTER = "sorter"; //$NON-NLS-1$ - private static final String MEMENTO_KEY_SORTER2 = "sorter2"; + private static final String MEMENTO_KEY_SORTER2 = "sorter2"; //$NON-NLS-1$ - private static final String MEMENTO_KEY_SORT_INDEX = "sortIndex"; + private static final String MEMENTO_KEY_SORT_INDEX = "sortIndex"; //$NON-NLS-1$ - private static final String MEMENTO_SORT_INDEX = "org.eclipse.mylyn.tasklist.ui.views.tasklist.sortIndex"; + private static final String MEMENTO_SORT_INDEX = "org.eclipse.mylyn.tasklist.ui.views.tasklist.sortIndex"; //$NON-NLS-1$ - private static final String MEMENTO_LINK_WITH_EDITOR = "linkWithEditor"; + private static final String MEMENTO_LINK_WITH_EDITOR = "linkWithEditor"; //$NON-NLS-1$ - private static final String MEMENTO_PRESENTATION = "presentation"; + private static final String MEMENTO_PRESENTATION = "presentation"; //$NON-NLS-1$ - private static final String ID_SEPARATOR_NEW = "new"; + private static final String ID_SEPARATOR_NEW = "new"; //$NON-NLS-1$ - public static final String ID_SEPARATOR_OPERATIONS = "operations"; + public static final String ID_SEPARATOR_OPERATIONS = "operations"; //$NON-NLS-1$ - public static final String ID_SEPARATOR_CONTEXT = "context"; + public static final String ID_SEPARATOR_CONTEXT = "context"; //$NON-NLS-1$ - public static final String ID_SEPARATOR_TASKS = "tasks"; + public static final String ID_SEPARATOR_TASKS = "tasks"; //$NON-NLS-1$ - private static final String ID_SEPARATOR_FILTERS = "filters"; + private static final String ID_SEPARATOR_FILTERS = "filters"; //$NON-NLS-1$ - private static final String ID_SEPARATOR_REPOSITORY = "repository"; + private static final String ID_SEPARATOR_REPOSITORY = "repository"; //$NON-NLS-1$ - private static final String ID_SEPARATOR_PROPERTIES = "properties"; + private static final String ID_SEPARATOR_PROPERTIES = "properties"; //$NON-NLS-1$ - public static final String ID_SEPARATOR_NAVIGATE = "navigate"; + public static final String ID_SEPARATOR_NAVIGATE = "navigate"; //$NON-NLS-1$ - private static final String LABEL_NO_TASKS = "no task active"; + private static final String LABEL_NO_TASKS = "no task active"; //$NON-NLS-1$ private final static int SIZE_MAX_SELECTION_HISTORY = 10; - private static final String PART_NAME = "Task List"; - static final String[] PRIORITY_LEVELS = { PriorityLevel.P1.toString(), PriorityLevel.P2.toString(), PriorityLevel.P3.toString(), PriorityLevel.P4.toString(), PriorityLevel.P5.toString() }; @@ -409,7 +405,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { private final Set<AbstractTaskListFilter> filters = new HashSet<AbstractTaskListFilter>(); - protected String[] columnNames = new String[] { "Summary" }; + protected String[] columnNames = new String[] { Messages.TaskListView_Summary }; protected int[] columnWidths = new int[] { 200 }; @@ -650,8 +646,8 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { categoryGradientStart = new Color(Display.getDefault(), red, green, blue); } catch (Exception e) { categoryGradientStart = getViewer().getTree().getParent().getBackground(); - StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not set color: " + red - + ", " + green + ", " + blue, e)); + StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not set color: " + red //$NON-NLS-1$ + + ", " + green + ", " + blue, e)); //$NON-NLS-1$ //$NON-NLS-2$ } red = Math.max(0, (int) (parentBackground.getRed() / GRADIENT_BOTTOM)); green = Math.max(0, (int) (parentBackground.getGreen() / GRADIENT_BOTTOM)); @@ -663,8 +659,8 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { categoryGradientEnd = new Color(Display.getDefault(), red, green, blue); } catch (Exception e) { categoryGradientStart = getViewer().getTree().getParent().getBackground(); - StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not set color: " + red - + ", " + green + ", " + blue, e)); + StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not set color: " + red //$NON-NLS-1$ + + ", " + green + ", " + blue, e)); //$NON-NLS-1$ //$NON-NLS-2$ } } } else if (categoryGradientStart != null && categoryGradientStart.equals(categoryGradientEnd)) { @@ -728,18 +724,18 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { } if (task != null) { - setTitleToolTip(PART_NAME + " (" + task.getSummary() + ")"); + setTitleToolTip(LABEL_VIEW + " (" + task.getSummary() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ if (shouldSetDescription) { setContentDescription(task.getSummary()); } else { - setContentDescription(""); + setContentDescription(""); //$NON-NLS-1$ } } else { - setTitleToolTip(PART_NAME); + setTitleToolTip(LABEL_VIEW); if (shouldSetDescription) { setContentDescription(LABEL_NO_TASKS); } else { - setContentDescription(""); + setContentDescription(""); //$NON-NLS-1$ } } } @@ -877,7 +873,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { // Set to empty string to disable native tooltips (windows only?) // bug#160897 // http://dev.eclipse.org/newslists/news.eclipse.platform.swt/msg29614.html - getViewer().getTree().setToolTipText(""); + getViewer().getTree().setToolTipText(""); //$NON-NLS-1$ filteredTree.getFilterControl().addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -887,7 +883,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { getViewer().getTree().setHeaderVisible(false); getViewer().setUseHashlookup(true); - refreshJob = new TaskListRefreshJob(getViewer(), "Task List Refresh"); + refreshJob = new TaskListRefreshJob(getViewer(), "Task List Refresh"); //$NON-NLS-1$ configureColumns(columnNames, columnWidths); @@ -1079,8 +1075,8 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { public void applyPresentation(AbstractTaskListPresentation presentation) { try { getViewer().getControl().setRedraw(false); - if (!filteredTree.getFilterControl().getText().equals("")) { - filteredTree.getFilterControl().setText(""); + if (!filteredTree.getFilterControl().getText().equals("")) { //$NON-NLS-1$ + filteredTree.getFilterControl().setText(""); //$NON-NLS-1$ } AbstractTaskListContentProvider contentProvider = presentation.getContentProvider(this); getViewer().setContentProvider(contentProvider); @@ -1199,7 +1195,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { } private void hookContextMenu() { - MenuManager menuManager = new MenuManager("#PopupMenu"); + MenuManager menuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuManager.setRemoveAllWhenShown(true); menuManager.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) { @@ -1300,7 +1296,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { SafeRunnable.run(new ISafeRunnable() { public void handleException(Throwable e) { StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, - "Menu contributor failed")); + "Menu contributor failed")); //$NON-NLS-1$ } public void run() throws Exception { @@ -1365,7 +1361,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { EditRepositoryPropertiesAction repositoryPropertiesAction = new EditRepositoryPropertiesAction(); repositoryPropertiesAction.selectionChanged(new StructuredSelection(element)); if (repositoryPropertiesAction.isEnabled()) { - MenuManager subMenu = new MenuManager("Repository"); + MenuManager subMenu = new MenuManager(Messages.TaskListView_Repository); manager.add(subMenu); UpdateRepositoryConfigurationAction resetRepositoryConfigurationAction = new UpdateRepositoryConfigurationAction(); @@ -1514,17 +1510,6 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { filteredTree.getViewer().getControl().setFocus(); } - public String getBugIdFromUser() { - InputDialog dialog = new InputDialog(getSite().getWorkbenchWindow().getShell(), "Enter Bugzilla ID", - "Enter the Bugzilla ID: ", "", null); - int dialogResult = dialog.open(); - if (dialogResult == Window.OK) { - return dialog.getValue(); - } else { - return null; - } - } - public void refresh(boolean expandIfFocused) { if (expandIfFocused && isFocusedMode()) { try { @@ -1657,11 +1642,11 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { IStatusLineManager statusLineManager = getViewSite().getActionBars().getStatusLineManager(); if (isPaused) { statusLineManager.setMessage(CommonImages.getImage(TasksUiImages.TASKS_VIEW), - "Mylyn context capture paused"); - setPartName("(paused) " + PART_NAME); + Messages.TaskListView_Mylyn_context_capture_paused); + setPartName(Messages.TaskListView__paused_ + LABEL_VIEW); } else { - statusLineManager.setMessage(""); - setPartName(PART_NAME); + statusLineManager.setMessage(""); //$NON-NLS-1$ + setPartName(LABEL_VIEW); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesSorter.java index 0b225ea82..cc73ba01c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesSorter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesSorter.java @@ -40,9 +40,9 @@ public class TaskRepositoriesSorter extends ViewerSorter { if (!t1.getConnectorKind().equals(t2.getConnectorKind())) { return (t1.getConnectorKind()).compareTo(t2.getConnectorKind()); } else { - if ((label1 == null || label1.equals("")) && label2 != null) { + if ((label1 == null || label1.equals("")) && label2 != null) { //$NON-NLS-1$ return 1; - } else if (label1 != null && (label2 == null || label2.equals(""))) { + } else if (label1 != null && (label2 == null || label2.equals(""))) { //$NON-NLS-1$ return -1; } else if (label1 != null && label2 != null) { return label1.compareTo(label2); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java index 3d8b389ab..6d861166c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoriesView.java @@ -31,6 +31,7 @@ import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryAdapter; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.internal.tasks.ui.actions.AddRepositoryAction; import org.eclipse.mylyn.internal.tasks.ui.actions.DeleteTaskRepositoryAction; +import org.eclipse.mylyn.internal.tasks.ui.actions.DisconnectRepositoryAction; import org.eclipse.mylyn.tasks.core.IRepositoryListener; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUi; @@ -54,7 +55,7 @@ import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds; */ public class TaskRepositoriesView extends ViewPart { - public static final String ID = "org.eclipse.mylyn.tasks.ui.views.repositories"; + public static final String ID = "org.eclipse.mylyn.tasks.ui.views.repositories"; //$NON-NLS-1$ private TableViewer viewer; @@ -196,7 +197,7 @@ public class TaskRepositoriesView extends ViewPart { service.executeCommand(IWorkbenchActionDefinitionIds.PROPERTIES, null); } catch (Exception e) { StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, - "Opening repository properties failed", e)); + "Opening repository properties failed", e)); //$NON-NLS-1$ } } } @@ -223,7 +224,7 @@ public class TaskRepositoriesView extends ViewPart { viewer.addSelectionChangedListener(deleteRepositoryAction); resetConfigurationAction = new UpdateRepositoryConfigurationAction(); - resetConfigurationAction.setActionDefinitionId("org.eclipse.ui.file.refresh"); + resetConfigurationAction.setActionDefinitionId("org.eclipse.ui.file.refresh"); //$NON-NLS-1$ viewer.addSelectionChangedListener(resetConfigurationAction); offlineAction = new DisconnectRepositoryAction(); @@ -231,7 +232,7 @@ public class TaskRepositoriesView extends ViewPart { } private void hookContextMenu() { - MenuManager menuMgr = new MenuManager("#PopupMenu"); + MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) { @@ -260,10 +261,10 @@ public class TaskRepositoriesView extends ViewPart { manager.add(resetConfigurationAction); manager.add(new Separator()); manager.add(offlineAction); - manager.add(new Separator("repository")); + manager.add(new Separator("repository")); //$NON-NLS-1$ manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); manager.add(new Separator()); - manager.add(new Separator("properties")); + manager.add(new Separator("properties")); //$NON-NLS-1$ } private void fillLocalToolBar(IToolBarManager manager) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java index 73da7a9a1..34e1061e5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java @@ -15,6 +15,7 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; +import org.eclipse.mylyn.internal.tasks.ui.actions.DisconnectRepositoryAction; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiImages; @@ -61,7 +62,7 @@ public class TaskRepositoryLabelProvider implements ILabelProvider { StringBuilder label = new StringBuilder(); label.append(repository.getRepositoryLabel()); if (repository.isOffline()) { - label.append(" [" + DisconnectRepositoryAction.LABEL + "]"); + label.append(" [" + DisconnectRepositoryAction.LABEL + "]"); //$NON-NLS-1$ //$NON-NLS-2$ } return label.toString(); } else if (object instanceof AbstractRepositoryConnector) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java index 41fd163e0..f7adda79a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java @@ -84,7 +84,7 @@ public class TaskScheduleContentProvider extends TaskListContentProvider impleme containers.add(nextWeekContainer); ScheduledTaskContainer twoWeeksContainer = new ScheduledTaskContainer(taskActivityManager, week.next() - .next(), "Two Weeks"); + .next(), Messages.TaskScheduleContentProvider_Two_Weeks); containers.add(twoWeeksContainer); containers.add(unscheduled); @@ -95,7 +95,7 @@ public class TaskScheduleContentProvider extends TaskListContentProvider impleme endDate.add(Calendar.YEAR, 4999); DateRange future = new DateRange(startDate, endDate); - ScheduledTaskContainer futureContainer = new ScheduledTaskContainer(taskActivityManager, future, "Future"); + ScheduledTaskContainer futureContainer = new ScheduledTaskContainer(taskActivityManager, future, Messages.TaskScheduleContentProvider_Future); containers.add(futureContainer); return applyFilter(containers).toArray(); @@ -194,7 +194,7 @@ public class TaskScheduleContentProvider extends TaskListContentProvider impleme private final TaskActivityManager activityManager; public Unscheduled(TaskActivityManager activityManager, DateRange range) { - super(activityManager, range, "Unscheduled"); + super(activityManager, range, Messages.TaskScheduleContentProvider_Unscheduled); this.activityManager = activityManager; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/UpdateRepositoryConfigurationAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/UpdateRepositoryConfigurationAction.java index 82d3bbe10..8bf184fe7 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/UpdateRepositoryConfigurationAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/UpdateRepositoryConfigurationAction.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies 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 @@ -33,10 +33,10 @@ import org.eclipse.ui.PlatformUI; */ public class UpdateRepositoryConfigurationAction extends AbstractTaskRepositoryAction { - private static final String ID = "org.eclipse.mylyn.tasklist.repositories.reset"; + private static final String ID = "org.eclipse.mylyn.tasklist.repositories.reset"; //$NON-NLS-1$ public UpdateRepositoryConfigurationAction() { - super("Update Repository Configuration"); + super(Messages.UpdateRepositoryConfigurationAction_Update_Repository_Configuration); setId(ID); setEnabled(false); } @@ -51,7 +51,7 @@ public class UpdateRepositoryConfigurationAction extends AbstractTaskRepositoryA final AbstractRepositoryConnector connector = TasksUi.getRepositoryManager() .getRepositoryConnector(repository.getConnectorKind()); if (connector != null) { - final String jobName = "Updating repository configuration for " + repository.getRepositoryUrl(); + final String jobName = Messages.UpdateRepositoryConfigurationAction_Updating_repository_configuration_for_ + repository.getRepositoryUrl(); Job updateJob = new Job(jobName) { @Override protected IStatus run(IProgressMonitor monitor) { @@ -80,7 +80,9 @@ public class UpdateRepositoryConfigurationAction extends AbstractTaskRepositoryA } catch (final CoreException e) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { - TasksUiInternal.displayStatus("Error updating repository configuration", e.getStatus()); + TasksUiInternal.displayStatus( + Messages.UpdateRepositoryConfigurationAction_Error_updating_repository_configuration, + e.getStatus()); } }); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties new file mode 100644 index 000000000..ae817cb03 --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties @@ -0,0 +1,58 @@ +DisconnectRepositoryAction_Disconnected=Disconnected + +PriorityDropDownAction_Filter_Priority_Lower_Than=Filter Priority Lower Than + +SortyByDropDownAction_Date_Created=Date Created +SortyByDropDownAction_Descending=Descending +SortyByDropDownAction_Priority=Priority +SortyByDropDownAction_Sort_by=Sort by +SortyByDropDownAction_Summary=Summary + +TaskInputDialog_Clear=Clear +TaskInputDialog_Description=Description: +TaskInputDialog_Get_Description=Get Description +TaskInputDialog_New_Task=New Task +TaskInputDialog_Web_Link=Web Link: + +TaskListDropAdapter__retrieving_from_URL_=<retrieving from URL> + +TaskListFilteredTree_Activate=Activate... +TaskListFilteredTree_Edit_Task_Working_Sets_=Edit Task Working Sets... +TaskListFilteredTree_Estimated_hours=\ Estimated hours: {0} of {1} estimated +TaskListFilteredTree__multiple_=<multiple> +TaskListFilteredTree_Scheduled_tasks=\ Scheduled tasks: {0} of {1} scheduled +TaskListFilteredTree_Search_repository_for_key_or_summary_=Search repository for key or summary... +TaskListFilteredTree_Select_Active_Task=Select Active Task +TaskListFilteredTree_Select_Working_Set=Select Working Set +TaskListFilteredTree_Workweek_Progress=Workweek Progress + +TaskListTableSorter_Manual_sorting_is_disabled_in_focused_mode=Manual sorting is disabled in focused mode, sort order will not take effect until focused mode is disabled. +TaskListTableSorter_Task_Sorting=Task Sorting + +TaskListToolTip_Automatic_container_for_all_local_tasks=Automatic container for all local tasks\nwith no category set +TaskListToolTip_Automatic_container_for_repository_tasks=Automatic container for repository tasks\nnot matched by any query +TaskListToolTip__Complete_=\ (Complete: +TaskListToolTip_Due_=Due: +TaskListToolTip_Elapsed_=Elapsed: +TaskListToolTip_Estimate_=Estimate: +TaskListToolTip_hours=\ hours +TaskListToolTip_Incomplete=, Incomplete: +TaskListToolTip_Please_synchronize_manually_for_full_error_message=\ Please synchronize manually for full error message. +TaskListToolTip_Scheduled_=Scheduled: +TaskListToolTip_Some_incoming_elements_may_be_filtered=Some incoming elements may be filtered,\nfocus the view to see all incomings +TaskListToolTip_Synchronized=Synchronized: +TaskListToolTip_Total_=Total: + +TaskListView_Mylyn_context_capture_paused=Mylyn context capture paused +TaskListView__paused_=(paused) +TaskListView_Repository=Repository +TaskListView_Summary=Summary +TaskListView_Task_List=Task List + +TaskScheduleContentProvider_Future=Future +TaskScheduleContentProvider_Two_Weeks=Two Weeks +TaskScheduleContentProvider_Unscheduled=Unscheduled + +UpdateRepositoryConfigurationAction_Error_updating_repository_configuration=Error updating repository configuration +UpdateRepositoryConfigurationAction_Update_Repository_Configuration=Update Repository Configuration +UpdateRepositoryConfigurationAction_Updating_repository_configuration_for_=Updating repository configuration for |