X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.suite.workbench.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fworkbench%2Fcommands%2FImportEntities.java;h=4febb0eccb357a7631ecea6a272671493b4d9c2d;hb=4754e4ec30ef5c570f1a45b11c19e5df95ffb0e5;hp=8f679be719a56905f5c0f6cea50b2f0ec3fd53da;hpb=361d28871743756fa4f12e4e50edaef8ead8c566;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
index 8f679be..4febb0e 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java
@@ -82,8 +82,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 	}
 
 	// TODO make this configurable
-	private final static String IMPORT_ENCODING = "ISO-8859-1";//"UTF-8";
-	
+	private final static String IMPORT_ENCODING = "ISO-8859-1";// "UTF-8";
 
 	/* DEPENDENCY INJECTION */
 	private Repository repository;
@@ -131,7 +130,8 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 		@Override
 		public boolean performFinish() {
 			// Session session = null;
-			// String templateName = resourceTypeCombo.getItem(resourceTypeCombo.getSelectionIndex());
+			// String templateName =
+			// resourceTypeCombo.getItem(resourceTypeCombo.getSelectionIndex());
 			// String type = KNOWN_TEMPLATES.get(templateName);
 			importDefaultOrgFile(file);
 			return true;
@@ -148,7 +148,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 				userInputPage.setErrorMessage("Please choose an entity type");
 				return false;
 			} else if (file == null) {
-				userInputPage.setErrorMessage("Please upload a file1");
+				userInputPage.setErrorMessage("Please upload a file");
 				return false;
 			} else {
 				userInputPage.setErrorMessage(null);
@@ -447,8 +447,8 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 							stStr, cStr, true, null, ContactValueCatalogs.CONTACT_CAT_MAIN, null);
 				String mobileStr = getStringValue(sheet, mobileIndex, i);
 				if (notEmpty(mobileStr))
-					PeopleJcrUtils.createPhone(peopleService, resourcesService, tmpOrg, mobileStr, true, null,
-							ContactValueCatalogs.CONTACT_CAT_MOBILE, null);
+					PeopleJcrUtils.createPhone(peopleService, resourcesService, tmpOrg, mobileStr, true, null, null,
+							null);
 				String phoneStr = getStringValue(sheet, telephoneNumberIndex, i);
 				if (notEmpty(phoneStr))
 					PeopleJcrUtils.createPhone(peopleService, resourcesService, tmpOrg, phoneStr, true, null,