341846: Better Formatting of Prefixes for certain Units
Change-Id: I5612fd613122c9e9e82354d6a7378b65327c77d3
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=341846
diff --git a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
index ae8f156..9af0128 100644
--- a/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.uomo.ucum/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@
tec.uom.se.function,
tec.uom.se.quantity,
tec.uom.se.spi,
- tec.uom.se.unit
+ tec.uom.se.unit,
+ systems.uom.quantity
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",
diff --git a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/SpecialUnitRegistry.java b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/SpecialUnitRegistry.java
index 6b34a84..9acfc7b 100644
--- a/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/SpecialUnitRegistry.java
+++ b/bundles/org.eclipse.uomo.ucum/src/main/java/org/eclipse/uomo/ucum/special/SpecialUnitRegistry.java
@@ -17,6 +17,7 @@
import java.util.Map;
import org.eclipse.uomo.util.Registry;
+import systems.uom.quantity.InformationRate;
@SuppressWarnings("rawtypes")
public class SpecialUnitRegistry implements Registry<SpecialUnitHandler> {
@@ -47,7 +48,7 @@
register(new HoldingHandler("B[uV]", "uV"));
register(new HoldingHandler("B[W]", "W"));
register(new HoldingHandler("B[kW]", "kW"));
-// register(new HoldingHandler<InformationRate>("bit_s", "1")); FIXME add systems-quantity
+ register(new HoldingHandler<InformationRate>("bit_s", "1")); //FIXME add systems-quantity
}
public boolean exists(String code) {
diff --git a/releng/org.eclipse.uomo.target/indigo.target b/releng/org.eclipse.uomo.target/indigo.target
deleted file mode 100644
index ee09d91..0000000
--- a/releng/org.eclipse.uomo.target/indigo.target
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Target Platform for the Eclipse UOMo project" sequenceNumber="23">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4WsRkue-4Vq4J6pCyW"/>
-<repository location="http://download.eclipse.org/releases/indigo/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.ibm.icu" version="50.1.1.v201304230130"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.uomo.target/mars.target b/releng/org.eclipse.uomo.target/mars.target
index 3a76325..ba32ba0 100644
--- a/releng/org.eclipse.uomo.target/mars.target
+++ b/releng/org.eclipse.uomo.target/mars.target
@@ -53,5 +53,12 @@
<unit id="org.slf4j.log4j" version="1.7.2.v20130115-1340"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="javax.measure.unit-api" version="0.0.0"/>
+ <unit id="tec.uom.lib.uom-lib-common" version="0.0.0"/>
+ <unit id="tec.uom.se" version="0.0.0"/>
+ <unit id="systems.uom.systems-quantity" version="0.0.0"/>
+ <repository location="https://dl.bintray.com/unitsofmeasurement/p2/systems.uom_p2_site/0.7"/>
+ </location>
</locations>
</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.uomo.target/neon.target b/releng/org.eclipse.uomo.target/neon.target
index 93b71d6..fbc717b 100644
--- a/releng/org.eclipse.uomo.target/neon.target
+++ b/releng/org.eclipse.uomo.target/neon.target
@@ -1,27 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="UOMo for Eclipse Neon" sequenceNumber="1492180497">
<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.10.2.v20150204-1316"/>
- <repository location="http://download.eclipse.org/releases/luna/201502271000"/>
-</location>
- <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.10.2.v20150204-1316"/>
+ <repository location="http://download.eclipse.org/releases/luna/201502271000"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.measure.unit-api" version="0.0.0"/>
<unit id="tec.uom.lib.uom-lib-common" version="0.0.0"/>
<unit id="tec.uom.se" version="0.0.0"/>
- <repository location="http://download.eclipse.org/uomo/third-party/repository"/>
+ <unit id="systems.uom.systems-quantity" version="0.0.0"/>
+ <repository location="https://dl.bintray.com/unitsofmeasurement/p2/systems.uom_p2_site/0.7"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.uomo.target/oxygen.target b/releng/org.eclipse.uomo.target/oxygen.target
index 9358bae..f9730ca 100644
--- a/releng/org.eclipse.uomo.target/oxygen.target
+++ b/releng/org.eclipse.uomo.target/oxygen.target
@@ -49,6 +49,7 @@
<unit id="tec.uom.lib.uom-lib-common.source" version="0.0.0"/>
<unit id="tec.uom.se" version="0.0.0"/>
<unit id="tec.uom.se.source" version="0.0.0"/>
+ <unit id="systems.uom.systems-quantity" version="0.0.0"/>
<repository location="http://unitsofmeasurement.github.io/third-party/target/repository"/>
</location>
-->
