From 66eb9f49d5f525f0eade65ca4baa5a400020bd67 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?=
Date: Tue, 5 Jan 2021 21:02:26 +0100
Subject: [PATCH] cleanup
---
...FileDataSourceWithReferenceWizardPage.java | 6 +---
.../ImportFromFileDataSourceWizardPage.java | 4 +--
.../io/e4/in/sdd/SddImportWizardE4.java | 8 +----
.../AbcdImportConfiguratorWizardPage.java | 22 +------------
.../ExcelNormalExplicitTaxaImportWizard.java | 21 +------------
.../taxeditor/io/wizard/SddImportWizard.java | 20 +-----------
.../taxeditor/ui/element/ImageElement.java | 3 --
.../ui/openurl/OpenUrlSelectorWizard.java | 31 +------------------
.../e4/SaveImportedSpecimenActionE4.java | 22 +++++--------
9 files changed, 15 insertions(+), 122 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWithReferenceWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWithReferenceWizardPage.java
index a04379620..f7b53f1ad 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWithReferenceWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWithReferenceWizardPage.java
@@ -18,10 +18,8 @@ import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
/**
- *
* @author pplitzner
* @since Oct 5, 2017
- *
*/
public class ImportFromFileDataSourceWithReferenceWizardPage extends ImportFromFileDataSourceWizardPage {
@@ -32,7 +30,6 @@ public class ImportFromFileDataSourceWithReferenceWizardPage extends ImportFromF
super();
}
- /** {@inheritDoc} */
@Override
public void createControl(Composite parent) {
super.createControl(parent);
@@ -53,5 +50,4 @@ public class ImportFromFileDataSourceWithReferenceWizardPage extends ImportFromF
public void setTextReferenceString(Text textReferenceString) {
this.textReferenceString = textReferenceString;
}
-
-}
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPage.java
index 1e324bd40..7f6022f8a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPage.java
@@ -6,7 +6,6 @@
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.io.e4.in;
import java.io.File;
@@ -112,5 +111,4 @@ public class ImportFromFileDataSourceWizardPage extends WizardPage {
public boolean isPageComplete() {
return CdmUtils.isNotBlank(text_source.getText());
}
-
-}
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java
index 407717683..b2f20b315 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java
@@ -27,14 +27,11 @@ import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWithReferenceWiza
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- *
* @author pplitzner
* @since Oct 5, 2017
- *
*/
public class SddImportWizardE4 extends AbstractImportWizardE4 {
-
private SDDImportConfigurator configurator;
private ImportFromFileDataSourceWithReferenceWizardPage dataSourcePage;
@@ -44,7 +41,6 @@ public class SddImportWizardE4 extends AbstractImportWizardE4ExcelNormalExplicitTaxaImportWizard class.
*
* @author n.hoffmann
* @created Sep 22, 2009
- * @version 1.0
*/
public class ExcelNormalExplicitTaxaImportWizard extends AbstractImportWizard{
@@ -43,19 +40,11 @@ public class ExcelNormalExplicitTaxaImportWizard extends AbstractImportWizard {
@@ -34,20 +33,11 @@ public class SddImportWizard extends AbstractImportWizard
private ImportFromFileDataSourceWizardPage dataSourcePage;
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#getConfigurator()
- */
- /** {@inheritDoc} */
@Override
public SDDImportConfigurator getConfigurator() {
return configurator;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPage(org.eclipse.jface.wizard.IWizardPage)
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
super.addPages();
@@ -57,10 +47,6 @@ public class SddImportWizard extends AbstractImportWizard
addPage(dataSourcePage);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
@@ -72,13 +58,9 @@ public class SddImportWizard extends AbstractImportWizard
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
super.init(workbench, selection);
configurator = CdmStore.getImportManager().SddConfigurator();
}
-}
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java
index 4e004bf0f..ab2db0901 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java
@@ -6,7 +6,6 @@
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.element;
import java.io.IOException;
@@ -44,14 +43,12 @@ import eu.etaxonomy.taxeditor.view.e4.supplementaldata.SupplementalDataPartE4;
/**
* @author n.hoffmann
* @created Sep 24, 2010
- * @version 1.0
*/
public class ImageElement extends AbstractCdmFormElement implements PaintListener{
/**
* @author pplitzner
* @since Jul 17, 2019
- *
*/
public class LoadImageJob extends Job {
public LoadImageJob(String name) {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
index 6327d4f3b..bad56dc80 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
@@ -6,7 +6,6 @@
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-
package eu.etaxonomy.taxeditor.ui.openurl;
import java.net.URI;
@@ -27,7 +26,6 @@ import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
/**
* @author n.hoffmann
* @created Jan 31, 2011
- * @version 1.0
*/
public class OpenUrlSelectorWizard extends Wizard {
@@ -45,8 +43,6 @@ public class OpenUrlSelectorWizard extends Wizard {
private final String referenceDetail;
-
-
/**
* @param openUrlSelectorElement
* @param reference
@@ -89,9 +85,6 @@ public class OpenUrlSelectorWizard extends Wizard {
query.startPage = referenceDetail;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
@Override
public void addPages() {
@@ -101,54 +94,32 @@ public class OpenUrlSelectorWizard extends Wizard {
super.addPages();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
@Override
public boolean performFinish() {
return true;
}
- /**
- * @param openUrlReference the openUrlReference to set
- */
public void setOpenUrlReference(OpenUrlReference openUrlReference) {
this.openUrlReference = openUrlReference;
this.openUrlReferenceImageUri = openUrlReference.getJpegImage(PreferencesUtil.getIntValue(PreferencePredicate.MobotOpenUrlServiceMaxWidth.getKey(), true)
, PreferencesUtil.getIntValue(PreferencePredicate.MobotOpenUrlServiceMaxHeight.getKey(), true));
}
-
- /**
- * @return the openUrlReference
- */
public OpenUrlReference getOpenUrlReference() {
return openUrlReference;
}
- /**
- * @return
- */
public List getResult() {
return openUrlServiceWrapper.doResolve(query);
}
- /**
- * @return the formFactory
- */
public CdmFormFactory getFormFactory() {
return formFactory;
}
- /**
- * @return the openUrlServiceWrapper
- */
public MobotOpenUrlServiceWrapper getOpenUrlServiceWrapper() {
return openUrlServiceWrapper;
}
- /**
- * @return
- */
public URI getOpenUrlReferenceImageUri() {
return openUrlReferenceImageUri;
}
@@ -160,4 +131,4 @@ public class OpenUrlSelectorWizard extends Wizard {
public String getReferenceDetail() {
return referenceDetail;
}
-}
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SaveImportedSpecimenActionE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SaveImportedSpecimenActionE4.java
index d624967e3..4a12261fd 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SaveImportedSpecimenActionE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SaveImportedSpecimenActionE4.java
@@ -31,10 +31,8 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.view.dataimport.GbifResponseComparator;
/**
- *
* @author pplitzner
* @since Oct 4, 2017
- *
*/
public class SaveImportedSpecimenActionE4 extends Action {
@@ -50,12 +48,12 @@ public class SaveImportedSpecimenActionE4 extends Action {
@Override
public void run() {
Table table = dataImportView.getTable();
- Collection checkedResults = new HashSet();
- Collection checkedAbcdResults = new HashSet();
+ Collection checkedResults = new HashSet<>();
+ Collection checkedAbcdResults = new HashSet<>();
Object data;
- Set unitIdsGbif = new HashSet();
- Set unitIdsBioCase = new HashSet();
- List biocaseResponses = new ArrayList();
+ Set unitIdsGbif = new HashSet<>();
+ Set unitIdsBioCase = new HashSet<>();
+ List biocaseResponses = new ArrayList<>();
for(TableItem item:table.getItems()){
if(item.getChecked()){
@@ -80,14 +78,12 @@ public class SaveImportedSpecimenActionE4 extends Action {
}else{
unitIdsGbif.add(tripleId);
}
-
-
}
}
Collections.sort(biocaseResponses, getComparator());
Abcd206ImportConfigurator configuratorAbcd;
- List abcdConfigurators = new ArrayList();
+ List abcdConfigurators = new ArrayList<>();
DataSetResponse dataSetResponse;
OccurenceQuery bioCaseOccurrenceQuery = null;
URI dataSetUri = null;
@@ -118,7 +114,7 @@ public class SaveImportedSpecimenActionE4 extends Action {
configuratorAbcd.setSourceReferenceTitle(sourceRef);
}
- unitIdsBioCase = new HashSet();
+ unitIdsBioCase = new HashSet<>();
bioCaseOccurrenceQuery = new OccurenceQuery(unitIdsBioCase);
configuratorAbcd.setOccurenceQuery(bioCaseOccurrenceQuery);
@@ -202,7 +198,6 @@ public class SaveImportedSpecimenActionE4 extends Action {
Job gbifJob = CdmStore.getImportManager().createIOServiceJob(configurator);
CdmStore.getImportManager().run(gbifJob);
}
-
}
private void persistTerm(DefinedTermBase> term, ITermService termService, ConversationHolder conversation){
@@ -225,5 +220,4 @@ public class SaveImportedSpecimenActionE4 extends Action {
}
return comparator;
}
-
-}
+}
\ No newline at end of file
--
2.34.1