diff options
117 files changed, 366 insertions, 819 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/.classpath b/org.eclipse.mylyn.bugzilla.core/.classpath index 804790513..ecb2bc3dc 100644 --- a/org.eclipse.mylyn.bugzilla.core/.classpath +++ b/org.eclipse.mylyn.bugzilla.core/.classpath @@ -3,6 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> + <accessrule kind="discouraged" pattern="**/mylar/**/internal/**"/> <accessrule kind="accessible" pattern="**/internal/**"/> <accessrule kind="nonaccessible" pattern="**/System"/> </accessrules> diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttachmentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttachmentHandler.java index 9c5b7edbe..137f9c227 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttachmentHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttachmentHandler.java @@ -22,12 +22,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.core.UnrecognizedReponseException; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.IAttachmentHandler; import org.eclipse.mylar.tasks.core.RepositoryAttachment; import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.TaskRepository; +import org.eclipse.mylar.tasks.core.UnrecognizedReponseException; /** * @author Mik Kersten 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 d71a0bd99..8d80b4e65 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 @@ -51,17 +51,17 @@ import org.apache.commons.httpclient.methods.multipart.StringPart; import org.apache.commons.httpclient.params.HttpMethodParams; import org.eclipse.core.runtime.CoreException; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer; -import org.eclipse.mylar.internal.tasks.core.HtmlTag; -import org.eclipse.mylar.internal.tasks.core.UnrecognizedReponseException; -import org.eclipse.mylar.internal.tasks.core.WebClientUtil; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer.Token; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.QueryHitCollector; import org.eclipse.mylar.tasks.core.RepositoryOperation; import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskList; +import org.eclipse.mylar.tasks.core.UnrecognizedReponseException; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer; +import org.eclipse.mylar.tasks.core.web.HtmlTag; +import org.eclipse.mylar.tasks.core.web.WebClientUtil; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer.Token; /** * @author Mik Kersten @@ -1012,7 +1012,7 @@ public class BugzillaClient { // */ // public static void setupNewBugAttributes(String repositoryUrl, Proxy // proxySettings, String userName, -// String password, NewBugzillaReport newReport, String characterEncoding) +// String password, NewBugzillaTaskData newReport, String characterEncoding) // throws IOException, // KeyManagementException, GeneralSecurityException, // NoSuchAlgorithmException, BugzillaException { 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 ced7d24ff..b7ed1c52e 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 @@ -26,7 +26,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants.BugzillaServerVersion; -import org.eclipse.mylar.internal.tasks.core.UnrecognizedReponseException; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -38,6 +37,7 @@ import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskList; import org.eclipse.mylar.tasks.core.TaskRepository; +import org.eclipse.mylar.tasks.core.UnrecognizedReponseException; /** * @author Mik Kersten @@ -342,7 +342,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { * @throws KeyManagementException * @throws BugzillaException */ - public static void setupNewBugAttributes(TaskRepository taskRepository, NewBugzillaReport newReport) + public static void setupNewBugAttributes(TaskRepository taskRepository, NewBugzillaTaskData newReport) throws CoreException { newReport.removeAllAttributes(); @@ -531,7 +531,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { // * and move TaskRepositoryManager // */ // public void setupNewBugAttributes(TaskRepository taskRepository, - // NewBugzillaReport newReport) throws CoreException { + // NewBugzillaTaskData newReport) throws CoreException { // // newReport.removeAllAttributes(); // diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java index b5879fa16..6d8b8a2ef 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java @@ -29,7 +29,6 @@ import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPERATION; import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_REPORT_STATUS; import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_RESOLUTION; -import org.eclipse.mylar.internal.tasks.core.UnrecognizedReponseException; import org.eclipse.mylar.tasks.core.AbstractAttributeFactory; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -40,6 +39,7 @@ import org.eclipse.mylar.tasks.core.RepositoryOperation; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskList; import org.eclipse.mylar.tasks.core.TaskRepository; +import org.eclipse.mylar.tasks.core.UnrecognizedReponseException; /** * @author Mik Kersten diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/KeywordParser.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/KeywordParser.java index 3abe0f225..feb002c44 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/KeywordParser.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/KeywordParser.java @@ -18,9 +18,9 @@ import java.util.List; import javax.security.auth.login.LoginException; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer; -import org.eclipse.mylar.internal.tasks.core.HtmlTag; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer.Token; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer; +import org.eclipse.mylar.tasks.core.web.HtmlTag; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer.Token; /** * Parses Bugzilla keywords page to determine keywords valid in this diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/NewBugzillaReport.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/NewBugzillaTaskData.java index f193d3297..d53165140 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/NewBugzillaReport.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/NewBugzillaTaskData.java @@ -22,7 +22,7 @@ import org.eclipse.mylar.tasks.core.RepositoryTaskData; * @author Eric Booth * @author Rob Elves */ -public class NewBugzillaReport extends RepositoryTaskData implements Serializable { +public class NewBugzillaTaskData extends RepositoryTaskData implements Serializable { /** Automatically generated serialVersionUID */ private static final long serialVersionUID = 3977859587934335283L; @@ -52,7 +52,7 @@ public class NewBugzillaReport extends RepositoryTaskData implements Serializabl * Creates a new <code>NewBugModel</code>. The id chosen for this bug is * based on the id of the last <code>NewBugModel</code> that was created. */ - public NewBugzillaReport(String repositoryURL, String offlineId) { + public NewBugzillaTaskData(String repositoryURL, String offlineId) { super(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repositoryURL, offlineId); } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java index 8fca72914..b621f5fc4 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java @@ -18,6 +18,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + /** * Class describing the configuration of products and components for a given * Bugzilla installation. diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugReportContentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugReportContentHandler.java index beec82493..c581797a7 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugReportContentHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugReportContentHandler.java @@ -14,12 +14,12 @@ package org.eclipse.mylar.internal.bugzilla.core; import java.util.HashMap; import java.util.Map; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer; import org.eclipse.mylar.tasks.core.AbstractAttributeFactory; import org.eclipse.mylar.tasks.core.RepositoryAttachment; import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskComment; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java index fe70f764b..b3bc57ce8 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java @@ -13,9 +13,9 @@ package org.eclipse.mylar.internal.bugzilla.core; import org.eclipse.core.runtime.CoreException; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer; import org.eclipse.mylar.tasks.core.QueryHitCollector; import org.eclipse.mylar.tasks.core.TaskList; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java index 20e3d531b..388000811 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java @@ -15,9 +15,9 @@ import java.io.IOException; import java.io.Reader; import java.text.ParseException; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer; -import org.eclipse.mylar.internal.tasks.core.HtmlTag; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer.Token; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer; +import org.eclipse.mylar.tasks.core.web.HtmlTag; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer.Token; /** * This is in place to escape & characters within the resource and rdf:about diff --git a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF index cd04de767..d4956ab30 100644 --- a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF @@ -11,4 +11,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.mylar.context.core, org.eclipse.update.core Export-Package: org.eclipse.mylar.internal.tasks.core, - org.eclipse.mylar.tasks.core + org.eclipse.mylar.tasks.core, + org.eclipse.mylar.tasks.core.web diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineDataStore.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/OfflineDataStore.java index 892a40354..46d6cad3b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OfflineDataStore.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/OfflineDataStore.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui; +package org.eclipse.mylar.internal.tasks.core; import java.io.Serializable; import java.util.HashMap; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SslProtocolSocketFactory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SslProtocolSocketFactory.java index b9bfb8536..6abc88ed5 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SslProtocolSocketFactory.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SslProtocolSocketFactory.java @@ -29,6 +29,7 @@ import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.tasks.core.web.WebClientUtil; /** * @author Nathan Hapke diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskDataManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskDataManager.java index 1919fb12f..b90e5b541 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskDataManager.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskDataManager.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui; +package org.eclipse.mylar.internal.tasks.core; import java.io.File; import java.io.FileInputStream; @@ -26,7 +26,7 @@ import org.eclipse.mylar.tasks.core.AbstractAttributeFactory; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.RepositoryTaskData; -import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.core.TaskRepositoryManager; /** * Manager for persisting RepositoryTaskData offline @@ -48,7 +48,10 @@ public class TaskDataManager { /** Unsubmitted tasks data */ private Map<String, RepositoryTaskData> unsubmittedTaskData; - public TaskDataManager(File file, boolean read) throws IOException, ClassNotFoundException { + private TaskRepositoryManager taskRepositoryManager; + + public TaskDataManager(TaskRepositoryManager taskRepositoryManager, File file, boolean read) throws IOException, ClassNotFoundException { + this.taskRepositoryManager = taskRepositoryManager; this.file = file; if (file.exists() && read) { readOfflineData(); @@ -125,7 +128,6 @@ public class TaskDataManager { * is called. */ public String getNewRepositoryTaskId() { - return "" + dataStore.getNextTaskId(); } @@ -284,8 +286,10 @@ public class TaskDataManager { } private void updateAttributeFactory(RepositoryTaskData taskData) { - AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector( + AbstractRepositoryConnector connector = taskRepositoryManager.getRepositoryConnector( taskData.getRepositoryKind()); +// AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector( +// taskData.getRepositoryKind()); if (connector != null && connector.getTaskDataHandler() != null) { AbstractAttributeFactory factory = connector.getTaskDataHandler().getAttributeFactory(); if (factory != null) { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/.AbstractRepositoryTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/.AbstractRepositoryTask.java index 4f5683f37..75e9a8ad8 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/.AbstractRepositoryTask.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/.AbstractRepositoryTask.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.tasks.core; import java.util.Date; import org.eclipse.core.runtime.IStatus; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer; /** * Virtual proxy for a repository task. diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java index 4f5683f37..75e9a8ad8 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.tasks.core; import java.util.Date; import org.eclipse.core.runtime.IStatus; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer; /** * Virtual proxy for a repository task. diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java index 7ac081339..dce16de75 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Locale; import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.internal.tasks.core.TaskDataManager; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -110,7 +111,16 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { public static final String KEY_SYNC_STATE = "offlineSyncState"; private List<ITaskListExternalizer> delegateExternalizers = new ArrayList<ITaskListExternalizer>(); - + + /** + * Only needed by delegating externalizer, not subtypes + */ + private TaskDataManager taskDataManager; + + public void init(TaskDataManager taskDataManager) { + this.taskDataManager = taskDataManager; + } + /** * Set these on the TaskListWriter instead */ @@ -428,10 +438,15 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { } } - // TODO pull up implementation from BugzillaTaskExternalizer and TracTaskExternalizer protected void readTaskData(AbstractRepositoryTask task) { + RepositoryTaskData data = taskDataManager.getTaskData(task.getHandleIdentifier()); +// RepositoryTaskData data = TasksUiPlugin.getDefault().getTaskDataManager().getTaskData(task.getHandleIdentifier()); + task.setTaskData(data); + if (data != null && data.hasLocalChanges()) { + task.setSyncState(RepositoryTaskSyncState.OUTGOING); + } } - + protected Date getDateFromString(String dateString) { Date date = null; if ("".equals(dateString)) diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java index 815b15e95..180711760 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java @@ -48,7 +48,7 @@ public interface ITaskListExternalizer { public abstract boolean canReadCategory(Node node); - public abstract void readCategory(Node node, TaskList tlist) throws TaskExternalizationException; + public abstract void readCategory(Node node, TaskList taskList) throws TaskExternalizationException; public abstract boolean canReadTask(Node node); diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java index bc07a0a1b..74baa3493 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java @@ -299,11 +299,11 @@ public class TaskList { } public Set<ITask> getRootTasks() { - return rootCategory.getChildren(); + return Collections.unmodifiableSet(rootCategory.getChildren()); } public Set<AbstractTaskContainer> getCategories() { - return categories; + return Collections.unmodifiableSet(categories); } public List<AbstractTaskContainer> getUserCategories() { @@ -317,7 +317,7 @@ public class TaskList { } public Set<AbstractRepositoryQuery> getQueries() { - return queries; + return Collections.unmodifiableSet(queries); } public Set<ITaskListElement> getRootElements() { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java index 82c2c5291..b1973f4c3 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java @@ -22,7 +22,7 @@ import java.util.TimeZone; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.core.WebClientUtil; +import org.eclipse.mylar.tasks.core.web.WebClientUtil; /** * Note that task repositories use Strings for storing time stamps because using diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnrecognizedReponseException.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UnrecognizedReponseException.java index 4c60efcc9..54c445755 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnrecognizedReponseException.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UnrecognizedReponseException.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.core; +package org.eclipse.mylar.tasks.core; import java.io.IOException; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/HtmlStreamTokenizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/web/HtmlStreamTokenizer.java index 8583a1a1d..9edf98a2e 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/HtmlStreamTokenizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/web/HtmlStreamTokenizer.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.core; +package org.eclipse.mylar.tasks.core.web; import java.io.BufferedReader; import java.io.IOException; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/HtmlTag.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/web/HtmlTag.java index b81e95b2c..e997defd3 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/HtmlTag.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/web/HtmlTag.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.core; +package org.eclipse.mylar.tasks.core.web; import java.net.URL; import java.text.ParseException; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebClientUtil.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/web/WebClientUtil.java index f3522af7e..be9f6d30e 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebClientUtil.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/web/WebClientUtil.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.core; +package org.eclipse.mylar.tasks.core.web; import java.net.InetSocketAddress; import java.net.Proxy; @@ -20,6 +20,8 @@ import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.protocol.Protocol; +import org.eclipse.mylar.internal.tasks.core.AuthenticatedProxy; +import org.eclipse.mylar.internal.tasks.core.SslProtocolSocketFactory; import org.eclipse.update.internal.core.UpdateCore; /** diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF index 6765deb29..aba1207b3 100644 --- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF @@ -23,13 +23,18 @@ Require-Bundle: org.eclipse.ui, Eclipse-AutoStart: true Bundle-Vendor: Eclipse.org Export-Package: org.eclipse.mylar.internal.tasks.ui, - org.eclipse.mylar.internal.tasks.ui.search, org.eclipse.mylar.internal.tasks.ui.actions, + org.eclipse.mylar.internal.tasks.ui.commands, org.eclipse.mylar.internal.tasks.ui.editors, org.eclipse.mylar.internal.tasks.ui.planner, org.eclipse.mylar.internal.tasks.ui.preferences, + org.eclipse.mylar.internal.tasks.ui.search, org.eclipse.mylar.internal.tasks.ui.util, org.eclipse.mylar.internal.tasks.ui.views, org.eclipse.mylar.internal.tasks.ui.wizards, - org.eclipse.mylar.tasks.ui + org.eclipse.mylar.tasks.ui, + org.eclipse.mylar.tasks.ui.editors, + org.eclipse.mylar.tasks.ui.properties, + org.eclipse.mylar.tasks.ui.search, + org.eclipse.mylar.tasks.ui.wizards Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml index 9e32fd1c6..ac98239cf 100644 --- a/org.eclipse.mylyn.tasks.ui/plugin.xml +++ b/org.eclipse.mylyn.tasks.ui/plugin.xml @@ -165,7 +165,7 @@ <extension point="org.eclipse.ui.editors"> <editor - class="org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor" + class="org.eclipse.mylar.tasks.ui.editors.TaskEditor" contributorClass="org.eclipse.mylar.internal.tasks.ui.editors.TaskEditorActionContributor" icon="icons/etool16/task.gif" id="org.eclipse.mylar.tasklist.ui.taskEditor" @@ -646,7 +646,7 @@ point="org.eclipse.search.searchResultViewPages"> <viewPage class="org.eclipse.mylar.internal.tasks.ui.search.RepositorySearchResultView" - searchResultClass="org.eclipse.mylar.internal.tasks.ui.search.RepositorySearchResult" + searchResultClass="org.eclipse.mylar.tasks.ui.search.RepositorySearchResult" id="org.eclipse.mylar.internal.tasks.ui.search.RepositorySearchResultView"/> <!-- id="org.eclipse.mylar.bugzilla.BugzillaSearchResultPage"/>--> </extension> diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java index c98e225b3..3a8f9657c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java @@ -19,6 +19,7 @@ import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.TaskCategory; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiConstants.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiConstants.java new file mode 100644 index 000000000..9d78cf36c --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiConstants.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2004 - 2006 Mylar committers 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 + *******************************************************************************/ + +package org.eclipse.mylar.internal.tasks.ui; + +/** + * @author Mik Kersten + */ +public interface ITasksUiConstants { + + public static final String TITLE_DIALOG = "Mylar Information"; + public static final String MESSAGE_RESTORE = "Could not read task list. Consider restoring via File -> Import -> Mylar Task Data"; + public static final String URL_HOMEPAGE = "http://eclipse.org/mylar"; + public static final String FILE_EXTENSION = ".xml.zip"; + public static final String OLD_TASK_LIST_FILE = "tasklist.xml"; + public static final String DEFAULT_BACKUP_FOLDER_NAME = "backup"; + public static final String DEFAULT_TASK_LIST_FILE = "tasklist" + FILE_EXTENSION; + +} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java index 91343541f..081a454e9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java @@ -21,12 +21,12 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.window.Window; import org.eclipse.mylar.internal.tasks.ui.planner.DateSelectionDialog; -import org.eclipse.mylar.internal.tasks.ui.views.DatePicker; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.ITaskListElement; +import org.eclipse.mylar.tasks.ui.DatePicker; import org.eclipse.mylar.tasks.ui.TaskListManager; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java index 3a0610df7..44a81c523 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java @@ -17,6 +17,7 @@ import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.mylar.internal.tasks.ui.views.TaskElementLabelProvider; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITask; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java index 0ade17342..690aa4180 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java @@ -16,6 +16,7 @@ import java.util.Date; import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.mylar.internal.tasks.ui.views.TaskElementLabelProvider; import org.eclipse.mylar.tasks.core.AbstractQueryHit; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java index 4bd7d5cc9..ed49a634f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java @@ -16,6 +16,7 @@ import java.util.Date; import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.mylar.internal.tasks.ui.views.TaskElementLabelProvider; import org.eclipse.mylar.tasks.core.ITask; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java index 6f9c32d9e..993c419c9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java @@ -20,12 +20,13 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.search.AbstractRepositoryQueryPage; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.core.TaskRepositoryManager; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; +import org.eclipse.mylar.tasks.ui.search.AbstractRepositoryQueryPage; import org.eclipse.search.ui.ISearchPage; import org.eclipse.search.ui.ISearchPageContainer; import org.eclipse.swt.SWT; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java index 83660b9b7..c2d86e7d7 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java @@ -16,13 +16,13 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylar.context.core.ContextCorePlugin; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.TaskCategory; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.internal.WorkbenchImages; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java index 05ef491ce..12a4a329a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java @@ -15,9 +15,9 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoriesView; import org.eclipse.mylar.tasks.core.TaskRepository; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.ui.IViewPart; /** diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java index adc72bb31..9c0ea50cd 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java @@ -18,15 +18,16 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.views.TaskInputDialog; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.Task; import org.eclipse.mylar.tasks.core.TaskCategory; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; @@ -88,7 +89,7 @@ public class NewLocalTaskAction extends Action implements IViewActionDelegate { } else { if (view != null && view.getDrilledIntoCategory() != null) { MessageDialog - .openInformation(Display.getCurrent().getActiveShell(), TasksUiPlugin.TITLE_DIALOG, + .openInformation(Display.getCurrent().getActiveShell(), ITasksUiConstants.TITLE_DIALOG, "The new task has been added to the root of the list, since tasks can not be added to a query."); } TasksUiPlugin.getTaskListManager().getTaskList().addTask(newTask, diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java index 8e1c45864..b124c134c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java @@ -15,9 +15,9 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.window.Window; import org.eclipse.mylar.internal.tasks.ui.AddExistingTaskJob; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.commands.RemoteTaskSelectionDialog; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java index f1cd32fe5..334fd8866 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java @@ -12,10 +12,10 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.window.Window; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.actions.ActionDelegate; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java index 361cba3fc..a3d6a4af8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java @@ -15,9 +15,9 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.ITaskListElement; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; /** * @author Mik Kersten diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java index 84f34f27f..487fddd6a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java @@ -13,10 +13,10 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import java.util.Iterator; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.ITask; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.ui.actions.BaseSelectionListenerAction; /** diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java index a9948682c..c1c34adfb 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java @@ -15,10 +15,10 @@ import java.util.List; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.views.TaskActivationHistory; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.ITask; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; /** * @author Wesley Coelho diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java index 909fbf7a4..f3222cbcf 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java @@ -16,6 +16,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.ITask; @@ -48,7 +49,7 @@ public class RemoveFromCategoryAction extends Action { ITask task = (ITask) selectedObject; if (task.isActive()) { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - TasksUiPlugin.TITLE_DIALOG, + ITasksUiConstants.TITLE_DIALOG, "Task must be deactivated in order to remove from category."); return; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java index 79e8f0fb6..64ae1dc57 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java @@ -14,10 +14,10 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; /** * @author Mik Kersten diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java index c21c57d62..c00439429 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java @@ -15,10 +15,10 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.ITaskListElement; import org.eclipse.mylar.tasks.core.TaskCategory; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; /** * @author Mik Kersten diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java index da9c276ac..0f83cd050 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java @@ -13,11 +13,11 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuCreator; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.views.TaskActivationHistory; import org.eclipse.mylar.internal.tasks.ui.views.TaskElementLabelProvider; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.ITask; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java index 3c4976e9b..70e4d8373 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java @@ -19,6 +19,8 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.tasks.core.TaskComment; +import org.eclipse.mylar.tasks.ui.editors.AbstractRepositoryTaskEditor; +import org.eclipse.mylar.tasks.ui.editors.RepositoryTaskOutlineNode; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.ISelectionListener; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SpellingDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SpellingDialog.java index a3272e09f..d8795dc4f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SpellingDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/SpellingDialog.java @@ -14,6 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.editors; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.mylar.tasks.ui.editors.AbstractRepositoryTaskEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java index fbdf669e0..79d45f078 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java @@ -34,6 +34,9 @@ import org.eclipse.mylar.internal.tasks.ui.actions.TaskDeactivateAction; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.ITaskListElement; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.editors.AbstractRepositoryTaskEditor; +import org.eclipse.mylar.tasks.ui.editors.TaskEditor; +import org.eclipse.mylar.tasks.ui.editors.TaskFormPage; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.ISharedImages; @@ -56,7 +59,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib private SubActionBars sourceActionBars; - private MylarTaskEditor editor; + private TaskEditor editor; private OpenWithBrowserAction openWithBrowserAction = new OpenWithBrowserAction(); @@ -257,7 +260,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib } - public MylarTaskEditor getEditor() { + public TaskEditor getEditor() { return editor; } @@ -267,8 +270,8 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib @Override public void setActiveEditor(IEditorPart targetEditor) { - if (targetEditor instanceof MylarTaskEditor) { - editor = (MylarTaskEditor) targetEditor; + if (targetEditor instanceof TaskEditor) { + editor = (TaskEditor) targetEditor; updateSelectableActions(editor.getSelection()); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java index 21de61f56..54a241317 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java @@ -14,6 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.editors; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.editors.TaskEditorInput; import org.eclipse.ui.IElementFactory; import org.eclipse.ui.IMemento; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorUrlHyperlinkDetector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorUrlHyperlinkDetector.java index f41c004b6..4eec22d7b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorUrlHyperlinkDetector.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorUrlHyperlinkDetector.java @@ -21,7 +21,7 @@ import org.eclipse.jface.text.Region; import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.text.hyperlink.URLHyperlink; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; /** * @author Rob Elves 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 859806f90..3a447add7 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 @@ -23,7 +23,6 @@ import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.context.core.util.DateUtil; import org.eclipse.mylar.internal.tasks.ui.RetrieveTitleFromUrlJob; import org.eclipse.mylar.internal.tasks.ui.actions.NewLocalTaskAction; -import org.eclipse.mylar.internal.tasks.ui.views.DatePicker; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.monitor.MylarMonitorPlugin; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -33,7 +32,11 @@ import org.eclipse.mylar.tasks.core.ITaskListChangeListener; import org.eclipse.mylar.tasks.core.Task; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.core.Task.PriorityLevel; +import org.eclipse.mylar.tasks.ui.DatePicker; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.editors.TaskEditor; +import org.eclipse.mylar.tasks.ui.editors.TaskEditorInput; +import org.eclipse.mylar.tasks.ui.editors.TaskFormPage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; @@ -119,7 +122,7 @@ public class TaskPlanningEditor extends TaskFormPage { private Button getDescButton; - private MylarTaskEditor parentEditor = null; + private TaskEditor parentEditor = null; private ITaskListChangeListener TASK_LIST_LISTENER = new ITaskListChangeListener() { @@ -927,7 +930,7 @@ public class TaskPlanningEditor extends TaskFormPage { toolkit.paintBordersFor(container); } - public void setParentEditor(MylarTaskEditor parentEditor) { + public void setParentEditor(TaskEditor parentEditor) { this.parentEditor = parentEditor; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java index abaecb444..41c16380f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java @@ -27,7 +27,7 @@ import org.eclipse.jface.text.reconciler.IReconcilerExtension; import org.eclipse.jface.text.reconciler.IReconcilingStrategy; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; -import org.eclipse.mylar.internal.tasks.ui.editors.TaskFormPage.ErrorAnnotation; +import org.eclipse.mylar.tasks.ui.editors.TaskFormPage.ErrorAnnotation; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector; import org.eclipse.ui.texteditor.spelling.SpellingContext; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java index 06c7ddd9f..79b6ce7ab 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java @@ -15,8 +15,8 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.core.ITask; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; /** * @author Mik Kersten diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ReminderCellEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ReminderCellEditor.java index 56fad2557..87ec72ef2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ReminderCellEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/ReminderCellEditor.java @@ -18,7 +18,7 @@ import java.util.GregorianCalendar; import java.util.Locale; import org.eclipse.jface.viewers.DialogCellEditor; -import org.eclipse.mylar.internal.tasks.ui.views.DatePicker; +import org.eclipse.mylar.tasks.ui.DatePicker; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java index e0c545381..5af79b151 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java @@ -17,11 +17,11 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylar.internal.tasks.ui.views.DatePicker; import org.eclipse.mylar.internal.tasks.ui.views.TaskElementLabelProvider; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.ITaskListElement; +import org.eclipse.mylar.tasks.ui.DatePicker; import org.eclipse.mylar.tasks.ui.TaskListManager; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.eclipse.swt.SWT; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java index a9c7181fe..5305ad0f8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java @@ -16,6 +16,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.eclipse.swt.SWT; @@ -200,13 +201,13 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre if (taskDataDirectoryAction != CANCEL) { taskDirectoryText.setText(taskDirectory); backupFolderText.setText(taskDirectory + FORWARDSLASH - + TasksUiPlugin.DEFAULT_BACKUP_FOLDER_NAME); + + ITasksUiConstants.DEFAULT_BACKUP_FOLDER_NAME); backupNow.setEnabled(false); } } else { taskDirectoryText.setText(taskDirectory); backupFolderText.setText(taskDirectory + FORWARDSLASH - + TasksUiPlugin.DEFAULT_BACKUP_FOLDER_NAME); + + ITasksUiConstants.DEFAULT_BACKUP_FOLDER_NAME); backupNow.setEnabled(true); } @@ -382,7 +383,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre if (taskDataDirectoryAction != CANCEL) { taskDirectoryText.setText(dir); - backupFolderText.setText(dir + FORWARDSLASH + TasksUiPlugin.DEFAULT_BACKUP_FOLDER_NAME); + backupFolderText.setText(dir + FORWARDSLASH + ITasksUiConstants.DEFAULT_BACKUP_FOLDER_NAME); backupNow.setEnabled(false); } } @@ -577,7 +578,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre File newDataFolder = new File(dir); if (newDataFolder.exists()) { for (String filename : newDataFolder.list()) { - if (filename.equals(TasksUiPlugin.DEFAULT_TASK_LIST_FILE)) { + if (filename.equals(ITasksUiConstants.DEFAULT_TASK_LIST_FILE)) { MessageDialog dialogConfirm = new MessageDialog( null, diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/AbstractRepositorySearchQuery.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/AbstractRepositorySearchQuery.java index 8fe0478ac..c2bc0bbd5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/AbstractRepositorySearchQuery.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/AbstractRepositorySearchQuery.java @@ -11,6 +11,7 @@ package org.eclipse.mylar.internal.tasks.ui.search; +import org.eclipse.mylar.tasks.ui.search.RepositorySearchResult; import org.eclipse.search.ui.ISearchQuery; import org.eclipse.search.ui.ISearchResult; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java index 1c7d4881c..171134873 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java @@ -15,8 +15,8 @@ import java.util.Iterator; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.core.AbstractQueryHit; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; /** * This class is used to open a bug report in an editor. diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java index 5591d7370..dc4eda750 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java @@ -19,11 +19,11 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.views.TaskElementLabelProvider; import org.eclipse.mylar.internal.tasks.ui.views.TaskListTableLabelProvider; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.search.internal.ui.SearchMessages; import org.eclipse.search.ui.IContextMenuConstants; import org.eclipse.search.ui.text.AbstractTextSearchViewPage; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java index 84943c02e..a7345e68c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java @@ -13,6 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.search; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.mylar.tasks.ui.search.RepositorySearchResult; /** * @author Rob Elves (moved into task.ui) diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTableContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTableContentProvider.java index 48fc2a749..5025c5e72 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTableContentProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTableContentProvider.java @@ -14,6 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.search; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.mylar.tasks.ui.search.RepositorySearchResult; /** * This implementation of <code>SearchResultContentProvider</code> is used for the diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/HTML2TextReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/HTML2TextReader.java deleted file mode 100644 index cfd419562..000000000 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/HTML2TextReader.java +++ /dev/null @@ -1,328 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation 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: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.util; - -import java.io.IOException; -import java.io.PushbackReader; -import java.io.Reader; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.eclipse.jface.text.TextPresentation; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.StyleRange; - -/** - * Reads the text contents from a reader of HTML contents and translates - * the tags or cut them out. - * <p> - * Moved into this package from <code>org.eclipse.jface.internal.text.revisions</code>.</p> - */ -/** - * COPY OF: org.eclipse.jface.internal.text.html.HTML2TextReader - */ -@SuppressWarnings("unchecked") -public class HTML2TextReader extends SubstitutionTextReader { - - private static final String EMPTY_STRING= ""; //$NON-NLS-1$ - private static final Map fgEntityLookup; - private static final Set fgTags; - - static { - - fgTags= new HashSet(); - fgTags.add("b"); //$NON-NLS-1$ - fgTags.add("br"); //$NON-NLS-1$ - fgTags.add("br/"); //$NON-NLS-1$ - fgTags.add("div"); //$NON-NLS-1$ - fgTags.add("h1"); //$NON-NLS-1$ - fgTags.add("h2"); //$NON-NLS-1$ - fgTags.add("h3"); //$NON-NLS-1$ - fgTags.add("h4"); //$NON-NLS-1$ - fgTags.add("h5"); //$NON-NLS-1$ - fgTags.add("p"); //$NON-NLS-1$ - fgTags.add("dl"); //$NON-NLS-1$ - fgTags.add("dt"); //$NON-NLS-1$ - fgTags.add("dd"); //$NON-NLS-1$ - fgTags.add("li"); //$NON-NLS-1$ - fgTags.add("ul"); //$NON-NLS-1$ - fgTags.add("pre"); //$NON-NLS-1$ - fgTags.add("head"); //$NON-NLS-1$ - - fgEntityLookup= new HashMap(7); - fgEntityLookup.put("lt", "<"); //$NON-NLS-1$ //$NON-NLS-2$ - fgEntityLookup.put("gt", ">"); //$NON-NLS-1$ //$NON-NLS-2$ - fgEntityLookup.put("nbsp", " "); //$NON-NLS-1$ //$NON-NLS-2$ - fgEntityLookup.put("amp", "&"); //$NON-NLS-1$ //$NON-NLS-2$ - fgEntityLookup.put("circ", "^"); //$NON-NLS-1$ //$NON-NLS-2$ - fgEntityLookup.put("tilde", "~"); //$NON-NLS-2$ //$NON-NLS-1$ - fgEntityLookup.put("quot", "\""); //$NON-NLS-1$ //$NON-NLS-2$ - } - - private int fCounter= 0; - private TextPresentation fTextPresentation; - private int fBold= 0; - private int fStartOffset= -1; - private boolean fInParagraph= false; - private boolean fIsPreformattedText= false; - private boolean fIgnore= false; - - /** - * Transforms the HTML text from the reader to formatted text. - * - * @param reader the reader - * @param presentation If not <code>null</code>, formattings will be applied to - * the presentation. - */ - public HTML2TextReader(Reader reader, TextPresentation presentation) { - super(new PushbackReader(reader)); - fTextPresentation= presentation; - } - - @Override - public int read() throws IOException { - int c= super.read(); - if (c != -1) - ++ fCounter; - return c; - } - - protected void startBold() { - if (fBold == 0) - fStartOffset= fCounter; - ++ fBold; - } - - protected void startPreformattedText() { - fIsPreformattedText= true; - setSkipWhitespace(false); - } - - protected void stopPreformattedText() { - fIsPreformattedText= false; - setSkipWhitespace(true); - } - - protected void stopBold() { - -- fBold; - if (fBold == 0) { - if (fTextPresentation != null) { - fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD)); - } - fStartOffset= -1; - } - } - - /* - * @see org.eclipse.jdt.internal.ui.text.SubstitutionTextReader#computeSubstitution(int) - */ - @Override - protected String computeSubstitution(int c) throws IOException { - - if (c == '<') - return processHTMLTag(); - else if (fIgnore) - return EMPTY_STRING; - else if (c == '&') - return processEntity(); - else if (fIsPreformattedText) - return processPreformattedText(c); - - return null; - } - - private String html2Text(String html) { - - if (html == null || html.length() == 0) - return EMPTY_STRING; - - html= html.toLowerCase(); - - String tag= html; - if ('/' == tag.charAt(0)) - tag= tag.substring(1); - - if (!fgTags.contains(tag)) - return EMPTY_STRING; - - - if ("pre".equals(html)) { //$NON-NLS-1$ - startPreformattedText(); - return EMPTY_STRING; - } - - if ("/pre".equals(html)) { //$NON-NLS-1$ - stopPreformattedText(); - return EMPTY_STRING; - } - - if (fIsPreformattedText) - return EMPTY_STRING; - - if ("b".equals(html)) { //$NON-NLS-1$ - startBold(); - return EMPTY_STRING; - } - - if ((html.length() > 1 && html.charAt(0) == 'h' && Character.isDigit(html.charAt(1))) || "dt".equals(html)) { //$NON-NLS-1$ - startBold(); - return EMPTY_STRING; - } - - if ("dl".equals(html)) //$NON-NLS-1$ - return LINE_DELIM; - - if ("dd".equals(html)) //$NON-NLS-1$ - return "\t"; //$NON-NLS-1$ - - if ("li".equals(html)) //$NON-NLS-1$ - // FIXME: this hard-coded prefix does not work for RTL languages, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=91682 - return LINE_DELIM + "HTML2TextReader.listItemPrefix"; //$NON-NLS-1$ - - if ("/b".equals(html)) { //$NON-NLS-1$ - stopBold(); - return EMPTY_STRING; - } - - if ("p".equals(html)) { //$NON-NLS-1$ - fInParagraph= true; - return LINE_DELIM; - } - - if ("br".equals(html) || "br/".equals(html) || "div".equals(html)) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - return LINE_DELIM; - - if ("/p".equals(html)) { //$NON-NLS-1$ - boolean inParagraph= fInParagraph; - fInParagraph= false; - return inParagraph ? EMPTY_STRING : LINE_DELIM; - } - - if ((html.startsWith("/h") && html.length() > 2 && Character.isDigit(html.charAt(2))) || "/dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$ - stopBold(); - return LINE_DELIM; - } - - if ("/dd".equals(html)) //$NON-NLS-1$ - return LINE_DELIM; - - if ("head".equals(html)) { //$NON-NLS-1$ - fIgnore= true; - return EMPTY_STRING; - } - - if ("/head".equals(html)) { //$NON-NLS-1$ - fIgnore= false; - return EMPTY_STRING; - } - - return EMPTY_STRING; - } - - /* - * A '<' has been read. Process a html tag - */ - private String processHTMLTag() throws IOException { - - StringBuffer buf= new StringBuffer(); - int ch; - do { - - ch= nextChar(); - - while (ch != -1 && ch != '>') { - buf.append(Character.toLowerCase((char) ch)); - ch= nextChar(); - if (ch == '"'){ - buf.append(Character.toLowerCase((char) ch)); - ch= nextChar(); - while (ch != -1 && ch != '"'){ - buf.append(Character.toLowerCase((char) ch)); - ch= nextChar(); - } - } - if (ch == '<'){ - unread(ch); - return '<' + buf.toString(); - } - } - - if (ch == -1) - return null; - - int tagLen= buf.length(); - // needs special treatment for comments - if ((tagLen >= 3 && "!--".equals(buf.substring(0, 3))) //$NON-NLS-1$ - && !(tagLen >= 5 && "--".equals(buf.substring(tagLen - 2)))) { //$NON-NLS-1$ - // unfinished comment - buf.append(ch); - } else { - break; - } - } while (true); - - return html2Text(buf.toString()); - } - - private String processPreformattedText(int c) { - if (c == '\r' || c == '\n') - fCounter++; - return null; - } - - - private void unread(int ch) throws IOException { - ((PushbackReader) getReader()).unread(ch); - } - - protected String entity2Text(String symbol) { - if (symbol.length() > 1 && symbol.charAt(0) == '#') { - int ch; - try { - if (symbol.charAt(1) == 'x') { - ch= Integer.parseInt(symbol.substring(2), 16); - } else { - ch= Integer.parseInt(symbol.substring(1), 10); - } - return EMPTY_STRING + (char)ch; - } catch (NumberFormatException e) { - } - } else { - String str= (String) fgEntityLookup.get(symbol); - if (str != null) { - return str; - } - } - return "&" + symbol; // not found //$NON-NLS-1$ - } - - /* - * A '&' has been read. Process a entity - */ - private String processEntity() throws IOException { - StringBuffer buf= new StringBuffer(); - int ch= nextChar(); - while (Character.isLetterOrDigit((char)ch) || ch == '#') { - buf.append((char) ch); - ch= nextChar(); - } - - if (ch == ';') - return entity2Text(buf.toString()); - - buf.insert(0, '&'); - if (ch != -1) - buf.append((char) ch); - return buf.toString(); - } -} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/SingleCharReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/SingleCharReader.java deleted file mode 100644 index 1e1a7fc86..000000000 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/SingleCharReader.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation 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: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.util; - -import java.io.IOException; -import java.io.Reader; - - -/** - * <p> - * Moved into this package from <code>org.eclipse.jface.internal.text.revisions</code>.</p> - */ -/** - * COPY OF: org.eclipse.jface.internal.text.html.HTML2TextReader - */ -@SuppressWarnings("unchecked") -public abstract class SingleCharReader extends Reader { - - /** - * @see Reader#read() - */ - @Override - public abstract int read() throws IOException; - - /** - * @see Reader#read(char[],int,int) - */ - @Override - public int read(char cbuf[], int off, int len) throws IOException { - int end= off + len; - for (int i= off; i < end; i++) { - int ch= read(); - if (ch == -1) { - if (i == off) - return -1; - return i - off; - } - cbuf[i]= (char)ch; - } - return len; - } - - /** - * @see Reader#ready() - */ - @Override - public boolean ready() throws IOException { - return true; - } - - /** - * Returns the readable content as string. - * @return the readable content as string - * @exception IOException in case reading fails - */ - public String getString() throws IOException { - StringBuffer buf= new StringBuffer(); - int ch; - while ((ch= read()) != -1) { - buf.append((char)ch); - } - return buf.toString(); - } -} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/SubstitutionTextReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/SubstitutionTextReader.java deleted file mode 100644 index c981af3ca..000000000 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/SubstitutionTextReader.java +++ /dev/null @@ -1,167 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation 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: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.util; - -import java.io.IOException; -import java.io.Reader; - - -/** - * Reads the text contents from a reader and computes for each character - * a potential substitution. The substitution may eat more characters than - * only the one passed into the computation routine. - * <p> - * Moved into this package from <code>org.eclipse.jface.internal.text.revisions</code>.</p> - */ -/** - * COPY OF: org.eclipse.jface.internal.text.html.HTML2TextReader - */ -@SuppressWarnings("unchecked") -public abstract class SubstitutionTextReader extends SingleCharReader { - - protected static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ - - private Reader fReader; - protected boolean fWasWhiteSpace; - private int fCharAfterWhiteSpace; - - /** - * Tells whether white space characters are skipped. - */ - private boolean fSkipWhiteSpace= true; - - private boolean fReadFromBuffer; - private StringBuffer fBuffer; - private int fIndex; - - - protected SubstitutionTextReader(Reader reader) { - fReader= reader; - fBuffer= new StringBuffer(); - fIndex= 0; - fReadFromBuffer= false; - fCharAfterWhiteSpace= -1; - fWasWhiteSpace= true; - } - - /** - * Computes the substitution for the given character and if necessary - * subsequent characters. Implementation should use <code>nextChar</code> - * to read subsequent characters. - * - * @param c the character to be substituted - * @return the substitution for <code>c</code> - * @throws IOException in case computing the substitution fails - */ - protected abstract String computeSubstitution(int c) throws IOException; - - /** - * Returns the internal reader. - * - * @return the internal reader - */ - protected Reader getReader() { - return fReader; - } - - /** - * Returns the next character. - * @return the next character - * @throws IOException in case reading the character fails - */ - protected int nextChar() throws IOException { - fReadFromBuffer= (fBuffer.length() > 0); - if (fReadFromBuffer) { - char ch= fBuffer.charAt(fIndex++); - if (fIndex >= fBuffer.length()) { - fBuffer.setLength(0); - fIndex= 0; - } - return ch; - } - - int ch= fCharAfterWhiteSpace; - if (ch == -1) { - ch= fReader.read(); - } - if (fSkipWhiteSpace && Character.isWhitespace((char)ch)) { - do { - ch= fReader.read(); - } while (Character.isWhitespace((char)ch)); - if (ch != -1) { - fCharAfterWhiteSpace= ch; - return ' '; - } - } else { - fCharAfterWhiteSpace= -1; - } - return ch; - } - - /** - * @see Reader#read() - */ - @Override - public int read() throws IOException { - int c; - do { - - c= nextChar(); - while (!fReadFromBuffer) { - String s= computeSubstitution(c); - if (s == null) - break; - if (s.length() > 0) - fBuffer.insert(0, s); - c= nextChar(); - } - - } while (fSkipWhiteSpace && fWasWhiteSpace && (c == ' ')); - fWasWhiteSpace= (c == ' ' || c == '\r' || c == '\n'); - return c; - } - - /** - * @see Reader#ready() - */ - @Override - public boolean ready() throws IOException { - return fReader.ready(); - } - - /** - * @see Reader#close() - */ - @Override - public void close() throws IOException { - fReader.close(); - } - - /** - * @see Reader#reset() - */ - @Override - public void reset() throws IOException { - fReader.reset(); - fWasWhiteSpace= true; - fCharAfterWhiteSpace= -1; - fBuffer.setLength(0); - fIndex= 0; - } - - protected final void setSkipWhitespace(boolean state) { - fSkipWhiteSpace= state; - } - - protected final boolean isSkippingWhitespace() { - return fSkipWhiteSpace; - } -} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java index d5fb2e4f2..73e3c0806 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java @@ -30,6 +30,7 @@ import org.eclipse.mylar.context.core.ContextCorePlugin; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.context.core.MylarContextManager; import org.eclipse.mylar.internal.context.core.util.ZipFileUtil; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.TaskRepositoryManager; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -137,11 +138,11 @@ public class TaskDataExportJob implements IRunnableWithProgress { TasksUiPlugin.getTaskListManager().saveTaskList(); String sourceTaskListPath = TasksUiPlugin.getDefault().getDataDirectory() + File.separator - + TasksUiPlugin.DEFAULT_TASK_LIST_FILE; + + ITasksUiConstants.DEFAULT_TASK_LIST_FILE; File sourceTaskListFile = new File(sourceTaskListPath); if (sourceTaskListFile.exists()) { File destTaskListFile = new File(destinationDirectory + File.separator - + TasksUiPlugin.DEFAULT_TASK_LIST_FILE); + + ITasksUiConstants.DEFAULT_TASK_LIST_FILE); if (zip) { filesToZip.add(sourceTaskListFile); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java index ad2bd7c32..52e88b3ed 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java @@ -29,6 +29,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.mylar.context.core.ContextCorePlugin; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.context.core.MylarContextManager; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.ITaskListChangeListener; @@ -113,11 +114,11 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground MessageDialog .openInformation( PlatformUI.getWorkbench().getDisplay().getActiveShell(), - TasksUiPlugin.TITLE_DIALOG, + ITasksUiConstants.TITLE_DIALOG, "If task list is blank, Mylar Task List may have failed to initialize.\n\n" + "First, try restarting to see if that corrects the problem.\n\n" + "Then, check the Error Log view for messages, and the FAQ for solutions.\n\n" - + TasksUiPlugin.URL_HOMEPAGE); + + ITasksUiConstants.URL_HOMEPAGE); } } }); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java index a016b5685..e6059f2ec 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java @@ -37,6 +37,8 @@ import javax.xml.transform.stream.StreamResult; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.internal.tasks.core.TaskDataManager; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.DelegatingTaskExternalizer; @@ -44,7 +46,6 @@ import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.ITaskListExternalizer; import org.eclipse.mylar.tasks.core.TaskExternalizationException; import org.eclipse.mylar.tasks.core.TaskList; -import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -71,7 +72,7 @@ public class TaskListWriter { private List<ITaskListExternalizer> externalizers; - private DelegatingTaskExternalizer delagatingExternalizer = new DelegatingTaskExternalizer(); + private DelegatingTaskExternalizer delagatingExternalizer; private List<Node> orphanedTaskNodes = new ArrayList<Node>(); @@ -79,6 +80,15 @@ public class TaskListWriter { private boolean hasCaughtException = false; + public TaskListWriter() { + this.delagatingExternalizer = new DelegatingTaskExternalizer(); + } + + + public void setTaskDataManager(TaskDataManager taskDataManager) { + delagatingExternalizer.init(taskDataManager); + } + public void setDelegateExternalizers(List<ITaskListExternalizer> externalizers) { this.externalizers = externalizers; this.delagatingExternalizer.setDelegateExternalizers(externalizers); @@ -172,7 +182,7 @@ public class TaskListWriter { private void writeDOMtoFile(Document doc, File file) { try { ZipOutputStream outputStream = new ZipOutputStream(new FileOutputStream(file)); - ZipEntry zipEntry = new ZipEntry(TasksUiPlugin.OLD_TASK_LIST_FILE); + ZipEntry zipEntry = new ZipEntry(ITasksUiConstants.OLD_TASK_LIST_FILE); outputStream.putNextEntry(zipEntry); outputStream.setMethod(ZipOutputStream.DEFLATED); // OutputStream outputStream = new FileOutputStream(file); @@ -224,7 +234,7 @@ public class TaskListWriter { /** * TODO: fix this old mess */ - public void readTaskList(TaskList taskList, File inFile) { + public void readTaskList(TaskList taskList, File inFile, TaskDataManager taskDataManager) { hasCaughtException = false; orphanedTaskNodes.clear(); try { @@ -364,7 +374,7 @@ public class TaskListWriter { // Parse the content of the given file as an XML document // and return a new DOM Document object. Also throws IOException InputStream inputStream = null; - if (inputFile.getName().endsWith(TasksUiPlugin.DEFAULT_TASK_LIST_FILE)) { + if (inputFile.getName().endsWith(ITasksUiConstants.DEFAULT_TASK_LIST_FILE)) { // is zipped context inputStream = new ZipInputStream(new FileInputStream(inputFile)); ((ZipInputStream) inputStream).getNextEntry(); @@ -415,7 +425,7 @@ public class TaskListWriter { inFile.renameTo(new File(name)); } if (child == null) { - MylarStatusHandler.log(e, TasksUiPlugin.MESSAGE_RESTORE); + MylarStatusHandler.log(e, ITasksUiConstants.MESSAGE_RESTORE); } else { MylarStatusHandler.log(e, "Tasks may have been lost from " + child.getNodeName()); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java index 5d68fcc26..f30ddc7c1 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java @@ -23,13 +23,13 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.IDynamicSubMenuContributor; -import org.eclipse.mylar.internal.tasks.ui.ITaskEditorFactory; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.ITaskListExternalizer; import org.eclipse.mylar.tasks.core.RepositoryTemplate; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.editors.ITaskEditorFactory; import org.eclipse.ui.plugin.AbstractUIPlugin; /** @@ -103,7 +103,7 @@ public class TasksUiExtensionReader { private static boolean coreExtensionsRead = false; - public static void initStartupExtensions(TaskListWriter writer) { + public static void initStartupExtensions(TaskListWriter delegatingExternalizer) { List<ITaskListExternalizer> externalizers = new ArrayList<ITaskListExternalizer>(); if (!coreExtensionsRead) { IExtensionRegistry registry = Platform.getExtensionRegistry(); @@ -156,7 +156,7 @@ public class TasksUiExtensionReader { } } } - writer.setDelegateExternalizers(externalizers); + delegatingExternalizer.setDelegateExternalizers(externalizers); coreExtensionsRead = true; } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java index 72ef0a9a4..3b2b9f106 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java @@ -23,13 +23,13 @@ import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.context.core.util.DateUtil; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.DateRangeActivityDelegate; import org.eclipse.mylar.tasks.core.DateRangeContainer; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.Task.PriorityLevel; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; 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 7a486551b..721640dcd 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 @@ -17,6 +17,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.RetrieveTitleFromUrlJob; +import org.eclipse.mylar.tasks.ui.DatePicker; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.TextTransfer; 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 c19b28323..186c3e401 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 @@ -24,8 +24,8 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerDropAdapter; import org.eclipse.mylar.context.core.ContextCorePlugin; import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.RetrieveTitleFromUrlJob; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.actions.NewLocalTaskAction; import org.eclipse.mylar.internal.tasks.ui.actions.TaskActivateAction; import org.eclipse.mylar.tasks.core.AbstractQueryHit; @@ -36,6 +36,7 @@ import org.eclipse.mylar.tasks.core.Task; import org.eclipse.mylar.tasks.core.TaskCategory; import org.eclipse.mylar.tasks.ui.TaskTransfer; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.TransferData; @@ -83,7 +84,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter { } if (targetTask != null) { final String[] names = (String[]) data; - boolean confirmed = MessageDialog.openConfirm(getViewer().getControl().getShell(), TasksUiPlugin.TITLE_DIALOG, + boolean confirmed = MessageDialog.openConfirm(getViewer().getControl().getShell(), ITasksUiConstants.TITLE_DIALOG, "Overwrite the context of the target task with the source's?"); if (confirmed) { String path = names[0]; 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 628ad62f3..85d2bac22 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 @@ -13,13 +13,13 @@ package org.eclipse.mylar.internal.tasks.ui.views; import java.util.List; import java.util.Set; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.DateRangeContainer; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.ITaskActivityListener; import org.eclipse.mylar.tasks.core.ITaskListChangeListener; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java index 5d95d9cdb..6e34b275a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java @@ -25,7 +25,6 @@ import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.mylar.context.core.ContextCorePlugin; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -35,6 +34,7 @@ import org.eclipse.mylar.tasks.core.ITaskListElement; import org.eclipse.mylar.tasks.core.TaskArchive; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState; import org.eclipse.mylar.tasks.core.Task.PriorityLevel; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; 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 55e956120..8a217c63b 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 @@ -14,6 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.views; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -21,7 +22,6 @@ import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.ITaskListElement; import org.eclipse.mylar.tasks.core.TaskArchive; -import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.eclipse.ui.PlatformUI; /** @@ -45,7 +45,7 @@ public class TaskListTableSorter extends ViewerSorter { this.column = column; if (view.isFocusedMode()) { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - TasksUiPlugin.TITLE_DIALOG, + ITasksUiConstants.TITLE_DIALOG, "Manual sorting is disabled in focused mode, sort order will not take effect until focused mode is disabled."); } } 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 1552a8b2c..814afc290 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 @@ -55,7 +55,6 @@ import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPatternFilter; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.TaskPriorityFilter; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.actions.CollapseAllAction; import org.eclipse.mylar.internal.tasks.ui.actions.CopyTaskDetailsAction; import org.eclipse.mylar.internal.tasks.ui.actions.DeleteAction; @@ -89,6 +88,7 @@ import org.eclipse.mylar.tasks.core.TaskArchive; import org.eclipse.mylar.tasks.core.TaskCategory; import org.eclipse.mylar.tasks.ui.TaskTransfer; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.SWTException; import org.eclipse.swt.dnd.DND; 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 801951800..be59cb631 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 @@ -45,8 +45,6 @@ public class TaskRepositoriesView extends ViewPart { public static final String ID = "org.eclipse.mylar.tasklist.repositories"; - public static final String NAME = "Task Repositories View"; - private TableViewer viewer; private Action addRepositoryAction = new AddRepositoryAction(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java index 9cac7befa..787892529 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java @@ -18,6 +18,7 @@ import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.wizards.AbstractRepositorySettingsPage; import org.eclipse.ui.INewWizard; /** diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java index eeeec5c73..63b6e8fa7 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java @@ -16,6 +16,7 @@ import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -64,7 +65,7 @@ public class ContextAttachWizard extends Wizard { try { if (!connector.attachContext(repository, task, wizardPage.getComment())) { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - TasksUiPlugin.TITLE_DIALOG, AbstractRepositoryConnector.MESSAGE_ATTACHMENTS_NOT_SUPPORTED + connector.getLabel()); + ITasksUiConstants.TITLE_DIALOG, AbstractRepositoryConnector.MESSAGE_ATTACHMENTS_NOT_SUPPORTED + connector.getLabel()); } else { task.setSyncState(RepositoryTaskSyncState.SYNCHRONIZED); IWorkbenchSite site = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite(); @@ -77,7 +78,7 @@ public class ContextAttachWizard extends Wizard { } } catch (final CoreException e) { String message = e.getStatus().getMessage() != null ? e.getStatus().getMessage() : ""; - MessageDialog.openError(null, TasksUiPlugin.TITLE_DIALOG, "Attachment of task context FAILED. \n\n"+message); + MessageDialog.openError(null, ITasksUiConstants.TITLE_DIALOG, "Attachment of task context FAILED. \n\n"+message); MylarStatusHandler.log(e.getStatus()); //ErrorDialog.openError(null, TasksUiPlugin.TITLE_DIALOG, "Attachment of task context FAILED.", e.getStatus()); return false; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java index 4ea1ca679..e5f02073d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java @@ -16,6 +16,7 @@ import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -71,7 +72,7 @@ public class ContextRetrieveWizard extends Wizard { try { if (!connector.retrieveContext(repository, task, delegate, TasksUiPlugin.getDefault().getDataDirectory())) { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - TasksUiPlugin.TITLE_DIALOG, AbstractRepositoryConnector.MESSAGE_ATTACHMENTS_NOT_SUPPORTED + ITasksUiConstants.TITLE_DIALOG, AbstractRepositoryConnector.MESSAGE_ATTACHMENTS_NOT_SUPPORTED + connector.getLabel()); } else { TasksUiPlugin.getTaskListManager().getTaskList().notifyLocalInfoChanged(task); @@ -82,7 +83,7 @@ public class ContextRetrieveWizard extends Wizard { } } } catch (CoreException e) { - ErrorDialog.openError(null, TasksUiPlugin.TITLE_DIALOG, "Retrieval of task context FAILED.", e.getStatus()); + ErrorDialog.openError(null, ITasksUiConstants.TITLE_DIALOG, "Retrieval of task context FAILED.", e.getStatus()); MylarStatusHandler.log(e.getStatus()); return false; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java index b322c7ab7..fa7e1dce7 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java @@ -17,6 +17,7 @@ import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.wizards.AbstractRepositorySettingsPage; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java index e5190a351..d108bb05f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java @@ -27,6 +27,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.context.core.ContextCorePlugin; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.internal.tasks.ui.util.WebBrowserDialog; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; @@ -188,7 +189,7 @@ public class NewAttachmentWizard extends Wizard { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { MessageDialog.openError(Display.getDefault().getActiveShell(), - TasksUiPlugin.TITLE_DIALOG, event.getResult().getMessage()); + ITasksUiConstants.TITLE_DIALOG, event.getResult().getMessage()); } }); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java index db1be4e82..2387a48d3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryWizard.java @@ -15,6 +15,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylar.internal.tasks.ui.actions.AddRepositoryAction; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.wizards.AbstractRepositorySettingsPage; import org.eclipse.ui.IWorkbench; /** diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java index 81a00aacc..8e33c1f77 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java @@ -25,6 +25,7 @@ import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoryLabelProvider; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.wizards.AbstractRepositorySettingsPage; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java index f5425ed25..64f8be5ce 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java @@ -28,15 +28,14 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardNode; import org.eclipse.jface.wizard.WizardSelectionPage; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.actions.AddRepositoryAction; -import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoriesView; import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoryLabelProvider; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.core.TaskRepositoryFilter; import org.eclipse.mylar.tasks.core.TaskRepositoryManager; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -56,7 +55,7 @@ import org.eclipse.ui.PlatformUI; */ public abstract class SelectRepositoryPage extends WizardSelectionPage { - private static final String DESCRIPTION = "Add new repositories using the " + TaskRepositoriesView.NAME + private static final String DESCRIPTION = "Add new repositories using the " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + " view.\n" + "If a repository is missing it does not support the requested operation."; private static final String TITLE = "Select a repository"; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java index 186660671..9398178d3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java @@ -24,6 +24,7 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.context.core.ContextCorePlugin; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.context.core.MylarContextManager; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.util.TaskDataExportJob; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -120,7 +121,7 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard { return false; } - final File destTaskListFile = new File(destDir + File.separator + TasksUiPlugin.DEFAULT_TASK_LIST_FILE); + final File destTaskListFile = new File(destDir + File.separator + ITasksUiConstants.DEFAULT_TASK_LIST_FILE); final File destActivationHistoryFile = new File(destDir + File.separator + MylarContextManager.CONTEXT_HISTORY_FILE_NAME + MylarContextManager.CONTEXT_FILE_EXTENSION); final File destZipFile = new File(destDir + File.separator + getZipFileName()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java index f7910a56a..bae3be1a4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java @@ -35,6 +35,7 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.context.core.MylarContextManager; import org.eclipse.mylar.internal.context.core.util.ZipFileUtil; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.TaskList; @@ -138,7 +139,7 @@ public class TaskDataImportWizard extends Wizard implements IImportWizard { // ignore directories (shouldn't be any) continue; } - if (!importPage.importTaskList() && entry.getName().endsWith(TasksUiPlugin.OLD_TASK_LIST_FILE)) { + if (!importPage.importTaskList() && entry.getName().endsWith(ITasksUiConstants.OLD_TASK_LIST_FILE)) { continue; } @@ -185,7 +186,7 @@ public class TaskDataImportWizard extends Wizard implements IImportWizard { } // make sure selected files for import are there - sourceTaskListFile = new File(sourceDir + File.separator + TasksUiPlugin.OLD_TASK_LIST_FILE); + sourceTaskListFile = new File(sourceDir + File.separator + ITasksUiConstants.OLD_TASK_LIST_FILE); sourceRepositoriesFile = new File(sourceDir + File.separator + TaskRepositoryManager.OLD_REPOSITORIES_FILE); sourceActivationHistoryFile = new File(sourceDir + File.separator + MylarContextManager.OLD_CONTEXT_HISTORY_FILE_NAME + MylarContextManager.CONTEXT_FILE_EXTENSION_OLD); @@ -349,7 +350,7 @@ public class TaskDataImportWizard extends Wizard implements IImportWizard { if (importTaskList) { String destTaskListPath = TasksUiPlugin.getDefault().getDataDirectory() + File.separator - + TasksUiPlugin.OLD_TASK_LIST_FILE; + + ITasksUiConstants.OLD_TASK_LIST_FILE; File destTaskListFile = new File(destTaskListPath); if (destTaskListFile.exists()) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java index 13d2429dd..de536c037 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java @@ -14,13 +14,12 @@ import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; -import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage; import org.eclipse.mylar.internal.tasks.ui.wizards.CommonAddExistingTaskWizard; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.core.TaskRepositoryManager; +import org.eclipse.mylar.tasks.ui.wizards.AbstractRepositorySettingsPage; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/DatePicker.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java index 2830c2700..3c6b6b31b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/DatePicker.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/DatePicker.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.views; +package org.eclipse.mylar.tasks.ui; import java.text.DateFormat; import java.text.ParseException; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java index 392904517..f2418e1d2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui; +package org.eclipse.mylar.tasks.ui; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -18,17 +18,17 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.core.UnrecognizedReponseException; -import org.eclipse.mylar.internal.tasks.ui.editors.AbstractTaskEditorInput; -import org.eclipse.mylar.internal.tasks.ui.editors.RepositoryTaskEditorInput; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; +import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.util.WebBrowserDialog; -import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoriesView; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITaskDataHandler; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskRepository; -import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.core.UnrecognizedReponseException; +import org.eclipse.mylar.tasks.ui.editors.AbstractTaskEditorInput; +import org.eclipse.mylar.tasks.ui.editors.RepositoryTaskEditorInput; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; @@ -68,7 +68,7 @@ public class OpenRepositoryTaskJob extends Job { public void run() { MessageDialog.openError(null, "Repository Not Found", "Could not find repository configuration for " + serverUrl - + ". \nPlease set up repository via " + TaskRepositoriesView.NAME + "."); + + ". \nPlease set up repository via " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + "."); TasksUiUtil.openUrl(taskUrl); } @@ -99,7 +99,7 @@ public class OpenRepositoryTaskJob extends Job { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - TasksUiPlugin.TITLE_DIALOG, + ITasksUiConstants.TITLE_DIALOG, "Could not open repository task. Verify that a task with this ID exists and is accessible." + "\n\nException: " + e.getStatus().getException()); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java index 94d4e03e4..12a64b69f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java @@ -28,7 +28,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.core.UnrecognizedReponseException; import org.eclipse.mylar.internal.tasks.ui.util.WebBrowserDialog; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; @@ -37,6 +36,7 @@ import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskList; import org.eclipse.mylar.tasks.core.TaskRepository; +import org.eclipse.mylar.tasks.core.UnrecognizedReponseException; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java index 697282f76..272746025 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java @@ -24,19 +24,17 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.core.UnrecognizedReponseException; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; -import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor; -import org.eclipse.mylar.internal.tasks.ui.editors.TaskEditorInput; import org.eclipse.mylar.internal.tasks.ui.util.WebBrowserDialog; -import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoriesView; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITaskDataHandler; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskRepository; +import org.eclipse.mylar.tasks.core.UnrecognizedReponseException; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState; +import org.eclipse.mylar.tasks.ui.editors.TaskEditor; +import org.eclipse.mylar.tasks.ui.editors.TaskEditorInput; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.IProgressConstants; @@ -98,7 +96,7 @@ class SynchronizeTaskJob extends Job { }); } else if (e.getStatus().getException() instanceof LoginException) { MylarStatusHandler.fail(e, "Task download failed. Ensure proper repository configuration of " - + repositoryTask.getRepositoryUrl() + " in " + TaskRepositoriesView.NAME + ".", true); + + repositoryTask.getRepositoryUrl() + " in " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + ".", true); repositoryTask.setStatus(e.getStatus()); } else if (forceSync) { MylarStatusHandler.log(e.getStatus().getException(), "Unable to retrieve task " @@ -137,7 +135,7 @@ class SynchronizeTaskJob extends Job { if (repository == null) { throw new CoreException(new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, 0, "Associated repository could not be found. Ensure proper repository configuration of " - + repositoryTask.getRepositoryUrl() + " in " + TaskRepositoriesView.NAME + ".", null)); + + repositoryTask.getRepositoryUrl() + " in " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + ".", null)); } TasksUiPlugin.getTaskListManager().getTaskList().notifyRepositoryInfoChanged(repositoryTask); @@ -165,8 +163,8 @@ class SynchronizeTaskJob extends Job { // TODO: move out of SynchronizeTaskJob (but beware of race conditions) if (repositoryTask.getSyncState() == RepositoryTaskSyncState.INCOMING || repositoryTask.getSyncState() == RepositoryTaskSyncState.CONFLICT) { - List<MylarTaskEditor> editors = TasksUiUtil.getActiveRepositoryTaskEditors(); - for (final MylarTaskEditor editor : editors) { + List<TaskEditor> editors = TasksUiUtil.getActiveRepositoryTaskEditors(); + for (final TaskEditor editor : editors) { final TaskEditorInput input = (TaskEditorInput) editor.getEditorInput(); if (input.getTask().getHandleIdentifier().equals(repositoryTask.getHandleIdentifier())) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListDataMigration.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListDataMigration.java index c929e6029..28a79a15f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListDataMigration.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListDataMigration.java @@ -18,6 +18,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.context.core.MylarContextManager; import org.eclipse.mylar.internal.context.core.util.ZipFileUtil; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.tasks.core.TaskRepositoryManager; /** @@ -60,8 +61,8 @@ public class TaskListDataMigration implements IRunnableWithProgress { } public boolean migrateTaskList(IProgressMonitor monitor) { - File oldTasklistFile = new File(dataDirectory, TasksUiPlugin.OLD_TASK_LIST_FILE); - File newTasklistFile = new File(dataDirectory, TasksUiPlugin.DEFAULT_TASK_LIST_FILE); + File oldTasklistFile = new File(dataDirectory, ITasksUiConstants.OLD_TASK_LIST_FILE); + File newTasklistFile = new File(dataDirectory, ITasksUiConstants.DEFAULT_TASK_LIST_FILE); if (!oldTasklistFile.exists()) return false; if (newTasklistFile.exists()) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java index c85542d22..d713efb9e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java @@ -566,7 +566,7 @@ public class TaskListManager implements IPropertyChangeListener { public boolean readExistingOrCreateNewList() { try { if (taskListFile.exists()) { - taskListWriter.readTaskList(taskList, taskListFile); + taskListWriter.readTaskList(taskList, taskListFile, TasksUiPlugin.getDefault().getTaskDataManager()); } else { resetTaskList(); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java index 0fe4679a9..75684f0e9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java @@ -40,13 +40,12 @@ import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.mylar.context.core.ContextCorePlugin; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.context.core.MylarPreferenceContstants; -import org.eclipse.mylar.internal.tasks.core.WebClientUtil; +import org.eclipse.mylar.internal.tasks.core.TaskDataManager; import org.eclipse.mylar.internal.tasks.ui.IDynamicSubMenuContributor; -import org.eclipse.mylar.internal.tasks.ui.ITaskEditorFactory; import org.eclipse.mylar.internal.tasks.ui.ITaskHighlighter; import org.eclipse.mylar.internal.tasks.ui.ITaskListNotification; import org.eclipse.mylar.internal.tasks.ui.ITaskListNotificationProvider; -import org.eclipse.mylar.internal.tasks.ui.TaskDataManager; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListBackupManager; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylar.internal.tasks.ui.TaskListNotificationIncoming; @@ -65,15 +64,19 @@ import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.DateRangeContainer; +import org.eclipse.mylar.tasks.core.DelegatingTaskExternalizer; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.ITaskActivityListener; import org.eclipse.mylar.tasks.core.ITaskDataHandler; +import org.eclipse.mylar.tasks.core.ITaskListExternalizer; import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.Task; import org.eclipse.mylar.tasks.core.TaskComment; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.core.TaskRepositoryManager; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState; +import org.eclipse.mylar.tasks.core.web.WebClientUtil; +import org.eclipse.mylar.tasks.ui.editors.ITaskEditorFactory; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IStartup; @@ -93,22 +96,10 @@ import org.osgi.service.prefs.BackingStoreException; */ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { - // TODO: move constants - - public static final String DEFAULT_BACKUP_FOLDER_NAME = "backup"; - - public static final String FILE_EXTENSION = ".xml.zip"; - - public static final String OLD_TASK_LIST_FILE = "tasklist.xml"; - - public static final String DEFAULT_TASK_LIST_FILE = "tasklist" + FILE_EXTENSION; - - public static final String TITLE_DIALOG = "Mylar Information"; + public static final String LABEL_VIEW_REPOSITORIES = "Task Repositories view"; public static final String PLUGIN_ID = "org.eclipse.mylar.tasklist"; - - public static final String URL_HOMEPAGE = "http://eclipse.org/mylar"; - + private static final String PROPERTY_PREFIX = "project.repository"; private static final String PROJECT_REPOSITORY_KIND = PROPERTY_PREFIX + ".kind"; @@ -121,8 +112,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { private static final int NOTIFICATION_DELAY = 5000; - public static final String MESSAGE_RESTORE = "Could not read task list. Consider restoring via File -> Import -> Mylar Task Data"; - private static TasksUiPlugin INSTANCE; private static TaskListManager taskListManager; @@ -160,7 +149,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { private Map<String, ImageDescriptor> overlayIcons = new HashMap<String, ImageDescriptor>(); private boolean eclipse_3_3_workbench = false; - + public enum TaskListSaveMode { ONE_HOUR, THREE_HOURS, DAY; @Override @@ -385,20 +374,27 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { File dataDir = new File(getDataDirectory()); dataDir.mkdirs(); migrateContextStoreFrom06Format(false); - String path = getDataDirectory() + File.separator + DEFAULT_TASK_LIST_FILE; + String path = getDataDirectory() + File.separator + ITasksUiConstants.DEFAULT_TASK_LIST_FILE; File taskListFile = new File(path); taskListManager = new TaskListManager(taskListWriter, taskListFile); taskRepositoryManager = new TaskRepositoryManager(taskListManager.getTaskList()); synchronizationManager = new RepositorySynchronizationManager(); - + // NOTE: initializing extensions in start(..) has caused race // conditions previously + TasksUiExtensionReader.initStartupExtensions(taskListWriter); - taskRepositoryManager.readRepositories(getRepositoriesFilePath()); - readOfflineReports(); - + for (ITaskListExternalizer externalizer : taskListWriter.getExternalizers()) { + if (externalizer instanceof DelegatingTaskExternalizer) { + ((DelegatingTaskExternalizer) externalizer).init(offlineTaskManager); + } + } + taskRepositoryManager.readRepositories(getRepositoriesFilePath()); + + taskListWriter.setTaskDataManager(offlineTaskManager); + taskListManager.init(); taskListManager.addActivityListener(CONTEXT_TASK_ACTIVITY_LISTENER); taskListManager.readExistingOrCreateNewList(); @@ -415,7 +411,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { taskListManager.activateTask(taskListManager.getTaskList().getActiveTask()); } taskListManager.initActivityHistory(); - + taskListNotificationManager = new TaskListNotificationManager(); taskListNotificationManager.addNotificationProvider(REMINDER_NOTIFICATION_PROVIDER); taskListNotificationManager.addNotificationProvider(INCOMING_NOTIFICATION_PROVIDER); @@ -437,8 +433,9 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { getPreferenceStore().addPropertyChangeListener(PROPERTY_LISTENER); getPreferenceStore().addPropertyChangeListener(synchronizationScheduler); getPreferenceStore().addPropertyChangeListener(taskListManager); - - // XXX: get rid of this, hack to make decorators show up on startup + + // XXX: get rid of this, hack to make decorators show up + // on startup TaskRepositoriesView repositoriesView = TaskRepositoriesView.getFromActivePerspective(); if (repositoriesView != null) { repositoriesView.getViewer().refresh(); @@ -448,7 +445,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } } }); - + Bundle bundle = Platform.getBundle("org.eclipse.ui.workbench"); if (bundle.getLocation().contains("_3.3.")) { eclipse_3_3_workbench = true; @@ -458,7 +455,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { MylarStatusHandler.fail(e, "Mylar Task List initialization failed", false); } } - + /** * Will run with every startup in case somebody copies over an old data * directory. Called upon import. Called upon change of task data directory @@ -518,9 +515,9 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } public void setDataDirectory(String newPath) { - getTaskListManager().saveTaskList(); -// getTaskListSaveManager().saveTaskList(true); -// taskListSaveManager.saveTaskList(true, false); + getTaskListManager().saveTaskList(); + // getTaskListSaveManager().saveTaskList(true); + // taskListSaveManager.saveTaskList(true, false); ContextCorePlugin.getContextManager().saveActivityHistoryContext(); getPreferenceStore().setValue(MylarPreferenceContstants.PREF_DATA_DIR, newPath); ContextCorePlugin.getDefault().getContextStore().notifyContextStoreMoved(); @@ -537,11 +534,11 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { getTaskListManager().getTaskActivationHistory().clear(); getRepositoryManager().readRepositories(getRepositoriesFilePath()); ContextCorePlugin.getContextManager().loadActivityMetaContext(); - getTaskListManager().setTaskListFile(new File(getDataDirectory() + File.separator + DEFAULT_TASK_LIST_FILE)); + getTaskListManager().setTaskListFile(new File(getDataDirectory() + File.separator + ITasksUiConstants.DEFAULT_TASK_LIST_FILE)); getTaskListManager().readExistingOrCreateNewList(); getTaskListManager().parseTaskActivityInteractionHistory(); } - + @Override protected void initializeDefaultPreferences(IPreferenceStore store) { store.setDefault(MylarPreferenceContstants.PREF_DATA_DIR, getDefaultDataDirectory()); @@ -595,14 +592,16 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { return INSTANCE; } -// private void checkTaskListBackup() { -// Date currentTime = new Date(); -// if (currentTime.getTime() > lastBackup.getTime() + AUTOMATIC_BACKUP_SAVE_INTERVAL) {// TaskListSaveMode.fromStringToLong(getPrefs().getString(SAVE_TASKLIST_MODE))) -// // { -// TasksUiPlugin.getDefault().getTaskListSaveManager().createTaskListBackupFile(); -// lastBackup = new Date(); -// } -// } + // private void checkTaskListBackup() { + // Date currentTime = new Date(); + // if (currentTime.getTime() > lastBackup.getTime() + + // AUTOMATIC_BACKUP_SAVE_INTERVAL) {// + // TaskListSaveMode.fromStringToLong(getPrefs().getString(SAVE_TASKLIST_MODE))) + // // { + // TasksUiPlugin.getDefault().getTaskListSaveManager().createTaskListBackupFile(); + // lastBackup = new Date(); + // } + // } private Map<String, List<IDynamicSubMenuContributor>> menuContributors = new HashMap<String, List<IDynamicSubMenuContributor>>(); @@ -630,7 +629,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } public String getBackupFolderPath() { - return getDataDirectory() + DEFAULT_PATH_SEPARATOR + DEFAULT_BACKUP_FOLDER_NAME; + return getDataDirectory() + DEFAULT_PATH_SEPARATOR + ITasksUiConstants.DEFAULT_BACKUP_FOLDER_NAME; } public ITaskHighlighter getHighlighter() { @@ -650,12 +649,12 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { this.taskEditors.add(contextEditor); } -// /** -// * Public for testing. -// */ -// public TaskListSaveManager getTaskListSaveManager() { -// return taskListSaveManager; -// } + // /** + // * Public for testing. + // */ + // public TaskListSaveManager getTaskListSaveManager() { + // return taskListSaveManager; + // } public boolean isShellActive() { return TasksUiPlugin.shellActive; @@ -703,16 +702,17 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { IPath offlineReportsPath = getOfflineReportsFilePath(); try { - offlineTaskManager = new TaskDataManager(offlineReportsPath.toFile(), true); + offlineTaskManager = new TaskDataManager(taskRepositoryManager, offlineReportsPath.toFile(), true); } catch (Throwable t) { - MylarStatusHandler.log(t, + MylarStatusHandler + .log(t, "Could not restore offline repository tasks file, creating new one, likely cause is format update."); boolean deleted = offlineReportsPath.toFile().delete(); if (!deleted) { MylarStatusHandler.log(t, "could not delete offline repository tasks file"); } try { - offlineTaskManager = new TaskDataManager(offlineReportsPath.toFile(), false); + offlineTaskManager = new TaskDataManager(taskRepositoryManager, offlineReportsPath.toFile(), false); } catch (Exception e1) { MylarStatusHandler.log(e1, "could not reset offline repository tasks file"); } @@ -720,8 +720,8 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } /** - * Returns the path to the file caching the offline bug reports. - * PUBLIC FOR TESTING + * Returns the path to the file caching the offline bug reports. PUBLIC FOR + * TESTING */ public IPath getOfflineReportsFilePath() { IPath stateLocation = Platform.getStateLocation(TasksUiPlugin.getDefault().getBundle()); @@ -823,4 +823,8 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { public TaskListSaveManager getTaskListSaveManager() { return taskListSaveManager; } + + public String getNextNewRepositoryTaskId() { + return getTaskDataManager().getNewRepositoryTaskId(); + } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java index 1780f5918..07d458d86 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiUtil.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui; +package org.eclipse.mylar.tasks.ui; import java.net.MalformedURLException; import java.net.URL; @@ -34,9 +34,9 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.mylar.context.core.MylarStatusHandler; +import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.editors.CategoryEditorInput; -import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor; -import org.eclipse.mylar.internal.tasks.ui.editors.TaskEditorInput; import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoriesView; import org.eclipse.mylar.internal.tasks.ui.wizards.EditRepositoryWizard; import org.eclipse.mylar.tasks.core.AbstractQueryHit; @@ -50,8 +50,8 @@ import org.eclipse.mylar.tasks.core.ITaskListElement; import org.eclipse.mylar.tasks.core.Task; import org.eclipse.mylar.tasks.core.TaskCategory; import org.eclipse.mylar.tasks.core.TaskRepository; -import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; -import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.editors.TaskEditor; +import org.eclipse.mylar.tasks.ui.editors.TaskEditorInput; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; @@ -199,7 +199,7 @@ public class TasksUiUtil { repositoryTask.getRepositoryUrl()); if (repository == null) { MylarStatusHandler.fail(null, "No repository found for task. Please create repository in " - + TaskRepositoriesView.NAME + ".", true); + + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + ".", true); return; } @@ -348,19 +348,19 @@ public class TasksUiUtil { return Dialog.OK; } - public static List<MylarTaskEditor> getActiveRepositoryTaskEditors() { - List<MylarTaskEditor> repositoryTaskEditors = new ArrayList<MylarTaskEditor>(); + public static List<TaskEditor> getActiveRepositoryTaskEditors() { + List<TaskEditor> repositoryTaskEditors = new ArrayList<TaskEditor>(); IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows(); for (IWorkbenchWindow window : windows) { IEditorReference[] editorReferences = window.getActivePage().getEditorReferences(); for (int i = 0; i < editorReferences.length; i++) { IEditorPart editor = editorReferences[i].getEditor(false); - if (editor instanceof MylarTaskEditor) { - MylarTaskEditor taskEditor = (MylarTaskEditor) editor; + if (editor instanceof TaskEditor) { + TaskEditor taskEditor = (TaskEditor) editor; if (taskEditor.getEditorInput() instanceof TaskEditorInput) { TaskEditorInput input = (TaskEditorInput) taskEditor.getEditorInput(); if (input.getTask() instanceof AbstractRepositoryTask) { - repositoryTaskEditors.add((MylarTaskEditor) editor); + repositoryTaskEditors.add((TaskEditor) editor); } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java index c2f61bdd4..00d622a8e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import java.util.Calendar; import java.util.Collections; @@ -24,15 +24,15 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; -import org.eclipse.mylar.internal.tasks.ui.search.SearchHitCollector; -import org.eclipse.mylar.internal.tasks.ui.views.DatePicker; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskCategory; import org.eclipse.mylar.tasks.core.TaskList; +import org.eclipse.mylar.tasks.ui.DatePicker; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.search.SearchHitCollector; import org.eclipse.search.ui.NewSearchUI; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java index 0fc528b37..94aa4cd1d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import java.io.ByteArrayInputStream; import java.io.File; @@ -66,9 +66,13 @@ import org.eclipse.mylar.internal.context.core.util.DateUtil; import org.eclipse.mylar.internal.tasks.core.CommentQuoter; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; import org.eclipse.mylar.internal.tasks.ui.actions.CopyToClipboardAction; import org.eclipse.mylar.internal.tasks.ui.actions.SaveRemoteFileAction; +import org.eclipse.mylar.internal.tasks.ui.editors.ContentOutlineTools; +import org.eclipse.mylar.internal.tasks.ui.editors.IRepositoryTaskAttributeListener; +import org.eclipse.mylar.internal.tasks.ui.editors.IRepositoryTaskSelection; +import org.eclipse.mylar.internal.tasks.ui.editors.RepositoryAttachmentEditorInput; +import org.eclipse.mylar.internal.tasks.ui.editors.RepositoryTaskOutlinePage; import org.eclipse.mylar.internal.tasks.ui.util.WebBrowserDialog; import org.eclipse.mylar.internal.tasks.ui.wizards.NewAttachmentWizard; import org.eclipse.mylar.internal.tasks.ui.wizards.NewAttachmentWizardDialog; @@ -86,6 +90,7 @@ import org.eclipse.mylar.tasks.core.TaskComment; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.custom.StyledText; @@ -221,7 +226,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { protected AbstractTaskEditorInput editorInput; - private MylarTaskEditor parentEditor = null; + private TaskEditor parentEditor = null; protected RepositoryTaskOutlineNode taskOutlineModel = null; @@ -2189,7 +2194,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { attributesListeners.remove(listener); } - public void setParentEditor(MylarTaskEditor parentEditor) { + public void setParentEditor(TaskEditor parentEditor) { this.parentEditor = parentEditor; } @@ -2584,6 +2589,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { return submitJobListener; } + protected void attachContext(final AbstractRepositoryTask modifiedTask) { IProgressService ps = PlatformUI.getWorkbench().getProgressService(); try { @@ -2608,8 +2614,8 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { protected void handleSubmitError(final IJobChangeEvent event) { if (event.getJob().getResult().getCode() == Status.INFO) { - WebBrowserDialog.openAcceptAgreement(this.getSite().getShell(), "Failed to submit to repository", event - .getJob().getResult().getMessage(), event.getJob().getResult().getException().getMessage()); + WebBrowserDialog.openAcceptAgreement(this.getSite().getShell(), "Failed to submit to repository", event.getJob().getResult() + .getMessage(), event.getJob().getResult().getException().getMessage()); } else if (event.getJob().getResult().getCode() == Status.ERROR) { MylarStatusHandler.fail(event.getJob().getResult().getException(), "Failed to submit to repository" + ": Changes may not have successfully committed.\n" + event.getJob().getResult().getMessage(), diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorInput.java index e28ff5cff..c920ed153 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorInput.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.mylar.tasks.core.RepositoryTaskData; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITaskEditorFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/ITaskEditorFactory.java index e593c8531..230e1f07f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITaskEditorFactory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/ITaskEditorFactory.java @@ -9,9 +9,8 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui; +package org.eclipse.mylar.tasks.ui.editors; -import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; @@ -21,7 +20,7 @@ import org.eclipse.ui.IEditorPart; */ public interface ITaskEditorFactory { - public IEditorPart createEditor(MylarTaskEditor parentEditor, IEditorInput editorInput); + public IEditorPart createEditor(TaskEditor parentEditor, IEditorInput editorInput); public IEditorInput createEditorInput(ITask task); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/NewTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java index 690e133bc..0bdf352ed 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/NewTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskRepository; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java index 9d0e969f2..53dab568e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITask; @@ -122,7 +122,7 @@ public class RepositoryTaskEditorInput extends AbstractTaskEditorInput { } /** - * @return url for the repositoryTask/hit. Used by MylarTaskEditor when + * @return url for the repositoryTask/hit. Used by TaskEditor when * opening browser */ public String getUrl() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlineNode.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskOutlineNode.java index 36928f6ee..380374aa8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlineNode.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskOutlineNode.java @@ -8,11 +8,12 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import java.util.ArrayList; import java.util.Iterator; +import org.eclipse.mylar.internal.tasks.ui.editors.IRepositoryTaskSelection; import org.eclipse.mylar.tasks.core.TaskComment; import org.eclipse.mylar.tasks.core.RepositoryTaskData; @@ -23,11 +24,11 @@ import org.eclipse.mylar.tasks.core.RepositoryTaskData; */ public class RepositoryTaskOutlineNode implements IRepositoryTaskSelection { - static final String LABEL_DESCRIPTION = "Description"; + public static final String LABEL_DESCRIPTION = "Description"; - static final String LABEL_COMMENTS = "Comments"; + public static final String LABEL_COMMENTS = "Comments"; - static final String LABEL_NEW_COMMENT = "New Comment"; + public static final String LABEL_NEW_COMMENT = "New Comment"; /** The id of the Bugzilla object that the selection was on. */ protected String id; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskSelection.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskSelection.java index 266144427..179fef19a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskSelection.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskSelection.java @@ -9,8 +9,9 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; +import org.eclipse.mylar.internal.tasks.ui.editors.IRepositoryTaskSelection; import org.eclipse.mylar.tasks.core.TaskComment; /** diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTextViewer.java index 15315d544..4862f57af 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTextViewer.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.source.IOverviewRuler; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/MylarTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java index 6415d3562..53687c822 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/MylarTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import java.util.ArrayList; import java.util.List; @@ -21,9 +21,10 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.ITaskEditorFactory; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; +import org.eclipse.mylar.internal.tasks.ui.editors.TaskEditorActionContributor; +import org.eclipse.mylar.internal.tasks.ui.editors.TaskPlanningEditor; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITask; @@ -51,7 +52,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; * @author Mik Kersten * @author Eric Booth (initial prototype) */ -public class MylarTaskEditor extends FormEditor { +public class TaskEditor extends FormEditor { // private static final String TASK_INFO_PAGE_LABEL = "Planning"; @@ -75,7 +76,7 @@ public class MylarTaskEditor extends FormEditor { private int browserPageIndex; - public MylarTaskEditor() { + public TaskEditor() { super(); taskPlanningEditor = new TaskPlanningEditor(this); taskPlanningEditor.setParentEditor(this); @@ -231,7 +232,7 @@ public class MylarTaskEditor extends FormEditor { private class TaskEditorListener implements IPartListener { public void partActivated(IWorkbenchPart part) { - if (part.equals(MylarTaskEditor.this)) { + if (part.equals(TaskEditor.this)) { if (taskEditorInput != null) { ITask task = taskEditorInput.getTask(); if (TaskListView.getFromActivePerspective() != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java index e59607310..5a05bb518 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java @@ -11,9 +11,10 @@ /* * Created on 19-Jan-2005 */ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.mylar.internal.tasks.ui.editors.TaskEditorInputFactory; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.ui.IEditorInput; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskFormPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java index 7e3b3f787..7a3e4b47f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskFormPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.editors; +package org.eclipse.mylar.tasks.ui.editors; import java.util.ArrayList; import java.util.Iterator; @@ -38,6 +38,8 @@ import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.ImageUtilities; import org.eclipse.jface.text.source.OverviewRuler; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; +import org.eclipse.mylar.internal.tasks.ui.editors.RepositoryViewerConfig; +import org.eclipse.mylar.internal.tasks.ui.editors.TaskEditorActionContributor; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; @@ -234,7 +236,7 @@ public class TaskFormPage extends FormPage { // protected Text addTextBox(Composite composite, String text, int style) { // if (actionContributor == null) { - // actionContributor = ((MylarTaskEditor) getEditor()).getContributor(); + // actionContributor = ((TaskEditor) getEditor()).getContributor(); // } // // final Text textBox = @@ -279,7 +281,7 @@ public class TaskFormPage extends FormPage { protected TextViewer addTextViewer(TaskRepository repository, Composite composite, String text, int style) { if (actionContributor == null) { - actionContributor = ((MylarTaskEditor) getEditor()).getContributor(); + actionContributor = ((TaskEditor) getEditor()).getContributor(); } final RepositoryTextViewer commentViewer = new RepositoryTextViewer(repository, composite, style); @@ -337,7 +339,7 @@ public class TaskFormPage extends FormPage { int style) { if (actionContributor == null) { - actionContributor = ((MylarTaskEditor) getEditor()).getContributor(); + actionContributor = ((TaskEditor) getEditor()).getContributor(); } CompositeRuler fCompositeRuler = null; @@ -555,7 +557,7 @@ public class TaskFormPage extends FormPage { } } - static class ErrorAnnotation extends Annotation { + public static class ErrorAnnotation extends Annotation { public static String ERROR_TYPE = "spelling.error"; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/AbstractRepositoryQueryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java index a6afd681f..993b829de 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/AbstractRepositoryQueryPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java @@ -9,10 +9,11 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.search; +package org.eclipse.mylar.tasks.ui.search; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; @@ -124,7 +125,7 @@ public abstract class AbstractRepositoryQueryPage extends WizardPage implements public boolean performAction() { if (repository == null) { - MessageDialog.openInformation(Display.getCurrent().getActiveShell(), TasksUiPlugin.TITLE_DIALOG, + MessageDialog.openInformation(Display.getCurrent().getActiveShell(), ITasksUiConstants.TITLE_DIALOG, TaskRepositoryManager.MESSAGE_NO_REPOSITORY); return false; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResult.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/RepositorySearchResult.java index 110fdc3ad..b94be6bdb 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResult.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/RepositorySearchResult.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.search; +package org.eclipse.mylar.tasks.ui.search; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.search.internal.ui.SearchPluginImages; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchHitCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java index 287f79325..45deb89c3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchHitCollector.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java @@ -8,7 +8,7 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.search; +package org.eclipse.mylar.tasks.ui.search; import org.eclipse.core.runtime.CoreException; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractEditQueryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java index c35a78bca..043558bd5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractEditQueryWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java @@ -9,15 +9,15 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.wizards; +package org.eclipse.mylar.tasks.ui.wizards; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; -import org.eclipse.mylar.internal.tasks.ui.search.AbstractRepositoryQueryPage; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +import org.eclipse.mylar.tasks.ui.search.AbstractRepositoryQueryPage; /** * @author Mik Kersten diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositorySettingsPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java index 58824c0f1..fca7acb39 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositorySettingsPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.wizards; +package org.eclipse.mylar.tasks.ui.wizards; import java.nio.charset.Charset; import java.util.HashSet; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewWebTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewWebTaskWizard.java index 40844a10f..dfdedaa93 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewWebTaskWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewWebTaskWizard.java @@ -9,13 +9,14 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.tasks.ui.wizards; +package org.eclipse.mylar.tasks.ui.wizards; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.internal.tasks.ui.TaskListImages; -import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil; +import org.eclipse.mylar.internal.tasks.ui.wizards.NewWebTaskPage; import org.eclipse.mylar.tasks.core.TaskRepository; +import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.mylyn.trac.core/.classpath b/org.eclipse.mylyn.trac.core/.classpath index 304e86186..81680a36f 100644 --- a/org.eclipse.mylyn.trac.core/.classpath +++ b/org.eclipse.mylyn.trac.core/.classpath @@ -2,6 +2,10 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> + <accessrules> + <accessrule kind="discouraged" pattern="**/mylar/**/internal/**"/> + </accessrules> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java index c1e51b6d0..167a30eff 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java @@ -37,10 +37,6 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer; -import org.eclipse.mylar.internal.tasks.core.HtmlTag; -import org.eclipse.mylar.internal.tasks.core.WebClientUtil; -import org.eclipse.mylar.internal.tasks.core.HtmlStreamTokenizer.Token; import org.eclipse.mylar.internal.trac.core.model.TracComponent; import org.eclipse.mylar.internal.trac.core.model.TracMilestone; import org.eclipse.mylar.internal.trac.core.model.TracPriority; @@ -55,6 +51,10 @@ import org.eclipse.mylar.internal.trac.core.model.TracVersion; import org.eclipse.mylar.internal.trac.core.model.TracSearchFilter.CompareOperator; import org.eclipse.mylar.internal.trac.core.model.TracTicket.Key; import org.eclipse.mylar.internal.trac.core.util.TracHttpClientTransportFactory.TracHttpException; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer; +import org.eclipse.mylar.tasks.core.web.HtmlTag; +import org.eclipse.mylar.tasks.core.web.WebClientUtil; +import org.eclipse.mylar.tasks.core.web.HtmlStreamTokenizer.Token; /** * Represents a Trac repository that is accessed through the Trac's query script 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 9e63471fd..beabd355a 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 @@ -27,7 +27,7 @@ import org.apache.xmlrpc.client.XmlRpcCommonsTransport; import org.apache.xmlrpc.client.XmlRpcHttpClientConfig; import org.apache.xmlrpc.client.XmlRpcTransport; import org.apache.xmlrpc.client.XmlRpcTransportFactory; -import org.eclipse.mylar.internal.tasks.core.WebClientUtil; +import org.eclipse.mylar.tasks.core.web.WebClientUtil; /** * A custom transport factory used to establish XML-RPC connections. Uses the |