Attachment 94252 Details for Bug 200541 – Patch returning the real connector instead of Proxy when possible

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch returning the real connector instead of Proxy when possible

ftpInitCommands.diff.txt (text/plain), 3.56 KB, created by Martin Oberhuber

on 2008-03-31 12:32:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2008-03-31 12:32:35 EDT

Size: 3.56 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tm.terminal
>Index: src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java,v
>retrieving revision 1.7
>diff -u -r1.7 TerminalConnectorExtension.java
>--- src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java	6 Jun 2007 17:37:04 -0000	1.7
>+++ src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java	31 Mar 2008 16:31:39 -0000
>@@ -1,16 +1,18 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2007 Wind River Systems, Inc. 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 
>+ * Copyright (c) 2006, 2008 Wind River Systems, Inc. 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: 
>+ * Contributors:
>  * Michael Scharf (Wind River) - initial API and implementation
>  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
>+ * Martin Oberhuber (Wind River) - [200541] Return real terminal connector if possible
>  *******************************************************************************/
> package org.eclipse.tm.internal.terminal.provisional.api;
> 
>+import java.io.InputStream;
> import java.io.OutputStream;
> import java.util.ArrayList;
> import java.util.List;
>@@ -37,6 +39,9 @@
> 			fProxy=proxy;
> 		}
> 		public ITerminalConnector getConnector() {
>+			if (fProxy.isInitialized()) {
>+				return fProxy.getConnector();
>+			}
> 			return fProxy;
> 		}
> 		public String getId() {
>@@ -55,7 +60,7 @@
> 	}
> 	/**
> 	 * A placeholder for the ITerminalConnector. It gets initialized when
>-	 * the real connector is needed. 
>+	 * the real connector is needed.
> 	 * The following methods can be called without initializing
> 	 * the contributed class: {@link #getId()}, {@link #getName()},
> 	 * {@link #getSettingsSummary()},{@link #load(ISettingsStore)},
>@@ -133,6 +138,9 @@
> 		public OutputStream getOutputStream() {
> 			return getConnector().getOutputStream();
> 		}
>+		public InputStream getInputStream() {
>+			return getConnector().getInputStream();
>+		}
> 		public String getSettingsSummary() {
> 			if(fConnector!=null)
> 				return getConnector().getSettingsSummary();
>@@ -167,7 +175,7 @@
> 				fConnector.setTerminalSize(newWidth, newHeight);
> 			}
> 		}
>-		public void initialize() throws Exception {	
>+		public void initialize() throws Exception {
> 			throw new IllegalStateException("Connector already initialized!"); //$NON-NLS-1$
> 		}
> 	}
>@@ -178,7 +186,7 @@
> 		return (ITerminalConnector)config.createExecutableExtension("class"); //$NON-NLS-1$
> 	}
> 	/**
>-	 * @return a new list of ITerminalConnectorInfo. 
>+	 * @return a new list of ITerminalConnectorInfo.
> 	 */
> 	public static ITerminalConnectorInfo[] getTerminalConnectors() {
> 		IConfigurationElement[] config=RegistryFactory.getRegistry().getConfigurationElementsFor("org.eclipse.tm.terminal.terminalConnector"); //$NON-NLS-1$

Actions: View | Diff

Attachments on bug 200541: 94252 | 94317 | 94807 | 94858