Attachment #95564 for bug #226574

Lines 26-31 Link Here

(-)src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java (-1 / +2 lines)
26	* 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	26	* 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
27	* David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared	27	* David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
28	* Martin Oberhuber (Wind River) - [218304] Improve deferred adapter loading	28	* Martin Oberhuber (Wind River) - [218304] Improve deferred adapter loading
		29	* David McKnight (IBM) - [226574] [api] IFileService should have a supportsEncoding() method
29	*******************************************************************************/	30	*******************************************************************************/
30		31
31	package org.eclipse.rse.subsystems.files.core.subsystems;	32	package org.eclipse.rse.subsystems.files.core.subsystems;
Lines 1445-1451 Link Here
1445		1446
1446	/**	1447	/**
1447	* Returns <code>true</code> by default. Subclasses should override if they do not support encodings.	1448	* Returns <code>true</code> by default. Subclasses should override if they do not support encodings.
1448	* @see org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem#supportsEncoding()	1449	* @see org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem#supportsEncodings()
1449	* @since 2.0	1450	* @since 2.0
1450	*/	1451	*/
1451	public boolean supportsEncoding() {	1452	public boolean supportsEncoding() {

Lines 252-258 Link Here

(-)src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java (-1 / +1 lines)
252	* using other mechanisms besides encodings, and such platforms should return <code>false</code>. Other file subsystems	252	* using other mechanisms besides encodings, and such platforms should return <code>false</code>. Other file subsystems
253	* may not deal with encodings at all.	253	* may not deal with encodings at all.
254	* @return <code>true<code> if the file subsystem supports encodings, <code>false</code> otherwise.	254	* @return <code>true<code> if the file subsystem supports encodings, <code>false</code> otherwise.
255	* @since 2.0	255	* @since 3.0
256	*/	256	*/
257	public boolean supportsEncoding();	257	public boolean supportsEncoding();
258		258




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

	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();
	}

}




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


		DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_RENAME, monitor);

		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

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




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

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

}

Lines 25-30 Link Here

(-)src/org/eclipse/rse/services/files/AbstractFileService.java (+11 lines)
25	* David McKnight (IBM) - [209704] added supportsEncodingConversion()	25	* David McKnight (IBM) - [209704] added supportsEncodingConversion()
26	* David McKnight (IBM) - [216252] use SimpleSystemMessage instead of getMessage()	26	* David McKnight (IBM) - [216252] use SimpleSystemMessage instead of getMessage()
27	* Martin Oberhuber (Wind River) - [226262] Make IService IAdaptable and add Javadoc	27	* Martin Oberhuber (Wind River) - [226262] Make IService IAdaptable and add Javadoc
		28	* David McKnight (IBM) - [226574] [api] IFileService should have a supportsEncoding() method
28	*******************************************************************************/	29	*******************************************************************************/
29		30
30	package org.eclipse.rse.services.files;	31	package org.eclipse.rse.services.files;
Lines 232-235 Link Here
232	public boolean supportsEncodingConversion(){	233	public boolean supportsEncodingConversion(){
233	return false;	234	return false;
234	}	235	}
		236
		237	/**
		238	* The default implementation returns true. Clients should override this method if the
		239	* service does not provide support for encodings.
		240	*
		241	*/
		242	public boolean supportsEncoding() {
		243	return true;
		244	}
		245
235	}	246	}

Return to bug 226574

Lines 41-46 Link Here

(-)src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java (-3 / +10 lines)
41	* David McKnight (IBM) - [220379] [api] Provide a means for contributing custom BIDI encodings	41	* David McKnight (IBM) - [220379] [api] Provide a means for contributing custom BIDI encodings
42	* David McKnight (IBM) - [225573] [dstore] client not falling back to single operation when missing batch descriptors (due to old server)	42	* David McKnight (IBM) - [225573] [dstore] client not falling back to single operation when missing batch descriptors (due to old server)
43	* Martin Oberhuber (Wind River) - [226262] Make IService IAdaptable	43	* Martin Oberhuber (Wind River) - [226262] Make IService IAdaptable
		44	* David McKnight (IBM) - [226574] [api] IFileService should have a supportsEncoding() method
44	*******************************************************************************/	45	*******************************************************************************/
45		46
46	package org.eclipse.rse.internal.services.dstore.files;	47	package org.eclipse.rse.internal.services.dstore.files;
Lines 1456-1462 Link Here
1456		1457
1457	DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_RENAME, monitor);	1458	DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_RENAME, monitor);
1458		1459
1459	if (status != null && status.getAttribute(DE.A_SOURCE).equals("failed"))	1460	if (status != null && status.getAttribute(DE.A_SOURCE).equals("failed")) //$NON-NLS-1$
1460	{	1461	{
1461	// in the patch for bug 196211, a change was made to the UniversalFileSystemMiner that	1462	// in the patch for bug 196211, a change was made to the UniversalFileSystemMiner that
1462	// had the rename expecting the full path in the A_SOURCE attribute itself	1463	// had the rename expecting the full path in the A_SOURCE attribute itself
Lines 2272-2277 Link Here
2272	return capabilities;	2273	return capabilities;
2273	}	2274	}
2274		2275
2275		2276	/**
2276		2277	* The default implementation returns true. Clients should override this method if the
		2278	* service does not provide support for encodings.
		2279	*
		2280	*/
		2281	public boolean supportsEncoding() {
		2282	return true;
		2283	}
2277	}	2284	}

Lines 23-28 Link Here

(-)src/org/eclipse/rse/services/files/IFileService.java (+13 lines)
23	* Kevin Doyle (IBM) - [208778] new API getOutputSteam for getting an output stream in append mode	23	* Kevin Doyle (IBM) - [208778] new API getOutputSteam for getting an output stream in append mode
24	* David McKnight (IBM) - [209704] added supportsEncodingConversion()	24	* David McKnight (IBM) - [209704] added supportsEncodingConversion()
25	* Martin Oberhuber (Wind River) - [cleanup] Fix API since tags	25	* Martin Oberhuber (Wind River) - [cleanup] Fix API since tags
		26	* David McKnight (IBM) - [226574] [api] IFileService should have a supportsEncoding() method
26	*******************************************************************************/	27	*******************************************************************************/
27		28
28	package org.eclipse.rse.services.files;	29	package org.eclipse.rse.services.files;
Lines 594-597 Link Here
594	* @since org.eclipse.rse.services 3.0	595	* @since org.eclipse.rse.services 3.0
595	*/	596	*/
596	public boolean supportsEncodingConversion();	597	public boolean supportsEncodingConversion();
		598
		599	/**
		600	* Indicates whether this file service supports encodings.
		601	* This effects whether or not the encoding for a remote file
		602	* is displayed in the Info property page
		603	*
		604	* @return whether this service supports encodings
		605	*
		606	* @since 3.0
		607	*/
		608	public boolean supportsEncoding();
		609
597	}	610	}