Attachment 75878 Details for Bug 191548 – No longer return true if the classification is not a file

[patch] No longer return true if the classification is not a file

patch.txt (text/plain), 4.79 KB, created by Kevin Doyle

on 2007-08-10 14:31:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Doyle

Created: 2007-08-10 14:31:39 EDT

Size: 4.79 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java,v
>retrieving revision 1.20
>diff -u -r1.20 UniversalFileSystemMiner.java
>--- miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java	10 Aug 2007 11:26:23 -0000	1.20
>+++ miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java	10 Aug 2007 18:19:43 -0000
>@@ -22,6 +22,7 @@
>  * 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;
>@@ -957,6 +958,7 @@
> 						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
>@@ -2136,6 +2138,7 @@
> 				DataElement parent = subject.getParent();
> 				_dataStore.deleteObject(parent, subject);
> 				_dataStore.refresh(parent);
>+				status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS);
> 			}
> 		}
> 
>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.15
>diff -u -r1.15 DStoreFileService.java
>--- src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	26 Jul 2007 18:30:23 -0000	1.15
>+++ src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	10 Aug 2007 18:19:43 -0000
>@@ -17,6 +17,7 @@
>  * 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;
>@@ -928,16 +929,11 @@
> 		DataElement de = getElementFor(remotePath);
> 		DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_DELETE, monitor);
> 		if (status == null) return false;
>-		if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILE_DESCRIPTOR))
>-		{
>-			if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) return true;
>-			else throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$
>-		}
>-		else
>-		{
>+		if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) {
> 			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
>@@ -953,9 +949,11 @@
> 		}	
> 		DataElement status = dsStatusCommand((DataElement) dataElements.get(0), dataElements, IUniversalDataStoreConstants.C_DELETE_BATCH, monitor);
> 		if (status == null) return false;
>-		if (FileSystemMessageUtil.getSourceMessage(status).startsWith(IServiceConstants.FAILED))
>-			throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status))); //$NON-NLS-1$
>-		else return true;
>+		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

Flags:

mober.at+eclipse: iplog+

Actions: View | Diff

Attachments on bug 191548: 75878 | 75984 | 76123 | 76331