Attachment #75878 for bug #191548




 * Xuan Chen (IBM)        - [198046] [dstore] Cannot copy a folder into an archive file
 * Xuan Chen (IBM)        - [191367] with supertransfer on, Drag & Drop Folder from DStore to DStore doesn't work
 * Martin Oberhuber (Wind River) - [199548] Avoid touching files on setReadOnly() if unnecessary
 * Kevin Doyle (IBM) - [191548]  Deleting Read-Only directory removes it from view and displays no error
 *******************************************************************************/

package org.eclipse.rse.dstore.universal.miners;

						DataElement parent = subject.getParent();
						_dataStore.deleteObject(parent, subject);
						_dataStore.refresh(parent);
						status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS + "|" + deleteObj.getAbsolutePath()); //$NON-NLS-1$
					}
				} else {
					UniversalServerUtilities

				DataElement parent = subject.getParent();
				_dataStore.deleteObject(parent, subject);
				_dataStore.refresh(parent);
				status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS);
			}
		}





 * Kushal Munir (IBM) - [189352] Replace with appropriate line end character on upload
 * David McKnight   (IBM)        - [190803] Canceling a long-running dstore job prints "InterruptedException" to stdout 
 * David McKnight   (IBM)        - [196035] Wrapper SystemMessageExceptions for createFile and createFolder with RemoteFileSecurityException
 * Kevin Doyle 		(IBM)		 - [191548] Deleting Read-Only directory removes it from view and displays no error
 ********************************************************************************/

package org.eclipse.rse.internal.services.dstore.files;

		DataElement de = getElementFor(remotePath);
		DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_DELETE, monitor);
		if (status == null) return false;
		if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) {
		{
			if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) return true;
			else throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$
		}
		else
		{
			return true;
		} else {
			throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$
		}

	}
	
	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException

		}	
		DataElement status = dsStatusCommand((DataElement) dataElements.get(0), dataElements, IUniversalDataStoreConstants.C_DELETE_BATCH, monitor);
		if (status == null) return false;
		if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) {
			return true;
		} else {
			throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$
		}
	}

	public boolean rename(String remoteParent, String oldName, String newName, IProgressMonitor monitor) throws SystemMessageException

Return to bug 191548

Lines 22-27 Link Here

(-)miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java (+3 lines)
22	* Xuan Chen (IBM) - [198046] [dstore] Cannot copy a folder into an archive file	22	* Xuan Chen (IBM) - [198046] [dstore] Cannot copy a folder into an archive file
23	* Xuan Chen (IBM) - [191367] with supertransfer on, Drag & Drop Folder from DStore to DStore doesn't work	23	* Xuan Chen (IBM) - [191367] with supertransfer on, Drag & Drop Folder from DStore to DStore doesn't work
24	* Martin Oberhuber (Wind River) - [199548] Avoid touching files on setReadOnly() if unnecessary	24	* Martin Oberhuber (Wind River) - [199548] Avoid touching files on setReadOnly() if unnecessary
		25	* Kevin Doyle (IBM) - [191548] Deleting Read-Only directory removes it from view and displays no error
25	*******************************************************************************/	26	*******************************************************************************/
26		27
27	package org.eclipse.rse.dstore.universal.miners;	28	package org.eclipse.rse.dstore.universal.miners;
Lines 957-962 Link Here
957	DataElement parent = subject.getParent();	958	DataElement parent = subject.getParent();
958	_dataStore.deleteObject(parent, subject);	959	_dataStore.deleteObject(parent, subject);
959	_dataStore.refresh(parent);	960	_dataStore.refresh(parent);
		961	status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS + "\|" + deleteObj.getAbsolutePath()); //$NON-NLS-1$
960	}	962	}
961	} else {	963	} else {
962	UniversalServerUtilities	964	UniversalServerUtilities
Lines 2136-2141 Link Here
2136	DataElement parent = subject.getParent();	2138	DataElement parent = subject.getParent();
2137	_dataStore.deleteObject(parent, subject);	2139	_dataStore.deleteObject(parent, subject);
2138	_dataStore.refresh(parent);	2140	_dataStore.refresh(parent);
		2141	status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS);
2139	}	2142	}
2140	}	2143	}
2141		2144

Lines 17-22 Link Here

(-)src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java (-11 / +9 lines)
17	* Kushal Munir (IBM) - [189352] Replace with appropriate line end character on upload	17	* Kushal Munir (IBM) - [189352] Replace with appropriate line end character on upload
18	* David McKnight (IBM) - [190803] Canceling a long-running dstore job prints "InterruptedException" to stdout	18	* David McKnight (IBM) - [190803] Canceling a long-running dstore job prints "InterruptedException" to stdout
19	* David McKnight (IBM) - [196035] Wrapper SystemMessageExceptions for createFile and createFolder with RemoteFileSecurityException	19	* David McKnight (IBM) - [196035] Wrapper SystemMessageExceptions for createFile and createFolder with RemoteFileSecurityException
		20	* Kevin Doyle (IBM) - [191548] Deleting Read-Only directory removes it from view and displays no error
20	********************************************************************************/	21	********************************************************************************/
21		22
22	package org.eclipse.rse.internal.services.dstore.files;	23	package org.eclipse.rse.internal.services.dstore.files;
Lines 928-943 Link Here
928	DataElement de = getElementFor(remotePath);	929	DataElement de = getElementFor(remotePath);
929	DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_DELETE, monitor);	930	DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_DELETE, monitor);
930	if (status == null) return false;	931	if (status == null) return false;
931	if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILE_DESCRIPTOR))	932	if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) {
932	{
933	if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) return true;
934	else throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status))); //$NON-NLS-1$
935	}
936	else
937	{
938	return true;	933	return true;
		934	} else {
		935	throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status))); //$NON-NLS-1$
939	}	936	}
940
941	}	937	}
942		938
943	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException	939	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException
Lines 953-961 Link Here
953	}	949	}
954	DataElement status = dsStatusCommand((DataElement) dataElements.get(0), dataElements, IUniversalDataStoreConstants.C_DELETE_BATCH, monitor);	950	DataElement status = dsStatusCommand((DataElement) dataElements.get(0), dataElements, IUniversalDataStoreConstants.C_DELETE_BATCH, monitor);
955	if (status == null) return false;	951	if (status == null) return false;
956	if (FileSystemMessageUtil.getSourceMessage(status).startsWith(IServiceConstants.FAILED))	952	if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) {
957	throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status))); //$NON-NLS-1$	953	return true;
958	else return true;	954	} else {
		955	throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status))); //$NON-NLS-1$
		956	}
959	}	957	}
960		958
961	public boolean rename(String remoteParent, String oldName, String newName, IProgressMonitor monitor) throws SystemMessageException	959	public boolean rename(String remoteParent, String oldName, String newName, IProgressMonitor monitor) throws SystemMessageException