Updated dependencies
Change-Id: Ic3aa86d75d84e1e1455eb737776b5ba840ad8a75
diff --git a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
index f635afb..49ffcbd 100644
--- a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@
Require-Bundle: org.eclipse.uomo.core;bundle-version="0.1.0",
org.eclipse.uomo.util;bundle-version="0.2.6",
org.eclipse.uomo.xml;bundle-version="0.2.0",
- org.apache.commons.lang;bundle-version="2.3.0"
+ org.apache.commons.lang;bundle-version="2.3.0",
+ tech.units.indriya;bundle-version="1.3.0"
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/impl/UcumConverter.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/impl/UcumConverter.java
index af6f781..8074fec 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/impl/UcumConverter.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/impl/UcumConverter.java
@@ -17,6 +17,7 @@
import static org.eclipse.uomo.ucum.model.ConceptKind.*;
import static org.eclipse.uomo.ucum.expression.Operator.*;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.math.MathContext;
import java.util.ArrayList;
@@ -45,7 +46,7 @@
* @author Grahame Grieve
* @author Werner Keil
*/
-class UcumConverter extends AbstractConverter {
+class UcumConverter implements UnitConverter, Serializable, Comparable<UnitConverter> {
/**
*
@@ -300,10 +301,10 @@
return compound.convert(value);
}
- public BigDecimal convert(BigDecimal value, MathContext ctx)
- throws ArithmeticException {
- return ((AbstractConverter)compound).convert(value, ctx);
- }
+// public BigDecimal convert(BigDecimal value, MathContext ctx)
+// throws ArithmeticException {
+// return ((AbstractConverter)compound).convert(value, ctx);
+// }
public List<UnitConverter> getCompoundConverters() {
final List<UnitConverter> compound = new ArrayList<UnitConverter>();
@@ -338,4 +339,16 @@
// TODO Auto-generated method stub
return 0;
}
+
+ @Override
+ public int compareTo(UnitConverter o) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public List<? extends UnitConverter> getConversionSteps() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/Value.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/Value.java
index b536e9f..1f67fa9 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/Value.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/model/Value.java
@@ -89,5 +89,59 @@
*/
public Unit<Q> unit() {
return realUnit;
+ }
+
+ @Override
+ public Quantity<Q> add(Quantity<Q> augend) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Quantity<Q> subtract(Quantity<Q> subtrahend) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Quantity<?> divide(Quantity<?> divisor) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Quantity<Q> divide(Number divisor) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Quantity<?> multiply(Quantity<?> multiplier) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Quantity<Q> multiply(Number multiplier) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Quantity<?> inverse() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Quantity<Q> to(Unit<Q> unit) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <T extends Quantity<T>> Quantity<T> asType(Class<T> type) throws ClassCastException {
+ // TODO Auto-generated method stub
+ return null;
}
}
