From: n.hoffmann <n.hoffmann@localhost>
Date: Mon, 23 Jan 2012 10:58:24 +0000 (+0000)
Subject: Fixes #2740
X-Git-Tag: 3.6.0~1111
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b4d3bce00e8289b15b7d3f3a02dd58d8bfe19c17

Fixes #2740
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
index 118e915f0..2f90fbb2f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
@@ -9,15 +9,11 @@
 */
 package eu.etaxonomy.taxeditor.ui.section.vocabulary;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.Marker;
-import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermBasePropertyTester;
+import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
@@ -34,6 +30,7 @@ public abstract class AbstractTermBaseDetailElement<T extends TermBase> extends
 	protected TextWithLabelElement text_label;
 	protected TextWithLabelElement text_description;
 	protected UriWithLabelElement uri_uri;
+	protected TextWithLabelElement text_abbreviatedLabel;
 	
 	/**
 	 * @param formFactory
@@ -50,9 +47,17 @@ public abstract class AbstractTermBaseDetailElement<T extends TermBase> extends
 	@Override
 	protected void createControls(ICdmFormElement formElement,
 			T entity, int style) {
-		text_label = formFactory.createTextWithLabelElement(formElement, "Label", getEntity().getLabel(), style);
+		Representation representation = getEntity().getRepresentation(CdmStore.getDefaultLanguage());
+		
+		if(representation == null){
+			formFactory.createLabel(formElement, "No represantation for the current default Language");
+			return;
+		}
+		
+		text_label = formFactory.createTextWithLabelElement(formElement, "Label", representation.getLabel(), style);
+		text_abbreviatedLabel = formFactory.createTextWithLabelElement(formElement, "Abbrev. Label", representation.getAbbreviatedLabel(), style);
 		text_description = formFactory.createMultilineTextWithLabel(formElement, "Description", 100, style);
-		text_description.setText(getEntity().getDescription());
+		text_description.setText(representation.getDescription());
 		uri_uri = formFactory.createUriWithLabelElement(formElement, "URI", getEntity().getUri(), style);
 		
 	}
@@ -62,6 +67,22 @@ public abstract class AbstractTermBaseDetailElement<T extends TermBase> extends
 		super.setEntity(entity);
 		setEnabled(TermBasePropertyTester.isModifiable(entity));
 	}
+	
+	protected void handleRepresentation(Object eventSource){
+		Representation representation = getEntity().getRepresentation(CdmStore.getDefaultLanguage());
+		
+		if (representation == null){
+			return;
+		}
+		
+		if (eventSource == text_label){
+			representation.setLabel(text_label.getText());
+		}else if (eventSource == text_abbreviatedLabel){
+			representation.setAbbreviatedLabel(text_abbreviatedLabel.getText());
+		}else if (eventSource == text_description){
+			representation.setText(text_description.getText());
+		}
+	}
 
 	public abstract TermVocabulary getVocabulary();
 		
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
index 5c210aecd..98945bfe1 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
@@ -13,6 +13,7 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 
@@ -37,12 +38,7 @@ public class DefinedTermDetailElement<T extends DefinedTermBase> extends Abstrac
 	 */
 	@Override
 	public void handleEvent(Object eventSource) {
-		if (eventSource == text_label){
-			getEntity().setLabel(text_label.getText());
-		}else if (eventSource == text_description){
-			Representation representation = getEntity().getRepresentation(Language.DEFAULT());
-			representation.setText(text_description.getText());
-		}
+		handleRepresentation(eventSource);
 	}
 
 	/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java
index a4dabeef1..1cbaa5c96 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java
@@ -10,13 +10,12 @@
 package eu.etaxonomy.taxeditor.ui.section.vocabulary;
 
 import java.net.URISyntaxException;
-import java.util.HashSet;
-import java.util.Set;
 
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.UriWithLabelElement;
@@ -46,7 +45,7 @@ public class TermVocabularyDetailElement extends AbstractTermBaseDetailElement<T
 			TermVocabulary entity, int style) {
 		
 		super.createControls(formElement, entity, style);
-		uri_uriTermSource = formFactory.createUriWithLabelElement(formElement, "URI Term Source", getEntity().getTermSourceUri(), style);
+		uri_uriTermSource = formFactory.createUriWithLabelElement(formElement, "Term Source URI", getEntity().getTermSourceUri(), style);
 	}
 
 	/* (non-Javadoc)
@@ -55,27 +54,19 @@ public class TermVocabularyDetailElement extends AbstractTermBaseDetailElement<T
 	@Override
 	public void handleEvent(Object eventSource) {
 		
-		if (eventSource == text_label) {
-			getEntity().setLabel(text_label.getText());
-			getEntity().setTitleCache(null);
-		} else if (eventSource == text_description) {
-			
-			Representation representation = getEntity().getRepresentation(Language.DEFAULT());
-			representation.setText(text_description.getText());
-		} else if (eventSource == uri_uri) {
-			
+		handleRepresentation(eventSource);
+		
+		if (eventSource == uri_uri) {
 			try {
 				getEntity().setUri(uri_uri.getUri());
 			} catch (URISyntaxException e) {
-				
-				e.printStackTrace();
+				StoreUtil.errorDialog("Not a URI", getClass(), "You have to provide a valid URI");
 			}
 		} else if (eventSource == uri_uriTermSource) {
 			try {
 				getEntity().setTermSourceUri(uri_uriTermSource.getUri());
 			} catch (URISyntaxException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				StoreUtil.errorDialog("Not a URI", getClass(), "You have to provide a valid URI");
 			}
 		}
 	}