BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[taxeditor.git]
/
eu.etaxonomy.taxeditor.store
/
src
/
main
/
java
/
eu
/
etaxonomy
/
taxeditor
/
ui
/
section
/
name
/
NameRelationshipWizardPage.java
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
index 9da995803be73d84180325ddb9ebd27d29a17aa0..e8729b142a288192ac448261363493dde09cef89 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
@@
-13,12
+13,14
@@
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
+import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
import eu.etaxonomy.cdm.model.name.NameRelationship;
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.name.NameRelationship;
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
import eu.etaxonomy.cdm.model.name.TaxonName;
+import eu.etaxonomy.cdm.model.term.TermRelationshipType;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.ui.AbstractEntityCollectionElementWizardPage;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.ui.AbstractEntityCollectionElementWizardPage;
-import eu.etaxonomy.taxeditor.ui.combo.
Name
RelationshipTypeCombo;
+import eu.etaxonomy.taxeditor.ui.combo.RelationshipTypeCombo;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
@@
-35,11
+37,11
@@
public class NameRelationshipWizardPage extends AbstractEntityCollectionElementW
private EntitySelectionElement<TaxonName> selection_relatedTo;
private EntitySelectionElement<TaxonName> selection_relatedTo;
- private
Name
RelationshipTypeCombo combo_relationshipType;
+ private RelationshipTypeCombo combo_relationshipType;
private final TaxonName entity;
private final TaxonName entity;
- private
NameRelationshipTyp
e type;
+ private
RelationshipTermBas
e type;
private TaxonName relatedName;
boolean inverse;
private TaxonName relatedName;
boolean inverse;
@@
-82,9
+84,7
@@
public class NameRelationshipWizardPage extends AbstractEntityCollectionElementW
selection_relatedTo = formFactory
selection_relatedTo = formFactory
- .createSelectionElement(TaxonName.class,
- ((NameRelationshipWizard) getWizard())
- .getConversationHolder(), rootElement,
+ .createSelectionElement(TaxonName.class, rootElement,
"",this.entity, EntitySelectionElement.ALL,
SWT.NULL, true);
"",this.entity, EntitySelectionElement.ALL,
SWT.NULL, true);
@@
-100,9
+100,9
@@
public class NameRelationshipWizardPage extends AbstractEntityCollectionElementW
public NameRelationship getNameRelationship() {
NameRelationship rel;
if (inverse){
public NameRelationship getNameRelationship() {
NameRelationship rel;
if (inverse){
- rel = entity.addRelationshipFromName(relatedName, type, null, null, null, null);
+ rel = entity.addRelationshipFromName(relatedName,
(NameRelationshipType)
type, null, null, null, null);
}else{
}else{
- rel = entity.addRelationshipToName(relatedName, type, null, null, null, null);
+ rel = entity.addRelationshipToName(relatedName,
(NameRelationshipType)
type, null, null, null, null);
}
return rel;
}
}
return rel;
}
@@
-114,11
+114,12
@@
public class NameRelationshipWizardPage extends AbstractEntityCollectionElementW
return;
}
Object eventSource = event.getSource();
return;
}
Object eventSource = event.getSource();
- if (eventSource == combo_relationshipType) {
-
type = combo_relationshipType.getSelection().getTerm();
+ if (eventSource == combo_relationshipType
&& combo_relationshipType.getSelection() != null
) {
+ type = combo_relationshipType.getSelection().getTerm();
this.inverse = combo_relationshipType.getSelection().isInverse();
} else if (eventSource == selection_relatedTo) {
relatedName = selection_relatedTo.getEntity();
this.inverse = combo_relationshipType.getSelection().isInverse();
} else if (eventSource == selection_relatedTo) {
relatedName = selection_relatedTo.getEntity();
+
}
boolean complete = type != null && relatedName != null;
}
boolean complete = type != null && relatedName != null;