eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/ScientificNamePropertySource.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/ZoologicalNamePropertySource.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelationswizard/ChooseRelatedNameWizardPage.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelationswizard/ChooseRelationTypeWizardPage.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelationswizard/ListNameRelationsWizardPage.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelationswizard/NameRelationWizard.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelationswizard/NameRelationWizardModel.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelationswizard/NameRelationsListWizard.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelatedNameWizardPage.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationTypeWizardPage.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ListNameRelationsWizardPage.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationWizard.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationWizardModel.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationsListWizard.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/reference/IReferenceSearch.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/reference/NomenclaturalReferencePropertySource.java -text
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java -text
import eu.etaxonomy.cdm.model.name.NameRelationship;\r
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
import eu.etaxonomy.taxeditor.controller.GlobalController;\r
-import eu.etaxonomy.taxeditor.propertysheet.namerelationswizard.NameRelationWizard;\r
-import eu.etaxonomy.taxeditor.propertysheet.namerelationswizard.NameRelationWizardModel;\r
+import eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard.NameRelationWizard;\r
+import eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard.NameRelationWizardModel;\r
\r
/**\r
* @author p.ciardelli\r
import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
import eu.etaxonomy.taxeditor.controller.GlobalController;\r
-import eu.etaxonomy.taxeditor.propertysheet.namerelationswizard.NameRelationsListWizard;\r
+import eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard.NameRelationsListWizard;\r
\r
/**\r
* @author p.ciardelli\r
@Override\r
public TermVocabulary<TypeDesignationStatus> getTypeDesignationStatus() {\r
if (typeStatus == null) {\r
- typeStatus = getApplicationController().getNameService().\r
- getTypeDesignationStatusVocabulary();\r
+ typeStatus = getApplicationController().getNameService().getTypeDesignationVocabulary();\r
+// getTypeDesignationStatusVocabulary();\r
}\r
return typeStatus;\r
}\r
}\r
\r
// Annotations, listed in custom property descriptor \r
- if (id.equals(P_ID_ANNOTATIONS)) {\r
- return new AnnotationPropertySource(name.getAnnotations());\r
- }\r
+// if (id.equals(P_ID_ANNOTATIONS)) {\r
+// return new AnnotationPropertySource(name.getAnnotations());\r
+// }\r
\r
// Nomenclatural status \r
if (id.equals(P_ID_NOMSTATUS)) {\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
-package eu.etaxonomy.taxeditor.propertysheet.namerelationswizard;\r
+package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
\r
import java.util.List;\r
\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
-package eu.etaxonomy.taxeditor.propertysheet.namerelationswizard;\r
+package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
\r
import java.beans.PropertyChangeEvent;\r
import java.beans.PropertyChangeListener;\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
-package eu.etaxonomy.taxeditor.propertysheet.namerelationswizard;\r
+package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
\r
import org.apache.log4j.Logger;\r
import org.eclipse.core.databinding.beans.BeansObservables;\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
-package eu.etaxonomy.taxeditor.propertysheet.namerelationswizard;\r
+package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
\r
import org.apache.log4j.Logger;\r
import org.eclipse.jface.util.IPropertyChangeListener;\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
-package eu.etaxonomy.taxeditor.propertysheet.namerelationswizard;\r
+package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
\r
import java.beans.PropertyChangeListener;\r
import java.beans.PropertyChangeSupport;\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
\r
-package eu.etaxonomy.taxeditor.propertysheet.namerelationswizard;\r
+package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
\r
import org.apache.log4j.Logger;\r
import org.eclipse.jface.wizard.IWizardPage;\r
import org.eclipse.jface.wizard.WizardPage;\r
import org.eclipse.swt.SWT;\r
import org.eclipse.swt.custom.CCombo;\r
+import org.eclipse.swt.events.KeyAdapter;\r
import org.eclipse.swt.events.KeyEvent;\r
-import org.eclipse.swt.events.KeyListener;\r
import org.eclipse.swt.events.SelectionAdapter;\r
import org.eclipse.swt.events.SelectionEvent;\r
import org.eclipse.swt.layout.GridData;\r
import org.eclipse.swt.widgets.Label;\r
import org.eclipse.swt.widgets.Text;\r
\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
import eu.etaxonomy.cdm.model.name.TypeDesignationStatus;\r
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;\r
+import eu.etaxonomy.cdm.model.occurrence.Specimen;\r
import eu.etaxonomy.taxeditor.model.CdmSessionDataRepository;\r
\r
/**\r
\r
private Text txtDesignationType;\r
\r
+ private TypeDesignationStatus[] typeStatusArray;\r
+\r
+ private TaxonNameBase name;\r
+\r
/**\r
* @param typeDesignation\r
*/\r
public ChooseTypeDesignationWizardPage(\r
SpecimenTypeDesignation typeDesignation, TaxonNameBase name) {\r
super("");\r
- \r
+ \r
this.typeDesignation = typeDesignation;\r
+ this.name = name;\r
\r
setTitle("Create or edit type designation");\r
setDescription("Create or edit type designation for '" + name.getTitleCache() + "\".");\r
// Create designation type status dropdown \r
statusCombo = new CCombo(container, SWT.BORDER);\r
statusCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r
+ TermVocabulary<TypeDesignationStatus> typeStatusSet = CdmSessionDataRepository.getDefault().getTypeDesignationStatus();\r
+ typeStatusArray = new TypeDesignationStatus[CdmSessionDataRepository.getDefault().getTypeDesignationStatus().size()];\r
+ int i = 0;\r
+ int selectedIndex = -1;\r
for (TypeDesignationStatus typeStatus : \r
CdmSessionDataRepository.getDefault().getTypeDesignationStatus()) {\r
- \r
String label = typeStatus.getLabel();\r
-// String label = "placeholder";\r
+ typeStatusArray[i] = typeStatus;\r
+ \r
+ if (typeDesignation != null) {\r
+ if (typeStatus.equals(typeDesignation.getTypeStatus())) {\r
+ selectedIndex = i;\r
+ }\r
+ }\r
+ \r
+ i++;\r
statusCombo.add(label);\r
}\r
+ \r
+ // Set menu to type designation status if exists\r
+ statusCombo.select(selectedIndex);\r
\r
statusCombo.addSelectionListener(new SelectionAdapter() {\r
@Override\r
public void widgetSelected(SelectionEvent e) {\r
-// int typeIndex = typeCombo.getSelectionIndex();\r
-// relationModel.setType(relationTypes.get(typeIndex));\r
updatePage();\r
}\r
});\r
\r
txtDesignationType = new Text(container, SWT.BORDER);\r
txtDesignationType.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));\r
- txtDesignationType.addKeyListener(new KeyListener() {\r
-\r
- @Override\r
- public void keyPressed(KeyEvent e) {}\r
-\r
+ txtDesignationType.addKeyListener(new KeyAdapter() {\r
@Override\r
public void keyReleased(KeyEvent e) {\r
updatePage();\r
} \r
});\r
+ \r
+ // Set text to specimen text if exists\r
+ if (typeDesignation != null && typeDesignation.getTypeSpecimen() != null) {\r
+ txtDesignationType.setText(typeDesignation.getTypeSpecimen().getTitleCache());\r
+ }\r
}\r
\r
@Override\r
}\r
\r
private void updatePage() {\r
+ \r
getWizard().getContainer().updateButtons();\r
}\r
+ \r
+ public void setPageComplete(boolean complete) {\r
+ super.setPageComplete(complete);\r
+ \r
+ if (complete) {\r
+ \r
+ TypeDesignationStatus status = typeStatusArray[statusCombo.getSelectionIndex()];\r
+// String specimenText = txtDesignationType.getText();\r
+ \r
+ Specimen specimen;\r
+ if (typeDesignation == null || typeDesignation.getTypeSpecimen() == null) {\r
+ specimen = Specimen.NewInstance(); \r
+ } else {\r
+ specimen = (Specimen) typeDesignation.getTypeSpecimen();\r
+ }\r
+ specimen.setTitleCache(txtDesignationType.getText());\r
+ \r
+ if (typeDesignation == null) {\r
+ name.addSpecimenTypeDesignation(specimen, status, null, null, null, true, true);\r
+ } else {\r
+ typeDesignation.setTypeStatus(status);\r
+ \r
+// if (typeDesignation.getTypeSpecimen() == null) {\r
+// typeDesignation.setTypeSpecimen(Specimen.NewInstance());\r
+// }\r
+// typeDesignation.getTypeSpecimen().setTitleCache(specimenText);\r
+ }\r
+ }\r
+ }\r
}\r
import org.eclipse.jface.viewers.IDoubleClickListener;\r
import org.eclipse.jface.viewers.StructuredSelection;\r
import org.eclipse.jface.viewers.TableViewer;\r
+import org.eclipse.jface.window.Window;\r
import org.eclipse.jface.wizard.Wizard;\r
import org.eclipse.jface.wizard.WizardDialog;\r
import org.eclipse.jface.wizard.WizardPage;\r
\r
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
-import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
-import eu.etaxonomy.taxeditor.actions.ui.OpenNameRelationWizardAction;\r
import eu.etaxonomy.taxeditor.controller.GlobalController;\r
import eu.etaxonomy.taxeditor.model.CdmUtil;\r
-import eu.etaxonomy.taxeditor.propertysheet.namerelationswizard.NameRelationWizard;\r
\r
/**\r
* @author p.ciardelli\r
super("");\r
this.name = name;\r
\r
- this.typeDesignationsList.addAll(name.getSpecimenTypeDesignations());\r
+// this.typeDesignationsList.addAll(name.getSpecimenTypeDesignations());\r
+ createDesignationList();\r
\r
setTitle("Type designations for \""\r
+ CdmUtil.getDisplayName(name) + "\".");\r
\r
private boolean isZoological = false;\r
private SpecimenTypeDesignation typeDesignation;\r
+ private TableViewer tableViewer;\r
\r
\r
public void createControl(Composite parent) {\r
btnRemove.addSelectionListener(new SelectionAdapter() {\r
public void widgetSelected(SelectionEvent e) {\r
if (getSelectedTypeDesignation() != null) {\r
-// new DeleteNameRelationAction(name, getSelectedRelation()).run();\r
typeDesignationsList.remove(getSelectedTypeDesignation());\r
setSelectedTypeDesignation(null);\r
}\r
}\r
});\r
\r
- final TableViewer tableViewer = new TableViewer(container, SWT.BORDER | SWT.SINGLE);\r
+ tableViewer = new TableViewer(container, SWT.BORDER | SWT.SINGLE);\r
\r
typeDesignationsTable = tableViewer.getTable();\r
typeDesignationsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,\r
true, 3, 1));\r
typeDesignationsTable.addSelectionListener(new SelectionAdapter() {\r
- public void widgetSelected(SelectionEvent e) {\r
- // TODO: As long as onNameBase.removeNameRelationship() doesn't work, "Remove" stays disabled ... \r
+ public void widgetSelected(SelectionEvent e) { \r
setEnableTypeDesignationButtons(true);\r
TableItem[] selectedItem = typeDesignationsTable.getSelection();\r
if (e.item.getData() instanceof SpecimenTypeDesignation) {\r
}\r
\r
private void createTypeDesignationWizard(SpecimenTypeDesignation typeDesignation) {\r
-// if (relation == null) {\r
-// new OpenNameRelationWizardAction(name, typeDesignationsList).run();\r
-// } else {\r
-// new OpenNameRelationWizardAction(name, relation).run();\r
-// }\r
+ Wizard wizard = new TypeDesignationWizard(typeDesignation, name);\r
\r
-// Wizard wizard = new TypeDesignationWizard(typeDesignation, name);\r
-// \r
-// WizardDialog dialog = new WizardDialog(GlobalController.getShell(), wizard);\r
-// dialog.create();\r
-// dialog.open();\r
+ WizardDialog dialog = new WizardDialog(GlobalController.getShell(), wizard);\r
+ dialog.create();\r
+ if (dialog.open() == Window.OK) {\r
+ createDesignationList();\r
+ }\r
}\r
\r
protected void setEnableTypeDesignationButtons(boolean enabled) {\r
}\r
\r
private String getTypeDesignationString(SpecimenTypeDesignation typeDesignation) {\r
- return "Placeholder";\r
+ String str = "";\r
+ if (typeDesignation.getTypeSpecimen() != null) {\r
+ str += typeDesignation.getTypeSpecimen().getTitleCache();\r
+ } else {\r
+ str += "UNDEFINED";\r
+ }\r
+ if (typeDesignation.getTypeStatus() != null) {\r
+ str += " [" + typeDesignation.getTypeStatus().getLabel() + "]";\r
+ }\r
+ \r
+ return str;\r
+ }\r
+ \r
+ private void createDesignationList() {\r
+ this.typeDesignationsList.clear();\r
+ this.typeDesignationsList.addAll(name.getSpecimenTypeDesignations());\r
}\r
\r
}\r
package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
\r
import org.apache.log4j.Logger;\r
-import org.eclipse.jface.wizard.IWizardPage;\r
import org.eclipse.jface.wizard.Wizard;\r
+import org.eclipse.jface.wizard.WizardPage;\r
\r
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
private SpecimenTypeDesignation typeDesignation;\r
private TaxonNameBase name;\r
\r
+ private WizardPage chooseNamePage;\r
+\r
/**\r
* @param typeDesignation\r
*/\r
* @see org.eclipse.jface.wizard.Wizard#addPages()\r
*/\r
public void addPages() {\r
- IWizardPage chooseNamePage = new ChooseTypeDesignationWizardPage(typeDesignation, name);\r
+ chooseNamePage = new ChooseTypeDesignationWizardPage(typeDesignation, name);\r
addPage(chooseNamePage);\r
}\r
\r
*/\r
@Override\r
public boolean performFinish() {\r
- // TODO Auto-generated method stub\r
- return false;\r
+ \r
+ chooseNamePage.setPageComplete(true);\r
+ \r
+ return true;\r
}\r
}\r
BGBM BDI Projects / taxeditor.git / commitdiff