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 (parent:
de83ea1
)
Create taxon/parse name when wizard is closed and not with every key
author
Patrick Plitzner
<p.plitzner@bgbm.org>
Wed, 13 Apr 2016 14:05:31 +0000
(16:05 +0200)
committer
Patrick Plitzner
<p.plitzner@bgbm.org>
Wed, 13 Apr 2016 14:05:31 +0000
(16:05 +0200)
stroke #5605
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
index 0586c53f074be26348bfa04cbb772f66e1e6ccfd..e8dfc554796b2e2cdc33fdde7584a4a94cecef6c 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@
-48,12
+48,12
@@
public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITaxonTreeNode>{
@Override
protected void saveEntity() {
@Override
protected void saveEntity() {
- if(taxonNodePage.getTaxon() == null || StringUtils.isEmpty(taxonNodePage.getTaxon().getName().getFullTitleCache())){
+ Taxon taxon = taxonNodePage.createTaxon();
+ if(taxon == null || StringUtils.isEmpty(taxon.getName().getFullTitleCache())){
openEmptyEditor = true;
}else{
getConversationHolder().bind();
ITaxonTreeNode parent = getParentTreeNode();
openEmptyEditor = true;
}else{
getConversationHolder().bind();
ITaxonTreeNode parent = getParentTreeNode();
- Taxon taxon = taxonNodePage.getTaxon();
Reference sec = taxon.getSec();
taxon.setSec(null);
try{
Reference sec = taxon.getSec();
taxon.setSec(null);
try{
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index 5ac40f536071de654a8df5356bf562f4269081a4..6d347db6260973ab52da57d8d5cfdb5298475ba4 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@
-11,6
+11,7
@@
package eu.etaxonomy.taxeditor.ui.section.classification;
import org.apache.commons.lang.StringUtils;
package eu.etaxonomy.taxeditor.ui.section.classification;
import org.apache.commons.lang.StringUtils;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import eu.etaxonomy.cdm.common.CdmUtils;
import org.eclipse.swt.widgets.Text;
import eu.etaxonomy.cdm.common.CdmUtils;
@@
-22,7
+23,6
@@
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.parser.ParseHandler;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@
-55,8
+55,6
@@
public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeN
private Taxon taxon;
private Taxon taxon;
- private Reference secReference;
-
private TextWithLabelElement textNewTaxonName;
private TaxonNodeAgentRelationCollectionSection selectionNodeAgentRelation;
private TextWithLabelElement textNewTaxonName;
private TaxonNodeAgentRelationCollectionSection selectionNodeAgentRelation;
@@
-170,8
+168,6
@@
public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeN
setClassification(selection_classification.getEntity());
} else if (eventSource == selection_parentTaxonNode) {
setParentTreeNode(selection_parentTaxonNode.getEntity());
setClassification(selection_classification.getEntity());
} else if (eventSource == selection_parentTaxonNode) {
setParentTreeNode(selection_parentTaxonNode.getEntity());
- } else if (eventSource == selection_SecRef) {
- setSecReference(selection_SecRef.getEntity());
} else if (eventSource == selection_reuseExistingTaxon) {
boolean enabled = selection_reuseExistingTaxon.getEntity() == null;
selection_reuseExistingName.setEnabled(enabled);
} else if (eventSource == selection_reuseExistingTaxon) {
boolean enabled = selection_reuseExistingTaxon.getEntity() == null;
selection_reuseExistingName.setEnabled(enabled);
@@
-203,7
+199,6
@@
public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeN
selection_reuseExistingTaxon.setEnabled(enabled);
selection_reuseExistingName.setEnabled(enabled);
selection_reuseExistingTaxon.setEnabled(enabled);
selection_reuseExistingName.setEnabled(enabled);
- setTaxon(textNewTaxonName.getText());
complete = !textNewTaxonName.getText().isEmpty();
} else if (eventSource == checkbox_openInEditor) {
setOpenInEditor(checkbox_openInEditor.getSelection());
complete = !textNewTaxonName.getText().isEmpty();
} else if (eventSource == checkbox_openInEditor) {
setOpenInEditor(checkbox_openInEditor.getSelection());
@@
-229,10
+224,6
@@
public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeN
return parentTreeNode;
}
return parentTreeNode;
}
- public Taxon getTaxon() {
- return taxon;
- }
-
private void setClassification(Classification classification) {
this.classification = classification;
setParentTreeNode(classification);
private void setClassification(Classification classification) {
this.classification = classification;
setParentTreeNode(classification);
@@
-268,11
+259,6
@@
public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeN
selection_SecRef.setEntity(((TaxonNode)treeNode).getTaxon().getSec());
}
selection_SecRef.setEntity(((TaxonNode)treeNode).getTaxon().getSec());
}
- private void setSecReference(Reference secRef){
- this.secReference = secRef;
- setTaxon(textNewTaxonName.getText());
- }
-
private void setTaxon(Taxon taxon) {
this.taxon = taxon;
if (isCreateNew()){
private void setTaxon(Taxon taxon) {
this.taxon = taxon;
if (isCreateNew()){
@@
-281,24
+267,12
@@
public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeN
selection_SecRef.setEntity(taxon.getSec());
}
selection_SecRef.setEntity(taxon.getSec());
}
- private void setTaxon(String taxonNameString) {
- TaxonNameBase taxonName = ParseHandler.parseReferencedName(
- taxonNameString, null);
- setTaxon(taxonName);
- }
-
private void setTaxon(TaxonNameBase taxonName) {
Reference secundum = null;
if (getParentTreeNode() != null) {
if (this.selection_SecRef.getEntity() != null){
secundum = this.selection_SecRef.getEntity();
private void setTaxon(TaxonNameBase taxonName) {
Reference secundum = null;
if (getParentTreeNode() != null) {
if (this.selection_SecRef.getEntity() != null){
secundum = this.selection_SecRef.getEntity();
- } /*else if (getParentTreeNode() instanceof Classification) {
- secundum = ((Classification) getParentTreeNode())
- .getReference();
- } else if (getParentTreeNode() instanceof TaxonNode) {
- secundum = ((TaxonNode) getParentTreeNode()).getTaxon()
- .getSec();
- }*/
+ }
}
if (taxonName != null){
taxon = Taxon.NewInstance(taxonName, secundum);
}
if (taxonName != null){
taxon = Taxon.NewInstance(taxonName, secundum);
@@
-314,10
+288,18
@@
public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeN
this.openInEditor = openInEditor;
}
this.openInEditor = openInEditor;
}
- public
TextWithLabelElement getTextNew
TaxonName() {
- return textNewTaxonName;
+ public
String get
TaxonName() {
+ return textNewTaxonName
.getText()
;
}
}
+ public Reference getReference(){
+ return selection_SecRef.getSelection();
+ }
+
+ public Control getMainControl(){
+ return textNewTaxonName.getMainControl();
+ }
+
public boolean isComplete() {
boolean allComplete = true;
if (!isCreateNew()){
public boolean isComplete() {
boolean allComplete = true;
if (!isCreateNew()){
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
index 62d95788b0a643f6d1e38aca7021ce9a95b52bd1..f6e7a300d1b1105c24fe6edcf6364eadc497ff46 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
@@
-16,9
+16,12
@@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import org.eclipse.swt.widgets.Listener;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.newWizard.IWizardPageListener;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.newWizard.IWizardPageListener;
+import eu.etaxonomy.taxeditor.parser.ParseHandler;
import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@
-75,7
+78,7
@@
public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITaxonTreeN
detailElement.setEntity(entity);
formFactory.addPropertyChangeListener(this);
if (isCreateNew){
detailElement.setEntity(entity);
formFactory.addPropertyChangeListener(this);
if (isCreateNew){
- detailElement.get
TextNewTaxonName().get
MainControl().addListener(SWT.KeyDown, this);
+ detailElement.getMainControl().addListener(SWT.KeyDown, this);
}
return detailElement;
}
}
return detailElement;
}
@@
-112,7
+115,7
@@
public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITaxonTreeN
setMessage("No classification set.", WARNING);
}
else if(isCreateNew ){
setMessage("No classification set.", WARNING);
}
else if(isCreateNew ){
- if(detailElement.getT
extNewTaxonName().getText
().isEmpty()){
+ if(detailElement.getT
axonName
().isEmpty()){
setMessage("No taxon name set.", ERROR);
} else{
setMessage(null);
setMessage("No taxon name set.", ERROR);
} else{
setMessage(null);
@@
-144,8
+147,11
@@
public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITaxonTreeN
.getParentTreeNode();
}
.getParentTreeNode();
}
- public Taxon getTaxon() {
- return ((TaxonNodeDetailElement) getDetailElement()).getTaxon();
+ public Taxon createTaxon() {
+ String taxonName = ((TaxonNodeDetailElement) getDetailElement()).getTaxonName();
+ Reference reference = ((TaxonNodeDetailElement) getDetailElement()).getReference();
+ NonViralName parseReferencedName = ParseHandler.parseReferencedName(taxonName, null);
+ return Taxon.NewInstance(parseReferencedName, reference);
}
/*
}
/*
@@
-163,7
+169,7
@@
public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITaxonTreeN
@Override
public void handleEvent(Event event) {
TaxonNodeDetailElement detailElement = (TaxonNodeDetailElement) getDetailElement();
@Override
public void handleEvent(Event event) {
TaxonNodeDetailElement detailElement = (TaxonNodeDetailElement) getDetailElement();
- if(event.widget == detailElement.get
TextNewTaxonName().get
MainControl()
+ if(event.widget == detailElement.getMainControl()
&& event.keyCode == SWT.CR && isPageComplete()){
wizardPageListener.close();
}
&& event.keyCode == SWT.CR && isPageComplete()){
wizardPageListener.close();
}