Added ICU
Signed-off-by: Werner Keil <werner.keil@gmx.net>
diff --git a/bundles/org.eclipse.uomo.icu/.classpath b/bundles/org.eclipse.uomo.icu/.classpath
index 6d1821e..774a33f 100644
--- a/bundles/org.eclipse.uomo.icu/.classpath
+++ b/bundles/org.eclipse.uomo.icu/.classpath
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/java/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/HelloUnits.java b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/HelloUnits.java
index 021ee3b..6dfbd2a 100644
--- a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/HelloUnits.java
+++ b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/HelloUnits.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2005, 2020, Werner Keil and others.
+ * Copyright (c) 2005, 2022, Werner Keil and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,13 +20,12 @@
import si.uom.SI;
import systems.uom.common.USCustomary;
-import tech.units.indriya.ComparableQuantity;
import tech.units.indriya.quantity.Quantities;
/**
* A 'Hello World!' style example showing some basic units and operations.
* @author Werner Keil
- * @version 0.8
+ * @version 1.0
*/
public class HelloUnits {
@@ -34,7 +33,7 @@
* @param args
*/
public static void main(String[] args) {
- ComparableQuantity length = Quantities.getQuantity(10, SI.METRE);
+ Quantity<Length> length = Quantities.getQuantity(10, SI.METRE);
// LengthAmount length = new LengthAmount(10, SI.KILOGRAM); // this won't work ;-)
System.out.println(length);
@@ -48,7 +47,7 @@
System.out.println(" " + USCustomary.INCH);
@SuppressWarnings("unchecked")
- ComparableQuantity area = Quantities.getQuantity(length.getValue().doubleValue() * length.getValue().doubleValue(),
+ Quantity<Area> area = Quantities.getQuantity(length.getValue().doubleValue() * length.getValue().doubleValue(),
(Unit<Area>) length.getUnit().multiply(SI.METRE));
System.out.println(area);
diff --git a/features/org.eclipse.uomo.feature/feature.xml b/features/org.eclipse.uomo.feature/feature.xml
index 6f139ed..4c185cd 100644
--- a/features/org.eclipse.uomo.feature/feature.xml
+++ b/features/org.eclipse.uomo.feature/feature.xml
@@ -147,12 +147,11 @@
<import plugin="org.eclipse.uomo.core" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.uomo.util" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.uomo.xml" version="0.9.0" match="greaterOrEqual"/>
-
<import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi.services" version="3.2.100" match="greaterOrEqual"/>
</requires>
-
+
<plugin
id="org.eclipse.uomo.util"
download-size="0"
@@ -195,4 +194,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.uomo.icu"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>