From 94a85ef93e397615db8ae62218661f6c4da8c00d Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Thu, 21 Sep 2017 21:31:24 +0200 Subject: [PATCH] order of cache updater class in wizard and configurator --- .../wizard/DatabaseRepairWizard.java | 21 +++++ .../taxeditor/databaseAdmin/wizard/Test.java | 82 +++++++++++-------- .../eu/etaxonomy/taxeditor/l10n/Messages.java | 4 + .../taxeditor/l10n/messages.properties | 5 +- .../taxeditor/l10n/messages_de.properties | 5 +- 5 files changed, 78 insertions(+), 39 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/DatabaseRepairWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/DatabaseRepairWizard.java index ce8648b0b..dc6abd109 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/DatabaseRepairWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/DatabaseRepairWizard.java @@ -15,6 +15,12 @@ import eu.etaxonomy.cdm.config.ICdmSource; import eu.etaxonomy.cdm.io.operation.config.CacheUpdaterConfigurator; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; import eu.etaxonomy.cdm.io.operation.config.SortIndexUpdaterConfigurator; +import eu.etaxonomy.cdm.model.agent.AgentBase; +import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; +import eu.etaxonomy.cdm.model.name.TaxonName; +import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; +import eu.etaxonomy.cdm.model.reference.Reference; +import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -58,6 +64,21 @@ public class DatabaseRepairWizard extends Wizard { Job updateJob = CdmStore.getImportManager().createIOServiceJob(config); CdmStore.getImportManager().run(updateJob); } + if (test.updateAgentBase){ + cacheUpdaterConfig.getClassList().add(TeamOrPersonBase.class); + } + if (test.updateReference){ + cacheUpdaterConfig.getClassList().add(Reference.class); + } + if (test.updateName){ + cacheUpdaterConfig.getClassList().add(TaxonName.class); + } + if (test.updateTaxonBase){ + cacheUpdaterConfig.getClassList().add(TaxonBase.class); + } + if (test.updateSpecimen){ + cacheUpdaterConfig.getClassList().add(SpecimenOrObservationBase.class); + } if (!cacheUpdaterConfig.getClassList().isEmpty()){ cacheUpdaterConfig.setCheck(CHECK.IMPORT_WITHOUT_CHECK); Job updateJob2 = CdmStore.getImportManager().createIOServiceJob(cacheUpdaterConfig); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/Test.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/Test.java index 31bc8da5a..2c2fc5c34 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/Test.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/Test.java @@ -15,6 +15,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -40,6 +41,12 @@ public class Test extends WizardPage { CacheUpdaterConfigurator config; SortIndexUpdaterConfigurator sortIndexConfig; + boolean updateAgentBase = false; + boolean updateReference = false; + boolean updateTaxonBase = false; + boolean updateName = false; + boolean updateSpecimen = false; + public Test(String pageName, CacheUpdaterConfigurator configTitleCache, SortIndexUpdaterConfigurator sortIndexConfig) { super(pageName); config = configTitleCache; @@ -66,6 +73,7 @@ public class Test extends WizardPage { tbtmSortIndex.setControl(composite); composite.setLayout(new GridLayout(1, true)); + Button checkBoxTaxonNode = new Button(composite, SWT.CHECK); checkBoxTaxonNode.setSelection(sortIndexConfig.isDoTaxonNode()); checkBoxTaxonNode.setText(Messages.DatabaseRepairPage_updateTaxonNodes); @@ -109,7 +117,34 @@ public class Test extends WizardPage { Composite composite_1 = new Composite(tabFolder, SWT.NONE); tbtmNewItem.setControl(composite_1); composite_1.setLayout(new GridLayout(1, false)); - + + Button checkBoxTeamOrPerson = new Button(composite_1, SWT.CHECK); + checkBoxTeamOrPerson.setSelection(config.getClassList().contains(TeamOrPersonBase.class)); + checkBoxTeamOrPerson.setText(Messages.DatabaseRepairPage_TeamOrPerson); + checkBoxTeamOrPerson + .setToolTipText(Messages.DatabaseRepairPage_toolTip_teamOrPerson); + checkBoxTeamOrPerson.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + Button b = (Button) e.widget; + updateAgentBase = b.getSelection(); + + } + }); + + Button checkBoxReference = new Button(composite_1, SWT.CHECK); + checkBoxReference.setSelection(config.getClassList().contains(Reference.class)); + checkBoxReference.setText(Messages.DatabaseRepairPage_Reference); + checkBoxReference + .setToolTipText(Messages.DatabaseRepairPage_toolTip_reference); + checkBoxReference.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + Button b = (Button) e.widget; + updateReference= b.getSelection(); + } + }); + Button checkBoxTaxonName = new Button(composite_1, SWT.CHECK); checkBoxTaxonName.setSelection(config.getClassList().contains(TaxonName.class)); checkBoxTaxonName.setText(Messages.DatabaseRepairPage_updateTaxonName); @@ -118,8 +153,9 @@ public class Test extends WizardPage { checkBoxTaxonName.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - List> classList = config.getClassList(); - classList.add(TaxonName.class); + Button b = (Button) e.widget; + updateName = b.getSelection(); + } }); @@ -131,24 +167,13 @@ public class Test extends WizardPage { checkBoxTaxonBase.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - List> classList = config.getClassList(); - classList.add(TaxonBase.class); + Button b = (Button) e.widget; + updateTaxonBase = b.getSelection(); + } }); - Button checkBoxReference = new Button(composite_1, SWT.CHECK); - checkBoxReference.setSelection(config.getClassList().contains(Reference.class)); - checkBoxReference.setText(Messages.DatabaseRepairPage_Reference); - checkBoxReference - .setToolTipText(Messages.DatabaseRepairPage_toolTip_reference); - checkBoxReference.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - List> classList = config.getClassList(); - classList.add(Reference.class); - } - }); - + Button checkBoxSpecimen = new Button(composite_1, SWT.CHECK); checkBoxSpecimen.setSelection(config.getClassList().contains(SpecimenOrObservationBase.class)); checkBoxSpecimen.setText(Messages.DatabaseRepairPage_Specimen); @@ -157,25 +182,12 @@ public class Test extends WizardPage { checkBoxSpecimen.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - List> classList = config.getClassList(); - classList.add(SpecimenOrObservationBase.class); - } - }); - - Button checkBoxTeamOrPerson = new Button(composite_1, SWT.CHECK); - checkBoxTeamOrPerson.setSelection(config.getClassList().contains(TeamOrPersonBase.class)); - checkBoxTeamOrPerson.setText(Messages.DatabaseRepairPage_TeamOrPerson); - checkBoxTeamOrPerson - .setToolTipText(Messages.DatabaseRepairPage_toolTip_teamOrPerson); - checkBoxTeamOrPerson.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - List> classList = config.getClassList(); - classList.add(TeamOrPersonBase.class); + Button b = (Button) e.widget; + updateSpecimen = b.getSelection(); + } }); - - + tabFolder.pack(); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java index b70fc97df..a11c914c6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java @@ -215,6 +215,7 @@ public class Messages extends NLS { public static String DatabasePreferencesPage_Define_Default_NomenclaturalCode; public static String DatabasePreferencesPage_UseLocalPreferences; public static String DatabasePreferencesPage_Specimen_Or_Observation; + public static String DatabasePreferencesPage_SetPublishFlag; public static String ImportFromFileAndChooseVocIdWizardPage_AreaVoc; @@ -244,6 +245,9 @@ public class Messages extends NLS { + + + static { diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties index c0c72e79e..46a7778e6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties @@ -30,8 +30,8 @@ DatabaseRepairPage_Reference=References DatabaseRepairPage_toolTip_reference=Caches of all references are recalculated. DatabaseRepairPage_Specimen=Specimen DatabaseRepairPage_toolTip_specimen=Caches of all Derived Units und Field Units are recalculated. -DatabaseRepairPage_TeamOrPerson=Teams and Persons -DatabaseRepairPage_toolTip_teamOrPerson=Caches of all Teams und Persons are recalculated. +DatabaseRepairPage_TeamOrPerson=Persons and Teams +DatabaseRepairPage_toolTip_teamOrPerson=Caches of all Persons and Teams are recalculated. UriWithLabelElement_URL_NOT_SAVED=URI won't be saved\! UriWithLabelElement_COULD_NOT_OPEN_BROWSER=Could not open external browser. URI is invalid. @@ -190,6 +190,7 @@ DatabasePreferencesPage_Define_Default_NomenclaturalCode=Define default nomencla DatabasePreferencesPage_UseLocalPreferences=Allow to use local preference DatabasePreferencesPage_Specimen_Or_Observation=Specimen or observation configuration DatabasePreferncesPage_Life_Form=Show Life-Form in details view of field units +DatabasePreferencesPage_SetPublishFlag=Configure the handling of publish flag for new taxa ImportFromFileAndChooseVocIdWizardPage_AreaVoc=Area Vocabulary ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip=Please choose a vocabulary for the used areas. diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties index 6a27563a0..0704dc8ac 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties @@ -30,8 +30,8 @@ DatabaseRepairPage_Reference=Referenzen DatabaseRepairPage_toolTip_reference=Die Caches aller Referenzen werden aktualisiert. DatabaseRepairPage_Specimen=Specimen DatabaseRepairPage_toolTip_specimen=Die Caches aller Derived Units und Field Units werden aktualisiert. -DatabaseRepairPage_TeamOrPerson=Teams und Personen -DatabaseRepairPage_toolTip_teamOrPerson=Die Caches aller Teams und Personen werden aktualisiert. +DatabaseRepairPage_TeamOrPerson=Personen und Teams +DatabaseRepairPage_toolTip_teamOrPerson=Die Caches aller Personen und Teams werden aktualisiert. UriWithLabelElement_URL_NOT_SAVED=URI wird nicht gespeichert\! UriWithLabelElement_COULD_NOT_OPEN_BROWSER=Externer Browser konnte nicht geöffnet werden. URI ist ung\u00FCtlig. @@ -190,6 +190,7 @@ DatabasePreferencesPage_Show_NameRelations=Zeige Namensrelationen DatabasePreferencesPage_Define_Default_NomenclaturalCode=Festlegen des default Nomenklatorischen Codes DatabasePreferencesPage_UseLocalPreferences=Erlaube das lokale Überschreiben DatabasePreferencesPage_Specimen_Or_Observation=Konfiguration von Specimen und Observationen +DatabasePreferencesPage_SetPublishFlag=Konfiguriere das Handling des Publish Flags bei neuen Taxa ImportFromFileAndChooseVocIdWizardPage_AreaVoc=Area Vokabular ImportFromFileAndChooseVocIdWizardOage_AreaVoc_toolTip=Bitte wählen Sie ein Vokabular für die genutzten Areas aus. -- 2.34.1