BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7fad0a0
)
refactoring ICdmApplicationDefaultConfiguration
author
Cherian Mathew
<c.mathew@bgbm.org>
Wed, 12 Feb 2014 14:19:52 +0000
(14:19 +0000)
committer
Cherian Mathew
<c.mathew@bgbm.org>
Wed, 12 Feb 2014 14:19:52 +0000
(14:19 +0000)
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
index d91caa0d90d7af90749bd064b70f9384c5738b6a..a4b2e90073f414ab9ac0ff062996960d7b5f64ba 100644
(file)
--- a/
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
+++ b/
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
@@
-21,6
+21,7
@@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jdom.Element;
import org.eclipse.ui.handlers.HandlerUtil;
import org.jdom.Element;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
import eu.etaxonomy.cdm.print.IXMLEntityFactory;
import eu.etaxonomy.cdm.print.PublishConfigurator;
import eu.etaxonomy.cdm.print.out.pdf.PdfOutputModule;
import eu.etaxonomy.cdm.print.IXMLEntityFactory;
import eu.etaxonomy.cdm.print.PublishConfigurator;
import eu.etaxonomy.cdm.print.out.pdf.PdfOutputModule;
@@
-55,7
+56,7
@@
public class GeneratePdfHandler extends AbstractHandler {
return null;
}
return null;
}
- configurator = PublishConfigurator.NewLocalInstance(CdmStore.getCurrentApplicationConfiguration());
+ configurator = PublishConfigurator.NewLocalInstance(
(ICdmApplicationDefaultConfiguration)
CdmStore.getCurrentApplicationConfiguration());
Element taxonNodeElement = getTaxonNodeElement((TaxonEditorInput) input);
configurator.addSelectedTaxonNodeElements(taxonNodeElement);
Element taxonNodeElement = getTaxonNodeElement((TaxonEditorInput) input);
configurator.addSelectedTaxonNodeElements(taxonNodeElement);
diff --git
a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java
b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java
index 8876365de517268c838ad299f275240617bcf30a..ad5259573e421ef4d515fa4ceef2c4b4d85d2162 100644
(file)
--- a/
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java
+++ b/
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java
@@
-39,6
+39,7
@@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Text;
import org.jdom.Element;
import org.eclipse.swt.widgets.Text;
import org.jdom.Element;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
import eu.etaxonomy.cdm.print.IXMLEntityFactory;
import eu.etaxonomy.cdm.print.PublishConfigurator;
import eu.etaxonomy.cdm.print.XMLHelper;
import eu.etaxonomy.cdm.print.IXMLEntityFactory;
import eu.etaxonomy.cdm.print.PublishConfigurator;
import eu.etaxonomy.cdm.print.XMLHelper;
@@
-179,7
+180,7
@@
public class SelectServiceWizardPage extends AbstractPublishWizardPage {
text_serviceUrl.setEnabled(false);
text_serviceUrl.setEnabled(false);
- setConfigurator(PublishConfigurator.NewLocalInstance(CdmStore.getCurrentApplicationConfiguration()));
+ setConfigurator(PublishConfigurator.NewLocalInstance(
(ICdmApplicationDefaultConfiguration)
CdmStore.getCurrentApplicationConfiguration()));
getConfigurator().addOutputModule(getOutputModule());
refresh();
}
getConfigurator().addOutputModule(getOutputModule());
refresh();
}
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
index 984b7697b94aec721f63f5b821d4be9a1e55dbf8..c88f26a3c57707963f9717ff8ac4eee51928cd1b 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
@@
-19,6
+19,7
@@
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchPart;
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import org.eclipse.ui.IWorkbenchPart;
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.io.common.CdmDefaultExport;
import eu.etaxonomy.cdm.io.common.IExportConfigurator;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.io.common.CdmDefaultExport;
import eu.etaxonomy.cdm.io.common.IExportConfigurator;
@@
-103,7
+104,7
@@
public class ExportManager extends AbstractIOManager<IExportConfigurator> {
CdmDefaultExport<IExportConfigurator> exporter = new CdmDefaultExport<IExportConfigurator>();
configurator.setProgressMonitor(CdmProgressMonitorAdapter
.CreateSubMonitor(monitor, 80));
CdmDefaultExport<IExportConfigurator> exporter = new CdmDefaultExport<IExportConfigurator>();
configurator.setProgressMonitor(CdmProgressMonitorAdapter
.CreateSubMonitor(monitor, 80));
- exporter.setCdmAppController(applicationConfiguration);
+ exporter.setCdmAppController(
(ICdmApplicationDefaultConfiguration)
applicationConfiguration);
monitor.worked(10);
try {
monitor.worked(10);
try {
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
index 64e097cb349bda65d44fca07e5c0f1d378f50cf0..0657e286cadbbf465eb3e60aeabf43dc37e5f78d 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
@@
-18,6
+18,7
@@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.widgets.Display;
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import org.eclipse.swt.widgets.Display;
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
@@
-90,7
+91,7
@@
public class ImportManager extends AbstractIOManager<IImportConfigurator> {
monitor.worked(5);
CdmDefaultImport<IImportConfigurator> importer = new CdmDefaultImport<IImportConfigurator>();
monitor.worked(5);
CdmDefaultImport<IImportConfigurator> importer = new CdmDefaultImport<IImportConfigurator>();
- importer.setCdmAppController(applicationConfiguration);
+ importer.setCdmAppController(
(ICdmApplicationDefaultConfiguration)
applicationConfiguration);
monitor.worked(5);
try {
monitor.worked(5);
try {
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
index 1348b2a67726408c713dc58abe7c7268125a5392..2cc374c0c0e76fc127b3c47726168b01bf5b9942 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
@@
-28,6
+28,7
@@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import org.eclipse.swt.widgets.Text;
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.ext.ipni.IIpniService;
import eu.etaxonomy.cdm.ext.ipni.IpniService;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.ext.ipni.IIpniService;
import eu.etaxonomy.cdm.ext.ipni.IpniService;
@@
-131,7
+132,7
@@
public class ExternalReferenceServiceWizardPage extends WizardPage implements Se
@Override
public void widgetSelected(SelectionEvent e) {
String query = text_query.getText();
@Override
public void widgetSelected(SelectionEvent e) {
String query = text_query.getText();
- List<Reference> publications = ipniService.getPublications(query, null, (ICdmApplicationConfiguration) CdmStore.getCurrentApplicationConfiguration(), null);
+ List<Reference> publications = ipniService.getPublications(query, null, (ICdmApplication
Default
Configuration) CdmStore.getCurrentApplicationConfiguration(), null);
viewer.setInput(publications);
}
viewer.setInput(publications);
}