From: bsinou <bsinou@argeo.org>
Date: Wed, 8 Mar 2017 12:34:30 +0000 (+0100)
Subject: Adapt after contact refactoring
X-Git-Tag: argeo-suite-0.1.5~4
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=904e8d151fda67e17b232dfe561723bc0b1d98fd;hp=6d63fef3db3bce8a70e278a9164ee797b5774a99

Adapt after contact refactoring
---

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 4febb0e..44bd81e 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
@@ -364,12 +364,11 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 			line = line.trim();
 
 			if (line.startsWith("https://www.facebook.com")) {
-				PeopleJcrUtils.createSocialMedia(peopleService, resourcesService, contactable, line,
-						!hasPrimaryFacebook, null, ContactValueCatalogs.CONTACT_CAT_FACEBOOK, null);
+				PeopleJcrUtils.createSocialMedia(resourcesService, peopleService, contactable, line,
+						!hasPrimaryFacebook, ContactValueCatalogs.CONTACT_CAT_FACEBOOK, null);
 				hasPrimaryFacebook = true;
 			} else {
-				PeopleJcrUtils.createWebsite(peopleService, resourcesService, contactable, line, !hasPrimary, null,
-						null);
+				PeopleJcrUtils.createWebsite(resourcesService, peopleService, contactable, line, !hasPrimary, null);
 				hasPrimary = true;
 			}
 		}
@@ -382,8 +381,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 			if (EclipseUiUtils.isEmpty(line))
 				continue loop;
 			line = line.trim();
-			PeopleJcrUtils.createEmail(peopleService, resourcesService, contactable, line, !hasPrimary, null, null,
-					null);
+			PeopleJcrUtils.createEmail(resourcesService, peopleService, contactable, line, !hasPrimary, null, null);
 			hasPrimary = true;
 		}
 	}
@@ -443,15 +441,14 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
 				String stStr = getStringValue(sheet, stIndex, i);
 				String cStr = getStringValue(sheet, cIndex, i);
 				if (notEmpty(streetStr) || notEmpty(pcStr) || notEmpty(lStr) || notEmpty(stStr) || notEmpty(cStr))
-					PeopleJcrUtils.createAddress(peopleService, resourcesService, tmpOrg, streetStr, null, pcStr, lStr,
-							stStr, cStr, true, null, ContactValueCatalogs.CONTACT_CAT_MAIN, null);
+					PeopleJcrUtils.createAddress(resourcesService, peopleService, tmpOrg, streetStr, null, pcStr, lStr,
+							stStr, cStr, true, ContactValueCatalogs.CONTACT_CAT_MAIN, null);
 				String mobileStr = getStringValue(sheet, mobileIndex, i);
 				if (notEmpty(mobileStr))
-					PeopleJcrUtils.createPhone(peopleService, resourcesService, tmpOrg, mobileStr, true, null, null,
-							null);
+					PeopleJcrUtils.createPhone(resourcesService, peopleService, tmpOrg, mobileStr, true, null, null);
 				String phoneStr = getStringValue(sheet, telephoneNumberIndex, i);
 				if (notEmpty(phoneStr))
-					PeopleJcrUtils.createPhone(peopleService, resourcesService, tmpOrg, phoneStr, true, null,
+					PeopleJcrUtils.createPhone(resourcesService, peopleService, tmpOrg, phoneStr, true,
 							ContactValueCatalogs.CONTACT_CAT_DIRECT, null);
 				String descStr = getStringValue(sheet, descriptionIndex, i);
 				if (notEmpty(descStr))