Attachment 76232 Details for Bug 199871 – Implemented getMessage for LocalFileService and LocalProcessService

[patch] Implemented getMessage for LocalFileService and LocalProcessService

patch.txt (text/plain), 8.71 KB, created by Kevin Doyle

on 2007-08-16 11:55:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Doyle

Created: 2007-08-16 11:55:49 EDT

Size: 8.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.local
>Index: src/org/eclipse/rse/internal/services/local/files/LocalFileService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java,v
>retrieving revision 1.14
>diff -u -r1.14 LocalFileService.java
>--- src/org/eclipse/rse/internal/services/local/files/LocalFileService.java	10 Aug 2007 11:25:46 -0000	1.14
>+++ src/org/eclipse/rse/internal/services/local/files/LocalFileService.java	16 Aug 2007 15:47:03 -0000
>@@ -20,6 +20,7 @@
>  * Kevin Doyle (IBM) - [196211] Move a folder to a directory that contains a folder by that name errors
>  * Martin Oberhuber (Wind River) - [199394] Allow real files/folders containing String #virtual#
>  * Martin Oberhuber (Wind River) - [199548] Avoid touching files on setReadOnly() if unnecessary
>+ * Kevin Doyle (IBM) - [199871] LocalFileService needs to implement getMessage()
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.services.local.files;
>@@ -52,6 +53,7 @@
> import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
> import org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler;
> import org.eclipse.rse.services.clientserver.archiveutils.VirtualChild;
>+import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider;
> import org.eclipse.rse.services.clientserver.messages.SystemMessage;
> import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
> import org.eclipse.rse.services.files.AbstractFileService;
>@@ -95,13 +97,20 @@
> 	private boolean _isWin95 = false;
> 	private boolean _isWinNT = false;
> 	private String  _osCmdShell = null;
>+	
> 	protected ISystemFileTypes _fileTypeRegistry;
>+	protected ISystemMessageProvider _msgProvider;
> 	
> 	public LocalFileService(ISystemFileTypes fileTypeRegistry)
> 	{
> 		_fileTypeRegistry = fileTypeRegistry;
> 	}
> 	
>+	public LocalFileService (ISystemFileTypes fileTypeRegistry, ISystemMessageProvider msgProvider) {
>+		this(fileTypeRegistry);
>+		_msgProvider = msgProvider;
>+	}
>+	
> 	public String getName()
> 	{
> 		return LocalServiceResources.Local_File_Service_Name;
>@@ -1436,7 +1445,6 @@
> 	 * @see org.eclipse.rse.services.files.AbstractFileService#getOutputStream(String, String, boolean, IProgressMonitor)
> 	 */
> 	public OutputStream getOutputStream(String remoteParent, String remoteFile, boolean isBinary, IProgressMonitor monitor) throws SystemMessageException {
>-		
> 		File file = new File(remoteParent, remoteFile);
> 		OutputStream stream = null;
> 		
>@@ -1449,4 +1457,8 @@
> 		
> 		return stream;
> 	}	
>+	
>+	public SystemMessage getMessage(String messageID) {
>+		return (_msgProvider != null ? _msgProvider.getMessage(messageID) : super.getMessage(messageID));
>+	}
> }
>\ No newline at end of file
>Index: src/org/eclipse/rse/internal/services/local/processes/LocalProcessService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/processes/LocalProcessService.java,v
>retrieving revision 1.2
>diff -u -r1.2 LocalProcessService.java
>--- src/org/eclipse/rse/internal/services/local/processes/LocalProcessService.java	10 May 2007 14:11:19 -0000	1.2
>+++ src/org/eclipse/rse/internal/services/local/processes/LocalProcessService.java	16 Aug 2007 15:47:03 -0000
>@@ -12,6 +12,7 @@
>  * 
>  * Contributors:
>  * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
>+ * Kevin Doyle (IBM) - [199871] LocalProcessService needs to implement getMessage()
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.services.local.processes;
>@@ -23,6 +24,7 @@
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.rse.internal.services.local.ILocalService;
> import org.eclipse.rse.internal.services.local.LocalServiceResources;
>+import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider;
> import org.eclipse.rse.services.clientserver.messages.SystemMessage;
> import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
> import org.eclipse.rse.services.clientserver.processes.IHostProcess;
>@@ -36,12 +38,19 @@
> {	
> 	protected String[] _statusTypes;
> 	protected ProcessHandler handler;
>+	protected ISystemMessageProvider _msgProvider;
> 	
> 	public LocalProcessService()
> 	{
> 		handler = ProcessHandlerManager.getInstance().getNewProcessHandler();
> 	}
> 	
>+	public LocalProcessService(ISystemMessageProvider msgProvider)
>+	{
>+		this();
>+		_msgProvider = msgProvider;
>+	}
>+	
> 	public String getName()
> 	{
> 		return LocalServiceResources.Local_Process_Service_Name;
>@@ -157,4 +166,8 @@
> 	public void uninitService(IProgressMonitor monitor)
> 	{
> 	}
>+
>+	public SystemMessage getMessage(String messageID) {
>+		return (_msgProvider != null ? _msgProvider.getMessage(messageID) : super.getMessage(messageID));	
>+	}
> }
>\ No newline at end of file
>#P org.eclipse.rse.subsystems.files.local
>Index: src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java,v
>retrieving revision 1.21
>diff -u -r1.21 LocalFileSubSystemConfiguration.java
>--- src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java	15 May 2007 23:54:58 -0000	1.21
>+++ src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java	16 Aug 2007 15:47:03 -0000
>@@ -13,6 +13,7 @@
>  * Contributors:
>  * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
>  * Martin Oberhuber (Wind River) - [186997] No deferred queries in Local Files
>+ * Kevin Doyle (IBM) - [199871] LocalFileService needs to implement getMessage()
>  ********************************************************************************/
> 
> package org.eclipse.rse.subsystems.files.local;
>@@ -45,6 +46,7 @@
> import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystemConfiguration;
> import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
> import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
>+import org.eclipse.rse.ui.RSEUIPlugin;
> import org.eclipse.rse.ui.SystemBasePlugin;
> 
> 
>@@ -222,7 +224,7 @@
> 	
> 	public IFileService createFileService(IHost host)
> 	{
>-		return new LocalFileService(SystemFileTransferModeRegistry.getInstance());
>+		return new LocalFileService(SystemFileTransferModeRegistry.getInstance(), RSEUIPlugin.getDefault());
> 	}
> 	
> 	public ISearchService createSearchService(IHost host)
>#P org.eclipse.rse.subsystems.processes.local
>Index: src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java,v
>retrieving revision 1.9
>diff -u -r1.9 LocalProcessSubSystemConfiguration.java
>--- src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java	10 May 2007 12:40:02 -0000	1.9
>+++ src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java	16 Aug 2007 15:47:03 -0000
>@@ -12,6 +12,7 @@
>  * 
>  * Contributors:
>  * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
>+ * Kevin Doyle (IBM) - [199871] LocalProcessService needs to implement getMessage()
>  ********************************************************************************/
> 
> package org.eclipse.rse.subsystems.processes.local;
>@@ -29,6 +30,7 @@
> import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter;
> import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem;
> import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystemConfiguration;
>+import org.eclipse.rse.ui.RSEUIPlugin;
> 
> 
> public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemConfiguration 
>@@ -108,7 +110,7 @@
> 	public IProcessService createProcessService(IHost host)
> 	{
> 		//LocalConnectorService connectorService = (LocalConnectorService)getConnectorService(host);
>-		return new LocalProcessService();
>+		return new LocalProcessService(RSEUIPlugin.getDefault());
> 	}  
> 	
> 	/* (non-Javadoc)

Flags:

mober.at+eclipse: iplog+

Actions: View | Diff

Attachments on bug 199871: 76232