[Unicore-cvs-commits] SF.net SVN: unicore:[3337] eclipseclient/trunk/plugins/de.fzj.unicore.rcp. rse/src/main/java/de/fzj/unicore/rcp/rse

[<bd...@us...>]

Revision: 3337
          http://unicore.svn.sourceforge.net/unicore/?rev=3337&view=rev
Author:   bdemuth
Date:     2008-08-28 07:48:42 +0000 (Thu, 28 Aug 2008)

Log Message:
-----------


Modified Paths:
--------------
    eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreFileService.java
    eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreFileServiceSubsystemConfiguration.java
    eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreHostFile.java
    eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreHostFileToRemoteFileAdapter.java

Modified: eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreFileService.java
===================================================================
--- eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreFileService.java	2008-08-25 10:20:45 UTC (rev 3336)
+++ eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreFileService.java	2008-08-28 07:48:42 UTC (rev 3337)
@@ -41,9 +41,11 @@
 import java.util.ArrayList;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.rse.services.clientserver.messages.SystemElementNotFoundException;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.services.files.AbstractFileService;
 import org.eclipse.rse.services.files.IHostFile;
+import org.eclipse.rse.services.files.RemoteFileIOException;
 import org.unigrids.services.atomic.types.GridFileType;
 
 import de.fzj.unicore.uas.client.RByteIOClient;
@@ -143,16 +145,16 @@
 		return retval;
 	}
 
-	public boolean copy(String srcParent, String srcName, String tgtParent,
+	public void copy(String srcParent, String srcName, String tgtParent,
 			String tgtName, IProgressMonitor monitor)
 			throws SystemMessageException {
 		String source = fullFileName(srcParent, srcName);
 		UnicoreHostFile sourceElement = new UnicoreHostFile(storageClient,
 				source);
 		if (sourceElement.isDirectory()) {
-			return copyFolder(srcParent, srcName, tgtParent, tgtName, monitor);
+			copyFolder(srcParent, srcName, tgtParent, tgtName, monitor);
 		} else {
-			return copySingleFile(srcParent, srcName, tgtParent, tgtName,
+			copySingleFile(srcParent, srcName, tgtParent, tgtName,
 					monitor);
 		}
 	}
@@ -295,23 +297,15 @@
 		return true;
 	}
 
-	public boolean copyBatch(String[] srcParents, String[] srcNames,
+	public void copyBatch(String[] srcParents, String[] srcNames,
 			String tgtParent, IProgressMonitor monitor)
 			throws SystemMessageException {
-		boolean temp;
-		boolean success = true;
 
-		if (!(srcParents.length == srcNames.length) || tgtParent.equals("")) {
-			return false;
-		}
-
 		for (int i = 0; i < srcParents.length; i++) {
-			temp = copy(srcParents[i], srcNames[i], tgtParent, srcNames[i],
+			copy(srcParents[i], srcNames[i], tgtParent, srcNames[i],
 					monitor);
-			if (!temp)
-				success = false;
 		}
-		return success;
+
 	}
 
 	public IHostFile createFile(String remoteParent, String fileName,
@@ -357,26 +351,25 @@
 		}
 	}
 
-	public boolean delete(String remoteParent, String fileName,
+	public void delete(String remoteParent, String fileName,
 			IProgressMonitor monitor) throws SystemMessageException {
 
 		String deleteFileName = fullFileName(remoteParent, fileName);
 		UnicoreHostFile deleteFile = new UnicoreHostFile(storageClient,
 				deleteFileName);
 		if (!deleteFile.exists() || !deleteFile.canWrite()) {
-			return false;
+			throw new RemoteFileIOException(new Exception("Remote file not accessible"));
 		}
 		try {
 			storageClient.delete(deleteFileName);
 		} catch (BaseFault e) {
 			Activator.log(org.eclipse.core.runtime.Status.ERROR,
 					"Could not delete remote file " + deleteFileName + "!", e);
-			return false;
+			throw new RemoteFileIOException(e);
 		}
-		return true;
 	}
 
-	public boolean download(String remoteParent, String remoteFile,
+	public void download(String remoteParent, String remoteFile,
 			File localFile, boolean isBinary, String hostEncoding,
 			IProgressMonitor monitor) throws SystemMessageException {
 		FileOutputStream outputStream = null;
@@ -388,7 +381,7 @@
 			Activator.log(org.eclipse.core.runtime.Status.ERROR,
 					"Could not download " + remoteFileName
 							+ ", could not get export on remote File!", e);
-			return false;
+			throw new RemoteFileIOException(e);
 		}
 		try {
 			if (!localFile.exists()) {
@@ -404,13 +397,13 @@
 					"Could not download " + remoteFile
 							+ ", could not create local file " + localFile
 							+ " !", e);
-			return false;
+			throw new RemoteFileIOException(e);
 		} catch (IOException e) {
 			Activator.log(org.eclipse.core.runtime.Status.ERROR,
 					"Could not download " + remoteFile
 							+ ", could not open local file " + localFile
 							+ " for writing!", e);
-			return false;
+			throw new RemoteFileIOException(e);
 		}
 		try {
 			rioClient.readAllData(outputStream);
@@ -420,9 +413,8 @@
 							"Could not download " + remoteFile
 									+ ", could not write data to " + localFile
 									+ "!", e);
-			return false;
+			throw new RemoteFileIOException(e);
 		}
-		return true;
 	}
 
 	public IHostFile getFile(String remoteParent, String name,
@@ -454,18 +446,14 @@
 		return true;
 	}
 
-	public boolean move(String srcParent, String srcName, String tgtParent,
+	public void move(String srcParent, String srcName, String tgtParent,
 			String tgtName, IProgressMonitor monitor)
 			throws SystemMessageException {
-		boolean success = false;
-		success = this.copy(srcParent, srcName, tgtParent, tgtName, monitor);
-		if (success) {
-			success = this.delete(srcParent, srcName, monitor);
-		}
-		return success;
+		copy(srcParent, srcName, tgtParent, tgtName, monitor);
+		delete(srcParent, srcName, monitor);
 	}
 
-	public boolean rename(String remoteParent, String oldName, String newName,
+	public void rename(String remoteParent, String oldName, String newName,
 			IProgressMonitor monitor) throws SystemMessageException {
 
 		String oldFileName = fullFileName(remoteParent, oldName);
@@ -477,52 +465,46 @@
 				newFileName);
 
 		if (!unicoreOldFile.exists())
-			return false;
+			throw new RemoteFileIOException(new Exception("File to be renamed does not exist"));
 		if (unicoreNewFile.exists())
-			return false;
+			throw new RemoteFileIOException(new Exception("File with this name does already exist"));
 		try {
 			storageClient.rename(oldFileName, newFileName);
 		} catch (BaseFault e) {
 			Activator.log(org.eclipse.core.runtime.Status.ERROR,
 					"Could not rename remote file " + oldFileName + " to "
 							+ newFileName + "!", e);
-			return false;
+			throw new RemoteFileIOException(e);
 		}
-		return true;
 	}
 
-	public boolean rename(String remoteParent, String oldName, String newName,
+	public void rename(String remoteParent, String oldName, String newName,
 			IHostFile oldFile, IProgressMonitor monitor)
 			throws SystemMessageException {
 		oldFile.renameTo(newName);
-		return true;
 	}
 
-	public boolean setLastModified(String parent, String name, long timestamp,
+	public void setLastModified(String parent, String name, long timestamp,
 			IProgressMonitor monitor) throws SystemMessageException {
 		// TODO setLastModified can not be changed with current storageClient
 		/*
 		 * lastmodified can not be changed with current storageClient
 		 */
-		return false;
 	}
 
-	public boolean setReadOnly(String parent, String name, boolean readOnly,
+	public void setReadOnly(String parent, String name, boolean readOnly,
 			IProgressMonitor monitor) throws SystemMessageException {
 		// TODO setReadOnly can not be changed with current storageClient
 		/*
 		 * permissions can not be changed with current storageClient
 		 */
-		return false;
 	}
 
-	public boolean upload(InputStream stream, String remoteParent,
+	public void upload(InputStream stream, String remoteParent,
 			String remoteFile, boolean isBinary, String hostEncoding,
 			IProgressMonitor monitor) throws SystemMessageException {
 		String remoteFileName = fullFileName(remoteParent, remoteFile);
-		if (stream == null) {
-			return false;
-		}
+		
 		/*
 		 * if file already does exist, it must be deleted before upload is
 		 * possible
@@ -540,7 +522,7 @@
 										+ remoteFileName
 										+ " already exists and could not be overwritten!",
 								e);
-				return false;
+				throw new RemoteFileIOException(e);
 			}
 		}
 		/*
@@ -553,17 +535,16 @@
 			Activator.log(org.eclipse.core.runtime.Status.ERROR,
 					"Could not upload remote file " + remoteFileName
 							+ ", could not get Import on remote file!", e);
-			return false;
+			throw new RemoteFileIOException(e);
 		} catch (Exception e) {
 			Activator.log(org.eclipse.core.runtime.Status.ERROR,
 					"Could not upload remote file " + remoteFileName
 							+ ", error while writingAllData!", e);
-			return false;
+			throw new RemoteFileIOException(e);
 		}
-		return true;
 	}
 
-	public boolean upload(File localFile, String remoteParent,
+	public void upload(File localFile, String remoteParent,
 			String remoteFile, boolean isBinary, String srcEncoding,
 			String hostEncoding, IProgressMonitor monitor)
 			throws SystemMessageException {
@@ -575,10 +556,10 @@
 			Activator.log(org.eclipse.core.runtime.Status.ERROR, "Local file "
 					+ localFile.getAbsolutePath()
 					+ " does not exist, could not upload !", e);
-			return false;
+			throw new RemoteFileIOException(e);
 		}
 
-		return this.upload(inputStream, remoteParent, remoteFile, isBinary,
+		upload(inputStream, remoteParent, remoteFile, isBinary,
 				hostEncoding, monitor);
 	}
 

Modified: eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreFileServiceSubsystemConfiguration.java
===================================================================
--- eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreFileServiceSubsystemConfiguration.java	2008-08-25 10:20:45 UTC (rev 3336)
+++ eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreFileServiceSubsystemConfiguration.java	2008-08-28 07:48:42 UTC (rev 3337)
@@ -86,6 +86,10 @@
 		 */
 		return true;
 	}
+	
+	public boolean supportsFilterCaching() {
+		return false;
+	}
 
 	public boolean supportsFileTypes() {
 		return false;

Modified: eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreHostFile.java
===================================================================
--- eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreHostFile.java	2008-08-25 10:20:45 UTC (rev 3336)
+++ eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreHostFile.java	2008-08-28 07:48:42 UTC (rev 3337)
@@ -330,21 +330,21 @@
 
 			};
 			Display display = PlatformUI.getWorkbench().getDisplay();
-			if(Thread.currentThread().equals(display.getThread()))
-			{	
-				j.schedule();
-
-				while (gridInfo == null && !errorOcurred) {
-					// process the next event, wait when none available
-					if (!display.readAndDispatch()) {
-						display.sleep();
-					}
-				}
-			}
-			else
-			{
+//			if(Thread.currentThread().equals(display.getThread()))
+//			{	
+//				j.schedule();
+//
+//				while (gridInfo == null && !errorOcurred) {
+//					// process the next event, wait when none available
+//					if (!display.readAndDispatch()) {
+//						display.sleep();
+//					}
+//				}
+//			}
+//			else
+//			{
 				gridInfo = retrieveInfo();
-			}
+//			}
 
 		}
 		return gridInfo;

Modified: eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreHostFileToRemoteFileAdapter.java
===================================================================
--- eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreHostFileToRemoteFileAdapter.java	2008-08-25 10:20:45 UTC (rev 3336)
+++ eclipseclient/trunk/plugins/de.fzj.unicore.rcp.rse/src/main/java/de/fzj/unicore/rcp/rse/UnicoreHostFileToRemoteFileAdapter.java	2008-08-28 07:48:42 UTC (rev 3337)
@@ -33,6 +33,7 @@
 package de.fzj.unicore.rcp.rse;
 
 import org.eclipse.rse.services.files.IHostFile;
+import org.eclipse.rse.subsystems.files.core.servicesubsystem.AbstractRemoteFile;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
@@ -61,11 +62,11 @@
 	 *            is the UnicoreHostFile that should be converted
 	 * @return the corresponding UnicoreRemoteFile to node
 	 */
-	public IRemoteFile convertToRemoteFile(FileServiceSubSystem ss,
+	public AbstractRemoteFile convertToRemoteFile(FileServiceSubSystem ss,
 			IRemoteFileContext context, IRemoteFile parent, IHostFile node) {
 		// if file from root directory, but not root ("/") itself and parent
 		// node == null
-		IRemoteFile file;
+		AbstractRemoteFile file;
 		/*
 		 * if remoteFile is in root directory, but not root ("/") itself and
 		 * (parent node ==null) then create a parent node "/"
@@ -96,10 +97,10 @@
 	 *            UnicoreHostFile that should be converted
 	 * @return UnicoreRemoteFile that corresponds to nodes
 	 */
-	public IRemoteFile[] convertToRemoteFiles(FileServiceSubSystem ss,
+	public AbstractRemoteFile[] convertToRemoteFiles(FileServiceSubSystem ss,
 			IRemoteFileContext context, IRemoteFile parent, IHostFile[] nodes) {
-		IRemoteFile[] retval = null;
-		retval = new IRemoteFile[nodes.length];
+		AbstractRemoteFile[] retval = null;
+		retval = new AbstractRemoteFile[nodes.length];
 		for (int i = 0; i < retval.length; i++) {
 			retval[i] = this.convertToRemoteFile(ss, context, parent, nodes[i]);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.