Adapt after contact refactoring

[gpl/argeo-suite.git] / org.argeo.suite.workbench.rap / src / org / argeo / suite / workbench / commands / ImportEntities.java

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 a267df52d139c2fc30234e62707699b52f7bc33c..44bd81eddb77f6d532b2ddeeb2f2a85367cd7c05 100644 (file)
--- 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,7 +82,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
        }
 
        // TODO make this configurable
-       private final static String IMPORT_ENCODING = "ISO-8859-1";
+       private final static String IMPORT_ENCODING = "ISO-8859-1";// "UTF-8";
 
        /* DEPENDENCY INJECTION */
        private Repository repository;
@@ -130,11 +130,10 @@ 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;
                }
 
@@ -149,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);
@@ -182,6 +181,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
                                        }
                                });
                                resourceTypeCombo.setItems(KNOWN_TEMPLATES.keySet().toArray(new String[0]));
+                               resourceTypeCombo.select(0);
 
                                // File upload
                                Label lbl = new Label(composite, SWT.NONE);
@@ -345,10 +345,10 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
                        if (EclipseUiUtils.notEmpty(lastName))
                                tmpPerson.setProperty(PEOPLE_LAST_NAME, lastName);
                        Node newPersonNode = peopleService.createEntity(targetParent, PeopleTypes.PEOPLE_PERSON, tmpPerson);
-                       if (EclipseUiUtils.notEmpty(position))
-                               PersonJcrUtils.addJob(newPersonNode, newOrgNode, position, true);
+                       // if (EclipseUiUtils.notEmpty(position))
+                       PersonJcrUtils.addJob(resourcesService, peopleService, newPersonNode, newOrgNode, position, true);
                        // Save the newly created entity without creating a base version
-                       newOrgNode = peopleService.saveEntity(newOrgNode, false);
+                       newPersonNode = peopleService.saveEntity(newPersonNode, false);
 
                }
        }
@@ -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,
-                                                       ContactValueCatalogs.CONTACT_CAT_MOBILE, 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))
@@ -467,7 +464,6 @@ public class ImportEntities extends AbstractHandler implements PeopleNames {
                                String contactsStr = getStringValue(sheet, contactsIndex, i);
                                if (notEmpty(contactsStr))
                                        importOrgEmployees(tmpParent, targetParent, newOrgNode, contactsStr);
-
                        }
                } catch (PeopleException | RepositoryException e) {
                        throw new SuiteException("Cannot import mapping file, error at line: " + (i + 1), e);