From 7c90a4b959685501c4034d8fbf9ab30ec8a6cb94 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Fri, 3 Apr 2009 10:16:39 +0000 Subject: [PATCH] switched plugin version to 2.1 --- .gitattributes | 2 ++ .../eu.etaxonomy.taxeditor/.classpath | 7 +++++ .../eu.etaxonomy.taxeditor/.project | 28 +++++++++++++++++++ .../datasource/CdmDataSourceDialog.java | 1 - .../editor/FreeTextElementFactory.java | 2 -- .../editor/images/ImageComposite.java | 1 - .../images/TaxonHasNoImagesComposite.java | 1 - .../taxeditor/editor/images/UrlDialog.java | 1 - .../taxeditor/handlers/ExportHandler.java | 1 - .../taxeditor/handlers/ImportHandler.java | 1 - .../model/CdmSessionDataRepository.java | 2 -- .../navigation/TaxonomicTreeView.java | 7 ++++- .../description/AddElementOperation.java | 2 +- .../DescriptionElementPropertySource.java | 12 ++++---- .../images/ImagePropertySource.java | 6 ---- .../name/NonViralNamePropertySource.java | 9 +++--- .../type/TypeCollectionPropertySource.java | 6 ---- .../type/wizard/ChooseNameTypeWizardPage.java | 7 ++--- .../wizard/ChooseSpecimenTypeWizardPage.java | 1 - 19 files changed, 58 insertions(+), 39 deletions(-) create mode 100644 eclipseprojects/eu.etaxonomy.taxeditor/.classpath create mode 100644 eclipseprojects/eu.etaxonomy.taxeditor/.project diff --git a/.gitattributes b/.gitattributes index 59891b387..89e990bfb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -309,6 +309,8 @@ eclipseprojects/eu.etaxonomy.taxeditor.prototype2/src/eu/etaxonomy/taxeditor/pro eclipseprojects/eu.etaxonomy.taxeditor.prototype2/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetContentProvider.java -text eclipseprojects/eu.etaxonomy.taxeditor.prototype2/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetValueEditingSupport.java -text eclipseprojects/eu.etaxonomy.taxeditor.prototype2/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetValueLabelProvider.java -text +eclipseprojects/eu.etaxonomy.taxeditor/.classpath -text +eclipseprojects/eu.etaxonomy.taxeditor/.project -text eclipseprojects/eu.etaxonomy.taxeditor/META-INF/MANIFEST.MF -text eclipseprojects/eu.etaxonomy.taxeditor/build.properties -text eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/.classpath b/eclipseprojects/eu.etaxonomy.taxeditor/.classpath new file mode 100644 index 000000000..1fa3e6803 --- /dev/null +++ b/eclipseprojects/eu.etaxonomy.taxeditor/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/.project b/eclipseprojects/eu.etaxonomy.taxeditor/.project new file mode 100644 index 000000000..4b68c1f0c --- /dev/null +++ b/eclipseprojects/eu.etaxonomy.taxeditor/.project @@ -0,0 +1,28 @@ + + + eu.etaxonomy.taxeditor + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceDialog.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceDialog.java index 8720938e6..3db8f42a5 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceDialog.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceDialog.java @@ -91,7 +91,6 @@ public class CdmDataSourceDialog extends Dialog { * Any time user modifies datasource properties, force a save or a cancel */ ModifyListener modifyListener = new ModifyListener() { - @Override public void modifyText(ModifyEvent e) { forceUserToSave(true); } diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java index a01167b10..5501c7678 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java @@ -328,7 +328,6 @@ public class FreeTextElementFactory implements IFreeTextElementFactory { /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.editor.IFreeTextElementFactory#createImageElement(org.eclipse.ui.forms.ManagedForm, eu.etaxonomy.cdm.model.taxon.Taxon, java.net.URL) */ - @Override public Composite createImageElement(ManagedForm form, Taxon taxon, URL url) { // Get the taxon's form @@ -382,7 +381,6 @@ public class FreeTextElementFactory implements IFreeTextElementFactory { /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.editor.IFreeTextElementFactory#createTaxonHasNoImagesElement(org.eclipse.ui.forms.ManagedForm, eu.etaxonomy.cdm.model.taxon.Taxon) */ - @Override public Composite createTaxonHasNoImagesElement(ManagedForm form, Taxon taxon) { // Get the taxon's form diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java index a96bd24c6..6cbe68057 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java @@ -145,7 +145,6 @@ public class ImageComposite extends GroupedComposite { /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.editor.IHasPropertySource#getPropertySource() */ - @Override public IPropertySource getPropertySource() { return new ImagePropertySource(getTaxon(), url); } diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/TaxonHasNoImagesComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/TaxonHasNoImagesComposite.java index c8d470bd9..e20dce34f 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/TaxonHasNoImagesComposite.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/TaxonHasNoImagesComposite.java @@ -105,7 +105,6 @@ public class TaxonHasNoImagesComposite extends GroupedComposite { /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.editor.IHasPropertySource#getPropertySource() */ - @Override public IPropertySource getPropertySource() { return null; } diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/UrlDialog.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/UrlDialog.java index fd06b5dea..e974b3dd7 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/UrlDialog.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/images/UrlDialog.java @@ -42,7 +42,6 @@ public class UrlDialog extends InputDialog { super(parentShell, dialogTitle, dialogMessage, "http://", new IInputValidator() { - @Override public String isValid(String text) { URL url = null; try { diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ExportHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ExportHandler.java index 853497839..b955fde4a 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ExportHandler.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ExportHandler.java @@ -30,7 +30,6 @@ public class ExportHandler extends AbstractHandler implements IHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ - @Override public Object execute(ExecutionEvent event) throws ExecutionException { FileDialog dialog = new FileDialog(GlobalController.getShell()); diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ImportHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ImportHandler.java index 12d5c3ba8..f25c13b2d 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ImportHandler.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/ImportHandler.java @@ -30,7 +30,6 @@ public class ImportHandler extends AbstractHandler implements IHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ - @Override public Object execute(ExecutionEvent event) throws ExecutionException { FileDialog dialog = new FileDialog(GlobalController.getShell()); diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java index 426acfb1a..0b4ea745a 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java @@ -489,7 +489,6 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository { /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.model.ICdmSessionDataRepository#getTypeDesignationStatus() */ - @Override public TermVocabulary getTypeDesignationStatus() { if (typeStatus == null) { typeStatus = getApplicationController().getNameService().getTypeDesignationVocabulary(); @@ -500,7 +499,6 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository { /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.model.ICdmSessionDataRepository#getLanguages() */ - @Override public List getLanguages() { if (languages == null) { diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java index dafeed080..d6b188fe2 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java @@ -187,7 +187,12 @@ public class TaxonomicTreeView extends ViewPart { private void setDataSourceText() { ICdmDataSource dataSource = CdmDataSourceRepository.getDefault().getCurrentDataSource(); - lblDataSource.setText(dataSource.getDatabaseType().getConnectionString(dataSource)); + try{ + lblDataSource.setText(dataSource.getDatabaseType().getConnectionString(dataSource)); + }catch(NullPointerException e){ + logger.error("Unable to set the connection string for the current dataSource. Reason:", e); + } + lblDataSourceTitle.setText(getDataSourceName(dataSource)); dbCompositeSub.layout(); diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/operations/description/AddElementOperation.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/operations/description/AddElementOperation.java index 46aff0c48..f9ccacc63 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/operations/description/AddElementOperation.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/operations/description/AddElementOperation.java @@ -55,7 +55,7 @@ public class AddElementOperation extends AbstractEditorOperation { public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - if (feature.isSupportsCommonTaxonName()) { + if (feature.supportsCommonTaxonName()) { // Get language for the common name Language language = LanguageDialog.getLanguage diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java index 93ca0ed8c..44f5a6e43 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java @@ -128,22 +128,22 @@ public class DescriptionElementPropertySource implements IPropertySource { Map supportedClasses = new HashMap(); // Populate feature class arrays with classes supported by this feature - if (feature.isSupportsCommonTaxonName()) { + if (feature.supportsCommonTaxonName()) { supportedClasses.put(CommonTaxonName.class, "Common name"); } - if (feature.isSupportsDistribution()) { + if (feature.supportsDistribution()) { supportedClasses.put(Distribution.class, "Distribution"); } - if (feature.isSupportsIndividualAssociation()) { + if (feature.supportsIndividualAssociation()) { supportedClasses.put(IndividualsAssociation.class, "Individual association"); } - if (feature.isSupportsQuantitativeData()) { + if (feature.supportsQuantitativeData()) { supportedClasses.put(QuantitativeData.class, "Quantitative data"); } - if (feature.isSupportsTaxonInteraction()) { + if (feature.supportsTaxonInteraction()) { supportedClasses.put(TaxonInteraction.class, "Taxon interaction"); } - if (feature.isSupportsTextData()) { + if (feature.supportsTextData()) { supportedClasses.put(TextData.class, "Text"); } diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java index 8eebef674..d756d77cb 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java @@ -70,7 +70,6 @@ public class ImagePropertySource implements IPropertySource { /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue() */ - @Override public Object getEditableValue() { return this; } @@ -78,7 +77,6 @@ public class ImagePropertySource implements IPropertySource { /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors() */ - @Override public IPropertyDescriptor[] getPropertyDescriptors() { return (IPropertyDescriptor[]) descriptors.toArray( new IPropertyDescriptor[descriptors.size()]); @@ -87,7 +85,6 @@ public class ImagePropertySource implements IPropertySource { /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object) */ - @Override public Object getPropertyValue(Object id) { if (id.equals(P_ID_URL)) { return url.toString(); @@ -98,7 +95,6 @@ public class ImagePropertySource implements IPropertySource { /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#isPropertySet(java.lang.Object) */ - @Override public boolean isPropertySet(Object id) { return false; } @@ -106,13 +102,11 @@ public class ImagePropertySource implements IPropertySource { /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object) */ - @Override public void resetPropertyValue(Object id) {} /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object, java.lang.Object) */ - @Override public void setPropertyValue(Object id, Object value) { if (id.equals(P_ID_URL)) { diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java index bb27b449a..2fcbbe8e3 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java @@ -26,6 +26,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; import eu.etaxonomy.cdm.common.CdmUtils; +import eu.etaxonomy.cdm.model.common.IIdentifiableEntity; import eu.etaxonomy.cdm.model.common.TermVocabulary; import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; @@ -441,7 +442,7 @@ public class NonViralNamePropertySource implements IPropertySource { if (name.getCreatedBy() == null) { return ""; } else { - return CdmUtils.Nz(name.getCreatedBy().generateTitle()); + return CdmUtils.Nz(((IIdentifiableEntity) name.getCreatedBy()).generateTitle()); } } @@ -468,7 +469,7 @@ public class NonViralNamePropertySource implements IPropertySource { nomRefPropertySource.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() instanceof INomenclaturalReference) { - name.setNomenclaturalReference((INomenclaturalReference) evt.getNewValue()); + name.setNomenclaturalReference((ReferenceBase) evt.getNewValue()); } } }); @@ -541,7 +542,7 @@ public class NonViralNamePropertySource implements IPropertySource { // Nomenclatural reference if (id.equals(P_ID_NOMENCLATURAL_REF)) { if (value instanceof INomenclaturalReference) { - name.setNomenclaturalReference((INomenclaturalReference) value); + name.setNomenclaturalReference((ReferenceBase) value); } } @@ -576,7 +577,7 @@ public class NonViralNamePropertySource implements IPropertySource { return name.getTitleCache(); } if (parentid.equals(P_ID_NOMENCLATURAL_REF)) { - INomenclaturalReference nomenclaturalReference = name.getNomenclaturalReference(); + INomenclaturalReference nomenclaturalReference = (INomenclaturalReference) name.getNomenclaturalReference(); if (nomenclaturalReference == null) { return ""; } diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java index 3e01991dd..76c920f3c 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java @@ -154,7 +154,6 @@ public class TypeCollectionPropertySource extends CollectionPropertySource { this.typeDesignation = typeDesignation; } - @Override public Object getEditableValue() { if (typeDesignation instanceof SpecimenTypeDesignation) { return ((SpecimenTypeDesignation) typeDesignation).getTypeSpecimen().getTitleCache(); @@ -169,7 +168,6 @@ public class TypeCollectionPropertySource extends CollectionPropertySource { return null; } - @Override public IPropertyDescriptor[] getPropertyDescriptors() { return new IPropertyDescriptor[]{ new PropertyDescriptor( @@ -177,7 +175,6 @@ public class TypeCollectionPropertySource extends CollectionPropertySource { }; } - @Override public Object getPropertyValue(Object id) { ReferenceBase reference = typeDesignation.getCitation(); if (reference == null) { @@ -194,15 +191,12 @@ public class TypeCollectionPropertySource extends CollectionPropertySource { return referencePropertySource; } - @Override public boolean isPropertySet(Object id) { return false; } - @Override public void resetPropertyValue(Object id) {} - @Override public void setPropertyValue(Object id, Object value) { } diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java index d0551f751..64b54cb97 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java @@ -85,7 +85,6 @@ public class ChooseNameTypeWizardPage extends WizardPage { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ - @Override public void createControl(Composite parent) { // Create composite for popup dialog @@ -374,7 +373,7 @@ public class ChooseNameTypeWizardPage extends WizardPage { if (typeDesignation == null) { typeDesignation = new TemporaryNameTypeDesignation(typeName, citation, null, - null, btnRejected.getSelection(), btnConserved.getSelection(), btnNotDesignated.getSelection()); + null, btnRejected.getSelection(), btnConserved.getSelection(), btnLecto.getSelection(), btnNotDesignated.getSelection()); typeDesignation.setLectoType(btnLecto.getSelection()); } else { typeDesignation.setRejectedType(btnRejected.getSelection()); @@ -407,9 +406,9 @@ public class ChooseNameTypeWizardPage extends WizardPage { // } public TemporaryNameTypeDesignation(TaxonNameBase typeName, ReferenceBase citation, String citationMicroReference, - String originalNameString, boolean isRejectedType, boolean isConservedType, boolean isNotDesignated) { + String originalNameString, boolean isRejectedType, boolean isConservedType, boolean isLectoType, boolean isNotDesignated) { super(typeName, citation, citationMicroReference, originalNameString, - isRejectedType, isConservedType, isNotDesignated); + isRejectedType, isConservedType, isLectoType, isNotDesignated); } } } diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java index 585c1ae5c..3c57d9987 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java @@ -85,7 +85,6 @@ public class ChooseSpecimenTypeWizardPage extends WizardPage { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ - @Override public void createControl(Composite parent) { // Create composite for popup dialog -- 2.34.1