Attachment 95564 Details for Bug 226574 – patch adding supportsEncoding() file service method

[patch] patch adding supportsEncoding() file service method

patch.txt (text/plain), 9.06 KB, created by David McKnight

on 2008-04-10 14:07:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2008-04-10 14:07:30 EDT

Size: 9.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.subsystems.files.core
>Index: src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java,v
>retrieving revision 1.54
>diff -u -r1.54 RemoteFileSubSystem.java
>--- src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java	10 Apr 2008 15:32:43 -0000	1.54
>+++ src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java	10 Apr 2008 18:05:49 -0000
>@@ -26,6 +26,7 @@
>  * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
>  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
>  * Martin Oberhuber (Wind River) - [218304] Improve deferred adapter loading
>+ * David McKnight   (IBM)        - [226574] [api] IFileService should have a supportsEncoding() method
>  *******************************************************************************/
> 
> package org.eclipse.rse.subsystems.files.core.subsystems;
>@@ -1445,7 +1446,7 @@
> 
> 	/**
> 	 * Returns <code>true</code> by default. Subclasses should override if they do not support encodings.
>-	 * @see org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem#supportsEncoding()
>+	 * @see org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem#supportsEncodings()
> 	 * @since 2.0
> 	 */
> 	public boolean supportsEncoding() {
>Index: src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java,v
>retrieving revision 1.34
>diff -u -r1.34 IRemoteFileSubSystem.java
>--- src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java	3 Apr 2008 17:13:21 -0000	1.34
>+++ src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java	10 Apr 2008 18:05:48 -0000
>@@ -252,7 +252,7 @@
> 	 * using other mechanisms besides encodings, and such platforms should return <code>false</code>. Other file subsystems
> 	 * may not deal with encodings at all.
> 	 * @return <code>true<code> if the file subsystem supports encodings, <code>false</code> otherwise.
>-	 * @since 2.0
>+	 * @since 3.0
> 	 */
> 	public boolean supportsEncoding();
> 
>Index: src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java,v
>retrieving revision 1.66
>diff -u -r1.66 FileServiceSubSystem.java
>--- src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java	10 Apr 2008 15:32:43 -0000	1.66
>+++ src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java	10 Apr 2008 18:05:48 -0000
>@@ -35,6 +35,7 @@
>  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
>  * Kevin Doyle		(IBM)		 - [224162] SystemEditableRemoteFile.saveAs does not work because FileServiceSubSytem.upload does invalid check
>  * Martin Oberhuber (Wind River) - [218304] Improve deferred adapter loading
>+ * David McKnight   (IBM)        - [226574] [api] IFileService should have a supportsEncoding() method
>  *******************************************************************************/
> 
> package org.eclipse.rse.subsystems.files.core.servicesubsystem;
>@@ -1060,5 +1061,15 @@
> 	public boolean supportsEncodingConversion(){
> 		return getFileService().supportsEncodingConversion();
> 	}
>+	
>+
>+	/**
>+	 * Returns whether or not the subsystem/service supports encodings
>+	 * 
>+	 * @return whether this supports encodings
>+	 */
>+	public boolean supportsEncoding() {
>+		return getFileService().supportsEncoding();
>+	}
> 
> }
>\ No newline at end of file
>#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.57
>diff -u -r1.57 DStoreFileService.java
>--- src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	9 Apr 2008 19:27:49 -0000	1.57
>+++ src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	10 Apr 2008 18:05:51 -0000
>@@ -41,6 +41,7 @@
>  * David McKnight    (IBM)       - [220379] [api] Provide a means for contributing custom BIDI encodings
>  * David McKnight    (IBM)       - [225573] [dstore] client not falling back to single operation when missing batch descriptors (due to old server)
>  * Martin Oberhuber (Wind River) - [226262] Make IService IAdaptable
>+ * David McKnight   (IBM)        - [226574] [api] IFileService should have a supportsEncoding() method
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.services.dstore.files;
>@@ -1456,7 +1457,7 @@
> 
> 		DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_RENAME, monitor);
> 
>-		if (status != null && status.getAttribute(DE.A_SOURCE).equals("failed"))
>+		if (status != null && status.getAttribute(DE.A_SOURCE).equals("failed")) //$NON-NLS-1$
> 		{
> 			// in the patch for bug 196211, a change was made to the UniversalFileSystemMiner that
> 			// had the rename expecting the full path in the A_SOURCE attribute itself
>@@ -2272,6 +2273,12 @@
> 		return capabilities;
> 	}
> 
>-
>-
>+	/**
>+	 * The default implementation returns true.  Clients should override this method if the
>+	 * service does not provide support for encodings.
>+	 * 
>+	 */
>+	public boolean supportsEncoding() {
>+		return true;
>+	}
> }
>#P org.eclipse.rse.services
>Index: src/org/eclipse/rse/services/files/IFileService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/IFileService.java,v
>retrieving revision 1.30
>diff -u -r1.30 IFileService.java
>--- src/org/eclipse/rse/services/files/IFileService.java	4 Apr 2008 11:41:40 -0000	1.30
>+++ src/org/eclipse/rse/services/files/IFileService.java	10 Apr 2008 18:05:52 -0000
>@@ -23,6 +23,7 @@
>  * Kevin Doyle (IBM) - [208778] new API getOutputSteam for getting an output stream in append mode
>  * David McKnight (IBM) - [209704] added supportsEncodingConversion()
>  * Martin Oberhuber (Wind River) - [cleanup] Fix API since tags
>+ * David McKnight   (IBM)        - [226574] [api] IFileService should have a supportsEncoding() method
>  *******************************************************************************/
> 
> package org.eclipse.rse.services.files;
>@@ -594,4 +595,16 @@
> 	 * @since org.eclipse.rse.services 3.0
> 	 */
> 	public boolean supportsEncodingConversion();
>+	
>+	/**
>+	 * Indicates whether this file service supports encodings.  
>+	 * This effects whether or not the encoding for a remote file 
>+	 * is displayed in the Info property page
>+	 * 
>+	 * @return whether this service supports encodings
>+	 * 
>+	 * @since 3.0
>+	 */
>+	public boolean supportsEncoding();
>+
> }
>Index: src/org/eclipse/rse/services/files/AbstractFileService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/AbstractFileService.java,v
>retrieving revision 1.28
>diff -u -r1.28 AbstractFileService.java
>--- src/org/eclipse/rse/services/files/AbstractFileService.java	9 Apr 2008 19:27:41 -0000	1.28
>+++ src/org/eclipse/rse/services/files/AbstractFileService.java	10 Apr 2008 18:05:52 -0000
>@@ -25,6 +25,7 @@
>  * David McKnight   (IBM)        - [209704] added supportsEncodingConversion()
>  * David McKnight   (IBM)        - [216252] use SimpleSystemMessage instead of getMessage()
>  * Martin Oberhuber (Wind River) - [226262] Make IService IAdaptable and add Javadoc
>+ * David McKnight   (IBM)        - [226574] [api] IFileService should have a supportsEncoding() method
>  *******************************************************************************/
> 
> package org.eclipse.rse.services.files;
>@@ -232,4 +233,14 @@
> 	public boolean supportsEncodingConversion(){
> 		return false;
> 	}
>+	
>+	/**
>+	 * The default implementation returns true.  Clients should override this method if the
>+	 * service does not provide support for encodings.
>+	 * 
>+	 */
>+	public boolean supportsEncoding() {
>+		return true;
>+	}
>+
> }

Actions: View | Diff

Attachments on bug 226574: 95564 | 95614 | 95617 | 95653 | 95655 | 95672