diff options
67 files changed, 449 insertions, 274 deletions
diff --git a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF index b685c1630..992121a74 100644 --- a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF @@ -10,4 +10,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.mylar.tasks.core, org.eclipse.search Eclipse-LazyStart: true -Export-Package: org.eclipse.mylar.trac.core.internal +Export-Package: org.eclipse.mylar.internal.trac.core, + org.eclipse.mylar.internal.trac.core.model, + org.eclipse.mylar.internal.trac.core.util +Bundle-Activator: org.eclipse.mylar.internal.trac.core.TracCorePlugin diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java index 6379abb01..345be816a 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java @@ -11,17 +11,18 @@ package org.eclipse.mylar.internal.trac.core; +import java.net.Proxy; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.mylar.internal.trac.model.TracComponent; -import org.eclipse.mylar.internal.trac.model.TracMilestone; -import org.eclipse.mylar.internal.trac.model.TracPriority; -import org.eclipse.mylar.internal.trac.model.TracSeverity; -import org.eclipse.mylar.internal.trac.model.TracTicketResolution; -import org.eclipse.mylar.internal.trac.model.TracTicketStatus; -import org.eclipse.mylar.internal.trac.model.TracTicketType; -import org.eclipse.mylar.internal.trac.model.TracVersion; +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; +import org.eclipse.mylar.internal.trac.core.model.TracSeverity; +import org.eclipse.mylar.internal.trac.core.model.TracTicketResolution; +import org.eclipse.mylar.internal.trac.core.model.TracTicketStatus; +import org.eclipse.mylar.internal.trac.core.model.TracTicketType; +import org.eclipse.mylar.internal.trac.core.model.TracVersion; /** * @author Steffen Pingel @@ -37,6 +38,8 @@ public abstract class AbstractTracClient implements ITracClient { protected Version version; protected TracClientData data; + + protected Proxy proxy; public AbstractTracClient(URL repositoryUrl, Version version, String username, String password) { this.repositoryUrl = repositoryUrl; @@ -118,4 +121,12 @@ public abstract class AbstractTracClient implements ITracClient { return null; } + public void setProxy(Proxy proxy) { + this.proxy = proxy; + } + + public Proxy getProxy() { + return proxy; + } + } diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/ITracClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/ITracClient.java index a1bb36d29..99e825c49 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/ITracClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/ITracClient.java @@ -11,21 +11,22 @@ package org.eclipse.mylar.internal.trac.core; +import java.net.Proxy; import java.util.Date; import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.mylar.internal.trac.model.TracComponent; -import org.eclipse.mylar.internal.trac.model.TracMilestone; -import org.eclipse.mylar.internal.trac.model.TracPriority; -import org.eclipse.mylar.internal.trac.model.TracSearch; -import org.eclipse.mylar.internal.trac.model.TracSeverity; -import org.eclipse.mylar.internal.trac.model.TracTicket; -import org.eclipse.mylar.internal.trac.model.TracTicketResolution; -import org.eclipse.mylar.internal.trac.model.TracTicketStatus; -import org.eclipse.mylar.internal.trac.model.TracTicketType; -import org.eclipse.mylar.internal.trac.model.TracVersion; +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; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracSeverity; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracTicketResolution; +import org.eclipse.mylar.internal.trac.core.model.TracTicketStatus; +import org.eclipse.mylar.internal.trac.core.model.TracTicketType; +import org.eclipse.mylar.internal.trac.core.model.TracVersion; /** * Defines the requirements for classes that provide remote access to Trac @@ -155,4 +156,6 @@ public interface ITracClient { Set<Integer> getChangedTickets(Date since) throws TracException; + void setProxy(Proxy proxy); + } diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/InvalidTicketException.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/InvalidTicketException.java index f5102eaa9..f5102eaa9 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/InvalidTicketException.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/InvalidTicketException.java diff --git a/org.eclipse.mylyn.trac.ui/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 dd9722357..9e114f26a 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/Trac09Client.java @@ -40,21 +40,20 @@ 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.TracHttpClientTransportFactory.TracHttpException; -import org.eclipse.mylar.internal.trac.model.TracComponent; -import org.eclipse.mylar.internal.trac.model.TracMilestone; -import org.eclipse.mylar.internal.trac.model.TracPriority; -import org.eclipse.mylar.internal.trac.model.TracSearch; -import org.eclipse.mylar.internal.trac.model.TracSearchFilter; -import org.eclipse.mylar.internal.trac.model.TracSeverity; -import org.eclipse.mylar.internal.trac.model.TracTicket; -import org.eclipse.mylar.internal.trac.model.TracTicketResolution; -import org.eclipse.mylar.internal.trac.model.TracTicketStatus; -import org.eclipse.mylar.internal.trac.model.TracTicketType; -import org.eclipse.mylar.internal.trac.model.TracVersion; -import org.eclipse.mylar.internal.trac.model.TracSearchFilter.CompareOperator; -import org.eclipse.mylar.internal.trac.model.TracTicket.Key; -import org.eclipse.mylar.tasks.ui.TasksUiPlugin; +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; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracSearchFilter; +import org.eclipse.mylar.internal.trac.core.model.TracSeverity; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracTicketResolution; +import org.eclipse.mylar.internal.trac.core.model.TracTicketStatus; +import org.eclipse.mylar.internal.trac.core.model.TracTicketType; +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; /** * Represents a Trac repository that is accessed through the Trac's query script @@ -83,7 +82,7 @@ public class Trac09Client extends AbstractTracClient { } private GetMethod connectInternal(String serverURL) throws TracLoginException, IOException, TracHttpException { - WebClientUtil.setupHttpClient(httpClient, TasksUiPlugin.getDefault().getProxySettings(), serverURL); + WebClientUtil.setupHttpClient(httpClient, proxy, serverURL); for (int attempt = 0; attempt < 2; attempt++) { // force authentication diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttributeFactory.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttributeFactory.java new file mode 100644 index 000000000..4c254dfba --- /dev/null +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttributeFactory.java @@ -0,0 +1,132 @@ +/******************************************************************************* + * Copyright (c) 2004 - 2006 University Of British Columbia 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: + * University Of British Columbia - initial API and implementation + *******************************************************************************/ + +package org.eclipse.mylar.internal.trac.core; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.mylar.internal.trac.core.model.TracTicket.Key; +import org.eclipse.mylar.tasks.core.AbstractAttributeFactory; +import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; + +/** + * Provides a mapping from Mylar task keys to Trac ticket keys. + * + * @author Steffen Pingel + */ +public class TracAttributeFactory extends AbstractAttributeFactory { + + private static final long serialVersionUID = 5333211422546115138L; + + private static Map<String, Attribute> attributeByTracKey = new HashMap<String, Attribute>(); + + private static Map<String, String> tracKeyByTaskKey = new HashMap<String, String>(); + + public enum Attribute { + CC(Key.CC, "CC:", RepositoryTaskAttribute.USER_CC), + CHANGE_TIME(Key.CHANGE_TIME, "Last Modification:", RepositoryTaskAttribute.DATE_MODIFIED, true, true), + COMPONENT(Key.COMPONENT, "Component:", null), + DESCRIPTION(Key.DESCRIPTION, "Description:", RepositoryTaskAttribute.DESCRIPTION, true, false), + ID(Key.ID, "<used by search engine>", null, true), + KEYWORDS(Key.KEYWORDS, "Keywords:", RepositoryTaskAttribute.KEYWORDS), + MILESTONE(Key.MILESTONE, "Milestone:", null), + OWNER(Key.OWNER, "Owner:", RepositoryTaskAttribute.USER_OWNER, false, true), + PRIORITY(Key.PRIORITY, "Priority:", null), + REPORTER(Key.REPORTER, "Reporter:", RepositoryTaskAttribute.USER_REPORTER, false, true), + RESOLUTION(Key.RESOLUTION, "Resolution:", RepositoryTaskAttribute.RESOLUTION, false, true), + SEVERITY(Key.SEVERITY, "Severity:", null), + STATUS(Key.STATUS, "Status:", RepositoryTaskAttribute.STATUS, false, true), + SUMMARY(Key.SUMMARY, "Summary:", RepositoryTaskAttribute.SUMMARY, true), + TIME(Key.TIME, "Created:", RepositoryTaskAttribute.DATE_CREATION, true, true), + TYPE(Key.TYPE, "Type:", null), + VERSION(Key.VERSION, "Version:", null); + + private final boolean isHidden; + + private final boolean isReadOnly; + + private final String tracKey; + + private final String prettyName; + + private final String taskKey; + + Attribute(Key key, String prettyName, String taskKey, boolean hidden, boolean readonly) { + this.tracKey = key.getKey(); + this.taskKey = taskKey; + this.prettyName = prettyName; + this.isHidden = hidden; + this.isReadOnly = readonly; + + attributeByTracKey.put(tracKey, this); + if (taskKey != null) { + tracKeyByTaskKey.put(taskKey, tracKey); + } + } + + Attribute(Key key, String prettyName, String taskKey, boolean hidden) { + this(key, prettyName, taskKey, hidden, false); + } + + Attribute(Key key, String prettyName, String taskKey) { + this(key, prettyName, taskKey, false, false); + } + + public String getTaskKey() { + return taskKey; + } + + public String getTracKey() { + return tracKey; + } + + public boolean isHidden() { + return isHidden; + } + + public boolean isReadOnly() { + return isReadOnly; + } + + public String toString() { + return prettyName; + } + } + + + @Override + public boolean getIsHidden(String key) { + Attribute attribute = attributeByTracKey.get(key); + return (attribute != null) ? attribute.isHidden() : false; + } + + @Override + public String getName(String key) { + Attribute attribute = attributeByTracKey.get(key); + // TODO if attribute == null it is probably a custom field: need + // to query custom field information from repoository + return (attribute != null) ? attribute.toString() : key; + } + + @Override + public boolean isReadOnly(String key) { + Attribute attribute = attributeByTracKey.get(key); + return (attribute != null) ? attribute.isReadOnly() : false; + } + + @Override + public String mapCommonAttributeKey(String key) { + String tracKey = tracKeyByTaskKey.get(key); + return (tracKey != null) ? tracKey : key; + } + +} diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracClientData.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientData.java index b335e3fdc..41fded092 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracClientData.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientData.java @@ -11,14 +11,14 @@ package org.eclipse.mylar.internal.trac.core; import java.io.Serializable; import java.util.List; -import org.eclipse.mylar.internal.trac.model.TracComponent; -import org.eclipse.mylar.internal.trac.model.TracMilestone; -import org.eclipse.mylar.internal.trac.model.TracPriority; -import org.eclipse.mylar.internal.trac.model.TracSeverity; -import org.eclipse.mylar.internal.trac.model.TracTicketResolution; -import org.eclipse.mylar.internal.trac.model.TracTicketStatus; -import org.eclipse.mylar.internal.trac.model.TracTicketType; -import org.eclipse.mylar.internal.trac.model.TracVersion; +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; +import org.eclipse.mylar.internal.trac.core.model.TracSeverity; +import org.eclipse.mylar.internal.trac.core.model.TracTicketResolution; +import org.eclipse.mylar.internal.trac.core.model.TracTicketStatus; +import org.eclipse.mylar.internal.trac.core.model.TracTicketType; +import org.eclipse.mylar.internal.trac.core.model.TracVersion; public class TracClientData implements Serializable { diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracClientFactory.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientFactory.java index 50b7ea6e3..50b7ea6e3 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracClientFactory.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientFactory.java diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracClientManager.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientManager.java index 609fcfacf..329b7104f 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracClientManager.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracClientManager.java @@ -21,11 +21,9 @@ import java.net.MalformedURLException; import java.util.HashMap; import java.util.Map; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; import org.eclipse.mylar.tasks.core.ITaskRepositoryListener; import org.eclipse.mylar.tasks.core.TaskRepository; -import org.eclipse.mylar.tasks.ui.TasksUiPlugin; /** * Caches {@link ITracClient} objects. @@ -44,8 +42,6 @@ public class TracClientManager implements ITaskRepositoryListener { this.cacheFile = cacheFile; readCache(); - - TasksUiPlugin.getRepositoryManager().addListener(this); } public synchronized ITracClient getRepository(TaskRepository taskRepository) throws MalformedURLException { @@ -103,7 +99,7 @@ public class TracClientManager implements ITaskRepositoryListener { } } } catch (Throwable e) { - TracUiPlugin.log(e); + TracCorePlugin.log(e); } finally { if (in != null) { try { @@ -130,7 +126,7 @@ public class TracClientManager implements ITaskRepositoryListener { out.writeObject(clientDataByUrl.get(url)); } } catch (IOException e) { - TracUiPlugin.log(e); + TracCorePlugin.log(e); } finally { if (out != null) { try { diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracCorePlugin.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracCorePlugin.java new file mode 100644 index 000000000..a9a2389df --- /dev/null +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracCorePlugin.java @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2003 - 2006 University Of British Columbia 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: + * University Of British Columbia - initial API and implementation + *******************************************************************************/ +package org.eclipse.mylar.internal.trac.core; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Plugin; +import org.eclipse.core.runtime.Status; +import org.osgi.framework.BundleContext; + +/** + * The headless Trac plug-in class. + * + * @author Steffen Pingel + */ +public class TracCorePlugin extends Plugin { + + public static final String PLUGIN_ID = "org.eclipse.mylar.trac.core"; + + public static final String ENCODING_UTF_8 = "UTF-8"; + + private static TracCorePlugin plugin; + + public final static String REPOSITORY_KIND = "trac"; + + public TracCorePlugin() { + } + + public static TracCorePlugin getDefault() { + return plugin; + } + + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Convenience method for logging statuses to the plug-in log + * + * @param status + * the status to log + */ + public static void log(IStatus status) { + getDefault().getLog().log(status); + } + + /** + * Convenience method for logging exceptions to the plug-in log + * + * @param e + * the exception to log + */ + public static void log(Throwable e) { + String message = e.getMessage(); + if (e.getMessage() == null) { + message = e.getClass().toString(); + } + log(new Status(Status.ERROR, TracCorePlugin.PLUGIN_ID, 0, message, e)); + } + +} + + diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracException.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracException.java index f38b02a4a..f38b02a4a 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracException.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracException.java diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracLoginException.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracLoginException.java index d50aff94b..d50aff94b 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracLoginException.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracLoginException.java diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracRemoteException.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRemoteException.java index 3923de9b8..3923de9b8 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracRemoteException.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRemoteException.java diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java index d978cf5e0..8e7a694fa 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java @@ -18,20 +18,22 @@ import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.trac.core.TracHttpClientTransportFactory.TracHttpException; -import org.eclipse.mylar.internal.trac.model.TracAttachment; -import org.eclipse.mylar.internal.trac.model.TracComment; -import org.eclipse.mylar.internal.trac.model.TracComponent; -import org.eclipse.mylar.internal.trac.model.TracMilestone; -import org.eclipse.mylar.internal.trac.model.TracPriority; -import org.eclipse.mylar.internal.trac.model.TracSearch; -import org.eclipse.mylar.internal.trac.model.TracSeverity; -import org.eclipse.mylar.internal.trac.model.TracTicket; -import org.eclipse.mylar.internal.trac.model.TracTicketResolution; -import org.eclipse.mylar.internal.trac.model.TracTicketStatus; -import org.eclipse.mylar.internal.trac.model.TracTicketType; -import org.eclipse.mylar.internal.trac.model.TracVersion; -import org.eclipse.mylar.internal.trac.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.core.model.TracAttachment; +import org.eclipse.mylar.internal.trac.core.model.TracComment; +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; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracSeverity; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracTicketResolution; +import org.eclipse.mylar.internal.trac.core.model.TracTicketStatus; +import org.eclipse.mylar.internal.trac.core.model.TracTicketType; +import org.eclipse.mylar.internal.trac.core.model.TracVersion; +import org.eclipse.mylar.internal.trac.core.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.core.util.TracHttpClientTransportFactory; +import org.eclipse.mylar.internal.trac.core.util.TracUtils; +import org.eclipse.mylar.internal.trac.core.util.TracHttpClientTransportFactory.TracHttpException; /** * Represents a Trac repository that is accessed through the Trac XmlRpcPlugin. diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracAttachment.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracAttachment.java index 338fae2c0..6125ababb 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracAttachment.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracAttachment.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; import java.util.Date; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracAttribute.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracAttribute.java index c60adddc3..5962eafba 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracAttribute.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracAttribute.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; import java.io.Serializable; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracComment.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracComment.java index 14b534393..d1be7585f 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracComment.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracComment.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; import java.util.Date; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracComponent.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracComponent.java index f63c5b189..00088e9e2 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracComponent.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracComponent.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracMilestone.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracMilestone.java index 1dd8822f1..935689e12 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracMilestone.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracMilestone.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; import java.io.Serializable; import java.util.Date; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracPriority.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracPriority.java index a41339338..eed975522 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracPriority.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracPriority.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracSearch.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java index 6cd141550..bcc8784c8 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracSearch.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java @@ -9,7 +9,7 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -21,7 +21,7 @@ import java.util.Map; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.trac.core.ITracClient; -import org.eclipse.mylar.internal.trac.model.TracSearchFilter.CompareOperator; +import org.eclipse.mylar.internal.trac.core.model.TracSearchFilter.CompareOperator; /** * Represents a Trac search. A search can have multiple {@link TracSearchFilter}s diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracSearchFilter.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearchFilter.java index 2702d90af..42f5c2942 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracSearchFilter.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearchFilter.java @@ -9,7 +9,7 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracSeverity.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSeverity.java index b2d6a6cd5..7a516f4db 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracSeverity.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSeverity.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicket.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java index 9b4959963..9c91acd5b 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicket.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicket.java @@ -9,7 +9,7 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; import java.util.ArrayList; import java.util.Date; @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; import org.eclipse.mylar.internal.trac.core.InvalidTicketException; -import org.eclipse.mylar.internal.trac.core.TracUtils; +import org.eclipse.mylar.internal.trac.core.util.TracUtils; /** * Represents a Trac ticket as it is retrieved from a Trac repository. diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicketAttribute.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketAttribute.java index 35ae1a871..01e4d5b2d 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicketAttribute.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketAttribute.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; import java.io.Serializable; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicketResolution.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketResolution.java index 1704c4088..71c863c3e 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicketResolution.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketResolution.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicketStatus.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketStatus.java index 5577b5778..d95baba3f 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicketStatus.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketStatus.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicketType.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketType.java index 995669fab..c87673fa0 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracTicketType.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracTicketType.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracVersion.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracVersion.java index b2ad756ea..f65a6b007 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/model/TracVersion.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracVersion.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.model; +package org.eclipse.mylar.internal.trac.core.model; import java.util.Date; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracHttpClientTransportFactory.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/util/TracHttpClientTransportFactory.java index 787696e5a..bc94ce5d8 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracHttpClientTransportFactory.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/util/TracHttpClientTransportFactory.java @@ -9,7 +9,7 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac.core; +package org.eclipse.mylar.internal.trac.core.util; import java.io.BufferedOutputStream; import java.io.IOException; @@ -34,7 +34,6 @@ import org.apache.xmlrpc.client.XmlRpcTransport; import org.apache.xmlrpc.client.XmlRpcTransportFactoryImpl; import org.apache.xmlrpc.util.XmlRpcIOException; import org.eclipse.mylar.internal.tasks.core.WebClientUtil; -import org.eclipse.mylar.tasks.ui.TasksUiPlugin; /** * A custom transport factory used to establish XML-RPC connections. Uses the @@ -60,6 +59,7 @@ public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { public static class TracHttpClientTransport extends XmlRpcCommonsTransport { private int contentLength; + private Proxy proxy; public TracHttpClientTransport(XmlRpcClient client) { super(client); @@ -119,8 +119,7 @@ public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { XmlRpcHttpClientConfig config = (XmlRpcHttpClientConfig) pRequest.getConfig(); String url = config.getServerURL().toString(); - Proxy proxySettings = TasksUiPlugin.getDefault().getProxySettings(); - WebClientUtil.setupHttpClient(getHttpClient(), proxySettings, url); + WebClientUtil.setupHttpClient(getHttpClient(), proxy, url); PostMethod method = new PostMethod(WebClientUtil.getRequestPath(url)); @@ -202,6 +201,14 @@ public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { this.contentLength = pLength; } + public void setProxy(Proxy proxy) { + this.proxy = proxy; + } + + public Proxy getProxy() { + return this.proxy; + } + } private final TracHttpClientTransport transport; @@ -215,4 +222,13 @@ public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { public XmlRpcTransport getTransport() { return transport; } + + public void setProxy(Proxy proxy) { + transport.setProxy(proxy); + } + + public Proxy getProxy() { + return transport.getProxy(); + } + } diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracUtils.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/util/TracUtils.java index e414bcfc1..be7b91c55 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/core/TracUtils.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/util/TracUtils.java @@ -6,12 +6,14 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac.core; +package org.eclipse.mylar.internal.trac.core.util; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; +import org.eclipse.mylar.internal.trac.core.ITracClient; + /** * Provides static helper methods. * diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/trac/core/internal/DELETE.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/trac/core/internal/DELETE.java deleted file mode 100644 index edd87f71c..000000000 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/trac/core/internal/DELETE.java +++ /dev/null @@ -1,13 +0,0 @@ -/******************************************************************************* - * 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.trac.core.internal; - -public class DELETE { - -} diff --git a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF index 4364524a6..2fcd0e50e 100644 --- a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ Require-Bundle: org.junit, org.eclipse.mylar.tasks.ui, org.eclipse.mylar.tasks.core, org.eclipse.mylar.core.tests, - org.eclipse.mylar.trac.ui + org.eclipse.mylar.trac.ui, + org.eclipse.mylar.trac.core Export-Package: org.eclipse.mylar.trac.tests Bundle-Activator: org.eclipse.mylar.trac.tests.TracTestPlugin Eclipse-LazyStart: true diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java index 3cf4d896f..7c90e140d 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java @@ -18,9 +18,9 @@ import java.util.Map; import org.eclipse.mylar.internal.trac.core.ITracClient; import org.eclipse.mylar.internal.trac.core.TracException; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; -import org.eclipse.mylar.internal.trac.model.TracSearch; -import org.eclipse.mylar.internal.trac.model.TracTicket; -import org.eclipse.mylar.internal.trac.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracTicket.Key; import org.eclipse.mylar.trac.tests.support.TestFixture; import org.eclipse.mylar.trac.tests.support.XmlRpcServer.TestData; import org.eclipse.mylar.trac.tests.support.XmlRpcServer.Ticket; diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java index a1b01e230..746b5f97c 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java @@ -18,11 +18,11 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.Credentials; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.PrivilegeLevel; -import org.eclipse.mylar.internal.trac.TracRepositoryQuery; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; -import org.eclipse.mylar.internal.trac.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryQuery; import org.eclipse.mylar.internal.trac.ui.search.AbstractQueryHitCollector; import org.eclipse.mylar.internal.trac.ui.search.RepositorySearchQuery; import org.eclipse.mylar.tasks.core.AbstractQueryHit; @@ -62,7 +62,7 @@ public class RepositorySearchQueryTest extends TestCase { protected void init(String url, Version version) { Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER); - repository = new TaskRepository(TracUiPlugin.REPOSITORY_KIND, url); + repository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, url); repository.setAuthenticationCredentials(credentials.username, credentials.password); repository.setTimeZoneId(ITracClient.TIME_ZONE); repository.setCharacterEncoding(ITracClient.CHARSET); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/Trac09ClientTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/Trac09ClientTest.java index ff3581cad..13e13ac29 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/Trac09ClientTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/Trac09ClientTest.java @@ -17,7 +17,7 @@ import java.util.Comparator; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.mylar.internal.trac.core.TracException; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; -import org.eclipse.mylar.internal.trac.model.TracVersion; +import org.eclipse.mylar.internal.trac.core.model.TracVersion; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java index 56af2a197..424c89184 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java @@ -23,11 +23,11 @@ import junit.framework.TestCase; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.Credentials; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.PrivilegeLevel; -import org.eclipse.mylar.internal.trac.TracRepositoryConnector; -import org.eclipse.mylar.internal.trac.TracTask; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryConnector; +import org.eclipse.mylar.internal.trac.ui.TracTask; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.IAttachmentHandler; import org.eclipse.mylar.tasks.core.TaskRepository; @@ -69,7 +69,7 @@ public class TracAttachmentHandlerTest extends TestCase { } protected void init(String url, Version version) { - String kind = TracUiPlugin.REPOSITORY_KIND; + String kind = TracCorePlugin.REPOSITORY_KIND; Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER); repository = new TaskRepository(kind, url); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientManagerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientManagerTest.java index 8cea2460a..d3ce5fdf9 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientManagerTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientManagerTest.java @@ -17,11 +17,11 @@ import java.util.Arrays; import junit.framework.TestCase; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient; import org.eclipse.mylar.internal.trac.core.TracClientManager; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; -import org.eclipse.mylar.internal.trac.model.TracMilestone; +import org.eclipse.mylar.internal.trac.core.model.TracMilestone; import org.eclipse.mylar.tasks.core.TaskRepository; /** @@ -30,7 +30,7 @@ import org.eclipse.mylar.tasks.core.TaskRepository; public class TracClientManagerTest extends TestCase { public void testNullCache() throws Exception { - TaskRepository taskRepository = new TaskRepository(TracUiPlugin.REPOSITORY_KIND, Constants.TEST_TRAC_096_URL); + TaskRepository taskRepository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, Constants.TEST_TRAC_096_URL); taskRepository.setVersion(Version.TRAC_0_9.name()); TracClientManager manager = new TracClientManager(null); @@ -42,7 +42,7 @@ public class TracClientManagerTest extends TestCase { } public void testReadCache() throws Exception { - TaskRepository taskRepository = new TaskRepository(TracUiPlugin.REPOSITORY_KIND, Constants.TEST_TRAC_096_URL); + TaskRepository taskRepository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, Constants.TEST_TRAC_096_URL); taskRepository.setVersion(Version.TRAC_0_9.name()); File file = File.createTempFile("mylar", null); @@ -54,7 +54,7 @@ public class TracClientManagerTest extends TestCase { } public void testWriteCache() throws Exception { - TaskRepository taskRepository = new TaskRepository(TracUiPlugin.REPOSITORY_KIND, Constants.TEST_TRAC_096_URL); + TaskRepository taskRepository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, Constants.TEST_TRAC_096_URL); taskRepository.setVersion(Version.TRAC_0_9.name()); File file = File.createTempFile("mylar", null); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracOfflineTaskHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracOfflineTaskHandlerTest.java index b5f82662b..b28748999 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracOfflineTaskHandlerTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracOfflineTaskHandlerTest.java @@ -19,11 +19,11 @@ import junit.framework.TestCase; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.Credentials; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.PrivilegeLevel; -import org.eclipse.mylar.internal.trac.TracRepositoryConnector; -import org.eclipse.mylar.internal.trac.TracTask; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryConnector; +import org.eclipse.mylar.internal.trac.ui.TracTask; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.IOfflineTaskHandler; import org.eclipse.mylar.tasks.core.TaskRepository; @@ -58,7 +58,7 @@ public class TracOfflineTaskHandlerTest extends TestCase { manager = TasksUiPlugin.getRepositoryManager(); manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath()); - connector = (TracRepositoryConnector) manager.getRepositoryConnector(TracUiPlugin.REPOSITORY_KIND); + connector = (TracRepositoryConnector) manager.getRepositoryConnector(TracCorePlugin.REPOSITORY_KIND); TasksUiPlugin.getSynchronizationManager().setForceSyncExec(true); offlineHandler = connector.getOfflineTaskHandler(); @@ -67,7 +67,7 @@ public class TracOfflineTaskHandlerTest extends TestCase { protected void init(String url, Version version) { Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER); - repository = new TaskRepository(TracUiPlugin.REPOSITORY_KIND, url); + repository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, url); repository.setAuthenticationCredentials(credentials.username, credentials.password); repository.setTimeZoneId(ITracClient.TIME_ZONE); repository.setCharacterEncoding(ITracClient.CHARSET); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryHitTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryHitTest.java index a89085c9e..2785a93c5 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryHitTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryHitTest.java @@ -13,8 +13,8 @@ package org.eclipse.mylar.trac.tests; import junit.framework.TestCase; -import org.eclipse.mylar.internal.trac.TracQueryHit; -import org.eclipse.mylar.internal.trac.TracTask; +import org.eclipse.mylar.internal.trac.ui.TracQueryHit; +import org.eclipse.mylar.internal.trac.ui.TracTask; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryTest.java index b31fa0bb8..dcbde718d 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracQueryTest.java @@ -13,9 +13,9 @@ package org.eclipse.mylar.trac.tests; import junit.framework.TestCase; -import org.eclipse.mylar.internal.trac.TracRepositoryQuery; import org.eclipse.mylar.internal.trac.core.ITracClient; -import org.eclipse.mylar.internal.trac.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryQuery; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java index 760b13edb..b3363eeb5 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java @@ -29,17 +29,18 @@ import org.eclipse.mylar.core.core.tests.support.MylarTestUtils; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.Credentials; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.PrivilegeLevel; import org.eclipse.mylar.internal.tasks.ui.wizards.EditRepositoryWizard; -import org.eclipse.mylar.internal.trac.TracRepositoryConnector; -import org.eclipse.mylar.internal.trac.TracRepositoryQuery; -import org.eclipse.mylar.internal.trac.TracTask; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient; import org.eclipse.mylar.internal.trac.core.InvalidTicketException; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; -import org.eclipse.mylar.internal.trac.model.TracSearch; -import org.eclipse.mylar.internal.trac.model.TracTicket; -import org.eclipse.mylar.internal.trac.model.TracVersion; -import org.eclipse.mylar.internal.trac.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracVersion; +import org.eclipse.mylar.internal.trac.core.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryConnector; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryQuery; +import org.eclipse.mylar.internal.trac.ui.TracTask; +import org.eclipse.mylar.internal.trac.ui.TracUiPlugin; import org.eclipse.mylar.internal.trac.ui.wizard.TracRepositorySettingsPage; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; @@ -88,7 +89,7 @@ public class TracRepositoryConnectorTest extends TestCase { } protected void init(String url, Version version) { - String kind = TracUiPlugin.REPOSITORY_KIND; + String kind = TracCorePlugin.REPOSITORY_KIND; Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER); repository = new TaskRepository(kind, url); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java index 929ff347c..09df347e2 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryQueryTest.java @@ -16,11 +16,11 @@ import java.util.List; import junit.framework.TestCase; -import org.eclipse.mylar.internal.trac.TracRepositoryQuery; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient; -import org.eclipse.mylar.internal.trac.model.TracSearch; -import org.eclipse.mylar.internal.trac.model.TracSearchFilter; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracSearchFilter; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.core.TaskRepositoryManager; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -34,7 +34,7 @@ public class TracRepositoryQueryTest extends TestCase { TaskRepositoryManager manager = TasksUiPlugin.getRepositoryManager(); manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath()); - TaskRepository repository = new TaskRepository(TracUiPlugin.REPOSITORY_KIND, Constants.TEST_TRAC_096_URL); + TaskRepository repository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, Constants.TEST_TRAC_096_URL); manager.addRepository(repository, TasksUiPlugin.getDefault().getRepositoriesFilePath()); TracSearch search = new TracSearch(); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracSearchTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracSearchTest.java index ced481642..a475623b9 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracSearchTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracSearchTest.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.trac.tests; import junit.framework.TestCase; -import org.eclipse.mylar.internal.trac.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskTest.java index b6199e30b..a888b774d 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskTest.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.trac.tests; import junit.framework.TestCase; -import org.eclipse.mylar.internal.trac.TracTask; +import org.eclipse.mylar.internal.trac.ui.TracTask; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTicketTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTicketTest.java index 3292020ac..a4be81343 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTicketTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTicketTest.java @@ -18,8 +18,8 @@ import java.util.TimeZone; import junit.framework.TestCase; import org.eclipse.mylar.internal.trac.core.InvalidTicketException; -import org.eclipse.mylar.internal.trac.model.TracTicket; -import org.eclipse.mylar.internal.trac.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracTicket.Key; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientSearchTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientSearchTest.java index 900280ee9..a7d1ac9c7 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientSearchTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientSearchTest.java @@ -15,9 +15,9 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; -import org.eclipse.mylar.internal.trac.model.TracSearch; -import org.eclipse.mylar.internal.trac.model.TracTicket; -import org.eclipse.mylar.internal.trac.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracTicket.Key; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientTest.java index ff057f5e9..475863559 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientTest.java @@ -20,7 +20,7 @@ import org.eclipse.mylar.internal.trac.core.TracLoginException; import org.eclipse.mylar.internal.trac.core.TracRemoteException; import org.eclipse.mylar.internal.trac.core.TracXmlRpcClient; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; -import org.eclipse.mylar.internal.trac.model.TracVersion; +import org.eclipse.mylar.internal.trac.core.model.TracVersion; /** * @author Steffen Pingel diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java index 7cdd677e0..ae7b59e92 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java @@ -28,7 +28,7 @@ import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.Credentials; import org.eclipse.mylar.core.core.tests.support.MylarTestUtils.PrivilegeLevel; -import org.eclipse.mylar.internal.trac.core.TracHttpClientTransportFactory; +import org.eclipse.mylar.internal.trac.core.util.TracHttpClientTransportFactory; /** * Test cases for <a href="http://trac-hacks.org/wiki/XmlRpcPlugin">Trac XML-RPC diff --git a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF index b4912c9c9..08e39a837 100644 --- a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Mylar Trac UI Plug-in Bundle-SymbolicName: org.eclipse.mylar.trac.ui;singleton:=true Bundle-Version: 0.6.2.v20060828-1600 -Bundle-Activator: org.eclipse.mylar.internal.trac.TracUiPlugin +Bundle-Activator: org.eclipse.mylar.internal.trac.ui.TracUiPlugin Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, @@ -15,9 +15,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.search, org.eclipse.mylar.trac.core Eclipse-LazyStart: true -Export-Package: org.eclipse.mylar.internal.trac, - org.eclipse.mylar.internal.trac.core, - org.eclipse.mylar.internal.trac.model, +Export-Package: org.eclipse.mylar.internal.trac.ui, org.eclipse.mylar.internal.trac.ui.editor, org.eclipse.mylar.internal.trac.ui.search, org.eclipse.mylar.internal.trac.ui.wizard diff --git a/org.eclipse.mylyn.trac.ui/plugin.xml b/org.eclipse.mylyn.trac.ui/plugin.xml index 9851196c3..29581985e 100644 --- a/org.eclipse.mylyn.trac.ui/plugin.xml +++ b/org.eclipse.mylyn.trac.ui/plugin.xml @@ -6,16 +6,18 @@ name="Trac Repository" point="org.eclipse.mylar.tasks.ui.repositories"> <connectorCore - class="org.eclipse.mylar.internal.trac.TracRepositoryConnector" + class="org.eclipse.mylar.internal.trac.ui.TracRepositoryConnector" id="org.eclipse.mylar.trac.tasklist.repositories" - name="Trac Repository Client" + name="Trac Headless Client" type="trac"/> <connectorUi - class="org.eclipse.mylar.internal.trac.TracRepositoryUi" - brandingIcon="icons/eview16/trac-icon.gif"/> + brandingIcon="icons/eview16/trac-icon.gif" + class="org.eclipse.mylar.internal.trac.ui.TracRepositoryUi" + id="Trac UI Client"/> <externalizer - class="org.eclipse.mylar.internal.trac.TracTaskExternalizer" - id="org.eclipse.mylar.trac.tasklist.externalizer"/> + class="org.eclipse.mylar.internal.trac.ui.TracTaskExternalizer" + id="org.eclipse.mylar.trac.tasklist.externalizer" + name="Trac Externalizer"/> </extension> <extension point="org.eclipse.mylar.tasks.ui.templates"> diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TrustAll.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TrustAll.java deleted file mode 100644 index 351824b17..000000000 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TrustAll.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 - 2006 Mylar eclipse.org project 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: - * Mylar project committers - initial API and implementation - *******************************************************************************/ - -package org.eclipse.mylar.internal.trac; - -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; - -import javax.net.ssl.X509TrustManager; - -/** - * A trust store that accepts all certificates. - * - * @author Steffen Pingel - */ -public class TrustAll implements X509TrustManager { - - public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException { - // ignore - } - - public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException { - // ignore - } - - public X509Certificate[] getAcceptedIssuers() { - return null; - } - -} diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracAttachmentHandler.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracAttachmentHandler.java index 977b79b67..265a42b59 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracAttachmentHandler.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracAttachmentHandler.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac; +package org.eclipse.mylar.internal.trac.ui; import java.io.File; import java.io.FileInputStream; @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.mylar.internal.trac.core.ITracClient; -import org.eclipse.mylar.internal.trac.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.IAttachmentHandler; import org.eclipse.mylar.tasks.core.RepositoryAttachment; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracOfflineTaskHandler.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracOfflineTaskHandler.java index ad7a7d5ea..de32b4e1f 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracOfflineTaskHandler.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracOfflineTaskHandler.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac; +package org.eclipse.mylar.internal.trac.ui; import java.util.ArrayList; import java.util.Arrays; @@ -24,12 +24,14 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; -import org.eclipse.mylar.internal.trac.TracAttributeFactory.Attribute; import org.eclipse.mylar.internal.trac.core.ITracClient; -import org.eclipse.mylar.internal.trac.core.TracUtils; -import org.eclipse.mylar.internal.trac.model.TracAttachment; -import org.eclipse.mylar.internal.trac.model.TracComment; -import org.eclipse.mylar.internal.trac.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.TracAttributeFactory; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; +import org.eclipse.mylar.internal.trac.core.TracAttributeFactory.Attribute; +import org.eclipse.mylar.internal.trac.core.model.TracAttachment; +import org.eclipse.mylar.internal.trac.core.model.TracComment; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.util.TracUtils; import org.eclipse.mylar.tasks.core.AbstractAttributeFactory; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.IOfflineTaskHandler; @@ -60,11 +62,11 @@ public class TracOfflineTaskHandler implements IOfflineTaskHandler { return null; } - TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(TracUiPlugin.REPOSITORY_KIND, + TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(TracCorePlugin.REPOSITORY_KIND, task.getRepositoryUrl()); try { int id = Integer.parseInt(AbstractRepositoryTask.getTaskId(task.getHandleIdentifier())); - RepositoryTaskData data = new RepositoryTaskData(attributeFactory, TracUiPlugin.REPOSITORY_KIND, repository + RepositoryTaskData data = new RepositoryTaskData(attributeFactory, TracCorePlugin.REPOSITORY_KIND, repository .getUrl(), id + ""); ITracClient client = connector.getClientManager().getRepository(repository); client.updateAttributes(new NullProgressMonitor(), false); diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracQueryHit.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracQueryHit.java index 89c7d16ba..72297c8e8 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracQueryHit.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracQueryHit.java @@ -9,7 +9,7 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac; +package org.eclipse.mylar.internal.trac.ui; import org.eclipse.mylar.internal.trac.core.ITracClient; import org.eclipse.mylar.tasks.core.AbstractQueryHit; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryConnector.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryConnector.java index 0b7b0f601..ec7785d3c 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryConnector.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryConnector.java @@ -9,7 +9,7 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac; +package org.eclipse.mylar.internal.trac.ui; import java.io.File; import java.util.ArrayList; @@ -19,12 +19,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.trac.TracTask.Kind; import org.eclipse.mylar.internal.trac.core.ITracClient; import org.eclipse.mylar.internal.trac.core.TracClientManager; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; -import org.eclipse.mylar.internal.trac.model.TracTicket; -import org.eclipse.mylar.internal.trac.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.ui.TracTask.Kind; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; @@ -71,7 +72,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { @Override public String getRepositoryType() { - return TracUiPlugin.REPOSITORY_KIND; + return TracCorePlugin.REPOSITORY_KIND; } @Override @@ -117,7 +118,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { String url = query.getRepositoryUrl(); TaskRepository taskRepository = TasksUiPlugin.getRepositoryManager().getRepository( - TracUiPlugin.REPOSITORY_KIND, url); + TracCorePlugin.REPOSITORY_KIND, url); ITracClient tracRepository; try { tracRepository = getClientManager().getRepository(taskRepository); @@ -168,6 +169,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { cacheFile = TracUiPlugin.getDefault().getRepostioryAttributeCachePath().toFile(); } clientManager = new TracClientManager(cacheFile); + TasksUiPlugin.getRepositoryManager().addListener(clientManager); } return clientManager; } @@ -225,13 +227,13 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector { } public boolean hasRichEditor(AbstractRepositoryTask task) { - TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(TracUiPlugin.REPOSITORY_KIND, + TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(TracCorePlugin.REPOSITORY_KIND, task.getRepositoryUrl()); return Version.XML_RPC.name().equals(repository.getVersion()); } public boolean hasAttachmentSupport(AbstractRepositoryTask task) { - TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(TracUiPlugin.REPOSITORY_KIND, + TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(TracCorePlugin.REPOSITORY_KIND, task.getRepositoryUrl()); return Version.XML_RPC.name().equals(repository.getVersion()); } diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryQuery.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryQuery.java index 8d7dc48fc..b35423dab 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryQuery.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryQuery.java @@ -9,7 +9,7 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac; +package org.eclipse.mylar.internal.trac.ui; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -17,7 +17,8 @@ import java.util.StringTokenizer; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.trac.core.ITracClient; -import org.eclipse.mylar.internal.trac.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskList; @@ -37,7 +38,7 @@ public class TracRepositoryQuery extends AbstractRepositoryQuery { @Override public String getRepositoryKind() { - return TracUiPlugin.REPOSITORY_KIND; + return TracCorePlugin.REPOSITORY_KIND; } public String getQueryParameter() { diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryUi.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java index 091a5bae5..f0a725a4f 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryUi.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylar.internal.trac; +package org.eclipse.mylar.internal.trac.ui; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; @@ -17,6 +17,7 @@ import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage; import org.eclipse.mylar.internal.tasks.ui.wizards.NewWebTaskWizard; import org.eclipse.mylar.internal.trac.core.ITracClient; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; import org.eclipse.mylar.internal.trac.ui.wizard.EditTracQueryWizard; import org.eclipse.mylar.internal.trac.ui.wizard.NewTracQueryWizard; import org.eclipse.mylar.internal.trac.ui.wizard.TracCustomQueryPage; @@ -107,7 +108,7 @@ public class TracRepositoryUi extends AbstractRepositoryConnectorUi { @Override public String getRepositoryType() { - return TracUiPlugin.REPOSITORY_KIND; + return TracCorePlugin.REPOSITORY_KIND; } } diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracTask.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTask.java index 1f7107724..9f857cfd5 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracTask.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTask.java @@ -9,10 +9,11 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac; +package org.eclipse.mylar.internal.trac.ui; -import org.eclipse.mylar.internal.trac.TracAttributeFactory.Attribute; import org.eclipse.mylar.internal.trac.core.ITracClient; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; +import org.eclipse.mylar.internal.trac.core.TracAttributeFactory.Attribute; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.Task; @@ -144,7 +145,7 @@ public class TracTask extends AbstractRepositoryTask { @Override public String getRepositoryKind() { - return TracUiPlugin.REPOSITORY_KIND; + return TracCorePlugin.REPOSITORY_KIND; } @Override diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracTaskExternalizer.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java index 05b7e38ae..36b8ca07f 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracTaskExternalizer.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java @@ -9,7 +9,7 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac; +package org.eclipse.mylar.internal.trac.ui; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.tasks.core.AbstractQueryHit; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracUiPlugin.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracUiPlugin.java index 4fd2b3c8a..b7e5ff671 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracUiPlugin.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracUiPlugin.java @@ -9,7 +9,7 @@ * Mylar project committers - initial API and implementation *******************************************************************************/ -package org.eclipse.mylar.internal.trac; +package org.eclipse.mylar.internal.trac.ui; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; @@ -29,9 +29,7 @@ import org.osgi.framework.BundleContext; */ public class TracUiPlugin extends AbstractUIPlugin { - public static final String PLUGIN_ID = "org.eclipse.mylar.trac"; - - public final static String REPOSITORY_KIND = "trac"; + public static final String PLUGIN_ID = "org.eclipse.mylar.trac.ui"; public final static String TITLE_MESSAGE_DIALOG = "Mylar Trac Client"; @@ -102,29 +100,5 @@ public class TracUiPlugin extends AbstractUIPlugin { ErrorDialog.openError(null, TITLE_MESSAGE_DIALOG, null, status); } } - - /** - * Convenience method for logging statuses to the plugin log - * - * @param status - * the status to log - */ - public static void log(IStatus status) { - getDefault().getLog().log(status); - } - - /** - * Convenience method for logging exceptions to the plugin log - * - * @param e - * the exception to log - */ - public static void log(Throwable e) { - String message = e.getMessage(); - if (e.getMessage() == null) { - message = e.getClass().toString(); - } - log(new Status(Status.ERROR, TracUiPlugin.PLUGIN_ID, 0, message, e)); - } } diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java index bd6fd4e0d..4a3f9536d 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java @@ -21,12 +21,12 @@ import org.eclipse.mylar.internal.tasks.ui.editors.AbstractBugEditorInput; import org.eclipse.mylar.internal.tasks.ui.editors.AbstractRepositoryTaskEditor; import org.eclipse.mylar.internal.tasks.ui.editors.ExistingBugEditorInput; import org.eclipse.mylar.internal.tasks.ui.editors.RepositoryTaskOutlineNode; -import org.eclipse.mylar.internal.trac.TracRepositoryConnector; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient; import org.eclipse.mylar.internal.trac.core.InvalidTicketException; -import org.eclipse.mylar.internal.trac.model.TracTicket; -import org.eclipse.mylar.internal.trac.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.core.model.TracTicket; +import org.eclipse.mylar.internal.trac.core.model.TracTicket.Key; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryConnector; +import org.eclipse.mylar.internal.trac.ui.TracUiPlugin; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.RepositoryOperation; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java index 73b103643..c376979a9 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java @@ -10,9 +10,9 @@ package org.eclipse.mylar.internal.trac.ui.editor; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.ITaskEditorFactory; import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor; -import org.eclipse.mylar.internal.trac.TracRepositoryConnector; -import org.eclipse.mylar.internal.trac.TracTask; -import org.eclipse.mylar.internal.trac.TracUiPlugin; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryConnector; +import org.eclipse.mylar.internal.trac.ui.TracTask; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -27,7 +27,7 @@ public class TracTaskEditorFactory implements ITaskEditorFactory { public boolean canCreateEditorFor(ITask task) { if (task instanceof TracTask) { TracRepositoryConnector connector = (TracRepositoryConnector) TasksUiPlugin.getRepositoryManager().getRepositoryConnector( - TracUiPlugin.REPOSITORY_KIND); + TracCorePlugin.REPOSITORY_KIND); return connector.hasRichEditor((TracTask) task); } return task instanceof TracTask; @@ -47,7 +47,7 @@ public class TracTaskEditorFactory implements ITaskEditorFactory { public IEditorInput createEditorInput(ITask task) { TracTask tracTask = (TracTask) task; TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository( - TracUiPlugin.REPOSITORY_KIND, tracTask.getRepositoryUrl()); + TracCorePlugin.REPOSITORY_KIND, tracTask.getRepositoryUrl()); try { return new TracTaskEditorInput(repository, tracTask); } catch (Exception e) { diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorInput.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorInput.java index 7d8d045e8..e37dc659b 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorInput.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorInput.java @@ -12,7 +12,7 @@ import java.io.IOException; import java.security.GeneralSecurityException; import org.eclipse.mylar.internal.tasks.ui.editors.ExistingBugEditorInput; -import org.eclipse.mylar.internal.trac.TracTask; +import org.eclipse.mylar.internal.trac.ui.TracTask; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.TaskRepository; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java index ac17bbd94..0888a3da1 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java @@ -22,14 +22,15 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.mylar.context.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.search.AbstractRepositoryQueryPage; import org.eclipse.mylar.internal.tasks.ui.search.RepositorySearchResult; -import org.eclipse.mylar.internal.trac.TracRepositoryConnector; -import org.eclipse.mylar.internal.trac.TracRepositoryQuery; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient; +import org.eclipse.mylar.internal.trac.core.TracCorePlugin; import org.eclipse.mylar.internal.trac.core.TracException; -import org.eclipse.mylar.internal.trac.model.TracSearch; -import org.eclipse.mylar.internal.trac.model.TracSearchFilter; -import org.eclipse.mylar.internal.trac.model.TracSearchFilter.CompareOperator; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracSearchFilter; +import org.eclipse.mylar.internal.trac.core.model.TracSearchFilter.CompareOperator; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryConnector; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryQuery; +import org.eclipse.mylar.internal.trac.ui.TracUiPlugin; import org.eclipse.mylar.internal.trac.ui.search.AbstractQueryHitCollector; import org.eclipse.mylar.internal.trac.ui.search.IQueryHitCollector; import org.eclipse.mylar.internal.trac.ui.search.RepositorySearchQuery; @@ -339,7 +340,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage { private void updateAttributesFromRepository(final boolean force) { TracRepositoryConnector connector = (TracRepositoryConnector) TasksUiPlugin.getRepositoryManager() - .getRepositoryConnector(TracUiPlugin.REPOSITORY_KIND); + .getRepositoryConnector(TracCorePlugin.REPOSITORY_KIND); final ITracClient client; try { client = connector.getClientManager().getRepository(repository); diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java index e7d024844..f1db76eb7 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java @@ -18,11 +18,11 @@ import java.util.Set; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.mylar.context.core.MylarStatusHandler; -import org.eclipse.mylar.internal.trac.TracRepositoryQuery; import org.eclipse.mylar.internal.trac.core.ITracClient; -import org.eclipse.mylar.internal.trac.model.TracSearch; -import org.eclipse.mylar.internal.trac.model.TracSearchFilter; -import org.eclipse.mylar.internal.trac.model.TracSearchFilter.CompareOperator; +import org.eclipse.mylar.internal.trac.core.model.TracSearch; +import org.eclipse.mylar.internal.trac.core.model.TracSearchFilter; +import org.eclipse.mylar.internal.trac.core.model.TracSearchFilter.CompareOperator; +import org.eclipse.mylar.internal.trac.ui.TracRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java index 2ae767edd..69a7cf9a5 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java @@ -19,12 +19,12 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage; -import org.eclipse.mylar.internal.trac.TracUiPlugin; import org.eclipse.mylar.internal.trac.core.ITracClient; import org.eclipse.mylar.internal.trac.core.TracClientFactory; import org.eclipse.mylar.internal.trac.core.TracException; import org.eclipse.mylar.internal.trac.core.TracLoginException; import org.eclipse.mylar.internal.trac.core.ITracClient.Version; +import org.eclipse.mylar.internal.trac.ui.TracUiPlugin; import org.eclipse.mylar.tasks.core.RepositoryTemplate; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.swt.SWT; |