diff options
author | spingel | 2009-10-13 00:58:06 +0000 |
---|---|---|
committer | spingel | 2009-10-13 00:58:06 +0000 |
commit | ffdec973eff28ccef2a2d6b20f21262fe84e1ce6 (patch) | |
tree | f326177269b7377414499abc4bc4dbc56b371007 | |
parent | 61d31b0b52b39a5de067b0ec6a855207aa17e5fc (diff) | |
download | org.eclipse.mylyn.tasks-ffdec973eff28ccef2a2d6b20f21262fe84e1ce6.tar.gz org.eclipse.mylyn.tasks-ffdec973eff28ccef2a2d6b20f21262fe84e1ce6.tar.xz org.eclipse.mylyn.tasks-ffdec973eff28ccef2a2d6b20f21262fe84e1ce6.zip |
NEW - bug 280161: cleanup fixme and todo comments for 3.3
https://bugs.eclipse.org/bugs/show_bug.cgi?id=280161
31 files changed, 45 insertions, 70 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF index 241d02d88..393b6f6d5 100644 --- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF @@ -13,6 +13,7 @@ Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-ClassPath: . Export-Package: org.eclipse.mylyn.internal.bugzilla.core;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui", - org.eclipse.mylyn.internal.bugzilla.core.history;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui" + org.eclipse.mylyn.internal.bugzilla.core.history;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui", + org.eclipse.mylyn.internal.bugzilla.core.service;x-internal:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: plugin diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java index 89fedc05d..e164b7e1c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java @@ -584,7 +584,7 @@ public class BugzillaClient { for (String type : VALID_CONFIG_CONTENT_TYPES) { if (responseTypeHeader.getValue().toLowerCase(Locale.ENGLISH).contains(type)) { RepositoryConfigurationFactory configFactory = new RepositoryConfigurationFactory( - stream, getCharacterEncoding(), connector); + stream, getCharacterEncoding()); repositoryConfiguration = configFactory.getConfiguration(); diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java index caeb3e5a3..9a5a3b7f4 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java @@ -103,8 +103,6 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { // A Map from Java's Platform to Buzilla's private static final Map<String, String> java2buzillaPlatformMap = new HashMap<String, String>(); - private static final String OPTION_ALL = "All"; //$NON-NLS-1$ - static { enSetting = new BugzillaLanguageSettings(IBugzillaConstants.DEFAULT_LANG); enSetting.addLanguageAttribute("error_login", "Login"); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java index f5da73228..76af0840c 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java @@ -25,15 +25,18 @@ import org.xml.sax.SAXParseException; * @author Rob Elves */ public class RepositoryConfigurationFactory extends AbstractReportFactory { - private final BugzillaRepositoryConnector connector; + @Deprecated public RepositoryConfigurationFactory(InputStream inStream, String encoding, BugzillaRepositoryConnector connector) { super(inStream, encoding); - this.connector = connector; + } + + public RepositoryConfigurationFactory(InputStream inStream, String encoding) { + super(inStream, encoding); } public RepositoryConfiguration getConfiguration() throws IOException, CoreException { - SaxConfigurationContentHandler contentHandler = new SaxConfigurationContentHandler(connector); + SaxConfigurationContentHandler contentHandler = new SaxConfigurationContentHandler(); collectResults(contentHandler, true); RepositoryConfiguration config = contentHandler.getConfiguration(); return config; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxConfigurationContentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxConfigurationContentHandler.java index 292e251ff..7c6803e9e 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxConfigurationContentHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxConfigurationContentHandler.java @@ -199,11 +199,7 @@ public class SaxConfigurationContentHandler extends DefaultHandler { private String currentCustomOptionName = ""; //$NON-NLS-1$ - private final BugzillaRepositoryConnector connector; - - public SaxConfigurationContentHandler(BugzillaRepositoryConnector connector) { - super(); - this.connector = connector; + public SaxConfigurationContentHandler() { configuration = new RepositoryConfiguration(); } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java index 3a3458ae4..203414dd1 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java @@ -648,6 +648,7 @@ public class SaxMultiBugReportContentHandler extends DefaultHandler { private static class TaskComment { + @SuppressWarnings("unused") public int number; public String author; @@ -660,8 +661,10 @@ public class SaxMultiBugReportContentHandler extends DefaultHandler { public String timeWorked; + @SuppressWarnings("unused") public boolean hasAttachment; + @SuppressWarnings("unused") public String attachmentId; public TaskComment(int num) { diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskDataHandlerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskDataHandlerTest.java index ba9c52f10..551a16c23 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskDataHandlerTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskDataHandlerTest.java @@ -15,7 +15,6 @@ import junit.framework.TestCase; import org.eclipse.mylyn.bugzilla.tests.support.BugzillaFixture; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute; -import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector; import org.eclipse.mylyn.internal.tasks.core.DefaultTaskMapping; import org.eclipse.mylyn.tasks.core.ITaskMapping; @@ -37,11 +36,8 @@ public class BugzillaTaskDataHandlerTest extends TestCase { private BugzillaRepositoryConnector connector; - private BugzillaClient client; - @Override public void setUp() throws Exception { - client = BugzillaFixture.current().client(PrivilegeLevel.USER); repository = BugzillaFixture.current().repository(); connector = BugzillaFixture.current().connector(); } diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaConfigurationTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaConfigurationTest.java index 560bfe249..96d7f87bf 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaConfigurationTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaConfigurationTest.java @@ -120,8 +120,7 @@ public class BugzillaConfigurationTest extends TestCase { } - SaxConfigurationContentHandler contentHandler = new SaxConfigurationContentHandler( - new BugzillaRepositoryConnector()); + SaxConfigurationContentHandler contentHandler = new SaxConfigurationContentHandler(); final XMLReader reader = XMLReaderFactory.createXMLReader(); reader.setContentHandler(contentHandler); reader.setErrorHandler(new ErrorHandler() { diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java index b134eb01b..d0aadff80 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/support/BugzillaFixture.java @@ -219,9 +219,6 @@ public class BugzillaFixture extends TestFixture { } public RepositoryResponse submitTask(TaskData taskData, BugzillaClient client) throws IOException, CoreException { - AbstractTaskDataHandler taskDataHandler = connector.getTaskDataHandler(); - TaskAttributeMapper mapper = taskDataHandler.getAttributeMapper(repository()); - final TaskData[] newData = new TaskData[1]; RepositoryResponse result = client.postTaskData(taskData, null); return result; } diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/actions/NewTaskFromErrorAction.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/actions/NewTaskFromErrorAction.java index 5f0aafe7f..541ea3d5a 100644 --- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/actions/NewTaskFromErrorAction.java +++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/actions/NewTaskFromErrorAction.java @@ -45,6 +45,8 @@ public class NewTaskFromErrorAction implements IObjectActionDelegate { * @param includeChildren * Indicates if it should include subentries, if the {@link LogEntry} have any */ + // FIXME 3.4 re-enable (bug 279267) + @SuppressWarnings("unused") private void buildDescriptionFromLogEntry(LogEntry entry, StringBuilder sb, boolean includeChildren) { sb.append(Messages.NewTaskFromErrorAction_ERROR_LOG_DATE); sb.append(entry.getDate()); diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTask.java index afa5deddb..c188407ad 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTask.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTask.java @@ -22,6 +22,7 @@ public class LocalTask extends AbstractTask { super(LocalRepositoryConnector.REPOSITORY_URL, taskId, summary); } + @Deprecated @Override public boolean isLocal() { return true; @@ -37,6 +38,7 @@ public class LocalTask extends AbstractTask { return true; } + @SuppressWarnings("deprecation") @Override public String getLastReadTimeStamp() { return SYNC_DATE_NOW; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskTask.java index 000f75426..65ecc88bc 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskTask.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskTask.java @@ -34,6 +34,7 @@ public class TaskTask extends AbstractTask { return taskKey; } + @Deprecated @Override public boolean isLocal() { return false; diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskMapperTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskMapperTest.java index aacc81991..c8db2601c 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskMapperTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskMapperTest.java @@ -49,7 +49,7 @@ public class TaskMapperTest extends TestCase { public void testCloneTaskCloneCommonAttributes() { source.setDescription("sourceDescription"); target.setDescription(""); - // TODO 3.3 remove (bug 247595) + // TODO 3.4 remove (bug 247595) target.getTaskData().getRoot().getAttribute(TaskAttribute.DESCRIPTION).getMetaData().setReadOnly(false); target.merge(source); assertEquals("sourceDescription", target.getDescription()); @@ -57,7 +57,7 @@ public class TaskMapperTest extends TestCase { source.setSummary("sourceSummary"); target.setSummary(""); - // TODO 3.3 remove (bug 247595) + // TODO 3.4 remove (bug 247595) target.getTaskData().getRoot().getAttribute(TaskAttribute.SUMMARY).getMetaData().setReadOnly(false); target.merge(source); assertEquals("sourceSummary", target.getSummary()); @@ -118,7 +118,7 @@ public class TaskMapperTest extends TestCase { source.setDescription("sourceDescription"); target.setDescription(""); - // TODO 3.3 remove (bug 247595) + // TODO 3.4 remove (bug 247595) target.getTaskData().getRoot().getAttribute(TaskAttribute.DESCRIPTION).getMetaData().setReadOnly(false); target.merge(source); assertEquals("sourceDescription", target.getDescription()); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java index 775610f02..0dab9eccc 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java @@ -126,7 +126,7 @@ public class TaskRepositoryManagerTest extends TestCase { assertEquals("httpPassword", map.get(AUTH_HTTP_PASSWORD)); } - // FIXME 3.3 re-enable test + // FIXME 3.4 re-enable test // public void testMigrationToSecureStorage() throws Exception { // TaskRepository repository1 = new TaskRepository("bugzilla", "http://repository1/"); // diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java index 264f27f7d..6e4e1f4e9 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java @@ -33,7 +33,7 @@ import org.eclipse.mylyn.tasks.ui.TasksUi; */ public class MockRepositoryConnector extends AbstractRepositoryConnector { - // TODO 3.3 rename to CONNECTOR_KIND + // TODO 3.4 rename to CONNECTOR_KIND public static final String REPOSITORY_KIND = "mock"; public static final String REPOSITORY_URL = "http://mockrepository.test"; diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTask.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTask.java index 5a7ad3b4c..b511a3e89 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTask.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockTask.java @@ -56,6 +56,7 @@ public class MockTask extends AbstractTask { return "Mock Task: " + super.getHandleIdentifier(); } + @Deprecated @Override public boolean isLocal() { // ignore diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/ContextPerspectiveManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/ContextPerspectiveManagerTest.java index 0d7f3cc8b..07e710f59 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/ContextPerspectiveManagerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/ContextPerspectiveManagerTest.java @@ -71,7 +71,7 @@ public class ContextPerspectiveManagerTest extends TestCase { assertEquals(ID_PLANNING_PERSPECTIVE, getActivePerspective()); } - // FIXME 3.3 re-enable test + // FIXME 3.4 re-enable test // public void testRecreateTask() throws Exception { // PlatformUI.getWorkbench().showPerspective(ID_RESOURCE_PERSPECTIVE, MonitorUi.getLaunchingWorkbenchWindow()); // TaskTask task = TaskTestUtil.createMockTask("1"); diff --git a/org.eclipse.mylyn.tasks.ui/.settings/.api_filters b/org.eclipse.mylyn.tasks.ui/.settings/.api_filters index 932dc94e0..8790322d1 100644 --- a/org.eclipse.mylyn.tasks.ui/.settings/.api_filters +++ b/org.eclipse.mylyn.tasks.ui/.settings/.api_filters @@ -7,12 +7,6 @@ <message_argument value="TaskJob"/> </message_arguments> </filter> - <filter id="571519004"> - <message_arguments> - <message_argument value="org.eclipse.mylyn.internal.tasks.ui.TaskJobFactory.createUpdateRepositoryConfigurationJob(AbstractRepositoryConnector, TaskRepository)"/> - <message_argument value="TaskJob"/> - </message_arguments> - </filter> </resource> <resource path="src/org/eclipse/mylyn/internal/tasks/ui/dialogs/AbstractWorkingSetDialogCOPY.java" type="org.eclipse.mylyn.internal.tasks.ui.dialogs.AbstractWorkingSetDialogCOPY"> <filter id="574619656"> diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java index 7963e5503..5f32d60d6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java @@ -176,7 +176,7 @@ public class PersonProposalProvider implements IContentProposalProvider { addAddress(task.getOwner(), addressSet); } - // TODO 3.3 re-implement + // TODO 3.4 re-implement private void addAddresses(TaskData data, Set<String> addressSet) { // addressSet.add(data.getAssignedTo()); // owner // addAddress(data.getReporter(), addressSet); // ?? diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java index d73087593..6cd3e29c4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java @@ -138,7 +138,7 @@ public class BrowserPreviewViewer { browser.getDisplay().asyncExec(new Runnable() { public void run() { setText(browser, job.getHtmlText()); - // TODO 3.3 error handling + // TODO 3.4 error handling //getAttributeEditorManager().setMessage(null, IMessageProvider.NONE); } }); @@ -146,7 +146,7 @@ public class BrowserPreviewViewer { browser.getDisplay().asyncExec(new Runnable() { public void run() { TasksUiInternal.displayStatus(Messages.BrowserPreviewViewer_Error, job.getStatus()); - // TODO 3.3 error handling + // TODO 3.4 error handling //getAttributeEditorManager().setMessage(job.getStatus().getMessage(), IMessageProvider.ERROR); } }); 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 2984d9a96..2b35cef62 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 @@ -53,8 +53,6 @@ public class Messages extends NLS { public static String BrowserPreviewViewer_The_repository_does_not_support_HTML_preview; - public static String CheckboxMultiSelectAttributeEditor_Edit; - public static String CheckboxMultiSelectAttributeEditor_Select_X; public static String CommentGroupStrategy_Current; @@ -71,8 +69,6 @@ public class Messages extends NLS { public static String PlanningPageFactory_Private; - public static String PlanningPart_Estimated_Time_Hours; - public static String PlanningPart_Personal_Notes; public static String RichTextAttributeEditor_Viewer_Source; @@ -153,7 +149,7 @@ public class Messages extends NLS { public static String TaskEditorPlanningPart_Active; - public static String TaskEditorPlanningPart_Clear; + public static String TaskEditorPlanningPart_Add_Private_Notes_Tooltip; public static String TaskEditorPlanningPart_Confirm_Activity_Time_Deletion; @@ -163,24 +159,18 @@ public class Messages extends NLS { public static String TaskEditorPlanningPart_Estimated; - public static String TaskEditorPlanningPart_Reset; - public static String TaskEditorPlanningPart_Scheduled; public static String TaskEditorPlanningPart_TaskEditorPlanningPart_tooltip; public static String TaskEditorPlanningPart_Time_working_on_this_task; - public static String TaskEditorPlanningPart_No_scheduled_date; - public static String TaskEditorRichTextPart_Browser_Preview; public static String TaskEditorRichTextPart_Edit_Tooltip; public static String TaskEditorRichTextPart_Maximize; - public static String TaskEditorRichTextPart_Preview; - public static String TaskEditorSummaryPart_Summary; public static String TaskPlanningEditor_Attributes; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java index cdf6df9f6..b85c322f5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java @@ -31,7 +31,7 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart { private class NotesAction extends Action { public NotesAction() { setImageDescriptor(CommonImages.NOTES_SMALL); - setToolTipText("Add Private Notes"); + setToolTipText(Messages.TaskEditorPlanningPart_Add_Private_Notes_Tooltip); } @Override 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 657ba2855..99eef75c4 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 @@ -25,8 +25,6 @@ BrowserPreviewViewer_Formatting_Wiki_Text=Formatting Wiki Text BrowserPreviewViewer_Loading_preview_=Loading preview... BrowserPreviewViewer_The_repository_does_not_support_HTML_preview=The repository does not support HTML preview. -CheckboxMultiSelectAttributeEditor_Edit=Edit -CheckboxMultiSelectAttributeEditor_Edit=Edit CheckboxMultiSelectAttributeEditor_Select_X=Select {0} CommentGroupStrategy_Current=Current @@ -38,7 +36,6 @@ DateAttributeEditor_Clear=Clear PersonalPart_Personal_Planning=Private PersonAttributeEditor_Insert_My_User_Id_Tooltip=Insert My User ID PlanningPageFactory_Private=Private -PlanningPart_Estimated_Time_Hours=Estimated time in hours PlanningPart_Personal_Notes=Notes RichTextAttributeEditor_Viewer_Source=View Unformatted Text @@ -88,21 +85,18 @@ TaskEditorPeoplePart_People=People TaskEditorPlanningPart_0_SECOUNDS=0 seconds TaskEditorPlanningPart_Active=Active: -TaskEditorPlanningPart_Clear=Clear +TaskEditorPlanningPart_Add_Private_Notes_Tooltip=Add Private Notes TaskEditorPlanningPart_Confirm_Activity_Time_Deletion=Confirm Activity Time Deletion TaskEditorPlanningPart_Do_you_wish_to_reset_your_activity_time_on_this_task_=Do you wish to reset your activity time on this task?\n\nThis will take immediate affect and can not be undone. TaskEditorPlanningPart_Due=Due: TaskEditorPlanningPart_Estimated=Estimate: -TaskEditorPlanningPart_Reset=Reset TaskEditorPlanningPart_Scheduled=Scheduled: TaskEditorPlanningPart_TaskEditorPlanningPart_tooltip=Contents are stored locally, not\n submitted to the repository. TaskEditorPlanningPart_Time_working_on_this_task=Time working on this task -TaskEditorPlanningPart_No_scheduled_date=Not Scheduled TaskEditorRichTextPart_Browser_Preview=Browser Preview TaskEditorRichTextPart_Edit_Tooltip=Edit TaskEditorRichTextPart_Maximize=Maximize -TaskEditorRichTextPart_Preview=Preview TaskEditorSummaryPart_Summary=Summary 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 index d90b5f4b8..b44f96ffe 100644 --- 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 @@ -77,8 +77,6 @@ public class Messages extends NLS { public static String TaskListToolTip_Due; - public static String TaskListToolTip_Elapsed; - public static String TaskListToolTip_Estimate; public static String TaskListToolTip_Please_synchronize_manually_for_full_error_message; 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 index 351ed9660..c9526addb 100644 --- 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 @@ -39,7 +39,6 @@ TaskListToolTip_Active_X=Active: {0} 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_Due=Due: {0}, {1} ({2}) -TaskListToolTip_Elapsed=Elapsed: {0} TaskListToolTip_Estimate=Estimate: {0} hours TaskListToolTip_Please_synchronize_manually_for_full_error_message=\ Please synchronize manually for full error message. TaskListToolTip_Scheduled=Scheduled: {0} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AttachmentPreviewPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AttachmentPreviewPage.java index b0dd7d582..13e2a276a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AttachmentPreviewPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AttachmentPreviewPage.java @@ -183,7 +183,7 @@ public class AttachmentPreviewPage extends WizardPage { private void createGenericPreview(Composite composite) { Label label = new Label(composite, SWT.NONE); label.setLayoutData(new GridData(GridData.FILL_BOTH)); - // TODO 3.3 put filename on model + // TODO 3.4 put filename on model String name = model.getSource().getName(); TaskAttachmentMapper taskAttachment = TaskAttachmentMapper.createFrom(model.getAttribute()); if (taskAttachment.getFileName() != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java index d54a8b1d2..6c813b7b3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java @@ -1020,7 +1020,7 @@ public abstract class AbstractTaskEditorPage extends TaskFormPage implements ISe updateOutlinePage(); return outlinePage; } - // TODO 3.3 replace by getTextSupport() method + // TODO 3.4 replace by getTextSupport() method if (adapter == CommonTextSupport.class) { return textSupport; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java index 0887bf53b..beb1131f0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java @@ -668,7 +668,7 @@ public class TaskEditor extends SharedHeaderFormEditor { if (page instanceof AbstractTaskEditorPage) { ((AbstractTaskEditorPage) page).refreshFormContent(); } else if (page instanceof BrowserFormPage) { - // XXX 3.3 replace by invocation of refreshFromContent(); + // XXX 3.4 replace by invocation of refreshFromContent(); ((BrowserFormPage) page).init(getEditorSite(), getEditorInput()); } } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/Messages.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/Messages.java index 77bf0adaa..2a8242def 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/Messages.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/Messages.java @@ -26,10 +26,12 @@ public class Messages extends NLS { NLS.initializeMessages(BUNDLE_NAME, Messages.class); } - public static String TracWebClient_Trac_version_X_is_unsupported_Error; public static String TracWebClient_Updating_attributes; + public static String TracXmlRpcClient_API_version_unsupported_Error; + public static String TracXmlRpcClient_API_version_X_unsupported_Error; + public static String TracXmlRpcClient_Required_API_calls_missing_Error; } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/messages.properties b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/messages.properties index 36a1cedc7..61bd08319 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/messages.properties +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/client/messages.properties @@ -8,7 +8,6 @@ # Contributors: # Steffen Pingel - initial API and implementation ############################################################################### -TracWebClient_Trac_version_X_is_unsupported_Error=The Trac version {0} is unsupported. Please use a version from 0.9 to 0.11 TracWebClient_Updating_attributes=Updating attributes TracXmlRpcClient_API_version_unsupported_Error=The API version is unsupported, update the Trac XML-RPC Plugin to revision {0} or later TracXmlRpcClient_API_version_X_unsupported_Error=The API version {0} is unsupported, update the Trac XML-RPC Plugin to revision {1} or later diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/util/TracHttpClientTransportFactory.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/util/TracHttpClientTransportFactory.java index a0b29d5b9..69ae72979 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/util/TracHttpClientTransportFactory.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/util/TracHttpClientTransportFactory.java @@ -102,15 +102,15 @@ public class TracHttpClientTransportFactory implements XmlRpcTransportFactory { try { return method.getResponseBodyAsStream(); } catch (HttpException e) { - throw new XmlRpcClientException("Error in HTTP transport: " + e.getMessage(), e); + throw new XmlRpcClientException("Error in HTTP transport: " + e.getMessage(), e); //$NON-NLS-1$ } catch (IOException e) { - throw new XmlRpcClientException("I/O error in server communication: " + e.getMessage(), e); + throw new XmlRpcClientException("I/O error in server communication: " + e.getMessage(), e); //$NON-NLS-1$ } } @Override protected String getUserAgent() { - return WebUtil.getUserAgent(""); + return WebUtil.getUserAgent(""); //$NON-NLS-1$ } @Override @@ -174,7 +174,7 @@ public class TracHttpClientTransportFactory implements XmlRpcTransportFactory { } public String getContentType() { - return "text/xml"; + return "text/xml"; //$NON-NLS-1$ } public boolean isRepeatable() { @@ -222,10 +222,10 @@ public class TracHttpClientTransportFactory implements XmlRpcTransportFactory { if (t instanceof XmlRpcException) { throw (XmlRpcException) t; } else { - throw new XmlRpcException("Unexpected exception: " + t.getMessage(), t); + throw new XmlRpcException("Unexpected exception: " + t.getMessage(), t); //$NON-NLS-1$ } } catch (IOException e) { - throw new XmlRpcException("I/O error while communicating with HTTP server: " + e.getMessage(), e); + throw new XmlRpcException("I/O error while communicating with HTTP server: " + e.getMessage(), e); //$NON-NLS-1$ } } @@ -238,7 +238,7 @@ public class TracHttpClientTransportFactory implements XmlRpcTransportFactory { private AuthScheme authScheme; public TracHttpException(int responseCode) { - super(responseCode, "HTTP Error " + responseCode); + super(responseCode, "HTTP Error " + responseCode); //$NON-NLS-1$ } public AuthScheme getAuthScheme() { |