X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fjcr%2Fwizards%2FImportFileSystemWizard.java;h=01427a63c80f14fc5baff1bae5c1d8c1b8ae7c56;hb=a57b28c44ebeea71533673b393234689edc1af0e;hp=e52fa6768aba927a95b0b2d6b54d3fc567f5c33e;hpb=5489d914ae3576354936390e980072792af6d6ef;p=lgpl%2Fargeo-commons.git

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/wizards/ImportFileSystemWizard.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/wizards/ImportFileSystemWizard.java
index e52fa6768..01427a63c 100644
--- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/wizards/ImportFileSystemWizard.java
+++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/wizards/ImportFileSystemWizard.java
@@ -14,8 +14,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.dialogs.Error;
-import org.argeo.eclipse.ui.specific.ImportFileSystemHandler;
-import org.argeo.eclipse.ui.specific.ImportFileSystemWizardPage;
+import org.argeo.eclipse.ui.specific.ImportToServerWizardPage;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -25,25 +24,19 @@ public class ImportFileSystemWizard extends Wizard {
 	private final static Log log = LogFactory
 			.getLog(ImportFileSystemWizard.class);
 
-	private ImportFileSystemWizardPage page1;
+	private ImportToServerWizardPage importPage;
 	private final Node folder;
 
-	private ImportFileSystemHandler ifsh = new ImportFileSystemHandler();
-
 	public ImportFileSystemWizard(Node folder) {
 		this.folder = folder;
-		setNeedsProgressMonitor(ifsh.getNeedsProgressMonitor());
 		setWindowTitle("Import from file system");
 	}
 
 	@Override
 	public void addPages() {
-		try {
-			page1 = new ImportFileSystemWizardPage();
-			addPage(page1);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+		importPage = new ImportToServerWizardPage();
+		addPage(importPage);
+		setNeedsProgressMonitor(importPage.getNeedsProgressMonitor());
 	}
 
 	/**
@@ -54,27 +47,27 @@ public class ImportFileSystemWizard extends Wizard {
 	public boolean performFinish() {
 
 		// Initialization
-		final String objectType = page1.getObjectType();
-		final String objectPath = page1.getObjectPath();
+		final String objectType = importPage.getObjectType();
+		final String objectPath = importPage.getObjectPath();
 
 		// We do not display a progress bar for one file only
-		if ("nt:file".equals(objectType)) {
+		if (importPage.FILE_ITEM_TYPE.equals(objectType)) {
 			// In Rap we must force the "real" upload of the file
-			page1.performFinish();
+			importPage.performFinish();
 			try {
-				Node fileNode = folder.addNode(page1.getObjectName(),
+				Node fileNode = folder.addNode(importPage.getObjectName(),
 						NodeType.NT_FILE);
 				Node resNode = fileNode.addNode(Property.JCR_CONTENT,
 						NodeType.NT_RESOURCE);
 				Binary binary = null;
 				try {
 					binary = folder.getSession().getValueFactory()
-							.createBinary(page1.getFileInputStream());
+							.createBinary(importPage.getFileInputStream());
 					resNode.setProperty(Property.JCR_DATA, binary);
 				} finally {
 					if (binary != null)
 						binary.dispose();
-					IOUtils.closeQuietly(page1.getFileInputStream());
+					IOUtils.closeQuietly(importPage.getFileInputStream());
 				}
 				folder.getSession().save();
 			} catch (Exception e) {
@@ -82,7 +75,7 @@ public class ImportFileSystemWizard extends Wizard {
 				return false;
 			}
 			return true;
-		} else if ("nt:folder".equals(objectType)) {
+		} else if (importPage.FOLDER_ITEM_TYPE.equals(objectType)) {
 			if (objectPath == null || !new File(objectPath).exists()) {
 				Error.show("Directory " + objectPath + " does not exist");
 				return false;