Attachment 70046 Details for Bug 189352 – Attachment with bug fix

[patch] Attachment with bug fix

Upload_Binary_Text.txt (text/plain), 4.25 KB, created by Kushal Munir

on 2007-06-04 18:21:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kushal Munir

Created: 2007-06-04 18:21:47 EDT

Size: 4.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java,v
>retrieving revision 1.10
>diff -u -r1.10 DStoreFileService.java
>--- src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	4 Jun 2007 20:37:49 -0000	1.10
>+++ src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	4 Jun 2007 22:19:33 -0000
>@@ -71,6 +71,8 @@
> 	protected ISystemFileTypes _fileTypeRegistry;
> 	private String remoteEncoding;
> 	
>+	protected boolean unixStyle = false;
>+	
> 	private static String _percentMsg = SystemMessage.sub(SystemMessage.sub(SystemMessage.sub(ServiceResources.DStore_Service_Percent_Complete_Message, "&0", "{0}"), "&1", "{1}"), "&2", "{2}");	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
> 
> 	private static String[] _filterAttributes =  {
>@@ -411,12 +413,33 @@
> 				if (!isBinary && srcEncoding != null && hostEncoding != null) 
> 				{
> 					String tempStr = new String(buffer, 0, bytesRead, srcEncoding);
>-
>-					// hack for zOS - \r causes problems for compilers
>-//					if (osName != null && (osName.startsWith("z") || osName.equalsIgnoreCase("aix")))
>-//					{
>-//						tempStr = tempStr.replace('\r', ' ');
>-//					}
>+					
>+					if (unixStyle) {
>+						int index = tempStr.indexOf("\r\n"); //$NON-NLS-1$
>+					
>+						StringBuffer buf = new StringBuffer();
>+					
>+						boolean lineEndFound = false;
>+						int lastIndex = 0;
>+					
>+						while (index != -1) {
>+							buf = buf.append(tempStr.substring(lastIndex, index));
>+							buf = buf.append('\n');
>+						
>+							if (!lineEndFound) {
>+								lineEndFound = true;
>+							}
>+						
>+							lastIndex = index+2;
>+						
>+							index = tempStr.indexOf("\r\n", lastIndex); //$NON-NLS-1$
>+						}
>+					
>+						if (lineEndFound) {
>+							buf = buf.append(tempStr.substring(lastIndex));
>+							tempStr = buf.toString();
>+						}
>+					}
> 
> 					convBytes = tempStr.getBytes(hostEncoding);
> 				
>@@ -465,9 +488,6 @@
> 					
> 					String str = MessageFormat.format(_percentMsg, new Object[] {totalSentBuf, totalBuf, percentBuf});
> 					monitor.subTask(str);					
>-	
>-
>-
> 
> 					isCancelled = monitor.isCanceled();
> 				}
>@@ -1347,4 +1367,13 @@
> 		DStoreOutputStream outputStream = new DStoreOutputStream(getDataStore(), remotePath, getEncoding(monitor), mode);
> 		return outputStream;
> 	}
>+	
>+	/**
>+	 * Sets whether this is a Unix-style file system or a Windows-style file system. The
>+	 * default is Windows if this is not called. The creator of this class should call this to set the type of the file system.
>+	 * @param isUnixStyle <code>true<code> if this is a Unix-style file system, <code>false</code> otherwise.
>+	 */
>+	public void setIsUnixStyle(boolean isUnixStyle) {
>+		this.unixStyle = isUnixStyle;
>+	}
> }
>\ No newline at end of file
>#P org.eclipse.rse.subsystems.files.dstore
>Index: src/org/eclipse/rse/subsystems/files/dstore/DStoreFileSubSystemConfiguration.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/DStoreFileSubSystemConfiguration.java,v
>retrieving revision 1.4
>diff -u -r1.4 DStoreFileSubSystemConfiguration.java
>--- src/org/eclipse/rse/subsystems/files/dstore/DStoreFileSubSystemConfiguration.java	15 May 2007 16:52:40 -0000	1.4
>+++ src/org/eclipse/rse/subsystems/files/dstore/DStoreFileSubSystemConfiguration.java	4 Jun 2007 22:19:35 -0000
>@@ -134,6 +134,7 @@
> 	{
> 		DStoreConnectorService connectorService = (DStoreConnectorService)getConnectorService(host);
> 		DStoreFileService service = new DStoreFileService(connectorService, SystemFileTransferModeRegistry.getInstance(), RSEUIPlugin.getDefault());
>+		service.setIsUnixStyle(isUnixStyle());
> 
> 		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
> 		int downloadBufferSize = store.getInt(ISystemFilePreferencesConstants.DOWNLOAD_BUFFER_SIZE);

Actions: View | Diff

Attachments on bug 189352: 70046 | 70049 | 70071