Improve cleaning of the model (bug 23)

[lgpl/argeo-commons.git] / server / plugins / org.argeo.jcr.ui.explorer / src / main / java / org / argeo / jcr / ui / explorer / wizards / ImportFileSystemWizard.java

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ImportFileSystemWizard.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ImportFileSystemWizard.java
index 9e9168e4faa3be48cabcbc633a3bd0e67c73e097..34ce3325a523f474cd5276bc9f29a390c77d82a9 100644 (file)
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ImportFileSystemWizard.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/wizards/ImportFileSystemWizard.java
@@ -13,7 +13,7 @@ import org.apache.commons.io.IOUtils;
 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.ErrorFeedback;
 import org.argeo.eclipse.ui.specific.ImportToServerWizardPage;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -51,7 +51,7 @@ public class ImportFileSystemWizard extends Wizard {
                final String objectPath = importPage.getObjectPath();
 
                // We do not display a progress bar for one file only
-               if (importPage.FILE_ITEM_TYPE.equals(objectType)) {
+               if (ImportToServerWizardPage.FILE_ITEM_TYPE.equals(objectType)) {
                        // In Rap we must force the "real" upload of the file
                        importPage.performFinish();
                        try {
@@ -75,9 +75,9 @@ public class ImportFileSystemWizard extends Wizard {
                                return false;
                        }
                        return true;
-               } else if (importPage.FOLDER_ITEM_TYPE.equals(objectType)) {
+               } else if (ImportToServerWizardPage.FOLDER_ITEM_TYPE.equals(objectType)) {
                        if (objectPath == null || !new File(objectPath).exists()) {
-                               Error.show("Directory " + objectPath + " does not exist");
+                               ErrorFeedback.show("Directory " + objectPath + " does not exist");
                                return false;
                        }
 
@@ -104,7 +104,7 @@ public class ImportFileSystemWizard extends Wizard {
                                        }
                                });
                        } catch (Exception e) {
-                               Error.show("Cannot import " + objectPath, e);
+                               ErrorFeedback.show("Cannot import " + objectPath, e);
                                failed = true;
                        }