diff options
3 files changed, 23 insertions, 37 deletions
diff --git a/org.eclipse.mylyn.trac.core/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 146b28d06..ad01317f3 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/AbstractTracClient.java @@ -58,7 +58,6 @@ public abstract class AbstractTracClient implements ITracClient { return username != null && username.length() > 0; } - public TracComponent[] getComponents() { return (data.components != null) ? data.components.toArray(new TracComponent[0]) : null; } 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 9d3e6b342..e620a4888 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 @@ -26,7 +26,7 @@ import org.apache.xmlrpc.client.XmlRpcClientException; import org.apache.xmlrpc.client.XmlRpcCommonsTransport; import org.apache.xmlrpc.client.XmlRpcHttpClientConfig; import org.apache.xmlrpc.client.XmlRpcTransport; -import org.apache.xmlrpc.client.XmlRpcTransportFactoryImpl; +import org.apache.xmlrpc.client.XmlRpcTransportFactory; import org.eclipse.mylar.internal.tasks.core.WebClientUtil; /** @@ -35,7 +35,7 @@ import org.eclipse.mylar.internal.tasks.core.WebClientUtil; * * @author Steffen Pingel */ -public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { +public class TracHttpClientTransportFactory implements XmlRpcTransportFactory { public static class TracHttpException extends XmlRpcException { @@ -58,7 +58,6 @@ public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { super(client); XmlRpcHttpClientConfig config = (XmlRpcHttpClientConfig) client.getConfig(); - // this needs to be set to avoid exceptions getHttpClient().getParams().setAuthenticationPreemptive(config.getBasicUserName() != null); } @@ -67,16 +66,6 @@ public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { return (HttpClient) getValue("client"); } - @Override - protected InputStream getInputStream() throws XmlRpcException { - int responseCode = getMethod().getStatusCode(); - if (responseCode != HttpURLConnection.HTTP_OK) { - throw new TracHttpException(responseCode); - } - - return super.getInputStream(); - } - public PostMethod getMethod() { return (PostMethod) getValue("method"); } @@ -91,7 +80,7 @@ public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { field.setAccessible(true); return field.get(this); } catch (Throwable t) { - throw new RuntimeException("Internal error accessing HttpClient", t); + throw new RuntimeException("Internal error accessing field: " + name, t); } } @@ -101,10 +90,20 @@ public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { field.setAccessible(true); field.set(this, value); } catch (Throwable t) { - throw new RuntimeException("Internal error accessing HttpClient", t); + throw new RuntimeException("Internal error accessing field: " + name, t); } } + + @Override + protected InputStream getInputStream() throws XmlRpcException { + int responseCode = getMethod().getStatusCode(); + if (responseCode != HttpURLConnection.HTTP_OK) { + throw new TracHttpException(responseCode); + } + return super.getInputStream(); + } + @Override protected void initHttpHeaders(XmlRpcRequest request) throws XmlRpcClientException { // super call needed to initialize private fields of XmlRpcCommonsTransport @@ -148,24 +147,23 @@ public class TracHttpClientTransportFactory extends XmlRpcTransportFactoryImpl { } - private final TracHttpClientTransport transport; + private XmlRpcClient client; + private Proxy proxy; public TracHttpClientTransportFactory(XmlRpcClient client) { - super(client); - - transport = new TracHttpClientTransport(client); + this.client = client; } public XmlRpcTransport getTransport() { - return transport; + return new TracHttpClientTransport(client); } - public void setProxy(Proxy proxy) { - transport.setProxy(proxy); + public Proxy getProxy() { + return proxy; } - public Proxy getProxy() { - return transport.getProxy(); + public void setProxy(Proxy proxy) { + this.proxy = proxy; } - + } 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 ec50c6faf..f0064736e 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 @@ -30,9 +30,7 @@ import org.eclipse.mylar.internal.trac.core.TracRepositoryConnector; import org.eclipse.mylar.internal.trac.core.model.TracTicket; 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.ui.TasksUiPlugin; -import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.PlatformUI; @@ -52,15 +50,6 @@ public class TracTaskEditor extends AbstractRepositoryTaskEditor { super(editor); } - @Override - protected void addAttachContextButton(Composite buttonComposite, ITask task) { - // disabled, see bug 155151 - } - - @Override - protected void createCustomAttributeLayout(Composite composite) { - } - public void init(IEditorSite site, IEditorInput input) { if (!(input instanceof RepositoryTaskEditorInput)) return; |