diff options
9 files changed, 53 insertions, 63 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java index 405ea5ab3..141996ebb 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java @@ -40,7 +40,7 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider { private final IThemeManager themeManager = PlatformUI.getWorkbench().getThemeManager(); - private static final String[] IMAGE_EXTENSIONS = { "jpg", "gif", "png", "tiff", "tif", "bmp" }; + private static final String[] IMAGE_EXTENSIONS = { "jpg", "gif", "png", "tiff", "tif", "bmp" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ private final TaskDataModel model; @@ -83,27 +83,27 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider { switch (columnIndex) { case 0: if (AttachmentUtil.isContext(attachment)) { - return " Task Context"; + return Messages.AttachmentTableLabelProvider_Task_Context; } else if (attachment.isPatch()) { - return " Patch"; + return Messages.AttachmentTableLabelProvider_Patch; } else { - return " " + attachment.getFileName(); + return " " + attachment.getFileName(); //$NON-NLS-1$ } case 1: return attachment.getDescription(); case 2: Long length = attachment.getLength(); if (length < 0) { - return "-"; + return "-"; //$NON-NLS-1$ } return sizeFormatter.format(length); case 3: - return (attachment.getAuthor() != null) ? attachment.getAuthor().toString() : ""; + return (attachment.getAuthor() != null) ? attachment.getAuthor().toString() : ""; //$NON-NLS-1$ case 4: return (attachment.getCreationDate() != null) ? EditorUtil.formatDateTime(attachment.getCreationDate()) - : ""; + : ""; //$NON-NLS-1$ } - return "unrecognized column"; + return "unrecognized column"; //$NON-NLS-1$ } @Override @@ -140,11 +140,11 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider { public String getToolTipText(Object element) { ITaskAttachment attachment = (ITaskAttachment) element; StringBuilder sb = new StringBuilder(); - sb.append("File: "); + sb.append(Messages.AttachmentTableLabelProvider_File_); sb.append(attachment.getFileName()); if (attachment.getContentType() != null) { - sb.append("\n"); - sb.append("Type: "); + sb.append("\n"); //$NON-NLS-1$ + sb.append(Messages.AttachmentTableLabelProvider_Type_); sb.append(attachment.getContentType()); } return sb.toString(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java index ecc0f957e..b4ff24d8c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java @@ -45,15 +45,7 @@ public class Messages extends NLS { public static String AttachmentTableLabelProvider_unrecognized_column; - public static String AttachmentTableLabelProvider2_File_; - - public static String AttachmentTableLabelProvider2_Patch; - - public static String AttachmentTableLabelProvider2_Task_Context; - - public static String AttachmentTableLabelProvider2_Type_; - - public static String AttachmentTableLabelProvider2_unrecognized_column; + public static String AttachmentTableLabelProvider_Type_; public static String BrowserPreviewViewer_Error; @@ -147,17 +139,15 @@ public class Messages extends NLS { public static String TaskEditorAttributePart_Updating_of_repository_configuration_failed; - public static String TaskEditorCommentPart_Collapse_All_Comments; + public static String TaskEditorCommentPart_0; - public static String TaskEditorCommentPart_Collapse_All_Current_Comments; + public static String TaskEditorCommentPart_1; - public static String TaskEditorCommentPart_Comments; - - public static String TaskEditorCommentPart_Current; + public static String TaskEditorCommentPart_Collapse_Comments; - public static String TaskEditorCommentPart_Expand_All_Comments; + public static String TaskEditorCommentPart_Comments; - public static String TaskEditorCommentPart_Expand_All_Current_Comments; + public static String TaskEditorCommentPart_Expand_Comments; public static String TaskEditorCommentPart_Reply; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java index f5f2eb30c..a2b9558d7 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java @@ -62,7 +62,7 @@ import org.eclipse.ui.forms.widgets.Section; */ public class TaskEditorActionPart extends AbstractTaskEditorPart { - private static final String KEY_OPERATION = "operation"; + private static final String KEY_OPERATION = "operation"; //$NON-NLS-1$ public class SelectButtonListener implements ModifyListener, VerifyListener, SelectionListener, FocusListener, TextChangeListener { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java index ad1c057ff..c7e5f609f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java @@ -101,7 +101,7 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart { groupSection.setBackground(getTaskEditorPage().getAttributeEditorToolkit().getColorIncoming()); } groupSection.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); - groupSection.setText(commentGroup.getGroupName() + " (" + commentGroup.getCommentAttributes().size() + ")"); + groupSection.setText(commentGroup.getGroupName() + Messages.TaskEditorCommentPart_0 + commentGroup.getCommentAttributes().size() + Messages.TaskEditorCommentPart_1); //$NON-NLS-2$ if (groupSection.isExpanded()) { Composite composite = createCommentViewers(groupSection, toolkit); @@ -378,7 +378,7 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart { StringBuilder sb = new StringBuilder(); if (taskComment.getNumber() >= 0) { sb.append(taskComment.getNumber()); - sb.append(": "); + sb.append(": "); //$NON-NLS-1$ } if (author != null) { if (author.getName() != null) { @@ -389,7 +389,7 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart { } } if (taskComment.getCreationDate() != null) { - sb.append(", "); + sb.append(", "); //$NON-NLS-1$ sb.append(EditorUtil.formatDateTime(taskComment.getCreationDate())); } formHyperlink.setText(sb.toString()); @@ -445,9 +445,9 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart { /** Expandable composites are indented by 6 pixels by default. */ private static final int INDENT = -6; - private static final String KEY_EDITOR = "viewer"; + private static final String KEY_EDITOR = "viewer"; //$NON-NLS-1$ - private static final String LABEL_REPLY = "Reply"; + private static final String LABEL_REPLY = Messages.TaskEditorCommentPart_Reply; private List<TaskAttribute> commentAttributes; @@ -468,7 +468,7 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart { return getModel().hasIncomingChanges(taskComment.getTaskAttribute()); } }; - setPartName("Comments"); + setPartName(Messages.TaskEditorCommentPart_Comments); } private void collapseAllComments() { @@ -506,7 +506,7 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart { initialize(); section = createSection(parent, toolkit, hasIncoming); - section.setText(section.getText() + " (" + commentAttributes.size() + ")"); + section.setText(section.getText() + " (" + commentAttributes.size() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ if (commentAttributes.isEmpty()) { section.setEnabled(false); @@ -588,24 +588,24 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart { return; } - Action collapseAllAction = new Action("") { + Action collapseAllAction = new Action("") { //$NON-NLS-1$ @Override public void run() { collapseAllComments(); } }; collapseAllAction.setImageDescriptor(CommonImages.COLLAPSE_ALL_SMALL); - collapseAllAction.setToolTipText("Collapse Comments"); + collapseAllAction.setToolTipText(Messages.TaskEditorCommentPart_Collapse_Comments); barManager.add(collapseAllAction); - Action expandAllAction = new Action("") { + Action expandAllAction = new Action("") { //$NON-NLS-1$ @Override public void run() { expandAllComments(); } }; expandAllAction.setImageDescriptor(CommonImages.EXPAND_ALL_SMALL); - expandAllAction.setToolTipText("Expand Comments"); + expandAllAction.setToolTipText(Messages.TaskEditorCommentPart_Expand_Comments); barManager.add(expandAllAction); } 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 392831c39..d75d8a29e 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 @@ -420,7 +420,8 @@ public class TaskPlanningEditor extends TaskFormPage { GridLayout nameValueLayout = new GridLayout(2, false); nameValueLayout.marginHeight = 3; nameValueComp.setLayout(nameValueLayout); - toolkit.createLabel(nameValueComp, Messages.TaskPlanningEditor_Priority).setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + toolkit.createLabel(nameValueComp, Messages.TaskPlanningEditor_Priority).setForeground( + toolkit.getColors().getColor(IFormColors.TITLE)); priorityCombo = new CCombo(nameValueComp, SWT.FLAT | SWT.READ_ONLY); toolkit.adapt(priorityCombo, false, false); priorityCombo.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); @@ -452,7 +453,8 @@ public class TaskPlanningEditor extends TaskFormPage { nameValueComp = toolkit.createComposite(statusComposite); nameValueComp.setLayout(new GridLayout(2, false)); - toolkit.createLabel(nameValueComp, Messages.TaskPlanningEditor_Status).setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); + toolkit.createLabel(nameValueComp, Messages.TaskPlanningEditor_Status).setForeground( + toolkit.getColors().getColor(IFormColors.TITLE)); statusCombo = new CCombo(nameValueComp, SWT.FLAT | SWT.READ_ONLY); toolkit.adapt(statusCombo, true, true); statusCombo.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER); @@ -479,13 +481,15 @@ public class TaskPlanningEditor extends TaskFormPage { Date creationDate = task.getCreationDate(); String creationDateString = (creationDate != null) ? DateFormat.getDateInstance(DateFormat.LONG).format( creationDate) : ""; //$NON-NLS-1$ - addNameValueComp(statusComposite, Messages.TaskPlanningEditor_Created, creationDateString, SWT.FLAT | SWT.READ_ONLY); + addNameValueComp(statusComposite, Messages.TaskPlanningEditor_Created, creationDateString, SWT.FLAT + | SWT.READ_ONLY); String completionDateString = ""; //$NON-NLS-1$ if (task.isCompleted()) { completionDateString = getTaskDateString(task); } - endDate = addNameValueComp(statusComposite, Messages.TaskPlanningEditor_Completed, completionDateString, SWT.FLAT | SWT.READ_ONLY); + endDate = addNameValueComp(statusComposite, Messages.TaskPlanningEditor_Completed, completionDateString, + SWT.FLAT | SWT.READ_ONLY); // URL Composite urlComposite = toolkit.createComposite(parent); GridLayout urlLayout = new GridLayout(4, false); @@ -756,20 +760,20 @@ public class TaskPlanningEditor extends TaskFormPage { nameValueComp = makeComposite(sectionClient, 3); GridDataFactory.fillDefaults().applyTo(nameValueComp); - label = toolkit.createLabel(nameValueComp, "Active:"); + label = toolkit.createLabel(nameValueComp, Messages.TaskPlanningEditor_Active); label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); - label.setToolTipText("Time working on this task"); + label.setToolTipText(Messages.TaskPlanningEditor_Time_working_on_this_task); String elapsedTimeString = NO_TIME_ELAPSED; try { elapsedTimeString = TasksUiInternal.getFormattedDuration(TasksUiPlugin.getTaskActivityManager() .getElapsedTime(task), false); - if (elapsedTimeString.equals("")) { + if (elapsedTimeString.equals("")) { //$NON-NLS-1$ elapsedTimeString = NO_TIME_ELAPSED; } } catch (RuntimeException e) { // FIXME what exception is caught here? - StatusHandler.fail(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not format elapsed time", e)); + StatusHandler.fail(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not format elapsed time", e)); //$NON-NLS-1$ } final Text elapsedTimeText = toolkit.createText(nameValueComp, elapsedTimeString); @@ -788,13 +792,13 @@ public class TaskPlanningEditor extends TaskFormPage { String elapsedTimeString = NO_TIME_ELAPSED; try { elapsedTimeString = TasksUiInternal.getFormattedDuration(newElapsedTime, false); - if (elapsedTimeString.equals("")) { + if (elapsedTimeString.equals("")) { //$NON-NLS-1$ elapsedTimeString = NO_TIME_ELAPSED; } } catch (RuntimeException e) { StatusHandler.fail(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, - "Could not format elapsed time", e)); + "Could not format elapsed time", e)); //$NON-NLS-1$ } final String elapsedString = elapsedTimeString; PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties index c10adfeda..365b017c6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties @@ -9,12 +9,8 @@ AttachmentSizeFormatter_1_byte=1 byte AttachmentTableLabelProvider_File_=File: AttachmentTableLabelProvider_Patch=\ Patch AttachmentTableLabelProvider_Task_Context=\ Task Context +AttachmentTableLabelProvider_Type_=Type: AttachmentTableLabelProvider_unrecognized_column=unrecognized column -AttachmentTableLabelProvider2_File_=File: -AttachmentTableLabelProvider2_Patch=\ Patch -AttachmentTableLabelProvider2_Task_Context=\ Task Context -AttachmentTableLabelProvider2_Type_=Type: -AttachmentTableLabelProvider2_unrecognized_column=unrecognized column BrowserPreviewViewer_Error=Error BrowserPreviewViewer_Formatting_Wiki_Text=Formatting Wiki Text BrowserPreviewViewer_Loading_preview_=Loading preview... @@ -73,12 +69,11 @@ TaskEditorAttributePart_Refresh_Attributes=Refresh Attributes TaskEditorAttributePart_Update_Failed=Update Failed TaskEditorAttributePart_Updating_of_repository_configuration_failed=Updating of repository configuration failed -TaskEditorCommentPart_Collapse_All_Comments=Collapse All Comments -TaskEditorCommentPart_Collapse_All_Current_Comments=Collapse All Current Comments +TaskEditorCommentPart_0=\ ( +TaskEditorCommentPart_1=) +TaskEditorCommentPart_Collapse_Comments=Collapse Comments TaskEditorCommentPart_Comments=Comments -TaskEditorCommentPart_Current=Current -TaskEditorCommentPart_Expand_All_Comments=Expand All Comments -TaskEditorCommentPart_Expand_All_Current_Comments=Expand All Current Comments +TaskEditorCommentPart_Expand_Comments=Expand Comments TaskEditorCommentPart_Reply=Reply TaskEditorDescriptionPart_Description=Description diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskAttachmentPropertyTester.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskAttachmentPropertyTester.java index cbd1dfab9..73722c3b9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskAttachmentPropertyTester.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskAttachmentPropertyTester.java @@ -20,9 +20,9 @@ import org.eclipse.mylyn.tasks.core.ITaskAttachment; */ public class TaskAttachmentPropertyTester extends PropertyTester { - private static final String PROPERTY_IS_CONTEXT = "isContext"; + private static final String PROPERTY_IS_CONTEXT = "isContext"; //$NON-NLS-1$ - private static final String PROPERTY_HAS_URL = "hasUrl"; + private static final String PROPERTY_HAS_URL = "hasUrl"; //$NON-NLS-1$ private boolean equals(boolean value, Object expectedValue) { return new Boolean(value).equals(expectedValue); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java index ea6034f20..8218479fd 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java @@ -186,7 +186,7 @@ public abstract class AbstractAttributeEditor { */ protected void decorateOutgoing(Color color) { if (labelControl != null) { - labelControl.setText("*" + labelControl.getText()); + labelControl.setText("*" + labelControl.getText()); //$NON-NLS-1$ } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttributeEditorToolkit.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttributeEditorToolkit.java index 75b5879dc..8987781a9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttributeEditorToolkit.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttributeEditorToolkit.java @@ -35,6 +35,7 @@ import org.eclipse.mylyn.internal.provisional.commons.ui.CommonThemes; import org.eclipse.mylyn.internal.tasks.ui.PersonProposalLabelProvider; import org.eclipse.mylyn.internal.tasks.ui.PersonProposalProvider; import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil; +import org.eclipse.mylyn.internal.tasks.ui.editors.Messages; import org.eclipse.mylyn.internal.tasks.ui.editors.RichTextAttributeEditor; import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewerConfiguration.Mode; import org.eclipse.mylyn.tasks.core.data.TaskAttribute; @@ -230,7 +231,7 @@ public class AttributeEditorToolkit { FieldDecorationRegistry.DEC_CONTENT_PROPOSAL); controlDecoration.setImage(contentProposalImage.getImage()); IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class); - controlDecoration.setDescriptionText(NLS.bind("Content Assist Available ({0})", + controlDecoration.setDescriptionText(NLS.bind(Messages.AttributeEditorToolkit_Content_Assist_Available__X_, bindingService.getBestActiveBindingFormattedFor(ContentAssistCommandAdapter.CONTENT_PROPOSAL_COMMAND))); return controlDecoration; } |