[388928] Develop a resource transfer framework

https://bugs.eclipse.org/bugs/show_bug.cgi?id=388928

2 files changed, 10 insertions, 6 deletions

diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/spi/transfer/FileSystemTransferSystem.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/spi/transfer/FileSystemTransferSystem.java
index 29abe67eaa..0b3ef6caaf 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/spi/transfer/FileSystemTransferSystem.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/spi/transfer/FileSystemTransferSystem.java
@@ -37,6 +37,8 @@ import java.io.Writer;
  */
 public class FileSystemTransferSystem extends CDOTransferSystem
 {
+  public static final FileSystemTransferSystem INSTANCE = new FileSystemTransferSystem();
+
   public static final String TYPE = "fs";
 
   public FileSystemTransferSystem()
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
index ed1f6b3c0a..dedc0d42d9 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
@@ -188,15 +188,17 @@ public class CDOTransfer implements INotifier
 
   protected CDOTransferType getTransferType(CDOTransferElement source)
   {
-    CDOTransferType type = source.getSystem().getDefaultTransferType(source);
-    if (type == CDOTransferType.UNKNOWN)
+    if (source.isDirectory())
     {
-      if (modelTransferContext.hasResourceFactory(source))
-      {
-        return CDOTransferType.MODEL;
-      }
+      return CDOTransferType.FOLDER;
+    }
+
+    if (modelTransferContext.hasResourceFactory(source))
+    {
+      return CDOTransferType.MODEL;
     }
 
+    CDOTransferType type = sourceSystem.getDefaultTransferType(source);
     if (type == CDOTransferType.UNKNOWN)
     {
       type = getDefaultTransferType();