Changeset 4632

Timestamp:

Nov 7, 2008, 2:46:52 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #792: Add support for units to annotation values

Fixes a permission problem with annotation flat file importer that doesn't try to use units, but still receieved a PermissionDeniedException?

File:

• trunk/src/core/net/sf/basedb/core/Annotation.java (modified) (4 diffs)

trunk/src/core/net/sf/basedb/core/Annotation.java

@@ -403 +403 @@
     checkPermission(Permission.WRITE);
     AnnotationType annotationType = getAnnotationType();
-    if (unit == null) unit = annotationType.getDefaultUnit();
-    UnitConverter converter = getUnitConverter(unit);
-    if (converter != null && value instanceof Number)
-    {
-      value = converter.convertToReferenceUnit(((Number)value).doubleValue());
+    UnitConverter converter = null;
+    if (annotationType.supportUnits() && unit != null)
+    {
+      converter = getUnitConverter(unit);
+      if (converter != null && value instanceof Number)
+      {
+        value = converter.convertToReferenceUnit(((Number)value).doubleValue());
+      }
     }
     annotationType.validateAnnotationValue(value);
-    if (unit != null) getData().setUnit(unit.getData());
+    if (annotationType.supportUnits())
+    {
+      getData().setUnit(unit == null ? annotationType.getData().getDefaultUnit() : unit.getData());
+    }
     getData().getValues().setSingleValue(Values.getDataValue(value));
   }
@@ -439 +445 @@
     checkPermission(Permission.WRITE);
     AnnotationType annotationType = getAnnotationType();
-    if (unit == null) unit = annotationType.getDefaultUnit();
     int multiplicity = annotationType.getMultiplicity();
     if (multiplicity > 0 && values.size() > multiplicity)
@@ -445 +450 @@
       throw new InvalidDataException("Too many values. Max "+multiplicity+" value(s) are allowed for this annotation type");
     }
-    UnitConverter converter = getUnitConverter(unit);
+    UnitConverter converter = null;
+    if (annotationType.supportUnits() && unit != null)
+    {
+      converter = getUnitConverter(unit);
+    }
     List<Object> convertedValues = new ArrayList<Object>(values.size());
     Type valueType = getValueType();
@@ -457 +466 @@
       convertedValues.add(value);
     }
-    if (unit != null) getData().setUnit(unit.getData());
+    if (annotationType.supportUnits())
+    {
+      getData().setUnit(unit == null ? annotationType.getData().getDefaultUnit() : unit.getData());
+    }
     getData().getValues().replaceValues(Values.getDataValues(convertedValues));
   }