Added new examples from Eclipse Days

9 files changed, 166 insertions, 69 deletions

diff --git a/examples/units/org.eclipse.uomo.examples.units.android/web/.classpath b/examples/units/org.eclipse.uomo.examples.units.android/web/.classpath
index 43b7c61..050e3de 100644
--- a/examples/units/org.eclipse.uomo.examples.units.android/web/.classpath
+++ b/examples/units/org.eclipse.uomo.examples.units.android/web/.classpath
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" output="target/classes" path="src/main/java">

-		<attributes>

-			<attribute name="optional" value="true"/>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 7.0 Runtime"/>

-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">

-		<attributes>

-			<attribute name="optional" value="true"/>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">

-		<attributes>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

 		<attributes>

-			<attribute name="maven.pomderived" value="true"/>

 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>

 		</attributes>

 	</classpathentry>

+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 7.0 Runtime"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/examples/units/org.eclipse.uomo.examples.units.console/.classpath b/examples/units/org.eclipse.uomo.examples.units.console/.classpath
index ebd7da3..40cc8ea 100644
--- a/examples/units/org.eclipse.uomo.examples.units.console/.classpath
+++ b/examples/units/org.eclipse.uomo.examples.units.console/.classpath
@@ -1,37 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" output="target/classes" path="src/main/java">

-		<attributes>

-			<attribute name="optional" value="true"/>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

-		<attributes>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">

-		<attributes>

-			<attribute name="optional" value="true"/>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">

-		<attributes>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>

+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>

+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>

+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">

-		<attributes>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

-		<attributes>

-			<attribute name="maven.pomderived" value="true"/>

-		</attributes>

-	</classpathentry>

 	<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/Demo.java b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/Demo.java
index 57006cb..9749bfb 100644
--- a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/Demo.java
+++ b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/Demo.java
@@ -13,6 +13,7 @@ package org.eclipse.uomo.examples.units.console;
 import static org.eclipse.uomo.units.SI.*;

 import static org.eclipse.uomo.units.SI.Prefix.*;

 import static org.eclipse.uomo.units.impl.system.USCustomary.FOOT;

+import static org.eclipse.uomo.examples.units.types.ObsoletePolish.*;

 

 import org.eclipse.uomo.units.IMeasure;

 import org.eclipse.uomo.units.impl.quantity.LengthAmount;

@@ -51,9 +52,9 @@ public class Demo {
 

     public static void main(String[] args) {

     	IMeasure<Length> someLength = getSomeLength();

-        System.out.println("toString = " + someLength);

+        System.out.println("l = " + someLength);

         IMeasure<Length> moreLength = getMoreLength();

-        System.out.println("toString2 = " + moreLength);

+        System.out.println("l2 = " + moreLength);

         System.out.println();

 

         IMeasure<Mass> someMass = getSomeMass();

@@ -71,6 +72,10 @@ public class Demo {
         IMeasure<Length> convertedLength = moreLength.to(FOOT);

         System.out.println("converted = " + convertedLength);

         

+       IMeasure<Length> convertedLengthPL = moreLength.to(ELL);

+       System.out.println("converted (PL) = " + convertedLengthPL);

+        

+        

         System.out.println();

         someLength = new LengthAmount(1, MILLI(METRE));

         System.out.println("len1 = " + someLength);

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 4254cd9..7b9a9f8 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, 2011, Werner Keil and others.

+ * Copyright (c) 2005, 2012, 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

@@ -10,13 +10,10 @@
  */

 package org.eclipse.uomo.examples.units.console;

 

-import static org.eclipse.uomo.units.SI.Prefix.KILO;

-

 import org.eclipse.uomo.units.IMeasure;

 import org.eclipse.uomo.units.SI;

 import org.eclipse.uomo.units.impl.quantity.AreaAmount;

 import org.eclipse.uomo.units.impl.quantity.LengthAmount;

-import org.eclipse.uomo.units.impl.quantity.MassAmount;

 import org.eclipse.uomo.units.impl.quantity.TimeAmount;

 import org.eclipse.uomo.units.impl.system.USCustomary;

 import org.unitsofmeasurement.unit.Unit;

@@ -50,14 +47,6 @@ public class HelloUnits {
 				(Unit<Area>) length.unit().multiply(SI.METRE));

 		System.out.println(area);

 		

-		// TODO Bug 338334 this could be a JUnit test, convert into after issue resolved.

-		MassAmount mass = new MassAmount(1000, SI.GRAM);

-		MassAmount mass2 = new MassAmount(1, SI.KILOGRAM);

-		MassAmount mass3 = new MassAmount(1, KILO(SI.GRAM));

-		System.out.println(mass.equals(mass2) + 

-				"; " + mass.equals(mass3) +

-				"; " + mass2.equals(mass3));

-		

 		// Equivalent to 

 		IMeasure<Length> meters = new LengthAmount(5, SI.METRE);

 		IMeasure<Time> secs = new TimeAmount(2, SI.SECOND);

diff --git a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/Messages.java b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/Messages.java
new file mode 100644
index 0000000..97d5033
--- /dev/null
+++ b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/Messages.java
@@ -0,0 +1,32 @@
+/**

+ * Copyright (c) 2005, 2011, 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

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Werner Keil - initial API and implementation

+ */

+package org.eclipse.uomo.examples.units.console;

+

+import org.eclipse.osgi.util.NLS;

+

+public class Messages extends NLS {

+	private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$

+	public static String Planet_Radius;

+	public static String Planet_SurfaceGravity;

+	public static String Planet_Usage;

+	public static String Planet_SurfaceWeight;

+	public static String REP_100mR;

+	public static String REP_1R;

+	public static String REP_2dot5R;

+	

+	static {

+		// initialize resource bundle

+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

+	}

+

+	private Messages() {

+	}

+}

diff --git a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/EqualsTest.java b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/EqualsTest.java
new file mode 100644
index 0000000..132805a
--- /dev/null
+++ b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/EqualsTest.java
@@ -0,0 +1,28 @@
+/**

+ * Copyright (c) 2012, 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

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Werner Keil - initial API and implementation

+ */

+package org.eclipse.uomo.examples.units.console.sandbox;

+

+import static org.eclipse.uomo.units.SI.Prefix.KILO;

+

+import org.eclipse.uomo.units.SI;

+import org.eclipse.uomo.units.impl.quantity.MassAmount;

+

+public class EqualsTest {

+	public static void main(String[] args) {

+		// TODO Bug 338334 this could be a JUnit test, convert into after issue

+		// resolved.

+		MassAmount mass = new MassAmount(1000, SI.GRAM);

+		MassAmount mass2 = new MassAmount(1, SI.KILOGRAM);

+		MassAmount mass3 = new MassAmount(1, KILO(SI.GRAM));

+		System.out.println(mass.equals(mass2) + "; " + mass.equals(mass3)

+				+ "; " + mass2.equals(mass3));

+	}

+}

diff --git a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/RadiologicalEmergencyPreparedness.java b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/RadiologicalEmergencyPreparedness.java
index 55ff309..6ad6d4c 100644
--- a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/RadiologicalEmergencyPreparedness.java
+++ b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/RadiologicalEmergencyPreparedness.java
@@ -16,7 +16,6 @@ import static org.eclipse.uomo.units.SI.*;
 import java.util.HashMap;

 import java.util.Map;

 

-import org.eclipse.uomo.examples.units.Messages;

 import org.eclipse.uomo.units.IMeasure;

 import org.eclipse.uomo.units.impl.quantity.IonizingRadiationAmount;

 import org.unitsofmeasurement.quantity.IonizingRadiation;

@@ -38,11 +37,11 @@ public class RadiologicalEmergencyPreparedness {
 		IonizingRadiationAmount ira = new IonizingRadiationAmount(100, MILLI(ROENTGEN));

 		// TODO fix formatting for mR

 		

-		repMap.put(ira, Messages.REP_100mR);

+		repMap.put(ira, SandboxMessages.REP_100mR);

 		ira = new IonizingRadiationAmount(1, ROENTGEN);

-		repMap.put(ira, Messages.REP_1R);

+		repMap.put(ira, SandboxMessages.REP_1R);

 		ira = new IonizingRadiationAmount(2.5, ROENTGEN);

-		repMap.put(ira, Messages.REP_2dot5R);

+		repMap.put(ira, SandboxMessages.REP_2dot5R);

 		

 		for (IMeasure<IonizingRadiation> dosimeterLimit : repMap.keySet()) {			

 			System.out.println(dosimeterLimit + " :: " + repMap.get(dosimeterLimit));

diff --git a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/SandboxMessages.java b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/SandboxMessages.java
new file mode 100644
index 0000000..cb6cd7f
--- /dev/null
+++ b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/console/sandbox/SandboxMessages.java
@@ -0,0 +1,28 @@
+/**

+ * Copyright (c) 2005, 2011, 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

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Werner Keil - initial API and implementation

+ */

+package org.eclipse.uomo.examples.units.console.sandbox;

+

+import org.eclipse.osgi.util.NLS;

+

+class SandboxMessages extends NLS {

+	private static final String BUNDLE_NAME = SandboxMessages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$

+	public static String REP_100mR;

+	public static String REP_1R;

+	public static String REP_2dot5R;

+	

+	static {

+		// initialize resource bundle

+		NLS.initializeMessages(BUNDLE_NAME, SandboxMessages.class);

+	}

+

+	private SandboxMessages() {

+	}

+}

diff --git a/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/types/ObsoletePolish.java b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/types/ObsoletePolish.java
new file mode 100644
index 0000000..a519214
--- /dev/null
+++ b/examples/units/org.eclipse.uomo.examples.units.console/src/main/java/org/eclipse/uomo/examples/units/types/ObsoletePolish.java
@@ -0,0 +1,58 @@
+/**

+ * Copyright (c) 2012, 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

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    Werner Keil - initial API and implementation

+ */

+package org.eclipse.uomo.examples.units.types;

+

+import org.eclipse.uomo.units.AbstractSystemOfUnits;

+import org.eclipse.uomo.units.SI;

+import org.unitsofmeasurement.quantity.Length;

+import org.unitsofmeasurement.unit.SystemOfUnits;

+import org.unitsofmeasurement.unit.Unit;

+

+/**

+ * @author <a href="mailto:uomo@catmedia.us">Werner Keil</a>

+ * @version 0.0.1

+ * @see <a

+ *      href="http://en.wikipedia.org/wiki/Obsolete_Polish_units_of_measurement">Wikipedia:

+ *      Obsolete Polish Uits of Measurement</a>

+ * @deprecated

+ */

+public class ObsoletePolish extends AbstractSystemOfUnits {

+

+	/** The basic unit of length - the ell or łokieć in Polish - was set to 0.5955 metres 

+	 *  

+	 * */

+	public static final  Unit<Length> ELL = SI.METRE.multiply(0.5955d);

+	

+	@Override

+	public String getName() {

+		return ObsoletePolish.class.getSimpleName();

+	}

+

+    /**

+     * Default constructor (prevents this class from being instantiated).

+     */

+    private ObsoletePolish() {

+    }

+	

+	/**

+	 * The singleton instance of {@code Seismic}.

+	 */

+	private static final ObsoletePolish INSTANCE = new ObsoletePolish();

+

+	/**

+	 * Returns the singleton instance of this class.

+	 * 

+	 * @return the Seismic system instance.

+	 */

+	public static final SystemOfUnits getInstance() {

+		return INSTANCE;

+	}	

+}