X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fwizards%2FImportFileSystemWizard.java;h=6653a80aa1e71fc1a673203773e2586ba61263bc;hb=cd50e3711d3b86921f11d9e021fc6a43bef0d400;hp=9e9168e4faa3be48cabcbc633a3bd0e67c73e097;hpb=c425aea5b318f0c291804cf3973b3059f923e9b5;p=lgpl%2Fargeo-commons.git

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 9e9168e4f..6653a80aa 100644
--- 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jcr.ui.explorer.wizards;
 
 import java.io.File;
@@ -13,7 +28,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 +66,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 +90,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 +119,7 @@ public class ImportFileSystemWizard extends Wizard {
 					}
 				});
 			} catch (Exception e) {
-				Error.show("Cannot import " + objectPath, e);
+				ErrorFeedback.show("Cannot import " + objectPath, e);
 				failed = true;
 			}