From 34c889c910759cfddf38566d6b4daca1ec7d265d Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Mon, 26 Feb 2018 15:52:00 +0100
Subject: [PATCH] ref #7095 Fix column error when no unit was chosen for a
quant. feature
---
.../editor/workingSet/matrix/CharacterMatrix.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
index 59883a488..0f4064c18 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
@@ -890,13 +890,14 @@ public class CharacterMatrix extends Composite {
//show unit for quantitative data
if(feature.isSupportsQuantitativeData()){
Set recommendedMeasurementUnits = feature.getRecommendedMeasurementUnits();
- if(recommendedMeasurementUnits.size()!=1){
+ if(recommendedMeasurementUnits.size()>1){
MessagingUtils.warningDialog(Messages.CharacterMatrix_INIT_PROBLEM, CharacterMatrix.class,
String.format(Messages.CharacterMatrix_INIT_PROBLEM_MESSAGE, feature.getLabel()));
- return;
}
- MeasurementUnit unit = recommendedMeasurementUnits.iterator().next();
- featureLabel += " ["+unit.getIdInVocabulary()+"]"; //$NON-NLS-1$ //$NON-NLS-2$
+ if(recommendedMeasurementUnits.size()==1){
+ MeasurementUnit unit = recommendedMeasurementUnits.iterator().next();
+ featureLabel += " ["+unit.getIdInVocabulary()+"]"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
}
propertyToLabelMap.put(property, featureLabel);
}
--
2.34.1