Attachment #76232 for bug #199871

View | Details | Raw Unified | Return to bug 199871
Collapse All | Expand All




 * 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;

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;

	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;

	 * @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;
		

		
		return stream;
	}	
	
	public SystemMessage getMessage(String messageID) {
		return (_msgProvider != null ? _msgProvider.getMessage(messageID) : super.getMessage(messageID));
	}
}




 * 
 * 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;

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;

{	
	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;

	public void uninitService(IProgressMonitor monitor)
	{
	}

	public SystemMessage getMessage(String messageID) {
		return (_msgProvider != null ? _msgProvider.getMessage(messageID) : super.getMessage(messageID));	
	}
}




 * 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;

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;



	
	public IFileService createFileService(IHost host)
	{
		return new LocalFileService(SystemFileTransferModeRegistry.getInstance(), RSEUIPlugin.getDefault());
	}
	
	public ISearchService createSearchService(IHost host)




 * 
 * 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;

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 

	public IProcessService createProcessService(IHost host)
	{
		//LocalConnectorService connectorService = (LocalConnectorService)getConnectorService(host);
		return new LocalProcessService(RSEUIPlugin.getDefault());
	}  
	
	/* (non-Javadoc)

Return to bug 199871

Lines 20-25 Link Here

(-)src/org/eclipse/rse/internal/services/local/files/LocalFileService.java (-1 / +13 lines)
20	* Kevin Doyle (IBM) - [196211] Move a folder to a directory that contains a folder by that name errors	20	* Kevin Doyle (IBM) - [196211] Move a folder to a directory that contains a folder by that name errors
21	* Martin Oberhuber (Wind River) - [199394] Allow real files/folders containing String #virtual#	21	* Martin Oberhuber (Wind River) - [199394] Allow real files/folders containing String #virtual#
22	* Martin Oberhuber (Wind River) - [199548] Avoid touching files on setReadOnly() if unnecessary	22	* Martin Oberhuber (Wind River) - [199548] Avoid touching files on setReadOnly() if unnecessary
		23	* Kevin Doyle (IBM) - [199871] LocalFileService needs to implement getMessage()
23	********************************************************************************/	24	********************************************************************************/
24		25
25	package org.eclipse.rse.internal.services.local.files;	26	package org.eclipse.rse.internal.services.local.files;
Lines 52-57 Link Here
52	import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;	53	import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
53	import org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler;	54	import org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler;
54	import org.eclipse.rse.services.clientserver.archiveutils.VirtualChild;	55	import org.eclipse.rse.services.clientserver.archiveutils.VirtualChild;
		56	import org.eclipse.rse.services.clientserver.messages.ISystemMessageProvider;
55	import org.eclipse.rse.services.clientserver.messages.SystemMessage;	57	import org.eclipse.rse.services.clientserver.messages.SystemMessage;
56	import org.eclipse.rse.services.clientserver.messages.SystemMessageException;	58	import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
57	import org.eclipse.rse.services.files.AbstractFileService;	59	import org.eclipse.rse.services.files.AbstractFileService;
Lines 95-107 Link Here
95	private boolean _isWin95 = false;	97	private boolean _isWin95 = false;
96	private boolean _isWinNT = false;	98	private boolean _isWinNT = false;
97	private String _osCmdShell = null;	99	private String _osCmdShell = null;
		100
98	protected ISystemFileTypes _fileTypeRegistry;	101	protected ISystemFileTypes _fileTypeRegistry;
		102	protected ISystemMessageProvider _msgProvider;
99		103
100	public LocalFileService(ISystemFileTypes fileTypeRegistry)	104	public LocalFileService(ISystemFileTypes fileTypeRegistry)
101	{	105	{
102	_fileTypeRegistry = fileTypeRegistry;	106	_fileTypeRegistry = fileTypeRegistry;
103	}	107	}
104		108
		109	public LocalFileService (ISystemFileTypes fileTypeRegistry, ISystemMessageProvider msgProvider) {
		110	this(fileTypeRegistry);
		111	_msgProvider = msgProvider;
		112	}
		113
105	public String getName()	114	public String getName()
106	{	115	{
107	return LocalServiceResources.Local_File_Service_Name;	116	return LocalServiceResources.Local_File_Service_Name;
Lines 1436-1442 Link Here
1436	* @see org.eclipse.rse.services.files.AbstractFileService#getOutputStream(String, String, boolean, IProgressMonitor)	1445	* @see org.eclipse.rse.services.files.AbstractFileService#getOutputStream(String, String, boolean, IProgressMonitor)
1437	*/	1446	*/
1438	public OutputStream getOutputStream(String remoteParent, String remoteFile, boolean isBinary, IProgressMonitor monitor) throws SystemMessageException {	1447	public OutputStream getOutputStream(String remoteParent, String remoteFile, boolean isBinary, IProgressMonitor monitor) throws SystemMessageException {
1439
1440	File file = new File(remoteParent, remoteFile);	1448	File file = new File(remoteParent, remoteFile);
1441	OutputStream stream = null;	1449	OutputStream stream = null;
1442		1450
Lines 1449-1452 Link Here
1449		1457
1450	return stream;	1458	return stream;
1451	}	1459	}
		1460
		1461	public SystemMessage getMessage(String messageID) {
		1462	return (_msgProvider != null ? _msgProvider.getMessage(messageID) : super.getMessage(messageID));
		1463	}
1452	}	1464	}

Lines 12-17 Link Here

(-)src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java (-1 / +3 lines)
12	*	12	*
13	* Contributors:	13	* Contributors:
14	* Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core	14	* Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
		15	* Kevin Doyle (IBM) - [199871] LocalProcessService needs to implement getMessage()
15	********************************************************************************/	16	********************************************************************************/
16		17
17	package org.eclipse.rse.subsystems.processes.local;	18	package org.eclipse.rse.subsystems.processes.local;
Lines 29-34 Link Here
29	import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter;	30	import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter;
30	import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem;	31	import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem;
31	import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystemConfiguration;	32	import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystemConfiguration;
		33	import org.eclipse.rse.ui.RSEUIPlugin;
32		34
33		35
34	public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemConfiguration	36	public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemConfiguration
Lines 108-114 Link Here
108	public IProcessService createProcessService(IHost host)	110	public IProcessService createProcessService(IHost host)
109	{	111	{
110	//LocalConnectorService connectorService = (LocalConnectorService)getConnectorService(host);	112	//LocalConnectorService connectorService = (LocalConnectorService)getConnectorService(host);
111	return new LocalProcessService();	113	return new LocalProcessService(RSEUIPlugin.getDefault());
112	}	114	}
113		115
114	/* (non-Javadoc)	116	/* (non-Javadoc)

Lines 13-18 Link Here

(-)src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java (-1 / +3 lines)
13	* Contributors:	13	* Contributors:
14	* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods	14	* Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
15	* Martin Oberhuber (Wind River) - [186997] No deferred queries in Local Files	15	* Martin Oberhuber (Wind River) - [186997] No deferred queries in Local Files
		16	* Kevin Doyle (IBM) - [199871] LocalFileService needs to implement getMessage()
16	********************************************************************************/	17	********************************************************************************/
17		18
18	package org.eclipse.rse.subsystems.files.local;	19	package org.eclipse.rse.subsystems.files.local;
Lines 45-50 Link Here
45	import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystemConfiguration;	46	import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystemConfiguration;
46	import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;	47	import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
47	import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;	48	import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
		49	import org.eclipse.rse.ui.RSEUIPlugin;
48	import org.eclipse.rse.ui.SystemBasePlugin;	50	import org.eclipse.rse.ui.SystemBasePlugin;
49		51
50		52
Lines 222-228 Link Here
222		224
223	public IFileService createFileService(IHost host)	225	public IFileService createFileService(IHost host)
224	{	226	{
225	return new LocalFileService(SystemFileTransferModeRegistry.getInstance());	227	return new LocalFileService(SystemFileTransferModeRegistry.getInstance(), RSEUIPlugin.getDefault());
226	}	228	}
227		229
228	public ISearchService createSearchService(IHost host)	230	public ISearchService createSearchService(IHost host)