Fixes for warnings. Lots of fixes.

git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk@3553 92a21009-5b66-0410-b83a-dc787c41c6e9

270 files changed, 696 insertions, 643 deletions

diff --git a/analysis/org.eclipse.stem.analysis.automaticexperiment/.classpath b/analysis/org.eclipse.stem.analysis.automaticexperiment/.classpath
index 304e86186..121e527a9 100644
--- a/analysis/org.eclipse.stem.analysis.automaticexperiment/.classpath
+++ b/analysis/org.eclipse.stem.analysis.automaticexperiment/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/analysis/org.eclipse.stem.analysis.automaticexperiment/META-INF/MANIFEST.MF b/analysis/org.eclipse.stem.analysis.automaticexperiment/META-INF/MANIFEST.MF
index 36a455805..1fb7da4e1 100644
--- a/analysis/org.eclipse.stem.analysis.automaticexperiment/META-INF/MANIFEST.MF
+++ b/analysis/org.eclipse.stem.analysis.automaticexperiment/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.stem.analysis,
  org.eclipse.ui.navigator.resources
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .
 Import-Package: org.eclipse.emf.ecore.provider
 Export-Package: org.eclipse.stem.analysis.automaticexperiment,
diff --git a/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/presentation/AutomaticexperimentEditor.java b/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/presentation/AutomaticexperimentEditor.java
index ee654e094..c9fe96238 100644
--- a/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/presentation/AutomaticexperimentEditor.java
+++ b/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/presentation/AutomaticexperimentEditor.java
@@ -1024,6 +1024,7 @@ public class AutomaticexperimentEditor
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@SuppressWarnings("rawtypes")

 	@Override

 	public Object getAdapter(Class key) {

 		if (key.equals(IContentOutlinePage.class)) {

diff --git a/analysis/org.eclipse.stem.analysis/.classpath b/analysis/org.eclipse.stem.analysis/.classpath
index 304e86186..121e527a9 100644
--- a/analysis/org.eclipse.stem.analysis/.classpath
+++ b/analysis/org.eclipse.stem.analysis/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/analysis/org.eclipse.stem.analysis/.settings/org.eclipse.jdt.core.prefs b/analysis/org.eclipse.stem.analysis/.settings/org.eclipse.jdt.core.prefs
index 9910b65b4..35cab3580 100644
--- a/analysis/org.eclipse.stem.analysis/.settings/org.eclipse.jdt.core.prefs
+++ b/analysis/org.eclipse.stem.analysis/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,10 @@
-#Tue Sep 01 16:54:37 EDT 2009
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -13,3 +17,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/analysis/org.eclipse.stem.analysis/META-INF/MANIFEST.MF b/analysis/org.eclipse.stem.analysis/META-INF/MANIFEST.MF
index aef01a1a5..d29bfddd3 100644
--- a/analysis/org.eclipse.stem.analysis/META-INF/MANIFEST.MF
+++ b/analysis/org.eclipse.stem.analysis/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.analysis,
  org.eclipse.stem.analysis.impl,
  org.eclipse.stem.analysis.provider,
diff --git a/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/provider/ErrorResultItemProvider.java b/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/provider/ErrorResultItemProvider.java
index d6f61c818..a0477c41d 100644
--- a/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/provider/ErrorResultItemProvider.java
+++ b/analysis/org.eclipse.stem.analysis/src/org/eclipse/stem/analysis/provider/ErrorResultItemProvider.java
@@ -204,7 +204,7 @@ public class ErrorResultItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		EList labelValue = ((ErrorResult)object).getErrorByTimeStep();
+		EList<Double> labelValue = ((ErrorResult)object).getErrorByTimeStep();
 		String label = labelValue == null ? null : labelValue.toString();
 		return label == null || label.length() == 0 ?
 			getString("_UI_ErrorResult_type") :
diff --git a/analysis/org.eclipse.stem.util.analysis/.classpath b/analysis/org.eclipse.stem.util.analysis/.classpath
index 304e86186..121e527a9 100644
--- a/analysis/org.eclipse.stem.util.analysis/.classpath
+++ b/analysis/org.eclipse.stem.util.analysis/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/analysis/org.eclipse.stem.util.analysis/.settings/org.eclipse.jdt.core.prefs b/analysis/org.eclipse.stem.util.analysis/.settings/org.eclipse.jdt.core.prefs
index 292978525..0108acb74 100644
--- a/analysis/org.eclipse.stem.util.analysis/.settings/org.eclipse.jdt.core.prefs
+++ b/analysis/org.eclipse.stem.util.analysis/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,7 @@
-#Thu Nov 01 14:50:38 EDT 2007
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -71,4 +66,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/analysis/org.eclipse.stem.util.analysis/META-INF/MANIFEST.MF b/analysis/org.eclipse.stem.util.analysis/META-INF/MANIFEST.MF
index e01d8a648..f064a3277 100644
--- a/analysis/org.eclipse.stem.util.analysis/META-INF/MANIFEST.MF
+++ b/analysis/org.eclipse.stem.util.analysis/META-INF/MANIFEST.MF
@@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.birt.chart.engine;visibility:=reexport,
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.util.analysis,
  org.eclipse.stem.util.analysis.views
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .
diff --git a/core/org.eclipse.stem.core/.classpath b/core/org.eclipse.stem.core/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.core/.classpath
+++ b/core/org.eclipse.stem.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.core/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.core/.settings/org.eclipse.jdt.core.prefs
index 285b9e14c..5f6ab71e6 100644
--- a/core/org.eclipse.stem.core/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,12 @@
-#Mon Jan 21 12:37:08 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
@@ -66,4 +61,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.core/META-INF/MANIFEST.MF b/core/org.eclipse.stem.core/META-INF/MANIFEST.MF
index f5c8b4457..f9f2e9963 100644
--- a/core/org.eclipse.stem.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.core/META-INF/MANIFEST.MF
@@ -61,6 +61,6 @@ Export-Package: org.eclipse.stem.adapters.file,
  org.eclipse.stem.core.trigger.impl,
  org.eclipse.stem.core.trigger.provider,
  org.eclipse.stem.core.trigger.util
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.apache.commons.math,
  org.apache.commons.math.distribution;version="2.1.0"
diff --git a/core/org.eclipse.stem.definitions/.classpath b/core/org.eclipse.stem.definitions/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.definitions/.classpath
+++ b/core/org.eclipse.stem.definitions/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.definitions/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.definitions/.settings/org.eclipse.jdt.core.prefs
index af59edcbc..cc81e6cbf 100644
--- a/core/org.eclipse.stem.definitions/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.definitions/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,13 @@
-#Mon Jan 21 12:39:26 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
@@ -66,4 +62,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.definitions/META-INF/MANIFEST.MF b/core/org.eclipse.stem.definitions/META-INF/MANIFEST.MF
index f48c171c8..08268caa3 100644
--- a/core/org.eclipse.stem.definitions/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.definitions/META-INF/MANIFEST.MF
@@ -39,5 +39,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.data.geography,
  org.eclipse.ui.ide;visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.emf.ecore.provider
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/relativevalue/RelativeValueProviderAdapter.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/relativevalue/RelativeValueProviderAdapter.java
index 86e605afe..bef6ad6d5 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/relativevalue/RelativeValueProviderAdapter.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/relativevalue/RelativeValueProviderAdapter.java
@@ -29,11 +29,13 @@ abstract public class RelativeValueProviderAdapter extends AdapterImpl
 	/**
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProvider#getProperties()
 	 */
+	@Override
 	public abstract List<IItemPropertyDescriptor> getProperties();
 
 	/**
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProvider#getRelativeValue(org.eclipse.emf.edit.provider.ItemPropertyDescriptor)
 	 */
+	@Override
 	public double getRelativeValue(ItemPropertyDescriptor property) {
 		return getRelativeValue((EStructuralFeature) property.getFeature(null));
 	} // getRelativeValue
@@ -41,6 +43,7 @@ abstract public class RelativeValueProviderAdapter extends AdapterImpl
 	/**
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProvider#getRelativeValue(org.eclipse.emf.ecore.EStructuralFeature)
 	 */
+	@Override
 	public abstract double getRelativeValue(final EStructuralFeature feature);
 	
 	/**
@@ -51,6 +54,7 @@ abstract public class RelativeValueProviderAdapter extends AdapterImpl
 	 * or can be used to create a label showing the maximum scale for any relative value.
 	 * @return the denominator or scale used to normalize the relative value
 	 */
+	@Override
 	public abstract double getDenominator(final EStructuralFeature feature) ;
 
 	/**
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/relativevalue/history/RelativeValueHistoryProviderAdapter.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/relativevalue/history/RelativeValueHistoryProviderAdapter.java
index 04389611e..6a277ca9a 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/relativevalue/history/RelativeValueHistoryProviderAdapter.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/relativevalue/history/RelativeValueHistoryProviderAdapter.java
@@ -39,6 +39,7 @@ public abstract class RelativeValueHistoryProviderAdapter extends
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.history.RelativeValueHistoryProvider#getRelativeValue(org.eclipse.emf.edit.provider.ItemPropertyDescriptor,
 	 *      org.eclipse.stem.core.model.STEMTime)
 	 */
+	@Override
 	public double getRelativeValue(final ItemPropertyDescriptor property,
 			final STEMTime time) {
 		return getRelativeValue((EStructuralFeature) property.getFeature(null),
@@ -49,18 +50,21 @@ public abstract class RelativeValueHistoryProviderAdapter extends
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.history.RelativeValueHistoryProvider#getRelativeValue(org.eclipse.emf.ecore.EStructuralFeature,
 	 *      org.eclipse.stem.core.model.STEMTime)
 	 */
+	@Override
 	abstract public double getRelativeValue(EStructuralFeature feature,
 			STEMTime time);
 
 	/**
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.history.RelativeValueHistoryProvider#getAllHistoricRelativeValues(org.eclipse.emf.ecore.EStructuralFeature)
 	 */
+	@Override
 	abstract public double[] getAllHistoricRelativeValues(
 			EStructuralFeature feature);
 
 	/**
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.history.RelativeValueHistoryProvider#getAllHistoricRelativeValues(org.eclipse.emf.edit.provider.ItemPropertyDescriptor)
 	 */
+	@Override
 	public double[] getAllHistoricRelativeValues(
 			final ItemPropertyDescriptor property) {
 		return getAllHistoricRelativeValues((EStructuralFeature) property
@@ -70,11 +74,13 @@ public abstract class RelativeValueHistoryProviderAdapter extends
 	/**
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.history.RelativeValueHistoryProvider#getAllHistoricTimeValues()
 	 */
+	@Override
 	abstract public STEMTime[] getAllHistoricTimeValues();
 
 	/**
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.history.RelativeValueHistoryProvider#getEarliestTimeValue()
 	 */
+	@Override
 	abstract public STEMTime getEarliestTimeValue();
 
 	/**
@@ -84,6 +90,7 @@ public abstract class RelativeValueHistoryProviderAdapter extends
 	/**
 	 * @see org.eclipse.stem.definitions.adapters.relativevalue.history.RelativeValueHistoryProvider#getEarliestCycleNumber()
 	 */
+	@Override
 	public int getEarliestCycleNumber() {
 		return earliestCycleNumber;
 	}
@@ -99,6 +106,7 @@ public abstract class RelativeValueHistoryProviderAdapter extends
 	/**
 	 * @see org.eclipse.stem.adapters.history.HistoryExtendedListener#historyExtended(org.eclipse.stem.adapters.history.HistoryProviderAdapter)
 	 */
+	@Override
 	public void historyExtended(HistoryProviderAdapter historyProviderAdapter) {
 		fireHistoryExtended();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/InlineLatLongDataProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/InlineLatLongDataProvider.java
index 3cc0008b1..4ed390e99 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/InlineLatLongDataProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/InlineLatLongDataProvider.java
@@ -61,6 +61,7 @@ public class InlineLatLongDataProvider implements LatLongDataProvider {
 	 * @param dataURI
 	 * @return a latitude/longitude value
 	 */
+	@Override
 	public LatLong getLatLong(final URI dataURI) {
 		final LatLong retValue = new LatLong();
 
@@ -108,6 +109,7 @@ public class InlineLatLongDataProvider implements LatLongDataProvider {
 	/**
 	 * @see org.eclipse.stem.definitions.adapters.spatial.geo.LatLongDataProvider#getLatLongNoWait(org.eclipse.emf.common.util.URI)
 	 */
+	@Override
 	public LatLong getLatLongNoWait(final URI dataURI) {
 		return getLatLong(dataURI);
 	} // getLatLongNoWait
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/LatLongProviderAdapter.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/LatLongProviderAdapter.java
index eb1499cac..7e4fdd8d9 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/LatLongProviderAdapter.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/LatLongProviderAdapter.java
@@ -96,6 +96,7 @@ public class LatLongProviderAdapter extends SpatialProviderAdapter implements
 	/**
 	 * @return the lat/long value
 	 */
+	@Override
 	public LatLong getLatLong() {
 		final Identifiable identifiable = (Identifiable) getTarget();
 		LatLong retValue = identifiableLatLongCache.get(identifiable);
@@ -167,6 +168,7 @@ public class LatLongProviderAdapter extends SpatialProviderAdapter implements
 	/**
 	 * @return the lat/long value
 	 */
+	@Override
 	public LatLong getLatLongNoWait() {
 
 		final Identifiable identifiable = (Identifiable) getTarget();
@@ -311,6 +313,7 @@ public class LatLongProviderAdapter extends SpatialProviderAdapter implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.stem.definitions.adapters.spatial.geo.LatLongProvider#getCenter()
 	 */
+	@Override
 	public double[] getCenter() {		
 		//First try to get the center of the identifiable from the cache
 		double[] centerLatLong = identifiableCenterCache.get(getTarget());
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/PlatformLatLongDataProvider.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/PlatformLatLongDataProvider.java
index b502d2a56..939f9d110 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/PlatformLatLongDataProvider.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/PlatformLatLongDataProvider.java
@@ -131,6 +131,7 @@ public class PlatformLatLongDataProvider implements LatLongDataProvider {
 
 		Activator.getDefault().getPreferenceStore()
 				.addPropertyChangeListener(new IPropertyChangeListener() {
+					@Override
 					public void propertyChange(final PropertyChangeEvent event) {
 						setPreferences();
 						// Flush everything in the cache to force it to be read
@@ -154,6 +155,7 @@ public class PlatformLatLongDataProvider implements LatLongDataProvider {
 	 * @param latlongFileURI
 	 * @return the lat/long values
 	 */
+	@Override
 	public LatLong getLatLong(final URI latlongFileURI) {
 		LatLong retValue = null;
 
@@ -177,6 +179,7 @@ public class PlatformLatLongDataProvider implements LatLongDataProvider {
 	 * @param latlongFileURI
 	 * @return the lat/long values
 	 */
+	@Override
 	public LatLong getLatLongNoWait(final URI latlongFileURI) {
 		LatLong retValue = null;
 
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/preferences/MapDataManagementPreferencePage.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/preferences/MapDataManagementPreferencePage.java
index 171279949..cd80e8534 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/preferences/MapDataManagementPreferencePage.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/adapters/spatial/geo/preferences/MapDataManagementPreferencePage.java
@@ -101,6 +101,7 @@ public class MapDataManagementPreferencePage extends FieldEditorPreferencePage
 	/**
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
+	@Override
 	public void init(final IWorkbench workbench) {
 		// Nothing
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MigrationEdge.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MigrationEdge.java
index 51aa9c5e1..7ab596efc 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MigrationEdge.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MigrationEdge.java
@@ -60,6 +60,7 @@ public interface MigrationEdge extends PopulationEdge {
 	/**
 	 * Overrides getLabel() to enforce the returning of a migration edge label
 	 **/
+	@Override
 	MigrationEdgeLabel getLabel();
 	
 	/**
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MigrationEdgeLabel.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MigrationEdgeLabel.java
index 976a10142..44166190f 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MigrationEdgeLabel.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MigrationEdgeLabel.java
@@ -38,6 +38,7 @@ public interface MigrationEdgeLabel extends EdgeLabel, Modifiable {
 	/**
 	 * Make the current value(s) be MigrationEdgeLabelValues
 	 **/
+	@Override
 	MigrationEdgeLabelValue getCurrentValue();
 	
 	/**
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MixingEdge.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MixingEdge.java
index a92b3ae3c..84193accf 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MixingEdge.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MixingEdge.java
@@ -63,6 +63,7 @@ public interface MixingEdge extends PopulationEdge {
 	/**

 	 * Overrides getLabel() to enforce the returning of a migration edge label

 	 **/

+	@Override

 	MixingEdgeLabel getLabel();

 	

 	/**

diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MixingEdgeLabel.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MixingEdgeLabel.java
index 4651419be..c84078ec2 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MixingEdgeLabel.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/MixingEdgeLabel.java
@@ -32,6 +32,7 @@ public interface MixingEdgeLabel extends EdgeLabel, Modifiable {
 	/**

 	 * Make the current value(s) be MixingEdgeLabelValues

 	 **/

+	@Override

 	MixingEdgeLabelValue getCurrentValue();

 	

 	/**

diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/EdgesFactoryImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/EdgesFactoryImpl.java
index e6fb4f801..05c6759cb 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/EdgesFactoryImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/EdgesFactoryImpl.java
@@ -87,6 +87,7 @@ public class EdgesFactoryImpl extends EFactoryImpl implements EdgesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public MigrationEdge createMigrationEdge() {
 		MigrationEdgeImpl migrationEdge = new MigrationEdgeImpl();
 		return migrationEdge;
@@ -97,6 +98,7 @@ public class EdgesFactoryImpl extends EFactoryImpl implements EdgesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public MigrationEdgeLabel createMigrationEdgeLabel() {
 		MigrationEdgeLabelImpl migrationEdgeLabel = new MigrationEdgeLabelImpl();
 		return migrationEdgeLabel;
@@ -107,6 +109,7 @@ public class EdgesFactoryImpl extends EFactoryImpl implements EdgesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public MigrationEdgeLabelValue createMigrationEdgeLabelValue() {
 		MigrationEdgeLabelValueImpl migrationEdgeLabelValue = new MigrationEdgeLabelValueImpl();
 		return migrationEdgeLabelValue;
@@ -117,6 +120,7 @@ public class EdgesFactoryImpl extends EFactoryImpl implements EdgesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public MixingEdge createMixingEdge() {
 		MixingEdgeImpl mixingEdge = new MixingEdgeImpl();
 		return mixingEdge;
@@ -127,6 +131,7 @@ public class EdgesFactoryImpl extends EFactoryImpl implements EdgesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public MixingEdgeLabel createMixingEdgeLabel() {
 		MixingEdgeLabelImpl mixingEdgeLabel = new MixingEdgeLabelImpl();
 		return mixingEdgeLabel;
@@ -137,6 +142,7 @@ public class EdgesFactoryImpl extends EFactoryImpl implements EdgesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public MixingEdgeLabelValue createMixingEdgeLabelValue() {
 		MixingEdgeLabelValueImpl mixingEdgeLabelValue = new MixingEdgeLabelValueImpl();
 		return mixingEdgeLabelValue;
@@ -147,6 +153,7 @@ public class EdgesFactoryImpl extends EFactoryImpl implements EdgesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PopulationEdge createPopulationEdge() {
 		PopulationEdgeImpl populationEdge = new PopulationEdgeImpl();
 		return populationEdge;
@@ -157,6 +164,7 @@ public class EdgesFactoryImpl extends EFactoryImpl implements EdgesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EdgesPackage getEdgesPackage() {
 		return (EdgesPackage)getEPackage();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/EdgesPackageImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/EdgesPackageImpl.java
index 5a175c1ee..7409e0917 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/EdgesPackageImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/EdgesPackageImpl.java
@@ -183,6 +183,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getMigrationEdge() {
 		return migrationEdgeEClass;
 	}
@@ -192,6 +193,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getMigrationEdge_UseAbsoluteValues() {
 		return (EAttribute)migrationEdgeEClass.getEStructuralFeatures().get(0);
 	}
@@ -201,6 +203,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getMigrationEdgeLabel() {
 		return migrationEdgeLabelEClass;
 	}
@@ -210,6 +213,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getMigrationEdgeLabelValue() {
 		return migrationEdgeLabelValueEClass;
 	}
@@ -219,6 +223,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getMigrationEdgeLabelValue_MigrationRate() {
 		return (EAttribute)migrationEdgeLabelValueEClass.getEStructuralFeatures().get(0);
 	}
@@ -228,6 +233,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getMigrationEdgeLabelValue_TimePeriod() {
 		return (EAttribute)migrationEdgeLabelValueEClass.getEStructuralFeatures().get(1);
 	}
@@ -237,6 +243,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getMixingEdge() {
 		return mixingEdgeEClass;
 	}
@@ -246,6 +253,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getMixingEdge_UseAbsoluteValues() {
 		return (EAttribute)mixingEdgeEClass.getEStructuralFeatures().get(0);
 	}
@@ -255,6 +263,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getMixingEdgeLabel() {
 		return mixingEdgeLabelEClass;
 	}
@@ -264,6 +273,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getMixingEdgeLabelValue() {
 		return mixingEdgeLabelValueEClass;
 	}
@@ -273,6 +283,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getMixingEdgeLabelValue_MixingRate() {
 		return (EAttribute)mixingEdgeLabelValueEClass.getEStructuralFeatures().get(0);
 	}
@@ -282,6 +293,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPopulationEdge() {
 		return populationEdgeEClass;
 	}
@@ -291,6 +303,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPopulationEdge_PopulationIdentifier() {
 		return (EAttribute)populationEdgeEClass.getEStructuralFeatures().get(0);
 	}
@@ -300,6 +313,7 @@ public class EdgesPackageImpl extends EPackageImpl implements EdgesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EdgesFactory getEdgesFactory() {
 		return (EdgesFactory)getEFactoryInstance();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeImpl.java
index 409ceca51..615cc3d52 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeImpl.java
@@ -95,6 +95,7 @@ public class MigrationEdgeImpl extends PopulationEdgeImpl implements MigrationEd
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isUseAbsoluteValues() {
 		return useAbsoluteValues;
 	}
@@ -105,6 +106,7 @@ public class MigrationEdgeImpl extends PopulationEdgeImpl implements MigrationEd
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setUseAbsoluteValues(boolean newUseAbsoluteValues) {
 		boolean oldUseAbsoluteValues = useAbsoluteValues;
 		useAbsoluteValues = newUseAbsoluteValues;
@@ -217,6 +219,7 @@ public class MigrationEdgeImpl extends PopulationEdgeImpl implements MigrationEd
 	 * Override to make getEdge set the 
 	 * correct type.
 	 **/
+	@Override
 	public void setLabel(MigrationEdgeLabel lbl) {
 		//just deal with making sure the URI labeling scheme is correct here.
 		lbl.setURIOfIdentifiableToBeLabeled(this.getURI());
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeLabelImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeLabelImpl.java
index 5fcd3ab98..adae48c02 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeLabelImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeLabelImpl.java
@@ -87,6 +87,7 @@ public class MigrationEdgeLabelImpl extends EdgeLabelImpl implements MigrationEd
 		return((MigrationEdgeLabelValue)super.getCurrentValue());
 	}
 	
+	@Override
 	public void setCurrentValue(MigrationEdgeLabelValue val) {
 		super.setCurrentValue(val);
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeLabelValueImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeLabelValueImpl.java
index 7f3710e93..0ce430c9c 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeLabelValueImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MigrationEdgeLabelValueImpl.java
@@ -97,6 +97,7 @@ public class MigrationEdgeLabelValueImpl extends LabelValueImpl implements Migra
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getMigrationRate() {
 		return migrationRate;
 	}
@@ -106,6 +107,7 @@ public class MigrationEdgeLabelValueImpl extends LabelValueImpl implements Migra
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMigrationRate(double newMigrationRate) {
 		double oldMigrationRate = migrationRate;
 		migrationRate = newMigrationRate;
@@ -118,6 +120,7 @@ public class MigrationEdgeLabelValueImpl extends LabelValueImpl implements Migra
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getTimePeriod() {
 		return timePeriod;
 	}
@@ -127,6 +130,7 @@ public class MigrationEdgeLabelValueImpl extends LabelValueImpl implements Migra
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setTimePeriod(long newTimePeriod) {
 		long oldTimePeriod = timePeriod;
 		timePeriod = newTimePeriod;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeImpl.java
index f59538dad..3ab9bd3a9 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeImpl.java
@@ -92,6 +92,7 @@ public class MixingEdgeImpl extends PopulationEdgeImpl implements MixingEdge {
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isUseAbsoluteValues() {

 		return useAbsoluteValues;

 	}

@@ -101,6 +102,7 @@ public class MixingEdgeImpl extends PopulationEdgeImpl implements MixingEdge {
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setUseAbsoluteValues(boolean newUseAbsoluteValues) {

 		boolean oldUseAbsoluteValues = useAbsoluteValues;

 		useAbsoluteValues = newUseAbsoluteValues;

@@ -197,6 +199,7 @@ public class MixingEdgeImpl extends PopulationEdgeImpl implements MixingEdge {
 	 * Override to make getEdge set the 

 	 * correct type.

 	 **/

+	@Override

 	public void setLabel(MixingEdgeLabel lbl) {

 		//just deal with making sure the URI labeling scheme is correct here.

 		lbl.setURIOfIdentifiableToBeLabeled(this.getURI());

diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeLabelImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeLabelImpl.java
index 78cd6f403..0637292d5 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeLabelImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeLabelImpl.java
@@ -80,6 +80,7 @@ public class MixingEdgeLabelImpl extends EdgeLabelImpl implements MixingEdgeLabe
 		return((MixingEdgeLabelValue)super.getCurrentValue());

 	}

 	

+	@Override

 	public void setCurrentValue(MixingEdgeLabelValue val) {

 		super.setCurrentValue(val);

 	}

diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeLabelValueImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeLabelValueImpl.java
index 29e2ed161..708e8a3d0 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeLabelValueImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/MixingEdgeLabelValueImpl.java
@@ -71,6 +71,7 @@ public class MixingEdgeLabelValueImpl extends LabelValueImpl implements MixingEd
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public double getMixingRate() {

 		return mixingRate;

 	}

@@ -80,6 +81,7 @@ public class MixingEdgeLabelValueImpl extends LabelValueImpl implements MixingEd
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMixingRate(double newMixingRate) {

 		double oldMixingRate = mixingRate;

 		mixingRate = newMixingRate;

diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/PopulationEdgeImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/PopulationEdgeImpl.java
index b54d78955..341f95163 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/PopulationEdgeImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/impl/PopulationEdgeImpl.java
@@ -76,6 +76,7 @@ public class PopulationEdgeImpl extends EdgeImpl implements PopulationEdge {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getPopulationIdentifier() {
 		return populationIdentifier;
 	}
@@ -85,6 +86,7 @@ public class PopulationEdgeImpl extends EdgeImpl implements PopulationEdge {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPopulationIdentifier(String newPopulationIdentifier) {
 		String oldPopulationIdentifier = populationIdentifier;
 		populationIdentifier = newPopulationIdentifier;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/presentation/EdgesActionBarContributor.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/presentation/EdgesActionBarContributor.java
index 16555705e..e93cd886c 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/presentation/EdgesActionBarContributor.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/presentation/EdgesActionBarContributor.java
@@ -206,7 +206,8 @@ public class EdgesActionBarContributor
 		//
 		submenuManager.addMenuListener
 			(new IMenuListener() {
-				 public void menuAboutToShow(IMenuManager menuManager) {
+				 @Override
+				public void menuAboutToShow(IMenuManager menuManager) {
 					 menuManager.updateAll(true);
 				 }
 			 });
@@ -253,6 +254,7 @@ public class EdgesActionBarContributor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		// Remove any menu items for old selection.
 		//
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/presentation/EdgesEditor.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/presentation/EdgesEditor.java
index 86b977ae5..66ac52b5e 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/presentation/EdgesEditor.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/presentation/EdgesEditor.java
@@ -247,6 +247,7 @@ public class EdgesEditor
 	 */
 	protected IPartListener partListener =
 		new IPartListener() {
+			@Override
 			public void partActivated(IWorkbenchPart p) {
 				if (p instanceof ContentOutline) {
 					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
@@ -265,15 +266,19 @@ public class EdgesEditor
 					handleActivate();
 				}
 			}
+			@Override
 			public void partBroughtToTop(IWorkbenchPart p) {
 				// Ignore.
 			}
+			@Override
 			public void partClosed(IWorkbenchPart p) {
 				// Ignore.
 			}
+			@Override
 			public void partDeactivated(IWorkbenchPart p) {
 				// Ignore.
 			}
+			@Override
 			public void partOpened(IWorkbenchPart p) {
 				// Ignore.
 			}
@@ -346,7 +351,8 @@ public class EdgesEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										 public void run() {
+										 @Override
+										public void run() {
 											 updateProblemIndication();
 										 }
 									 });
@@ -379,6 +385,7 @@ public class EdgesEditor
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 		new IResourceChangeListener() {
+			@Override
 			public void resourceChanged(IResourceChangeEvent event) {
 				IResourceDelta delta = event.getDelta();
 				try {
@@ -387,6 +394,7 @@ public class EdgesEditor
 						protected Collection<Resource> changedResources = new ArrayList<Resource>();
 						protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
+						@Override
 						public boolean visit(IResourceDelta delta) {
 							if (delta.getResource().getType() == IResource.FILE) {
 								if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -421,7 +429,8 @@ public class EdgesEditor
 					if (!visitor.getRemovedResources().isEmpty()) {
 						getSite().getShell().getDisplay().asyncExec
 							(new Runnable() {
-								 public void run() {
+								 @Override
+								public void run() {
 									 removedResources.addAll(visitor.getRemovedResources());
 									 if (!isDirty()) {
 										 getSite().getPage().closeEditor(EdgesEditor.this, false);
@@ -433,7 +442,8 @@ public class EdgesEditor
 					if (!visitor.getChangedResources().isEmpty()) {
 						getSite().getShell().getDisplay().asyncExec
 							(new Runnable() {
-								 public void run() {
+								 @Override
+								public void run() {
 									 changedResources.addAll(visitor.getChangedResources());
 									 if (getSite().getPage().getActiveEditor() == EdgesEditor.this) {
 										 handleActivate();
@@ -637,10 +647,12 @@ public class EdgesEditor
 		//
 		commandStack.addCommandStackListener
 			(new CommandStackListener() {
-				 public void commandStackChanged(final EventObject event) {
+				 @Override
+				public void commandStackChanged(final EventObject event) {
 					 getContainer().getDisplay().asyncExec
 						 (new Runnable() {
-							  public void run() {
+							  @Override
+							public void run() {
 								  firePropertyChange(IEditorPart.PROP_DIRTY);
 
 								  // Try to select the affected objects.
@@ -686,6 +698,7 @@ public class EdgesEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 				new Runnable() {
+					@Override
 					public void run() {
 						// Try to select the items in the current content viewer of the editor.
 						//
@@ -706,6 +719,7 @@ public class EdgesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -787,6 +801,7 @@ public class EdgesEditor
 					new ISelectionChangedListener() {
 						// This just notifies those things that are affected by the section.
 						//
+						@Override
 						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 							setSelection(selectionChangedEvent.getSelection());
 						}
@@ -821,6 +836,7 @@ public class EdgesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Viewer getViewer() {
 		return currentViewer;
 	}
@@ -940,7 +956,8 @@ public class EdgesEditor
 
 			getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					 public void run() {
+					 @Override
+					public void run() {
 						 setActivePage(0);
 					 }
 				 });
@@ -964,7 +981,8 @@ public class EdgesEditor
 
 		getSite().getShell().getDisplay().asyncExec
 			(new Runnable() {
-				 public void run() {
+				 @Override
+				public void run() {
 					 updateProblemIndication();
 				 }
 			 });
@@ -1099,7 +1117,8 @@ public class EdgesEditor
 				(new ISelectionChangedListener() {
 					 // This ensures that we handle selections correctly.
 					 //
-					 public void selectionChanged(SelectionChangedEvent event) {
+					 @Override
+					public void selectionChanged(SelectionChangedEvent event) {
 						 handleContentOutlineSelection(event.getSelection());
 					 }
 				 });
@@ -1309,6 +1328,7 @@ public class EdgesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void gotoMarker(IMarker marker) {
 		try {
 			if (marker.getType().equals(EValidator.MARKER)) {
@@ -1359,6 +1379,7 @@ public class EdgesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.add(listener);
 	}
@@ -1369,6 +1390,7 @@ public class EdgesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.remove(listener);
 	}
@@ -1379,6 +1401,7 @@ public class EdgesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ISelection getSelection() {
 		return editorSelection;
 	}
@@ -1390,6 +1413,7 @@ public class EdgesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSelection(ISelection selection) {
 		editorSelection = selection;
 
@@ -1459,6 +1483,7 @@ public class EdgesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void menuAboutToShow(IMenuManager menuManager) {
 		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/EdgesItemProviderAdapterFactory.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/EdgesItemProviderAdapterFactory.java
index aec3bc931..e4c2bda80 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/EdgesItemProviderAdapterFactory.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/edges/provider/EdgesItemProviderAdapterFactory.java
@@ -245,6 +245,7 @@ public class EdgesItemProviderAdapterFactory extends EdgesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -255,6 +256,7 @@ public class EdgesItemProviderAdapterFactory extends EdgesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -303,6 +305,7 @@ public class EdgesItemProviderAdapterFactory extends EdgesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -313,6 +316,7 @@ public class EdgesItemProviderAdapterFactory extends EdgesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -323,6 +327,7 @@ public class EdgesItemProviderAdapterFactory extends EdgesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -337,6 +342,7 @@ public class EdgesItemProviderAdapterFactory extends EdgesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		if (migrationEdgeItemProvider != null) migrationEdgeItemProvider.dispose();
 		if (migrationEdgeLabelItemProvider != null) migrationEdgeLabelItemProvider.dispose();
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/RelativePhysicalRelationship.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/RelativePhysicalRelationship.java
index 4e340809a..78cccdf62 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/RelativePhysicalRelationship.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/RelativePhysicalRelationship.java
@@ -356,6 +356,7 @@ public enum RelativePhysicalRelationship implements Enumerator
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getValue() {
 	  return value;
 	}
@@ -365,6 +366,7 @@ public enum RelativePhysicalRelationship implements Enumerator
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 	  return name;
 	}
@@ -374,6 +376,7 @@ public enum RelativePhysicalRelationship implements Enumerator
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getLiteral() {
 	  return literal;
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/TransportMode.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/TransportMode.java
index 36cf50eb2..c448fd239 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/TransportMode.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/TransportMode.java
@@ -231,6 +231,7 @@ public enum TransportMode implements Enumerator
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getValue() {
 	  return value;
 	}
@@ -240,6 +241,7 @@ public enum TransportMode implements Enumerator
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 	  return name;
 	}
@@ -249,6 +251,7 @@ public enum TransportMode implements Enumerator
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getLiteral() {
 	  return literal;
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/AreaLabelImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/AreaLabelImpl.java
index 26b12fc1a..8c6ab946b 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/AreaLabelImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/AreaLabelImpl.java
@@ -73,6 +73,7 @@ public class AreaLabelImpl extends StaticNodeLabelImpl implements AreaLabel {
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public AreaLabelValue getCurrentAreaValue() {
 		return (AreaLabelValue) getCurrentValue();
 	} // getCurrentAreaValue
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/AreaLabelValueImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/AreaLabelValueImpl.java
index 04572a30b..3668f24e5 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/AreaLabelValueImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/AreaLabelValueImpl.java
@@ -97,6 +97,7 @@ public class AreaLabelValueImpl extends LabelValueImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getArea() {
 		return area;
 	}
@@ -131,6 +132,7 @@ public class AreaLabelValueImpl extends LabelValueImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public void setArea(double newArea) {
 		double oldArea = getArea();
 		area = newArea;
@@ -148,6 +150,7 @@ public class AreaLabelValueImpl extends LabelValueImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getAverageExtent() {
 		return averageExtent;
 	}
@@ -157,6 +160,7 @@ public class AreaLabelValueImpl extends LabelValueImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setAverageExtent(double newAverageExtent) {
 		double oldAverageExtent = averageExtent;
 		averageExtent = newAverageExtent;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/CommonBorderRelationshipLabelValueImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/CommonBorderRelationshipLabelValueImpl.java
index a6dab3082..35b9f69ba 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/CommonBorderRelationshipLabelValueImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/CommonBorderRelationshipLabelValueImpl.java
@@ -71,6 +71,7 @@ public class CommonBorderRelationshipLabelValueImpl extends
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getBorderLength() {
 		return borderLength;
 	}
@@ -80,6 +81,7 @@ public class CommonBorderRelationshipLabelValueImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setBorderLength(double newBorderLength) {
 		double oldBorderLength = borderLength;
 		borderLength = newBorderLength;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/EarthScienceLabelImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/EarthScienceLabelImpl.java
index ee9073c83..789ad8a95 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/EarthScienceLabelImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/EarthScienceLabelImpl.java
@@ -58,6 +58,7 @@ public class EarthScienceLabelImpl extends StaticNodeLabelImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public EarthScienceLabelValue getCurrentEarthScienceValue() {
 		return (EarthScienceLabelValue)getCurrentValue();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/EarthScienceLabelValueImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/EarthScienceLabelValueImpl.java
index ebb2c438b..838dd5e76 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/EarthScienceLabelValueImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/EarthScienceLabelValueImpl.java
@@ -231,6 +231,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getDataType() {
 		return dataType;
 	}
@@ -240,6 +241,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setDataType(String newDataType) {
 		String oldDataType = dataType;
 		dataType = newDataType;
@@ -252,6 +254,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getUnits() {
 		return units;
 	}
@@ -261,6 +264,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setUnits(String newUnits) {
 		String oldUnits = units;
 		units = newUnits;
@@ -273,6 +277,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getMean() {
 		if (mean == null) {
 			mean = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__MEAN);
@@ -285,6 +290,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getSd() {
 		if (sd == null) {
 			sd = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__SD);
@@ -297,6 +303,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getMin() {
 		if (min == null) {
 			min = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__MIN);
@@ -309,6 +316,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getMax() {
 		if (max == null) {
 			max = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__MAX);
@@ -321,6 +329,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getMedian() {
 		if (median == null) {
 			median = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__MEDIAN);
@@ -333,6 +342,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getSkewness() {
 		if (skewness == null) {
 			skewness = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__SKEWNESS);
@@ -345,6 +355,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getKurtosis() {
 		if (kurtosis == null) {
 			kurtosis = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__KURTOSIS);
@@ -357,6 +368,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getRms() {
 		if (rms == null) {
 			rms = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__RMS);
@@ -369,6 +381,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getSamplesize() {
 		if (samplesize == null) {
 			samplesize = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__SAMPLESIZE);
@@ -381,6 +394,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<Double> getRange() {
 		if (range == null) {
 			range = new EDataTypeEList<Double>(Double.class, this, LabelsPackage.EARTH_SCIENCE_LABEL_VALUE__RANGE);
@@ -393,6 +407,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getValidYear() {
 		return validYear;
 	}
@@ -402,6 +417,7 @@ public class EarthScienceLabelValueImpl extends LabelValueImpl implements EarthS
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValidYear(int newValidYear) {
 		int oldValidYear = validYear;
 		validYear = newValidYear;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/LabelsFactoryImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/LabelsFactoryImpl.java
index 4455da592..3050c64d4 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/LabelsFactoryImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/LabelsFactoryImpl.java
@@ -140,6 +140,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public AreaLabel createAreaLabel() {
 		AreaLabelImpl areaLabel = new AreaLabelImpl();
 		return areaLabel;
@@ -150,6 +151,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public AreaLabelValue createAreaLabelValue() {
 		AreaLabelValueImpl areaLabelValue = new AreaLabelValueImpl();
 		return areaLabelValue;
@@ -160,6 +162,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public CommonBorderRelationshipLabel createCommonBorderRelationshipLabel() {
 		CommonBorderRelationshipLabelImpl commonBorderRelationshipLabel = new CommonBorderRelationshipLabelImpl();
 		return commonBorderRelationshipLabel;
@@ -170,6 +173,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public CommonBorderRelationshipLabelValue createCommonBorderRelationshipLabelValue() {
 		CommonBorderRelationshipLabelValueImpl commonBorderRelationshipLabelValue = new CommonBorderRelationshipLabelValueImpl();
 		return commonBorderRelationshipLabelValue;
@@ -180,6 +184,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PopulationLabel createPopulationLabel() {
 		PopulationLabelImpl populationLabel = new PopulationLabelImpl();
 		return populationLabel;
@@ -190,6 +195,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PopulationLabelValue createPopulationLabelValue() {
 		PopulationLabelValueImpl populationLabelValue = new PopulationLabelValueImpl();
 		return populationLabelValue;
@@ -200,6 +206,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RelativePhysicalRelationshipLabel createRelativePhysicalRelationshipLabel() {
 		RelativePhysicalRelationshipLabelImpl relativePhysicalRelationshipLabel = new RelativePhysicalRelationshipLabelImpl();
 		return relativePhysicalRelationshipLabel;
@@ -210,6 +217,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RelativePhysicalRelationshipLabelValue createRelativePhysicalRelationshipLabelValue() {
 		RelativePhysicalRelationshipLabelValueImpl relativePhysicalRelationshipLabelValue = new RelativePhysicalRelationshipLabelValueImpl();
 		return relativePhysicalRelationshipLabelValue;
@@ -220,6 +228,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public TransportRelationshipLabel createTransportRelationshipLabel() {
 		TransportRelationshipLabelImpl transportRelationshipLabel = new TransportRelationshipLabelImpl();
 		return transportRelationshipLabel;
@@ -230,6 +239,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public TransportRelationshipLabelValue createTransportRelationshipLabelValue() {
 		TransportRelationshipLabelValueImpl transportRelationshipLabelValue = new TransportRelationshipLabelValueImpl();
 		return transportRelationshipLabelValue;
@@ -240,6 +250,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public PhysicalRelationshipLabelValue createPhysicalRelationshipLabelValue() {
 		PhysicalRelationshipLabelValueImpl physicalRelationshipLabelValue = new PhysicalRelationshipLabelValueImpl();
 		return physicalRelationshipLabelValue;
@@ -250,6 +261,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RoadTransportRelationshipLabel createRoadTransportRelationshipLabel() {
 		RoadTransportRelationshipLabelImpl roadTransportRelationshipLabel = new RoadTransportRelationshipLabelImpl();
 		return roadTransportRelationshipLabel;
@@ -260,6 +272,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RoadTransportRelationshipLabelValue createRoadTransportRelationshipLabelValue() {
 		RoadTransportRelationshipLabelValueImpl roadTransportRelationshipLabelValue = new RoadTransportRelationshipLabelValueImpl();
 		return roadTransportRelationshipLabelValue;
@@ -270,6 +283,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EarthScienceLabel createEarthScienceLabel() {
 		EarthScienceLabelImpl earthScienceLabel = new EarthScienceLabelImpl();
 		return earthScienceLabel;
@@ -280,6 +294,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EarthScienceLabelValue createEarthScienceLabelValue() {
 		EarthScienceLabelValueImpl earthScienceLabelValue = new EarthScienceLabelValueImpl();
 		return earthScienceLabelValue;
@@ -330,6 +345,7 @@ public class LabelsFactoryImpl extends EFactoryImpl implements LabelsFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public LabelsPackage getLabelsPackage() {
 		return (LabelsPackage)getEPackage();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/LabelsPackageImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/LabelsPackageImpl.java
index 3604512c3..cbfe052cb 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/LabelsPackageImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/LabelsPackageImpl.java
@@ -273,6 +273,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getAreaLabel() {
 		return areaLabelEClass;
 	}
@@ -282,6 +283,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getAreaLabel_CurrentAreaValue() {
 		return (EReference)areaLabelEClass.getEStructuralFeatures().get(0);
 	}
@@ -291,6 +293,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getAreaLabelValue() {
 		return areaLabelValueEClass;
 	}
@@ -300,6 +303,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getAreaLabelValue_Area() {
 		return (EAttribute)areaLabelValueEClass.getEStructuralFeatures().get(0);
 	}
@@ -309,6 +313,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getAreaLabelValue_AverageExtent() {
 		return (EAttribute)areaLabelValueEClass.getEStructuralFeatures().get(1);
 	}
@@ -318,6 +323,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getCommonBorderRelationshipLabel() {
 		return commonBorderRelationshipLabelEClass;
 	}
@@ -327,6 +333,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getCommonBorderRelationshipLabelValue() {
 		return commonBorderRelationshipLabelValueEClass;
 	}
@@ -336,6 +343,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getCommonBorderRelationshipLabelValue_BorderLength() {
 		return (EAttribute)commonBorderRelationshipLabelValueEClass.getEStructuralFeatures().get(0);
 	}
@@ -345,6 +353,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPhysicalRelationshipLabel() {
 		return physicalRelationshipLabelEClass;
 	}
@@ -354,6 +363,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPopulationLabel() {
 		return populationLabelEClass;
 	}
@@ -363,6 +373,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPopulationLabel_PopulationIdentifier() {
 		return (EAttribute)populationLabelEClass.getEStructuralFeatures().get(0);
 	}
@@ -372,6 +383,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getPopulationLabel_CurrentPopulationValue() {
 		return (EReference)populationLabelEClass.getEStructuralFeatures().get(1);
 	}
@@ -381,6 +393,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPopulationLabel_PopulatedArea() {
 		return (EAttribute)populationLabelEClass.getEStructuralFeatures().get(2);
 	}
@@ -390,6 +403,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPopulationLabel_ValidYear() {
 		return (EAttribute)populationLabelEClass.getEStructuralFeatures().get(3);
 	}
@@ -399,6 +413,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPopulationLabelValue() {
 		return populationLabelValueEClass;
 	}
@@ -408,6 +423,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getPopulationLabelValue_Count() {
 		return (EAttribute)populationLabelValueEClass.getEStructuralFeatures().get(0);
 	}
@@ -417,6 +433,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRelativePhysicalRelationshipLabel() {
 		return relativePhysicalRelationshipLabelEClass;
 	}
@@ -426,6 +443,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getRelativePhysicalRelationshipLabel_CurrentRelationship() {
 		return (EReference)relativePhysicalRelationshipLabelEClass.getEStructuralFeatures().get(0);
 	}
@@ -435,6 +453,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRelativePhysicalRelationshipLabelValue() {
 		return relativePhysicalRelationshipLabelValueEClass;
 	}
@@ -444,6 +463,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getRelativePhysicalRelationshipLabelValue_Adjacent() {
 		return (EAttribute)relativePhysicalRelationshipLabelValueEClass.getEStructuralFeatures().get(0);
 	}
@@ -453,6 +473,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getRelativePhysicalRelationshipLabelValue_Relationship() {
 		return (EAttribute)relativePhysicalRelationshipLabelValueEClass.getEStructuralFeatures().get(1);
 	}
@@ -462,6 +483,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getTransportRelationshipLabel() {
 		return transportRelationshipLabelEClass;
 	}
@@ -471,6 +493,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_TransportMode() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(0);
 	}
@@ -480,6 +503,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_PopulationIdentifier() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(1);
 	}
@@ -489,6 +513,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_TransportIdentifier() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(2);
 	}
@@ -498,6 +523,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getTransportRelationshipLabel_CurrentTransportRelationshipLabelValue() {
 		return (EReference)transportRelationshipLabelEClass.getEStructuralFeatures().get(3);
 	}
@@ -507,6 +533,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_RateTimePeriod() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(4);
 	}
@@ -516,6 +543,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_DepartureCapacity() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(5);
 	}
@@ -525,6 +553,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_MaximumDepartureCapacity() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(6);
 	}
@@ -534,6 +563,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_Capacity() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(7);
 	}
@@ -543,6 +573,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_MaximumCapacity() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(8);
 	}
@@ -552,6 +583,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_TransitTime() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(9);
 	}
@@ -561,6 +593,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabel_StartUpDelay() {
 		return (EAttribute)transportRelationshipLabelEClass.getEStructuralFeatures().get(10);
 	}
@@ -570,6 +603,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getTransportRelationshipLabelValue() {
 		return transportRelationshipLabelValueEClass;
 	}
@@ -579,6 +613,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getTransportRelationshipLabelValue_AvailableDepartureCapacityProportion() {
 		return (EAttribute)transportRelationshipLabelValueEClass.getEStructuralFeatures().get(0);
 	}
@@ -588,6 +623,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getPhysicalRelationshipLabelValue() {
 		return physicalRelationshipLabelValueEClass;
 	}
@@ -597,6 +633,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRoadTransportRelationshipLabel() {
 		return roadTransportRelationshipLabelEClass;
 	}
@@ -606,6 +643,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRoadTransportRelationshipLabelValue() {
 		return roadTransportRelationshipLabelValueEClass;
 	}
@@ -615,6 +653,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getRoadTransportRelationshipLabelValue_RoadName() {
 		return (EAttribute)roadTransportRelationshipLabelValueEClass.getEStructuralFeatures().get(0);
 	}
@@ -624,6 +663,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getRoadTransportRelationshipLabelValue_RoadClass() {
 		return (EAttribute)roadTransportRelationshipLabelValueEClass.getEStructuralFeatures().get(1);
 	}
@@ -633,6 +673,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getRoadTransportRelationshipLabelValue_NumberCrossings() {
 		return (EAttribute)roadTransportRelationshipLabelValueEClass.getEStructuralFeatures().get(2);
 	}
@@ -642,6 +683,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEarthScienceLabel() {
 		return earthScienceLabelEClass;
 	}
@@ -651,6 +693,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getEarthScienceLabel_CurrentEarthScienceValue() {
 		return (EReference)earthScienceLabelEClass.getEStructuralFeatures().get(0);
 	}
@@ -660,6 +703,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getEarthScienceLabelValue() {
 		return earthScienceLabelValueEClass;
 	}
@@ -669,6 +713,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_DataType() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(0);
 	}
@@ -678,6 +723,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Units() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(1);
 	}
@@ -687,6 +733,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Mean() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(2);
 	}
@@ -696,6 +743,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Sd() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(3);
 	}
@@ -705,6 +753,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Min() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(4);
 	}
@@ -714,6 +763,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Max() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(5);
 	}
@@ -723,6 +773,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Median() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(6);
 	}
@@ -732,6 +783,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Skewness() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(7);
 	}
@@ -741,6 +793,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Kurtosis() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(8);
 	}
@@ -750,6 +803,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Rms() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(9);
 	}
@@ -759,6 +813,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Samplesize() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(10);
 	}
@@ -768,6 +823,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_Range() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(11);
 	}
@@ -777,6 +833,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getEarthScienceLabelValue_ValidYear() {
 		return (EAttribute)earthScienceLabelValueEClass.getEStructuralFeatures().get(12);
 	}
@@ -786,6 +843,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EEnum getRelativePhysicalRelationship() {
 		return relativePhysicalRelationshipEEnum;
 	}
@@ -795,6 +853,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EEnum getTransportMode() {
 		return transportModeEEnum;
 	}
@@ -804,6 +863,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public LabelsFactory getLabelsFactory() {
 		return (LabelsFactory)getEFactoryInstance();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/PopulationLabelImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/PopulationLabelImpl.java
index 29b91cd28..506a88b2c 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/PopulationLabelImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/PopulationLabelImpl.java
@@ -181,6 +181,7 @@ public class PopulationLabelImpl extends StaticNodeLabelImpl implements
 	 * @return <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getPopulationIdentifier() {
 		return populationIdentifier;
 	}
@@ -193,6 +194,7 @@ public class PopulationLabelImpl extends StaticNodeLabelImpl implements
 	 *            <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPopulationIdentifier(String newPopulationIdentifier) {
 		String oldPopulationIdentifier = populationIdentifier;
 		populationIdentifier = newPopulationIdentifier;
@@ -206,6 +208,7 @@ public class PopulationLabelImpl extends StaticNodeLabelImpl implements
 	 * @return <!-- end-user-doc -->
 	 * @generated NOT
 	 */
+	@Override
 	public PopulationLabelValue getCurrentPopulationValue() {
 		return (PopulationLabelValue) getCurrentValue();
 	} // getCurrentPopulationValue
@@ -214,6 +217,7 @@ public class PopulationLabelImpl extends StaticNodeLabelImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getPopulatedArea() {
 		return populatedArea;
 	}
@@ -222,6 +226,7 @@ public class PopulationLabelImpl extends StaticNodeLabelImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPopulatedArea(double newPopulatedArea) {
 		double oldPopulatedArea = populatedArea;
 		populatedArea = newPopulatedArea;
@@ -234,6 +239,7 @@ public class PopulationLabelImpl extends StaticNodeLabelImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getValidYear() {
 		return validYear;
 	}
@@ -243,6 +249,7 @@ public class PopulationLabelImpl extends StaticNodeLabelImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setValidYear(int newValidYear) {
 		int oldValidYear = validYear;
 		validYear = newValidYear;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/PopulationLabelValueImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/PopulationLabelValueImpl.java
index c952a7eab..0364f065e 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/PopulationLabelValueImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/PopulationLabelValueImpl.java
@@ -75,6 +75,7 @@ public class PopulationLabelValueImpl extends LabelValueImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getCount() {
 		return count;
 	}
@@ -83,6 +84,7 @@ public class PopulationLabelValueImpl extends LabelValueImpl implements
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setCount(double newCount) {
 		double oldCount = count;
 		count = newCount;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RelativePhysicalRelationshipLabelImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RelativePhysicalRelationshipLabelImpl.java
index 1d2d531e7..ea2d93158 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RelativePhysicalRelationshipLabelImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RelativePhysicalRelationshipLabelImpl.java
@@ -57,6 +57,7 @@ public class RelativePhysicalRelationshipLabelImpl extends
 	 * 
 	 * @generated NOT
 	 */
+	@Override
 	public RelativePhysicalRelationshipLabelValue getCurrentRelationship() {
 		return (RelativePhysicalRelationshipLabelValue) getCurrentValue();
 	} // getCurrentRelationship
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RelativePhysicalRelationshipLabelValueImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RelativePhysicalRelationshipLabelValueImpl.java
index fb5baa61a..708d603cd 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RelativePhysicalRelationshipLabelValueImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RelativePhysicalRelationshipLabelValueImpl.java
@@ -91,6 +91,7 @@ public class RelativePhysicalRelationshipLabelValueImpl extends LabelValueImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isAdjacent() {
 		return adjacent;
 	}
@@ -99,6 +100,7 @@ public class RelativePhysicalRelationshipLabelValueImpl extends LabelValueImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setAdjacent(boolean newAdjacent) {
 		boolean oldAdjacent = adjacent;
 		adjacent = newAdjacent;
@@ -110,6 +112,7 @@ public class RelativePhysicalRelationshipLabelValueImpl extends LabelValueImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public RelativePhysicalRelationship getRelationship() {
 		return relationship;
 	}
@@ -118,6 +121,7 @@ public class RelativePhysicalRelationshipLabelValueImpl extends LabelValueImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setRelationship(RelativePhysicalRelationship newRelationship) {
 		RelativePhysicalRelationship oldRelationship = relationship;
 		relationship = newRelationship == null ? RELATIONSHIP_EDEFAULT : newRelationship;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RoadTransportRelationshipLabelValueImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RoadTransportRelationshipLabelValueImpl.java
index 058526b94..5d007ede1 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RoadTransportRelationshipLabelValueImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/RoadTransportRelationshipLabelValueImpl.java
@@ -118,6 +118,7 @@ public class RoadTransportRelationshipLabelValueImpl extends PhysicalRelationshi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getRoadName() {
 		return roadName;
 	}
@@ -127,6 +128,7 @@ public class RoadTransportRelationshipLabelValueImpl extends PhysicalRelationshi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setRoadName(String newRoadName) {
 		String oldRoadName = roadName;
 		roadName = newRoadName;
@@ -139,6 +141,7 @@ public class RoadTransportRelationshipLabelValueImpl extends PhysicalRelationshi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getRoadClass() {
 		return roadClass;
 	}
@@ -148,6 +151,7 @@ public class RoadTransportRelationshipLabelValueImpl extends PhysicalRelationshi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setRoadClass(String newRoadClass) {
 		String oldRoadClass = roadClass;
 		roadClass = newRoadClass;
@@ -160,6 +164,7 @@ public class RoadTransportRelationshipLabelValueImpl extends PhysicalRelationshi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getNumberCrossings() {
 		return numberCrossings;
 	}
@@ -169,6 +174,7 @@ public class RoadTransportRelationshipLabelValueImpl extends PhysicalRelationshi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setNumberCrossings(int newNumberCrossings) {
 		int oldNumberCrossings = numberCrossings;
 		numberCrossings = newNumberCrossings;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/TransportRelationshipLabelImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/TransportRelationshipLabelImpl.java
index 695527003..ab84405e4 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/TransportRelationshipLabelImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/TransportRelationshipLabelImpl.java
@@ -408,6 +408,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public TransportMode getTransportMode() {
 		return transportMode;
 	}
@@ -416,6 +417,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setTransportMode(TransportMode newTransportMode) {
 		TransportMode oldTransportMode = transportMode;
 		transportMode = newTransportMode == null ? TRANSPORT_MODE_EDEFAULT : newTransportMode;
@@ -427,6 +429,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getPopulationIdentifier() {
 		return populationIdentifier;
 	}
@@ -435,6 +438,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setPopulationIdentifier(String newPopulationIdentifier) {
 		String oldPopulationIdentifier = populationIdentifier;
 		populationIdentifier = newPopulationIdentifier;
@@ -446,6 +450,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getTransportIdentifier() {
 		return transportIdentifier;
 	}
@@ -454,6 +459,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setTransportIdentifier(String newTransportIdentifier) {
 		String oldTransportIdentifier = transportIdentifier;
 		transportIdentifier = newTransportIdentifier;
@@ -466,6 +472,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * 
 	 * @generated NOT
 	 */
+	@Override
 	public TransportRelationshipLabelValue getCurrentTransportRelationshipLabelValue() {
 		return (TransportRelationshipLabelValue) getCurrentValue();
 	} // getCurrentTransportRelationshipLabelValue
@@ -474,6 +481,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getRateTimePeriod() {
 		return rateTimePeriod;
 	}
@@ -482,6 +490,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setRateTimePeriod(long newRateTimePeriod) {
 		long oldRateTimePeriod = rateTimePeriod;
 		rateTimePeriod = newRateTimePeriod;
@@ -494,6 +503,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * 
 	 * @generated NOT
 	 */
+	@Override
 	public int getDepartureCapacity() {
 		// $ANALYSIS-IGNORE
 		return (int) (getMaximumDepartureCapacity() * getCurrentTransportRelationshipLabelValue()
@@ -504,6 +514,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getMaximumDepartureCapacity() {
 		return maximumDepartureCapacity;
 	}
@@ -512,6 +523,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMaximumDepartureCapacity(int newMaximumDepartureCapacity) {
 		int oldMaximumDepartureCapacity = maximumDepartureCapacity;
 		maximumDepartureCapacity = newMaximumDepartureCapacity;
@@ -524,6 +536,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * 
 	 * @generated NOT
 	 */
+	@Override
 	public int getCapacity() {
 		// $ANALYSIS-IGNORE
 		return (int) (getMaximumCapacity() * getCurrentTransportRelationshipLabelValue()
@@ -534,6 +547,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getMaximumCapacity() {
 		return maximumCapacity;
 	}
@@ -542,6 +556,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setMaximumCapacity(int newMaximumCapacity) {
 		int oldMaximumCapacity = maximumCapacity;
 		maximumCapacity = newMaximumCapacity;
@@ -553,6 +568,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getTransitTime() {
 		return transitTime;
 	}
@@ -561,6 +577,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setTransitTime(long newTransitTime) {
 		long oldTransitTime = transitTime;
 		transitTime = newTransitTime;
@@ -572,6 +589,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public long getStartUpDelay() {
 		return startUpDelay;
 	}
@@ -580,6 +598,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setStartUpDelay(long newStartUpDelay) {
 		long oldStartUpDelay = startUpDelay;
 		startUpDelay = newStartUpDelay;
@@ -591,6 +610,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * @see org.eclipse.stem.definitions.labels.TransportRelationshipLabel#send(org.eclipse.stem.core.graph.Node,
 	 *      org.eclipse.emf.ecore.EObject)
 	 */
+	@Override
 	public void send(Node here, EObject departees) {
 		// Are we sending from Node A?
 		if (getEdge().getA().equals(here)) {
@@ -607,6 +627,7 @@ public class TransportRelationshipLabelImpl extends DynamicEdgeLabelImpl
 	 * @see org.eclipse.stem.definitions.labels.TransportRelationshipLabel#receive(org.eclipse.stem.core.graph.Node,
 	 *      org.eclipse.stem.core.model.STEMTime)
 	 */
+	@Override
 	public EList<EObject> receive(Node here, STEMTime currentTime) {
 		final EList<EObject> retValue = new BasicEList<EObject>();
 		// Are we receiving at Node A?
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/TransportRelationshipLabelValueImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/TransportRelationshipLabelValueImpl.java
index e7ac61fd4..ac2f31daa 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/TransportRelationshipLabelValueImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/impl/TransportRelationshipLabelValueImpl.java
@@ -74,6 +74,7 @@ public class TransportRelationshipLabelValueImpl extends LabelValueImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getAvailableDepartureCapacityProportion() {
 		return availableDepartureCapacityProportion;
 	}
@@ -83,6 +84,7 @@ public class TransportRelationshipLabelValueImpl extends LabelValueImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setAvailableDepartureCapacityProportion(double newAvailableDepartureCapacityProportion) {
 		double oldAvailableDepartureCapacityProportion = availableDepartureCapacityProportion;
 		availableDepartureCapacityProportion = newAvailableDepartureCapacityProportion;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/presentation/LabelsActionBarContributor.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/presentation/LabelsActionBarContributor.java
index f81db6379..1c9216757 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/presentation/LabelsActionBarContributor.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/presentation/LabelsActionBarContributor.java
@@ -206,7 +206,8 @@ public class LabelsActionBarContributor
 		//
 		submenuManager.addMenuListener
 			(new IMenuListener() {
-				 public void menuAboutToShow(IMenuManager menuManager) {
+				 @Override
+				public void menuAboutToShow(IMenuManager menuManager) {
 					 menuManager.updateAll(true);
 				 }
 			 });
@@ -253,6 +254,7 @@ public class LabelsActionBarContributor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		// Remove any menu items for old selection.
 		//
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/presentation/LabelsEditor.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/presentation/LabelsEditor.java
index b6eb40504..692c4f8fe 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/presentation/LabelsEditor.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/presentation/LabelsEditor.java
@@ -248,6 +248,7 @@ public class LabelsEditor
 	 */
 	protected IPartListener partListener =
 		new IPartListener() {
+			@Override
 			public void partActivated(IWorkbenchPart p) {
 				if (p instanceof ContentOutline) {
 					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
@@ -266,15 +267,19 @@ public class LabelsEditor
 					handleActivate();
 				}
 			}
+			@Override
 			public void partBroughtToTop(IWorkbenchPart p) {
 				// Ignore.
 			}
+			@Override
 			public void partClosed(IWorkbenchPart p) {
 				// Ignore.
 			}
+			@Override
 			public void partDeactivated(IWorkbenchPart p) {
 				// Ignore.
 			}
+			@Override
 			public void partOpened(IWorkbenchPart p) {
 				// Ignore.
 			}
@@ -347,7 +352,8 @@ public class LabelsEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										 public void run() {
+										 @Override
+										public void run() {
 											 updateProblemIndication();
 										 }
 									 });
@@ -380,6 +386,7 @@ public class LabelsEditor
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 		new IResourceChangeListener() {
+			@Override
 			public void resourceChanged(IResourceChangeEvent event) {
 				IResourceDelta delta = event.getDelta();
 				try {
@@ -388,6 +395,7 @@ public class LabelsEditor
 						protected Collection<Resource> changedResources = new ArrayList<Resource>();
 						protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
+						@Override
 						public boolean visit(IResourceDelta delta) {
 							if (delta.getResource().getType() == IResource.FILE) {
 								if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -422,7 +430,8 @@ public class LabelsEditor
 					if (!visitor.getRemovedResources().isEmpty()) {
 						getSite().getShell().getDisplay().asyncExec
 							(new Runnable() {
-								 public void run() {
+								 @Override
+								public void run() {
 									 removedResources.addAll(visitor.getRemovedResources());
 									 if (!isDirty()) {
 										 getSite().getPage().closeEditor(LabelsEditor.this, false);
@@ -434,7 +443,8 @@ public class LabelsEditor
 					if (!visitor.getChangedResources().isEmpty()) {
 						getSite().getShell().getDisplay().asyncExec
 							(new Runnable() {
-								 public void run() {
+								 @Override
+								public void run() {
 									 changedResources.addAll(visitor.getChangedResources());
 									 if (getSite().getPage().getActiveEditor() == LabelsEditor.this) {
 										 handleActivate();
@@ -638,10 +648,12 @@ public class LabelsEditor
 		//
 		commandStack.addCommandStackListener
 			(new CommandStackListener() {
-				 public void commandStackChanged(final EventObject event) {
+				 @Override
+				public void commandStackChanged(final EventObject event) {
 					 getContainer().getDisplay().asyncExec
 						 (new Runnable() {
-							  public void run() {
+							  @Override
+							public void run() {
 								  firePropertyChange(IEditorPart.PROP_DIRTY);
 
 								  // Try to select the affected objects.
@@ -687,6 +699,7 @@ public class LabelsEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 				new Runnable() {
+					@Override
 					public void run() {
 						// Try to select the items in the current content viewer of the editor.
 						//
@@ -707,6 +720,7 @@ public class LabelsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -763,6 +777,7 @@ public class LabelsEditor
 					new ISelectionChangedListener() {
 						// This just notifies those things that are affected by the section.
 						//
+						@Override
 						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 							setSelection(selectionChangedEvent.getSelection());
 						}
@@ -797,6 +812,7 @@ public class LabelsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Viewer getViewer() {
 		return currentViewer;
 	}
@@ -916,7 +932,8 @@ public class LabelsEditor
 
 			getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					 public void run() {
+					 @Override
+					public void run() {
 						 setActivePage(0);
 					 }
 				 });
@@ -940,7 +957,8 @@ public class LabelsEditor
 
 		getSite().getShell().getDisplay().asyncExec
 			(new Runnable() {
-				 public void run() {
+				 @Override
+				public void run() {
 					 updateProblemIndication();
 				 }
 			 });
@@ -1075,7 +1093,8 @@ public class LabelsEditor
 				(new ISelectionChangedListener() {
 					 // This ensures that we handle selections correctly.
 					 //
-					 public void selectionChanged(SelectionChangedEvent event) {
+					 @Override
+					public void selectionChanged(SelectionChangedEvent event) {
 						 handleContentOutlineSelection(event.getSelection());
 					 }
 				 });
@@ -1285,6 +1304,7 @@ public class LabelsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void gotoMarker(IMarker marker) {
 		try {
 			if (marker.getType().equals(EValidator.MARKER)) {
@@ -1335,6 +1355,7 @@ public class LabelsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.add(listener);
 	}
@@ -1345,6 +1366,7 @@ public class LabelsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.remove(listener);
 	}
@@ -1355,6 +1377,7 @@ public class LabelsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ISelection getSelection() {
 		return editorSelection;
 	}
@@ -1366,6 +1389,7 @@ public class LabelsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSelection(ISelection selection) {
 		editorSelection = selection;
 
@@ -1435,6 +1459,7 @@ public class LabelsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void menuAboutToShow(IMenuManager menuManager) {
 		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/LabelsItemProviderAdapterFactory.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/LabelsItemProviderAdapterFactory.java
index 073ee0605..76441482e 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/LabelsItemProviderAdapterFactory.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/labels/provider/LabelsItemProviderAdapterFactory.java
@@ -434,6 +434,7 @@ public class LabelsItemProviderAdapterFactory extends LabelsAdapterFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -447,6 +448,7 @@ public class LabelsItemProviderAdapterFactory extends LabelsAdapterFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(
 			ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
@@ -515,6 +517,7 @@ public class LabelsItemProviderAdapterFactory extends LabelsAdapterFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -528,6 +531,7 @@ public class LabelsItemProviderAdapterFactory extends LabelsAdapterFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -541,6 +545,7 @@ public class LabelsItemProviderAdapterFactory extends LabelsAdapterFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -555,6 +560,7 @@ public class LabelsItemProviderAdapterFactory extends LabelsAdapterFactory
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		if (areaLabelItemProvider != null) areaLabelItemProvider.dispose();
 		if (areaLabelValueItemProvider != null) areaLabelValueItemProvider.dispose();
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/lattice/impl/LatticeGeneratorUtilityImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/lattice/impl/LatticeGeneratorUtilityImpl.java
index 973323b66..a13eb8ed5 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/lattice/impl/LatticeGeneratorUtilityImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/lattice/impl/LatticeGeneratorUtilityImpl.java
@@ -99,6 +99,7 @@ public class LatticeGeneratorUtilityImpl extends GraphLatticeGenerator {
 	 * @param periodicBoundaries
 	 * @return
 	 */
+	@Override
 	public Graph getGraph(int xSize, int ySize, double area, boolean addNearestNeighbors, boolean addNextNearestNeighbors, boolean periodicBoundaries) {
 		final Graph graph = GraphFactory.eINSTANCE.createGraph();
 		final DublinCore dc = graph.getDublinCore();
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/impl/NodesFactoryImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/impl/NodesFactoryImpl.java
index 341d683df..90336bde2 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/impl/NodesFactoryImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/impl/NodesFactoryImpl.java
@@ -75,6 +75,7 @@ public class NodesFactoryImpl extends EFactoryImpl implements NodesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Region createRegion() {
 		RegionImpl region = new RegionImpl();
 		return region;
@@ -85,6 +86,7 @@ public class NodesFactoryImpl extends EFactoryImpl implements NodesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public NodesPackage getNodesPackage() {
 		return (NodesPackage)getEPackage();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/impl/NodesPackageImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/impl/NodesPackageImpl.java
index d7483a883..4a1b6b13b 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/impl/NodesPackageImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/impl/NodesPackageImpl.java
@@ -149,6 +149,7 @@ public class NodesPackageImpl extends EPackageImpl implements NodesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getGeographicFeature() {
 		return geographicFeatureEClass;
 	}
@@ -158,6 +159,7 @@ public class NodesPackageImpl extends EPackageImpl implements NodesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRegion() {
 		return regionEClass;
 	}
@@ -167,6 +169,7 @@ public class NodesPackageImpl extends EPackageImpl implements NodesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getNode() {
 		return nodeEClass;
 	}
@@ -176,6 +179,7 @@ public class NodesPackageImpl extends EPackageImpl implements NodesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public NodesFactory getNodesFactory() {
 		return (NodesFactory)getEFactoryInstance();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/presentation/NodesActionBarContributor.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/presentation/NodesActionBarContributor.java
index e0cdcabd5..358324d30 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/presentation/NodesActionBarContributor.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/presentation/NodesActionBarContributor.java
@@ -206,7 +206,8 @@ public class NodesActionBarContributor
 		//
 		submenuManager.addMenuListener
 			(new IMenuListener() {
-				 public void menuAboutToShow(IMenuManager menuManager) {
+				 @Override
+				public void menuAboutToShow(IMenuManager menuManager) {
 					 menuManager.updateAll(true);
 				 }
 			 });
@@ -253,6 +254,7 @@ public class NodesActionBarContributor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		// Remove any menu items for old selection.
 		//
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/presentation/NodesEditor.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/presentation/NodesEditor.java
index 77f75797f..d201fd2b2 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/presentation/NodesEditor.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/presentation/NodesEditor.java
@@ -248,6 +248,7 @@ public class NodesEditor
 	 */
 	protected IPartListener partListener =
 		new IPartListener() {
+			@Override
 			public void partActivated(IWorkbenchPart p) {
 				if (p instanceof ContentOutline) {
 					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
@@ -266,15 +267,19 @@ public class NodesEditor
 					handleActivate();
 				}
 			}
+			@Override
 			public void partBroughtToTop(IWorkbenchPart p) {
 				// Ignore.
 			}
+			@Override
 			public void partClosed(IWorkbenchPart p) {
 				// Ignore.
 			}
+			@Override
 			public void partDeactivated(IWorkbenchPart p) {
 				// Ignore.
 			}
+			@Override
 			public void partOpened(IWorkbenchPart p) {
 				// Ignore.
 			}
@@ -347,7 +352,8 @@ public class NodesEditor
 							if (updateProblemIndication) {
 								getSite().getShell().getDisplay().asyncExec
 									(new Runnable() {
-										 public void run() {
+										 @Override
+										public void run() {
 											 updateProblemIndication();
 										 }
 									 });
@@ -380,6 +386,7 @@ public class NodesEditor
 	 */
 	protected IResourceChangeListener resourceChangeListener =
 		new IResourceChangeListener() {
+			@Override
 			public void resourceChanged(IResourceChangeEvent event) {
 				IResourceDelta delta = event.getDelta();
 				try {
@@ -388,6 +395,7 @@ public class NodesEditor
 						protected Collection<Resource> changedResources = new ArrayList<Resource>();
 						protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
+						@Override
 						public boolean visit(IResourceDelta delta) {
 							if (delta.getResource().getType() == IResource.FILE) {
 								if (delta.getKind() == IResourceDelta.REMOVED ||
@@ -422,7 +430,8 @@ public class NodesEditor
 					if (!visitor.getRemovedResources().isEmpty()) {
 						getSite().getShell().getDisplay().asyncExec
 							(new Runnable() {
-								 public void run() {
+								 @Override
+								public void run() {
 									 removedResources.addAll(visitor.getRemovedResources());
 									 if (!isDirty()) {
 										 getSite().getPage().closeEditor(NodesEditor.this, false);
@@ -434,7 +443,8 @@ public class NodesEditor
 					if (!visitor.getChangedResources().isEmpty()) {
 						getSite().getShell().getDisplay().asyncExec
 							(new Runnable() {
-								 public void run() {
+								 @Override
+								public void run() {
 									 changedResources.addAll(visitor.getChangedResources());
 									 if (getSite().getPage().getActiveEditor() == NodesEditor.this) {
 										 handleActivate();
@@ -638,10 +648,12 @@ public class NodesEditor
 		//
 		commandStack.addCommandStackListener
 			(new CommandStackListener() {
-				 public void commandStackChanged(final EventObject event) {
+				 @Override
+				public void commandStackChanged(final EventObject event) {
 					 getContainer().getDisplay().asyncExec
 						 (new Runnable() {
-							  public void run() {
+							  @Override
+							public void run() {
 								  firePropertyChange(IEditorPart.PROP_DIRTY);
 
 								  // Try to select the affected objects.
@@ -687,6 +699,7 @@ public class NodesEditor
 		if (theSelection != null && !theSelection.isEmpty()) {
 			Runnable runnable =
 				new Runnable() {
+					@Override
 					public void run() {
 						// Try to select the items in the current content viewer of the editor.
 						//
@@ -707,6 +720,7 @@ public class NodesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
@@ -763,6 +777,7 @@ public class NodesEditor
 					new ISelectionChangedListener() {
 						// This just notifies those things that are affected by the section.
 						//
+						@Override
 						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
 							setSelection(selectionChangedEvent.getSelection());
 						}
@@ -797,6 +812,7 @@ public class NodesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Viewer getViewer() {
 		return currentViewer;
 	}
@@ -916,7 +932,8 @@ public class NodesEditor
 
 			getSite().getShell().getDisplay().asyncExec
 				(new Runnable() {
-					 public void run() {
+					 @Override
+					public void run() {
 						 setActivePage(0);
 					 }
 				 });
@@ -940,7 +957,8 @@ public class NodesEditor
 
 		getSite().getShell().getDisplay().asyncExec
 			(new Runnable() {
-				 public void run() {
+				 @Override
+				public void run() {
 					 updateProblemIndication();
 				 }
 			 });
@@ -1075,7 +1093,8 @@ public class NodesEditor
 				(new ISelectionChangedListener() {
 					 // This ensures that we handle selections correctly.
 					 //
-					 public void selectionChanged(SelectionChangedEvent event) {
+					 @Override
+					public void selectionChanged(SelectionChangedEvent event) {
 						 handleContentOutlineSelection(event.getSelection());
 					 }
 				 });
@@ -1285,6 +1304,7 @@ public class NodesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void gotoMarker(IMarker marker) {
 		try {
 			if (marker.getType().equals(EValidator.MARKER)) {
@@ -1335,6 +1355,7 @@ public class NodesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.add(listener);
 	}
@@ -1345,6 +1366,7 @@ public class NodesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.remove(listener);
 	}
@@ -1355,6 +1377,7 @@ public class NodesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ISelection getSelection() {
 		return editorSelection;
 	}
@@ -1366,6 +1389,7 @@ public class NodesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setSelection(ISelection selection) {
 		editorSelection = selection;
 
@@ -1435,6 +1459,7 @@ public class NodesEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void menuAboutToShow(IMenuManager menuManager) {
 		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/provider/NodesItemProviderAdapterFactory.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/provider/NodesItemProviderAdapterFactory.java
index dfb6a67d7..1f4d1a8af 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/provider/NodesItemProviderAdapterFactory.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/nodes/provider/NodesItemProviderAdapterFactory.java
@@ -107,6 +107,7 @@ public class NodesItemProviderAdapterFactory extends NodesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -117,6 +118,7 @@ public class NodesItemProviderAdapterFactory extends NodesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -165,6 +167,7 @@ public class NodesItemProviderAdapterFactory extends NodesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -175,6 +178,7 @@ public class NodesItemProviderAdapterFactory extends NodesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -185,6 +189,7 @@ public class NodesItemProviderAdapterFactory extends NodesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -199,6 +204,7 @@ public class NodesItemProviderAdapterFactory extends NodesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		if (regionItemProvider != null) regionItemProvider.dispose();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/RateImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/RateImpl.java
index 9f8451758..b7b6834b2 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/RateImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/RateImpl.java
@@ -76,6 +76,7 @@ public abstract class RateImpl extends EObjectImpl implements Rate {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public double getRate() {
 		return rate;
 	}
@@ -85,6 +86,7 @@ public abstract class RateImpl extends EObjectImpl implements Rate {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setRate(double newRate) {
 		double oldRate = rate;
 		rate = newRate;
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/TypesFactoryImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/TypesFactoryImpl.java
index d8a113ffc..0031e1e34 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/TypesFactoryImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/TypesFactoryImpl.java
@@ -73,6 +73,7 @@ public class TypesFactoryImpl extends EFactoryImpl implements TypesFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public TypesPackage getTypesPackage() {
 		return (TypesPackage)getEPackage();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/TypesPackageImpl.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/TypesPackageImpl.java
index 1f9e7ea63..e4654b188 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/TypesPackageImpl.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/impl/TypesPackageImpl.java
@@ -142,6 +142,7 @@ public class TypesPackageImpl extends EPackageImpl implements TypesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getCategorizedType() {
 		return categorizedTypeEClass;
 	}
@@ -151,6 +152,7 @@ public class TypesPackageImpl extends EPackageImpl implements TypesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getRate() {
 		return rateEClass;
 	}
@@ -160,6 +162,7 @@ public class TypesPackageImpl extends EPackageImpl implements TypesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getRate_Rate() {
 		return (EAttribute)rateEClass.getEStructuralFeatures().get(0);
 	}
@@ -169,6 +172,7 @@ public class TypesPackageImpl extends EPackageImpl implements TypesPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public TypesFactory getTypesFactory() {
 		return (TypesFactory)getEFactoryInstance();
 	}
diff --git a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/provider/TypesItemProviderAdapterFactory.java b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/provider/TypesItemProviderAdapterFactory.java
index 1e69d2498..aae253681 100644
--- a/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/provider/TypesItemProviderAdapterFactory.java
+++ b/core/org.eclipse.stem.definitions/src/org/eclipse/stem/definitions/types/provider/TypesItemProviderAdapterFactory.java
@@ -84,6 +84,7 @@ public class TypesItemProviderAdapterFactory extends TypesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -94,6 +95,7 @@ public class TypesItemProviderAdapterFactory extends TypesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -142,6 +144,7 @@ public class TypesItemProviderAdapterFactory extends TypesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -152,6 +155,7 @@ public class TypesItemProviderAdapterFactory extends TypesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -162,6 +166,7 @@ public class TypesItemProviderAdapterFactory extends TypesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -176,6 +181,7 @@ public class TypesItemProviderAdapterFactory extends TypesAdapterFactory impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 	}
 
diff --git a/core/org.eclipse.stem.graphgenerators/.classpath b/core/org.eclipse.stem.graphgenerators/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.graphgenerators/.classpath
+++ b/core/org.eclipse.stem.graphgenerators/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.graphgenerators/META-INF/MANIFEST.MF b/core/org.eclipse.stem.graphgenerators/META-INF/MANIFEST.MF
index c19da5306..1df58ad2f 100644
--- a/core/org.eclipse.stem.graphgenerators/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.graphgenerators/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.graphgenerators.provider.GraphgeneratorEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.graphgenerators,
  org.eclipse.stem.graphgenerators.impl,
  org.eclipse.stem.graphgenerators.provider,
diff --git a/core/org.eclipse.stem.jobs/.classpath b/core/org.eclipse.stem.jobs/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.jobs/.classpath
+++ b/core/org.eclipse.stem.jobs/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.jobs/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.jobs/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 193a460da..000000000
--- a/core/org.eclipse.stem.jobs/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Sep 01 16:57:07 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.jobs/META-INF/MANIFEST.MF b/core/org.eclipse.stem.jobs/META-INF/MANIFEST.MF
index 8be4e8818..db79315f2 100644
--- a/core/org.eclipse.stem.jobs/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.jobs/META-INF/MANIFEST.MF
@@ -18,4 +18,4 @@ Export-Package: org.eclipse.stem.jobs,
  org.eclipse.stem.jobs.execution,
  org.eclipse.stem.jobs.preferences,
  org.eclipse.stem.jobs.simulation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/DisplaySafeExecutor.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/DisplaySafeExecutor.java
index d0fca6b98..8115c143c 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/DisplaySafeExecutor.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/DisplaySafeExecutor.java
@@ -188,7 +188,6 @@ public class DisplaySafeExecutor
 			d.asyncExec(runnable);
 		} else {
 			new Job(runnable.toString()) {		
-				@SuppressWarnings("unused")
 				protected IStatus run(IProgressMonitor monitor) {
 					runnable.run();
 					return Status.OK_STATUS;
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/BatchExecutableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/BatchExecutableAdapterFactory.java
index f86404758..5ba5d91e8 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/BatchExecutableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/BatchExecutableAdapterFactory.java
@@ -25,6 +25,7 @@ public class BatchExecutableAdapterFactory extends ExecutableAdapterFactory {
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject,
 			final Class adapterType) {
 		IBatch retValue = null;
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/ConfigurationElementExecutableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/ConfigurationElementExecutableAdapterFactory.java
index c1a5a509c..c59629e12 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/ConfigurationElementExecutableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/ConfigurationElementExecutableAdapterFactory.java
@@ -28,6 +28,7 @@ public class ConfigurationElementExecutableAdapterFactory extends
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject,
 			final Class adapterType) {
 		IExecutable retValue = null;
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/ExecutableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/ExecutableAdapterFactory.java
index a5bf47d97..baed0a0ac 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/ExecutableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/ExecutableAdapterFactory.java
@@ -24,6 +24,7 @@ abstract public class ExecutableAdapterFactory implements IAdapterFactory {
 	/**
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
 	 */
+	@SuppressWarnings("rawtypes")
 	public Class[] getAdapterList() {
 		return new Class[] { IExecutable.class };
 	}
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/FileExecutableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/FileExecutableAdapterFactory.java
index e0fdfb7ee..09fc06849 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/FileExecutableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/FileExecutableAdapterFactory.java
@@ -27,6 +27,7 @@ public class FileExecutableAdapterFactory extends ExecutableAdapterFactory {
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject,
 			final Class adapterType) {
 		IExecutable retValue = null;
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/IdentifiableExecutableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/IdentifiableExecutableAdapterFactory.java
index 9ec8f638f..a6ea4cd8b 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/IdentifiableExecutableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/IdentifiableExecutableAdapterFactory.java
@@ -36,6 +36,7 @@ public class IdentifiableExecutableAdapterFactory extends
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject,
 			final Class adapterType) {
 		IExecutable retValue = null;
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/SimulationExecutableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/SimulationExecutableAdapterFactory.java
index 2f64616bb..2efb176a8 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/SimulationExecutableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/SimulationExecutableAdapterFactory.java
@@ -26,6 +26,7 @@ public class SimulationExecutableAdapterFactory extends
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject,
 			final Class adapterType) {
 		ISimulation retValue = null;
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/emf/ExecutableAdapter.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/emf/ExecutableAdapter.java
index 49e42c66b..e5a44dbb0 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/emf/ExecutableAdapter.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/executable/emf/ExecutableAdapter.java
@@ -127,8 +127,7 @@ abstract public class ExecutableAdapter extends AdapterImpl implements
 	 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
 	 */
 	@Override
-	public void notifyChanged(
-			@SuppressWarnings("unused") final Notification notification) {
+	public void notifyChanged(final Notification notification) {
 		// Nothing
 	}
 
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/ConfigurationElementIdentifiableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/ConfigurationElementIdentifiableAdapterFactory.java
index 891f82dc0..46c3372cf 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/ConfigurationElementIdentifiableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/ConfigurationElementIdentifiableAdapterFactory.java
@@ -29,6 +29,7 @@ public class ConfigurationElementIdentifiableAdapterFactory extends
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject,
 			final Class adapterType) {
 		Identifiable retValue = null;
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/FileIdentifiableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/FileIdentifiableAdapterFactory.java
index 8c80ba515..e940e0622 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/FileIdentifiableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/FileIdentifiableAdapterFactory.java
@@ -27,6 +27,7 @@ public class FileIdentifiableAdapterFactory extends IdentifiableAdapterFactory {
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject,
 			final Class adapterType) {
 		Identifiable retValue = null;
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/IdentifiableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/IdentifiableAdapterFactory.java
index 469a846de..a359c652c 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/IdentifiableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/IdentifiableAdapterFactory.java
@@ -24,6 +24,7 @@ abstract public class IdentifiableAdapterFactory implements IAdapterFactory {
 	/**
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
 	 */
+	@SuppressWarnings("rawtypes")
 	public Class[] getAdapterList() {
 		return new Class[] { Identifiable.class };
 	}
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/URIIdentifiableAdapterFactory.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/URIIdentifiableAdapterFactory.java
index 90ba0d64b..ae48ceabd 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/URIIdentifiableAdapterFactory.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/adapters/identifiable/URIIdentifiableAdapterFactory.java
@@ -29,6 +29,7 @@ public class URIIdentifiableAdapterFactory extends IdentifiableAdapterFactory {
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject,
 			final Class adapterType) {
 		Identifiable retValue = null;
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/preferences/SimulationManagementPreferencePage.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/preferences/SimulationManagementPreferencePage.java
index dd8a0314b..a046c86ee 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/preferences/SimulationManagementPreferencePage.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/preferences/SimulationManagementPreferencePage.java
@@ -146,8 +146,7 @@ public class SimulationManagementPreferencePage extends
 	/**
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
-	public void init(@SuppressWarnings("unused")//$NON-NLS-1$
-			IWorkbench workbench) {
+	public void init(IWorkbench workbench) {
 		// Nothing
 	}
 
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/Simulation.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/Simulation.java
index 3cc24c7fe..c694a7924 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/Simulation.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/Simulation.java
@@ -689,8 +689,7 @@ public class Simulation extends Executable implements ISimulation,
 	/**

 	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)

 	 */

-	public void propertyChange(

-			@SuppressWarnings("unused") final PropertyChangeEvent event) {

+	public void propertyChange(final PropertyChangeEvent event) {

 		setPreferences();

 	} // propertyChange

 

@@ -870,8 +869,7 @@ public class Simulation extends Executable implements ISimulation,
 			setPriority(Job.INTERACTIVE);

 		}

 

-		protected IStatus run(

-				@SuppressWarnings("unused") IProgressMonitor monitor) {

+		protected IStatus run(IProgressMonitor monitor) {

 			fireSimulationChanged(state);

 			return Status.OK_STATUS;

 		}

diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/SimulationCaching.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/SimulationCaching.java
index 07a82b5f5..75f987aa1 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/SimulationCaching.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/SimulationCaching.java
@@ -50,8 +50,7 @@ public class SimulationCaching {
 
 		Activator.getDefault().getPreferenceStore()
 				.addPropertyChangeListener(new IPropertyChangeListener() {
-					public void propertyChange(
-							@SuppressWarnings("unused") final PropertyChangeEvent event) {
+					public void propertyChange(final PropertyChangeEvent event) {
 						setPreferences();
 					} // propertyChange
 				} // IPropertyChangeListener
diff --git a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/SimulationManager.java b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/SimulationManager.java
index 44d0e3766..925f21ece 100644
--- a/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/SimulationManager.java
+++ b/core/org.eclipse.stem.jobs/src/org/eclipse/stem/jobs/simulation/SimulationManager.java
@@ -272,7 +272,6 @@ public class SimulationManager extends ExecutableManager implements
 	 * 			  Progress monitor
 	 * @return a {@link ISimulation} that's ready to run.
 	 */
-	@SuppressWarnings("unused")
 	public ISimulation createSimulation(final Scenario scenario, final IProgressMonitor monitor) {
 		ISimulation retValue = null;
 		try {
diff --git a/core/org.eclipse.stem.loggers.csv/META-INF/MANIFEST.MF b/core/org.eclipse.stem.loggers.csv/META-INF/MANIFEST.MF
index c89fd740f..765bc1832 100644
--- a/core/org.eclipse.stem.loggers.csv/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.loggers.csv/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Activator: org.eclipse.stem.loggers.csv.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
- J2SE-1.5
+ JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.jobs,
  org.eclipse.stem.ui,
diff --git a/core/org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF b/core/org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF
index 75ee190d8..b40330120 100644
--- a/core/org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF
@@ -26,4 +26,4 @@ Export-Package: org.eclipse.stem.loggers.imagewriter,
  org.eclipse.stem.loggers.imagewriter.provider,
  org.eclipse.stem.loggers.imagewriter.util
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
- J2SE-1.5
+ JavaSE-1.6
diff --git a/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/loggers/imagewriter/logger/DecoratorPropertyImageWriter.java b/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/loggers/imagewriter/logger/DecoratorPropertyImageWriter.java
index 66c7d45be..08bf9b570 100644
--- a/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/loggers/imagewriter/logger/DecoratorPropertyImageWriter.java
+++ b/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/loggers/imagewriter/logger/DecoratorPropertyImageWriter.java
@@ -35,6 +35,7 @@ import org.eclipse.stem.loggers.imagewriter.logger.draw.MapDrawer;
 import org.eclipse.stem.loggers.imagewriter.logger.projections.Equirectangular;
 import org.eclipse.stem.loggers.imagewriter.logger.projections.IMapProjection;
 import org.eclipse.stem.ui.adapters.color.AbstractRelativeValueColorProviderAdapterFactory;
+import org.eclipse.stem.ui.adapters.color.ColorProvider;
 import org.eclipse.stem.ui.adapters.color.ColorProviderAdapter;
 import org.eclipse.stem.ui.adapters.color.ColorProviderAdapterFactory;
 
@@ -148,18 +149,18 @@ public class DecoratorPropertyImageWriter
 	{
 		ColorProviderAdapter retVal = null;
 		
-		@SuppressWarnings("rawtypes")
-		List<Class> supportedColorProviders = ColorProviderAdapterFactory.INSTANCE.getSupportedColorProviders();
+		//@SuppressWarnings("rawtypes")
+		List<Class<? extends ColorProvider>> supportedColorProviders = ColorProviderAdapterFactory.INSTANCE.getSupportedColorProviders();
 		if (supportedColorProviders.size() > 0) {
 		
 			// Get the configured color provider from the logger instance
-			Class<?> selectedColorProvider = logger.getColorProvider();
+			Class<? extends ColorProvider> selectedColorProvider = logger.getColorProvider();
 	
 			// Check if the selected color provider is in the list of supported classes.  Otherwise, 
 			// search through the list for a default
 			if (selectedColorProvider == null 
 					|| !supportedColorProviders.contains(selectedColorProvider)) {
-				for (Class<?> clazz : supportedColorProviders) {
+				for (Class<? extends ColorProvider> clazz : supportedColorProviders) {
 					if (clazz.getName().equals(defaultColorProvider)){
 						selectedColorProvider = clazz;
 					}
diff --git a/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/ui/wizards/ImagewriterLoggerPropertyEditor.java b/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/ui/wizards/ImagewriterLoggerPropertyEditor.java
index 48e6b14f9..9cad68c69 100644
--- a/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/ui/wizards/ImagewriterLoggerPropertyEditor.java
+++ b/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/ui/wizards/ImagewriterLoggerPropertyEditor.java
@@ -40,8 +40,7 @@ import org.eclipse.swt.widgets.Text;
 public class ImagewriterLoggerPropertyEditor extends SimulationLoggerPropertyEditor {
 
 	private Combo colorProviderPicker;	
-	@SuppressWarnings("rawtypes")
-	private List<Class> colorProviders = ColorProviderAdapterFactory.INSTANCE.getSupportedColorProviders();
+	private List<Class<? extends ColorProvider>> colorProviders = ColorProviderAdapterFactory.INSTANCE.getSupportedColorProviders();
 	private List<String> colorProviderNames = ColorProviderAdapterFactory.INSTANCE.getSupportedColorProvidersNames();
 	
 	/**
diff --git a/core/org.eclipse.stem.sequencers/.classpath b/core/org.eclipse.stem.sequencers/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.sequencers/.classpath
+++ b/core/org.eclipse.stem.sequencers/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.sequencers/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.sequencers/.settings/org.eclipse.jdt.core.prefs
index 0d9793386..eee0e6208 100644
--- a/core/org.eclipse.stem.sequencers/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.sequencers/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,13 @@
-#Mon Jan 21 12:44:19 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=ignore
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -66,4 +62,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.sequencers/META-INF/MANIFEST.MF b/core/org.eclipse.stem.sequencers/META-INF/MANIFEST.MF
index 212c750f1..65bc18890 100644
--- a/core/org.eclipse.stem.sequencers/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.sequencers/META-INF/MANIFEST.MF
@@ -6,4 +6,4 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.stem.solvers.fd/.classpath b/core/org.eclipse.stem.solvers.fd/.classpath
index 45f024e85..121e527a9 100644
--- a/core/org.eclipse.stem.solvers.fd/.classpath
+++ b/core/org.eclipse.stem.solvers.fd/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

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

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

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<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.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/core/org.eclipse.stem.solvers.fd/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.solvers.fd/.settings/org.eclipse.jdt.core.prefs
index b436fa9a4..d9761e77c 100644
--- a/core/org.eclipse.stem.solvers.fd/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.solvers.fd/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,5 @@
-#Tue Sep 01 16:56:41 EDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -18,4 +12,3 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.solvers.fd/META-INF/MANIFEST.MF b/core/org.eclipse.stem.solvers.fd/META-INF/MANIFEST.MF
index 2140e79ad..20909c88c 100644
--- a/core/org.eclipse.stem.solvers.fd/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.solvers.fd/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.stem.core,

diff --git a/core/org.eclipse.stem.solvers.fd/src/org/eclipse/stem/solvers/fd/impl/FdJob.java b/core/org.eclipse.stem.solvers.fd/src/org/eclipse/stem/solvers/fd/impl/FdJob.java
index 22765f294..9c1fcd482 100644
--- a/core/org.eclipse.stem.solvers.fd/src/org/eclipse/stem/solvers/fd/impl/FdJob.java
+++ b/core/org.eclipse.stem.solvers.fd/src/org/eclipse/stem/solvers/fd/impl/FdJob.java
@@ -13,7 +13,6 @@ package org.eclipse.stem.solvers.fd.impl;
 
 
 
-import org.eclipse.core.internal.jobs.JobManager;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -26,6 +25,9 @@ import org.eclipse.stem.core.model.STEMTime;
  */
 public class FdJob extends Job {
 	
+	public static final String JOB_PLUGIN_ID = "org.eclipse.stem.solvers.fd";
+	public static final int JOB_ERROR_CODE = 2;
+	
 	public FdJob(String n, short thread, FiniteDifferenceImpl s) {
 		super(n);
 		this.threadnum = thread;
@@ -72,7 +74,7 @@ public class FdJob extends Job {
 				status = new Status(IStatus.OK, "unknownId", "");
 			}
 		} catch(Throwable t) {
-			 return new Status(IStatus.CANCEL, JobManager.PI_JOBS, JobManager.PLUGIN_ERROR, t.getMessage(), t);
+			 return new Status(IStatus.CANCEL, JOB_PLUGIN_ID, JOB_ERROR_CODE, t.getMessage(), t);
 		}
 		
 		return status;
diff --git a/core/org.eclipse.stem.solvers.rk/.classpath b/core/org.eclipse.stem.solvers.rk/.classpath
index 45f024e85..121e527a9 100644
--- a/core/org.eclipse.stem.solvers.rk/.classpath
+++ b/core/org.eclipse.stem.solvers.rk/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

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

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

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<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.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/core/org.eclipse.stem.solvers.rk/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.solvers.rk/.settings/org.eclipse.jdt.core.prefs
index 981820691..d9761e77c 100644
--- a/core/org.eclipse.stem.solvers.rk/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.solvers.rk/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,5 @@
-#Tue Sep 01 16:55:54 EDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -18,4 +12,3 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.solvers.rk/META-INF/MANIFEST.MF b/core/org.eclipse.stem.solvers.rk/META-INF/MANIFEST.MF
index 2e80ec9e4..6496ed92a 100644
--- a/core/org.eclipse.stem.solvers.rk/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.solvers.rk/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Export-Package: org.eclipse.stem.solvers.rk,

  org.eclipse.stem.solvers.rk.impl,

  org.eclipse.stem.solvers.rk.provider,

diff --git a/core/org.eclipse.stem.solvers.rk/src/org/eclipse/stem/solvers/rk/impl/ApacheCommonsMathODEJob.java b/core/org.eclipse.stem.solvers.rk/src/org/eclipse/stem/solvers/rk/impl/ApacheCommonsMathODEJob.java
index 949a3279c..c5e8c1db6 100644
--- a/core/org.eclipse.stem.solvers.rk/src/org/eclipse/stem/solvers/rk/impl/ApacheCommonsMathODEJob.java
+++ b/core/org.eclipse.stem.solvers.rk/src/org/eclipse/stem/solvers/rk/impl/ApacheCommonsMathODEJob.java
@@ -13,7 +13,6 @@ package org.eclipse.stem.solvers.rk.impl;
 
 
 
-import org.eclipse.core.internal.jobs.JobManager;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -26,6 +25,10 @@ import org.eclipse.stem.core.model.STEMTime;
  */
 public class ApacheCommonsMathODEJob extends Job {
 	
+	public static final String JOB_PLUGIN_ID = "org.eclipse.stem.solvers.rk";
+	public static final int JOB_ERROR_CODE = 2;
+	
+	
 	public ApacheCommonsMathODEJob(String n, short thread, ApacheCommonsMathODESolverImpl s) {
 		super(n);
 		this.threadnum = thread;
@@ -67,7 +70,7 @@ public class ApacheCommonsMathODEJob extends Job {
 		try {
 			solver._step(time,timeDelta,cycle,threadnum);
 		} catch(Throwable t) {
-			 return new Status(IStatus.CANCEL, JobManager.PI_JOBS, JobManager.PLUGIN_ERROR, t.getMessage(), t);
+			 return new Status(IStatus.CANCEL, JOB_PLUGIN_ID, JOB_ERROR_CODE, t.getMessage(), t);
 		}
 		return Status.OK_STATUS;
 	}
diff --git a/core/org.eclipse.stem.solvers.rk/src/org/eclipse/stem/solvers/rk/impl/RkJob.java b/core/org.eclipse.stem.solvers.rk/src/org/eclipse/stem/solvers/rk/impl/RkJob.java
index 1e163ba14..b0d9f40f6 100644
--- a/core/org.eclipse.stem.solvers.rk/src/org/eclipse/stem/solvers/rk/impl/RkJob.java
+++ b/core/org.eclipse.stem.solvers.rk/src/org/eclipse/stem/solvers/rk/impl/RkJob.java
@@ -13,7 +13,6 @@ package org.eclipse.stem.solvers.rk.impl;
 
 
 
-import org.eclipse.core.internal.jobs.JobManager;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -26,6 +25,10 @@ import org.eclipse.stem.core.model.STEMTime;
  */
 public class RkJob extends Job {
 	
+	public static final String JOB_PLUGIN_ID = "org.eclipse.stem.solvers.rk";
+	public static final int JOB_ERROR_CODE = 2;
+	
+	
 	public RkJob(String n, short thread, RungeKuttaImpl s) {
 		super(n);
 		this.threadnum = thread;
@@ -53,7 +56,7 @@ public class RkJob extends Job {
 		try {
 			solver._step(time,timeDelta,cycle,threadnum);
 		} catch(Throwable t) {
-			 return new Status(IStatus.CANCEL, JobManager.PI_JOBS, JobManager.PLUGIN_ERROR, t.getMessage(), t);
+			 return new Status(IStatus.CANCEL, JOB_PLUGIN_ID, JOB_ERROR_CODE, t.getMessage(), t);
 		}
 		return Status.OK_STATUS;
 	}
diff --git a/core/org.eclipse.stem.transport/.classpath b/core/org.eclipse.stem.transport/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.transport/.classpath
+++ b/core/org.eclipse.stem.transport/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.transport/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.transport/.settings/org.eclipse.jdt.core.prefs
index caaf8a17e..21058b52e 100644
--- a/core/org.eclipse.stem.transport/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.transport/.settings/org.eclipse.jdt.core.prefs
@@ -1,22 +1,12 @@
-#Tue Dec 04 17:31:06 EST 2007
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -75,4 +65,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.transport/META-INF/MANIFEST.MF b/core/org.eclipse.stem.transport/META-INF/MANIFEST.MF
index f6d965df9..7b9a98bf5 100644
--- a/core/org.eclipse.stem.transport/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.transport/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.definitions.transport,
  org.eclipse.stem.definitions.transport.impl,
  org.eclipse.stem.definitions.transport.provider,
diff --git a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportEditPlugin.java b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportEditPlugin.java
index cd88eda3a..68f4f4aa7 100644
--- a/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportEditPlugin.java
+++ b/core/org.eclipse.stem.transport/src/org/eclipse/stem/definitions/transport/provider/TransportEditPlugin.java
@@ -30,7 +30,7 @@ import org.osgi.framework.Bundle;
  */
 public final class TransportEditPlugin extends EMFPlugin {
 	
-	private static String TRANSPORT_UI_BUNDLE = "org.eclipse.stem.ui.transport";
+	public static String PLUGIN_ID = "org.eclipse.stem.ui.transport";
 	
 	/**
 	 * Keep track of the singleton.
@@ -112,7 +112,7 @@ public final class TransportEditPlugin extends EMFPlugin {
 			
 			// We need to start the ui plugin here to make sure to register the new graph generator in the UI
 			
-			Bundle uiBundle = Platform.getBundle(TRANSPORT_UI_BUNDLE);
+			Bundle uiBundle = Platform.getBundle(PLUGIN_ID);
 			if (uiBundle != null) {
 				try {
 					uiBundle.start(Bundle.START_TRANSIENT);
diff --git a/core/org.eclipse.stem.ui.ge/.classpath b/core/org.eclipse.stem.ui.ge/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.ui.ge/.classpath
+++ b/core/org.eclipse.stem.ui.ge/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.ui.ge/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.ui.ge/.settings/org.eclipse.jdt.core.prefs
index e2ba09196..b6a02758d 100644
--- a/core/org.eclipse.stem.ui.ge/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.ui.ge/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,7 @@
-#Tue Sep 19 15:43:47 PDT 2006
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=optimize out
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -71,4 +66,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/core/org.eclipse.stem.ui.ge/META-INF/MANIFEST.MF b/core/org.eclipse.stem.ui.ge/META-INF/MANIFEST.MF
index d94899f8a..6c93484ae 100644
--- a/core/org.eclipse.stem.ui.ge/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.ui.ge/META-INF/MANIFEST.MF
@@ -36,4 +36,4 @@ Export-Package: org.eclipse.stem.ui.ge;
    org.eclipse.ui.part,
    org.eclipse.stem.jobs.simulation,
    org.eclipse.ui"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.stem.ui.ge/src/org/eclipse/stem/ui/ge/kml/StemKml.java b/core/org.eclipse.stem.ui.ge/src/org/eclipse/stem/ui/ge/kml/StemKml.java
index dde9a7c2d..2a7cabcb1 100644
--- a/core/org.eclipse.stem.ui.ge/src/org/eclipse/stem/ui/ge/kml/StemKml.java
+++ b/core/org.eclipse.stem.ui.ge/src/org/eclipse/stem/ui/ge/kml/StemKml.java
@@ -58,7 +58,7 @@ import org.w3c.dom.Element;
  * 
  *
  */
-@SuppressWarnings("restriction")
+@SuppressWarnings({ "restriction", "deprecation" })
 public class StemKml {
 	/**
      * Servlet context.  
@@ -541,7 +541,6 @@ public static String initWebServer() {
  *       example: http://127.0.0.1:54345/
  *       It will return null if unable to start server
  */	
-@SuppressWarnings({ "deprecation" }) 
 public static String startWebServer() {
 	String url = null;
 	if (!_started && !_failed)	  {
diff --git a/core/org.eclipse.stem.ui.grapheditor/.classpath b/core/org.eclipse.stem.ui.grapheditor/.classpath
index 64c5e31b7..ad32c83a7 100644
--- a/core/org.eclipse.stem.ui.grapheditor/.classpath
+++ b/core/org.eclipse.stem.ui.grapheditor/.classpath
@@ -1,6 +1,6 @@
 <?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/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/core/org.eclipse.stem.ui.graphgenerators/.classpath b/core/org.eclipse.stem.ui.graphgenerators/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.ui.graphgenerators/.classpath
+++ b/core/org.eclipse.stem.ui.graphgenerators/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.ui.graphgenerators/src/org/eclipse/stem/graphgenerators/presentation/GraphgeneratorsEditor.java b/core/org.eclipse.stem.ui.graphgenerators/src/org/eclipse/stem/graphgenerators/presentation/GraphgeneratorsEditor.java
index b9d5808b5..ca150ac93 100644
--- a/core/org.eclipse.stem.ui.graphgenerators/src/org/eclipse/stem/graphgenerators/presentation/GraphgeneratorsEditor.java
+++ b/core/org.eclipse.stem.ui.graphgenerators/src/org/eclipse/stem/graphgenerators/presentation/GraphgeneratorsEditor.java
@@ -1279,6 +1279,7 @@ public class GraphgeneratorsEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Object getAdapter(Class key) {
 		if (key.equals(IContentOutlinePage.class)) {
diff --git a/core/org.eclipse.stem.ui.headless/.classpath b/core/org.eclipse.stem.ui.headless/.classpath
index 64c5e31b7..ad32c83a7 100644
--- a/core/org.eclipse.stem.ui.headless/.classpath
+++ b/core/org.eclipse.stem.ui.headless/.classpath
@@ -1,6 +1,6 @@
 <?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/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/core/org.eclipse.stem.ui.headless/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.ui.headless/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e21340ff7..000000000
--- a/core/org.eclipse.stem.ui.headless/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Mar 30 15:28:56 PDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.ui.headless/META-INF/MANIFEST.MF b/core/org.eclipse.stem.ui.headless/META-INF/MANIFEST.MF
index 6d335c914..ed2fc80ed 100644
--- a/core/org.eclipse.stem.ui.headless/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.ui.headless/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.stem.util.loggers,
  org.eclipse.stem.ui
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.ui.headless
diff --git a/core/org.eclipse.stem.ui.reports/.classpath b/core/org.eclipse.stem.ui.reports/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.ui.reports/.classpath
+++ b/core/org.eclipse.stem.ui.reports/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.ui.reports/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.ui.reports/.settings/org.eclipse.jdt.core.prefs
index 6e2ae96df..0108acb74 100644
--- a/core/org.eclipse.stem.ui.reports/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.ui.reports/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,7 @@
-#Mon Jan 21 12:53:05 EST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -71,4 +66,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/core/org.eclipse.stem.ui.reports/META-INF/MANIFEST.MF b/core/org.eclipse.stem.ui.reports/META-INF/MANIFEST.MF
index aeb9d1ac6..6837fec4e 100644
--- a/core/org.eclipse.stem.ui.reports/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.ui.reports/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.birt.chart.engine;visibility:=reexport,
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.ui.reports,
  org.eclipse.stem.ui.reports.views
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.stem.ui.solvers.fd/.classpath b/core/org.eclipse.stem.ui.solvers.fd/.classpath
index 45f024e85..121e527a9 100644
--- a/core/org.eclipse.stem.ui.solvers.fd/.classpath
+++ b/core/org.eclipse.stem.ui.solvers.fd/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

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

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

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<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.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/core/org.eclipse.stem.ui.solvers.fd/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.ui.solvers.fd/.settings/org.eclipse.jdt.core.prefs
index 28f53959c..d9761e77c 100644
--- a/core/org.eclipse.stem.ui.solvers.fd/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.ui.solvers.fd/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,5 @@
-#Tue Sep 01 16:55:35 EDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -18,4 +12,3 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.ui.solvers.fd/META-INF/MANIFEST.MF b/core/org.eclipse.stem.ui.solvers.fd/META-INF/MANIFEST.MF
index a6927dc77..17aebac0a 100644
--- a/core/org.eclipse.stem.ui.solvers.fd/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.ui.solvers.fd/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.ui.solvers.fd.Activator

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Export-Package: org.eclipse.stem.solvers.fd.presentation

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

diff --git a/core/org.eclipse.stem.ui.solvers.fd/src/org/eclipse/stem/solvers/fd/presentation/FdEditor.java b/core/org.eclipse.stem.ui.solvers.fd/src/org/eclipse/stem/solvers/fd/presentation/FdEditor.java
index 92b7b7c7c..4c1c61a1b 100644
--- a/core/org.eclipse.stem.ui.solvers.fd/src/org/eclipse/stem/solvers/fd/presentation/FdEditor.java
+++ b/core/org.eclipse.stem.ui.solvers.fd/src/org/eclipse/stem/solvers/fd/presentation/FdEditor.java
@@ -1279,6 +1279,7 @@ public class FdEditor
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@SuppressWarnings("rawtypes")

 	@Override

 	public Object getAdapter(Class key) {

 		if (key.equals(IContentOutlinePage.class)) {

diff --git a/core/org.eclipse.stem.ui.solvers.rk/.classpath b/core/org.eclipse.stem.ui.solvers.rk/.classpath
index 45f024e85..121e527a9 100644
--- a/core/org.eclipse.stem.ui.solvers.rk/.classpath
+++ b/core/org.eclipse.stem.ui.solvers.rk/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

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

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

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<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.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/core/org.eclipse.stem.ui.solvers.rk/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.ui.solvers.rk/.settings/org.eclipse.jdt.core.prefs
index ee47df4b9..35cab3580 100644
--- a/core/org.eclipse.stem.ui.solvers.rk/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.ui.solvers.rk/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Sep 01 16:52:58 EDT 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
@@ -18,4 +17,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/core/org.eclipse.stem.ui.solvers.rk/META-INF/MANIFEST.MF b/core/org.eclipse.stem.ui.solvers.rk/META-INF/MANIFEST.MF
index e9e4a58e5..1b5fc5d60 100644
--- a/core/org.eclipse.stem.ui.solvers.rk/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.ui.solvers.rk/META-INF/MANIFEST.MF
@@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.stem.ui

 Bundle-ActivationPolicy: lazy

 Bundle-Activator: org.eclipse.stem.ui.solvers.rk.Activator

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Export-Package: org.eclipse.stem.solvers.rk.presentation

diff --git a/core/org.eclipse.stem.ui.solvers.rk/src/org/eclipse/stem/solvers/rk/presentation/RkEditor.java b/core/org.eclipse.stem.ui.solvers.rk/src/org/eclipse/stem/solvers/rk/presentation/RkEditor.java
index a66cbc4e6..962f33898 100644
--- a/core/org.eclipse.stem.ui.solvers.rk/src/org/eclipse/stem/solvers/rk/presentation/RkEditor.java
+++ b/core/org.eclipse.stem.ui.solvers.rk/src/org/eclipse/stem/solvers/rk/presentation/RkEditor.java
@@ -1279,6 +1279,7 @@ public class RkEditor
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@SuppressWarnings("rawtypes")

 	@Override

 	public Object getAdapter(Class key) {

 		if (key.equals(IContentOutlinePage.class)) {

diff --git a/core/org.eclipse.stem.ui/.classpath b/core/org.eclipse.stem.ui/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.ui/.classpath
+++ b/core/org.eclipse.stem.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.ui/META-INF/MANIFEST.MF b/core/org.eclipse.stem.ui/META-INF/MANIFEST.MF
index a93b2bf09..93fa4d59a 100644
--- a/core/org.eclipse.stem.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.ui/META-INF/MANIFEST.MF
@@ -50,4 +50,4 @@ Export-Package: org.eclipse.stem.core.common.presentation,
 Bundle-ClassPath: .,
  bin/
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
- J2SE-1.5
+ JavaSE-1.6
diff --git a/core/org.eclipse.stem.ui/plugin.xml b/core/org.eclipse.stem.ui/plugin.xml
index 5c651956a..b2deae584 100644
--- a/core/org.eclipse.stem.ui/plugin.xml
+++ b/core/org.eclipse.stem.ui/plugin.xml
@@ -112,13 +112,13 @@
             icon="icons/full/customobj16/Model.gif"
             id="org.eclipse.stem.ui.wizards.newmodel"
             name="%_UI_ModelModelWizard_label"/>
-      <wizard
+      <!--<wizard
             category="org.eclipse.stem.ui.wizards.stemcategory"
             class="org.eclipse.stem.ui.wizards.NewGraphWizard"
             hasPages="true"
             icon="icons/full/customobj16/Graph.gif"
             id="org.eclipse.stem.ui.wizards.newgraph"
-            name="%_UI_GraphModelWizard_label"/>
+            name="%_UI_GraphModelWizard_label"/>-->
       <wizard
             category="org.eclipse.stem.ui.wizards.stemcategory"
             class="org.eclipse.stem.ui.wizards.NewSequentialSequencerWizard$NewFixedSequentialSequencerWizard"
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/core/solver/presentation/SolverEditor.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/core/solver/presentation/SolverEditor.java
index e2ab86054..a3d02d485 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/core/solver/presentation/SolverEditor.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/core/solver/presentation/SolverEditor.java
@@ -1284,6 +1284,7 @@ public class SolverEditor
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@SuppressWarnings("rawtypes")

 	@Override

 	public Object getAdapter(Class key) {

 		if (key.equals(IContentOutlinePage.class)) {

diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/Activator.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/Activator.java
index 66df52502..3060b82d9 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/Activator.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/Activator.java
@@ -20,6 +20,7 @@ import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.stem.ui.adapters.color.ColorProvider;
 import org.eclipse.stem.ui.adapters.color.ColorProviderAdapterFactory;
 import org.eclipse.stem.ui.adapters.featuremodifiereditcomposite.ExperimentFeatureModifierEditCompositeFactory;
 import org.eclipse.stem.ui.adapters.newmodifierpage.CommonNewModifierPageAdapterFactory;
@@ -74,6 +75,7 @@ public class Activator extends AbstractUIPlugin {
 	 * @param context
 	 * @throws Exception
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
@@ -102,12 +104,12 @@ public class Activator extends AbstractUIPlugin {
 			String factory = element.getAttribute("factory");
 			String provider = element.getAttribute("provider");
 			//Use the bundle's class loader to load the classes
-			Class factoryClass = bundle.loadClass(factory);
+			Class<?> factoryClass = bundle.loadClass(factory);
 			Object factoryInstance = factoryClass.newInstance();
-			Class providerClass = bundle.loadClass(provider);
+			Class<?> providerClass = bundle.loadClass(provider);
 			//Register the specific factory in the general factory
 			ColorProviderAdapterFactory.INSTANCE.addAdapterFactory(
-					(AdapterFactory)factoryInstance, providerClass, name);
+					(AdapterFactory)factoryInstance, (Class<? extends ColorProvider>)providerClass, name);
 		}
 	} // start
 
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/color/ColorProviderAdapterFactory.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/color/ColorProviderAdapterFactory.java
index b9f132f78..5eeb5945f 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/color/ColorProviderAdapterFactory.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/color/ColorProviderAdapterFactory.java
@@ -47,7 +47,7 @@ public interface ColorProviderAdapterFactory {
 		/**
 		 * List of supported color providers
 		 */
-		protected final List<Class> supportedColorProviders = new ArrayList<Class>();
+		protected final List<Class<? extends ColorProvider>> supportedColorProviders = new ArrayList<Class<? extends ColorProvider>>();
 		/**
 		 * List of supported color providers names
 		 */
@@ -66,7 +66,7 @@ public interface ColorProviderAdapterFactory {
 		 * @param colorProvider The {@link ColorProvider} class 
 		 * @param displayName A display name for the adapter (to be added to the UI)
 		 */
-		public void addAdapterFactory(AdapterFactory adapterFactory, Class colorProvider, String displayName) {
+		public void addAdapterFactory(AdapterFactory adapterFactory, Class<? extends ColorProvider> colorProvider, String displayName) {
 			supportedColorProviders.add(colorProvider);
 			supportedColorProvidersNames.add(displayName);
 			super.addAdapterFactory(adapterFactory);
@@ -83,7 +83,7 @@ public interface ColorProviderAdapterFactory {
 		/**
 		 * @return the supportedColorProviders
 		 */
-		public List<Class> getSupportedColorProviders() {
+		public List<Class<? extends ColorProvider>> getSupportedColorProviders() {
 			return supportedColorProviders;
 		}
 
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/color/IColorProviderChangedListener.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/color/IColorProviderChangedListener.java
index 3051016d6..f3176d21b 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/color/IColorProviderChangedListener.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/color/IColorProviderChangedListener.java
@@ -25,5 +25,5 @@ public interface IColorProviderChangedListener {
 	 * 
 	 * @param selectedColorProvider The recently selected color provider
 	 */
-	public void colorProviderChanged(Class selectedColorProvider);
+	public void colorProviderChanged(Class<? extends ColorProvider> selectedColorProvider);
 }
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/executable/IdentifiableDelegateExecutableAdapterFactory.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/executable/IdentifiableDelegateExecutableAdapterFactory.java
index 1ce589f5f..477b39d19 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/executable/IdentifiableDelegateExecutableAdapterFactory.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/executable/IdentifiableDelegateExecutableAdapterFactory.java
@@ -29,6 +29,7 @@ public class IdentifiableDelegateExecutableAdapterFactory extends
 	 * 	org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 * 	java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(final Object adaptableObject,
 			final Class adapterType) {
 		IExecutable retValue = null;
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/identifiable/DelegatingWrapperItemProviderIdentifiableAdapterFactory.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/identifiable/DelegatingWrapperItemProviderIdentifiableAdapterFactory.java
index 99e783fbb..07897a7e6 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/identifiable/DelegatingWrapperItemProviderIdentifiableAdapterFactory.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/identifiable/DelegatingWrapperItemProviderIdentifiableAdapterFactory.java
@@ -29,6 +29,7 @@ public class DelegatingWrapperItemProviderIdentifiableAdapterFactory extends
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		Identifiable retValue = null;
 
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/identifiable/IdentifiableDelegateIdentifiableAdapterFactory.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/identifiable/IdentifiableDelegateIdentifiableAdapterFactory.java
index a41f1dce6..2bc4ca2a4 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/identifiable/IdentifiableDelegateIdentifiableAdapterFactory.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/identifiable/IdentifiableDelegateIdentifiableAdapterFactory.java
@@ -27,6 +27,7 @@ public class IdentifiableDelegateIdentifiableAdapterFactory extends
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		Identifiable retValue = null;
 		// It it what we're looking for?
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/modifiable/DelegatingWrapperItemProviderModifiableAdapterFactory.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/modifiable/DelegatingWrapperItemProviderModifiableAdapterFactory.java
index 715e64c6c..bacf292d9 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/modifiable/DelegatingWrapperItemProviderModifiableAdapterFactory.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/modifiable/DelegatingWrapperItemProviderModifiableAdapterFactory.java
@@ -28,6 +28,7 @@ public class DelegatingWrapperItemProviderModifiableAdapterFactory extends
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		Modifiable retValue = null;
 
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/modifiable/IdentifiableDelegateModifiableAdapterFactory.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/modifiable/IdentifiableDelegateModifiableAdapterFactory.java
index 6a1f113ba..fdb755217 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/modifiable/IdentifiableDelegateModifiableAdapterFactory.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/adapters/modifiable/IdentifiableDelegateModifiableAdapterFactory.java
@@ -28,6 +28,7 @@ public class IdentifiableDelegateModifiableAdapterFactory extends
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
 	 *      java.lang.Class)
 	 */
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		Identifiable retValue = null;
 		// It it what we're looking for?
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/IdentifiablePluginView.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/IdentifiablePluginView.java
index e586eb737..35b81a758 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/IdentifiablePluginView.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/IdentifiablePluginView.java
@@ -204,7 +204,7 @@ public abstract class IdentifiablePluginView extends ViewPart {
 			private IStructuredSelection extractURIStringsFromIdentifiableDelegates(
 					final IStructuredSelection selectedDelegates) {
 				final List<String> collection = new ArrayList<String>();
-				for (final Iterator selectionIter = selectedDelegates
+				for (final Iterator<?> selectionIter = selectedDelegates
 						.iterator(); selectionIter.hasNext();) {
 					final Object element = selectionIter.next();
 					// Was an Identifiable Delegate selected?
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/SimulationControlView.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/SimulationControlView.java
index df8e6716a..a4315998d 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/SimulationControlView.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/SimulationControlView.java
@@ -246,50 +246,35 @@ public class SimulationControlView extends ViewPart implements
 
 	// Run all simulations -- set state of all simulations to RUNNING
 	protected void masterRunAction() {
-		Iterator iter = controlList.iterator();
-		while (iter.hasNext()) {
-			SimulationControl simulationControl = (SimulationControl) iter
-					.next();
+		for (SimulationControl simulationControl : controlList) {
 			simulationControl.run();
 		}
 	}
 
 	// Pause all simulations -- set state of all simulations to PAUSED
 	protected void masterPauseAction() {
-		Iterator iter = controlList.iterator();
-		while (iter.hasNext()) {
-			SimulationControl simulationControl = (SimulationControl) iter
-					.next();
+		for (SimulationControl simulationControl : controlList) {
 			simulationControl.pause();
 		}
 	}
 
 	// Reset all simulations -- set state of all simulations to RESET
 	protected void masterResetAction() {
-		Iterator iter = controlList.iterator();
-		while (iter.hasNext()) {
-			SimulationControl simulationControl = (SimulationControl) iter
-					.next();
+		for (SimulationControl simulationControl : controlList) {
 			simulationControl.reset();
 		}
 	}
 
 	// Step all simulations -- step in all simulations
 	protected void masterStepAction() {
-		Iterator iter = controlList.iterator();
-		while (iter.hasNext()) {
-			SimulationControl simulationControl = (SimulationControl) iter
-					.next();
+		for (SimulationControl simulationControl : controlList) {
 			simulationControl.step();
 		}
 	}
 
 	// Stop all simulations
 	protected void masterStopAction() {
-		Iterator iter = controlList.iterator();
-		while (iter.hasNext()) {
-			SimulationControl simulationControl = (SimulationControl) iter
-					.next();
+		for (SimulationControl simulationControl : controlList) {
 			simulationControl.stop();
 		}
 	}
@@ -324,9 +309,9 @@ public class SimulationControlView extends ViewPart implements
 		}
 
 		if (controlList.isEmpty() == false) {
-			Iterator iter = controlList.listIterator();
+			Iterator<SimulationControl> iter = controlList.iterator();
 			while (iter.hasNext()) {
-				SimulationControl sctrl = (SimulationControl)iter.next();
+				SimulationControl sctrl = iter.next();
 				sctrl.dispose();
 				iter.remove();
 			}
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/GeographicControl.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/GeographicControl.java
index 6578a2ae0..a49e8ec77 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/GeographicControl.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/geographic/GeographicControl.java
@@ -65,6 +65,7 @@ import org.eclipse.stem.jobs.simulation.ISimulationListener;
 import org.eclipse.stem.jobs.simulation.SimulationEvent;
 import org.eclipse.stem.populationmodels.standard.PopulationModelLabel;
 import org.eclipse.stem.ui.Activator;
+import org.eclipse.stem.ui.adapters.color.ColorProvider;
 import org.eclipse.stem.ui.adapters.color.ColorProviderAdapter;
 import org.eclipse.stem.ui.adapters.color.ColorProviderAdapterFactory;
 import org.eclipse.stem.ui.adapters.color.IColorProviderChangedListener;
@@ -1155,7 +1156,7 @@ abstract public class GeographicControl extends Composite implements
 	/**
 	 * @see org.eclipse.stem.ui.adapters.color.IColorProviderChangedListener#colorProviderChanged(java.lang.Class)
 	 */
-	public void colorProviderChanged(final Class selectedColorProvider) {
+	public void colorProviderChanged(final Class<? extends ColorProvider> selectedColorProvider) {
 		final Decorator decorator = optionsBar.getSelectedDecorator();
 		
 		if(decorator == null) return;
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GeoViewOptionsBar.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GeoViewOptionsBar.java
index be5feb8bf..9d5942326 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GeoViewOptionsBar.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/views/graphmap/GeoViewOptionsBar.java
@@ -38,6 +38,7 @@ import org.eclipse.stem.diseasemodels.standard.DiseaseModel;
 import org.eclipse.stem.jobs.simulation.ISimulation;
 import org.eclipse.stem.jobs.simulation.SimulationManager;
 import org.eclipse.stem.populationmodels.standard.PopulationModel;
+import org.eclipse.stem.ui.adapters.color.ColorProvider;
 import org.eclipse.stem.ui.adapters.color.ColorProviderAdapterFactory;
 import org.eclipse.stem.ui.adapters.color.IColorProviderAdapterFactory;
 import org.eclipse.stem.ui.preferences.PreferenceConstants;
@@ -112,7 +113,7 @@ public class GeoViewOptionsBar extends Composite implements SelectionListener {
 	/**
 	 * List of available color providers
 	 */
-	private List<Class> supportedColorProviders = null;
+	private List<Class<? extends ColorProvider>> supportedColorProviders = null;
 	/**
 	 * List of available color providers names
 	 */
@@ -124,7 +125,7 @@ public class GeoViewOptionsBar extends Composite implements SelectionListener {
 	/**
 	 * The selected color provider
 	 */
-	private Class selectedColorProvider = null;
+	private Class<? extends ColorProvider> selectedColorProvider = null;
 	/**
 	 * The selected decorator
 	 */
@@ -280,7 +281,7 @@ public class GeoViewOptionsBar extends Composite implements SelectionListener {
 		selectionListeners.remove(listener);
 	}
 
-	public Class getSelectedColorProvider() {
+	public Class<? extends ColorProvider> getSelectedColorProvider() {
 		return selectedColorProvider;
 	}
 
@@ -484,7 +485,7 @@ public class GeoViewOptionsBar extends Composite implements SelectionListener {
 		int selProvider = 0;
 		for (int i = 0; i < supportedColorProvidersNames.size(); i++) {
 			String providerName = supportedColorProvidersNames.get(i);
-			Class provider = supportedColorProviders.get(i);
+			Class<? extends ColorProvider> provider = supportedColorProviders.get(i);
 			if (settings != null
 					&& provider
 							.getSimpleName()
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/GeoViewOptionsBar.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/GeoViewOptionsBar.java
index afb52f0a5..1cd97a11d 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/GeoViewOptionsBar.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/GeoViewOptionsBar.java
@@ -36,6 +36,7 @@ import org.eclipse.stem.definitions.adapters.relativevalue.RelativeValueProvider
 import org.eclipse.stem.diseasemodels.standard.DiseaseModel;
 import org.eclipse.stem.jobs.simulation.ISimulation;
 import org.eclipse.stem.populationmodels.standard.PopulationModel;
+import org.eclipse.stem.ui.adapters.color.ColorProvider;
 import org.eclipse.stem.ui.adapters.color.ColorProviderAdapterFactory;
 import org.eclipse.stem.ui.adapters.color.IColorProviderAdapterFactory;
 import org.eclipse.stem.ui.adapters.color.IColorProviderChangedListener;
@@ -129,7 +130,7 @@ public class GeoViewOptionsBar extends Composite {
 	/**
 	 * List of available color providers
 	 */
-	List<Class> supportedColorProviders = null;
+	List<Class<? extends ColorProvider>> supportedColorProviders = null;
 	/**
 	 * List of available color providers names
 	 */
@@ -141,7 +142,7 @@ public class GeoViewOptionsBar extends Composite {
 	/**
 	 * The selected color provider
 	 */
-	Class selectedColorProvider = null;
+	Class<? extends ColorProvider> selectedColorProvider = null;
 	/**
 	 * The selected decorator
 	 */
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/IdentifiablePickerDialog.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/IdentifiablePickerDialog.java
index 5f4c566c8..b710d92f1 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/IdentifiablePickerDialog.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/IdentifiablePickerDialog.java
@@ -47,7 +47,7 @@ public class IdentifiablePickerDialog extends Dialog {
 	IProject project;
 	
 	//
-	Class restrictClass;
+	Class<?> restrictClass;
 	boolean cancelPressed = false;
 	protected Shell shell;
 	Composite mainComposite;
@@ -57,7 +57,7 @@ public class IdentifiablePickerDialog extends Dialog {
 	
 	private Identifiable selectedObject;
 	
-	public IdentifiablePickerDialog (Shell parent, int style, String title, IProject p, Class restrictClass) {
+	public IdentifiablePickerDialog (Shell parent, int style, String title, IProject p, Class<?> restrictClass) {
 		super (parent, style);
 		//setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.APPLICATION_MODAL);
 		this.title = title;
@@ -213,9 +213,9 @@ public class IdentifiablePickerDialog extends Dialog {
 		return result;
 	}
 	
-	private boolean isClass(Class c, Class target) {
+	private boolean isClass(Class<?> c, Class<?> target) {
 		if(target.equals(c)) return true;
-		Class superC = c.getSuperclass();
+		Class<?> superC = c.getSuperclass();
 		if(superC == null) return false;
 		return isClass(superC, target);
 	}
diff --git a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/ParameterPickerDialog.java b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/ParameterPickerDialog.java
index 12f5f958c..08212434e 100644
--- a/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/ParameterPickerDialog.java
+++ b/core/org.eclipse.stem.ui/src/org/eclipse/stem/ui/widgets/ParameterPickerDialog.java
@@ -50,7 +50,7 @@ public class ParameterPickerDialog extends Dialog {
 	IProject project;
 	
 	//
-	Class restrictClass;
+	Class<?> restrictClass;
 	boolean cancelPressed = false;
 	protected Shell shell;
 	Composite mainComposite;
@@ -62,7 +62,7 @@ public class ParameterPickerDialog extends Dialog {
 	private Identifiable selectedObject;
 	private EAttribute selectedAttribute;
 	
-	public ParameterPickerDialog (Shell parent, int style, String title, IProject p, Class restrictClass) {
+	public ParameterPickerDialog (Shell parent, int style, String title, IProject p, Class<?> restrictClass) {
 		super (parent, style);
 		//setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.APPLICATION_MODAL);
 		this.title = title;
@@ -286,9 +286,9 @@ public class ParameterPickerDialog extends Dialog {
 		return result;
 	}
 	
-	private boolean isClass(Class c, Class target) {
+	private boolean isClass(Class<?> c, Class<?> target) {
 		if(target.equals(c)) return true;
-		Class superC = c.getSuperclass();
+		Class<?> superC = c.getSuperclass();
 		if(superC == null) return false;
 		return isClass(superC, target);
 	}
diff --git a/core/org.eclipse.stem.util.loggers/.classpath b/core/org.eclipse.stem.util.loggers/.classpath
index 304e86186..121e527a9 100644
--- a/core/org.eclipse.stem.util.loggers/.classpath
+++ b/core/org.eclipse.stem.util.loggers/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.stem.util.loggers/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.stem.util.loggers/.settings/org.eclipse.jdt.core.prefs
index 9993046bd..b4f0d0117 100644
--- a/core/org.eclipse.stem.util.loggers/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.stem.util.loggers/.settings/org.eclipse.jdt.core.prefs
@@ -1,22 +1,12 @@
-#Mon Feb 25 14:59:18 PST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
@@ -71,4 +61,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.stem.util.loggers/META-INF/MANIFEST.MF b/core/org.eclipse.stem.util.loggers/META-INF/MANIFEST.MF
index 4df0eaa5b..9d9165338 100644
--- a/core/org.eclipse.stem.util.loggers/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.stem.util.loggers/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.util.loggers,
  org.eclipse.stem.util.loggers.util,
  org.eclipse.stem.util.loggers.views
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/developer_tools/modelgen/org.eclipse.stem.model.codegen/.settings/org.eclipse.pde.prefs b/developer_tools/modelgen/org.eclipse.stem.model.codegen/.settings/org.eclipse.pde.prefs
new file mode 100644
index 000000000..70418be2e
--- /dev/null
+++ b/developer_tools/modelgen/org.eclipse.stem.model.codegen/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=2
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/distributed/org.eclipse.stem.graphsynchronizer/.classpath b/distributed/org.eclipse.stem.graphsynchronizer/.classpath
index 304e86186..121e527a9 100644
--- a/distributed/org.eclipse.stem.graphsynchronizer/.classpath
+++ b/distributed/org.eclipse.stem.graphsynchronizer/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/distributed/org.eclipse.stem.graphsynchronizer/.settings/org.eclipse.jdt.core.prefs b/distributed/org.eclipse.stem.graphsynchronizer/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c1ec28d06..000000000
--- a/distributed/org.eclipse.stem.graphsynchronizer/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Feb 18 09:55:38 PST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/distributed/org.eclipse.stem.graphsynchronizer/META-INF/MANIFEST.MF b/distributed/org.eclipse.stem.graphsynchronizer/META-INF/MANIFEST.MF
index 153520ec0..4ef839106 100644
--- a/distributed/org.eclipse.stem.graphsynchronizer/META-INF/MANIFEST.MF
+++ b/distributed/org.eclipse.stem.graphsynchronizer/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.stem.populationmodels,
  org.eclipse.stem.diseasemodels,
  org.eclipse.stem.data.geography
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.graphsynchronizer,
  org.eclipse.stem.graphsynchronizer.impl,
  org.eclipse.stem.graphsynchronizer.util
diff --git a/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/Activator.java b/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/Activator.java
index a9364d8e3..66e0824eb 100644
--- a/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/Activator.java
+++ b/distributed/org.eclipse.stem.graphsynchronizer/src/org/eclipse/stem/graphsynchronizer/Activator.java
@@ -112,7 +112,7 @@ public class Activator extends AbstractUIPlugin {
 
 		Messenger messenger = null;
 		try {
-		 Class messC = Class.forName(messengerClass);
+		 Class<?> messC = Class.forName(messengerClass);
 		 messenger = (Messenger)messC.newInstance();
 		} catch(Exception cnfe) {
 			Activator.logError("Unable to load or instantiate class "+messengerClass, cnfe);
diff --git a/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/.classpath b/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/.classpath
+++ b/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/.settings/org.eclipse.jdt.core.prefs
index b876e8e10..d9761e77c 100644
--- a/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/.settings/org.eclipse.jdt.core.prefs
+++ b/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,5 @@
-#Tue Sep 01 17:00:41 EDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -18,4 +12,3 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/META-INF/MANIFEST.MF
index 06d500924..123c5fa28 100644
--- a/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.data.diseasemodels.models/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.stem.data.diseasemodels.models;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.stem.data.diseasemodels.models.Activator
 Require-Bundle: org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.data.diseasemodels.models
 Bundle-Vendor: Eclipse.org
diff --git a/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/.classpath b/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/.classpath
+++ b/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/.settings/org.eclipse.jdt.core.prefs
index f7ae348a9..d9761e77c 100644
--- a/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/.settings/org.eclipse.jdt.core.prefs
+++ b/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,5 @@
-#Tue Sep 01 17:01:02 EDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -18,4 +12,3 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/META-INF/MANIFEST.MF
index 737aad41a..ba8ac621d 100644
--- a/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.data.diseasemodels.scenarios/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.stem.data.diseasemodels.scenarios.Activator
 Require-Bundle: org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.data.diseasemodels.scenarios
 Bundle-Vendor: Eclipse.org
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.example/.classpath b/models/epidemiology/org.eclipse.stem.diseasemodels.example/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.example/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.example/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.example/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.diseasemodels.example/.settings/org.eclipse.jdt.core.prefs
index 571970097..693aad354 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.example/.settings/org.eclipse.jdt.core.prefs
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.example/.settings/org.eclipse.jdt.core.prefs
@@ -1,22 +1,12 @@
-#Tue Nov 27 19:11:01 PST 2007
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -75,4 +65,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.example/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels.example/META-INF/MANIFEST.MF
index f56bb6027..0cac2ecc4 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.example/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.example/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.diseasemodels.example.provider.ExampleEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.stem.diseasemodels;visibility:=reexport,
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.experimental/.classpath b/models/epidemiology/org.eclipse.stem.diseasemodels.experimental/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.experimental/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.experimental/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.experimental/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels.experimental/META-INF/MANIFEST.MF
index d76b99db9..ff79f8b88 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.experimental/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.experimental/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.diseasemodels.experimental.provider.ExperimentalEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.experimental;uses:="org.eclipse.stem.diseasemodels.standard,org.eclipse.emf.ecore",
  org.eclipse.stem.diseasemodels.experimental.impl;
   uses:="org.eclipse.stem.diseasemodels.standard,
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/.classpath b/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs
index 911f2dae0..ce0f19c6d 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs
@@ -1,22 +1,12 @@
-#Tue Sep 23 09:35:12 EDT 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -75,4 +65,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/META-INF/MANIFEST.MF
index e03ccc418..2f687373a 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.externaldatasource/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.diseasemodels.externaldatasource.provider.ExternalDataSourceEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.diseasemodels;visibility:=reexport,
  org.eclipse.emf.ecore;visibility:=reexport,
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.forcing/.classpath b/models/epidemiology/org.eclipse.stem.diseasemodels.forcing/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.forcing/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.forcing/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.forcing/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels.forcing/META-INF/MANIFEST.MF
index b10a5731e..12ea56b1b 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.forcing/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.forcing/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.diseasemodels.forcing.provider.ForcingEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.forcing,
  org.eclipse.stem.diseasemodels.forcing.impl,
  org.eclipse.stem.diseasemodels.forcing.provider,
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/.classpath b/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/.classpath
index 45f024e85..ed2bc1287 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

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

+	<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.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3c0739d30..000000000
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 15 12:07:24 PDT 2009

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF
index 6d73eb5c9..a9afb4300 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.diseasemodels.globalinfluenzamodel.provider.GlobalinfluenzamodelEditPlugin$Implementation

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Export-Package: org.eclipse.stem.diseasemodels.globalinfluenzamodel,

  org.eclipse.stem.diseasemodels.globalinfluenzamodel.impl,

  org.eclipse.stem.diseasemodels.globalinfluenzamodel.provider,

diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/.classpath b/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f8c6ee914..000000000
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Feb 22 15:39:35 PST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/META-INF/MANIFEST.MF
index 9b3d15122..7de80ad9c 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.multipopulation/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.multipopulation;uses:="org.eclipse.emf.ecore,org.eclipse.stem.diseasemodels.standard",
  org.eclipse.stem.diseasemodels.multipopulation.impl;
   uses:="org.eclipse.emf.ecore,
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.poliodiseasemodel/.classpath b/models/epidemiology/org.eclipse.stem.diseasemodels.poliodiseasemodel/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.poliodiseasemodel/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.poliodiseasemodel/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.poliodiseasemodel/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels.poliodiseasemodel/META-INF/MANIFEST.MF
index 6572541ed..763d2a004 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.poliodiseasemodel/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.poliodiseasemodel/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.diseasemodels.poliodiseasemodel.provider.PolioEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.poliodiseasemodel;uses:="org.eclipse.emf.ecore,org.eclipse.stem.diseasemodels.standard",
  org.eclipse.stem.diseasemodels.poliodiseasemodel.impl;
   uses:="org.eclipse.emf.ecore,
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.vector/.classpath b/models/epidemiology/org.eclipse.stem.diseasemodels.vector/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.vector/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.vector/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels.vector/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels.vector/META-INF/MANIFEST.MF
index 4751447c6..5e67441e6 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels.vector/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels.vector/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.vector,
  org.eclipse.stem.diseasemodels.vector.impl,
  org.eclipse.stem.diseasemodels.vector.provider,
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/.classpath b/models/epidemiology/org.eclipse.stem.diseasemodels/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.diseasemodels/.settings/org.eclipse.jdt.core.prefs
index f403ab788..0453e5da1 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/.settings/org.eclipse.jdt.core.prefs
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,12 @@
-#Mon Jan 21 12:39:47 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -66,4 +61,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.diseasemodels/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseasemodels/META-INF/MANIFEST.MF
index 56a94acb7..86a8e123d 100644
--- a/models/epidemiology/org.eclipse.stem.diseasemodels/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseasemodels/META-INF/MANIFEST.MF
@@ -24,4 +24,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.interventions,
  org.eclipse.stem.data.geography
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/models/epidemiology/org.eclipse.stem.diseases/.classpath b/models/epidemiology/org.eclipse.stem.diseases/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.diseases/.classpath
+++ b/models/epidemiology/org.eclipse.stem.diseases/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.diseases/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.diseases/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e91f7f85b..000000000
--- a/models/epidemiology/org.eclipse.stem.diseases/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Jan 21 12:40:39 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.diseases/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.diseases/META-INF/MANIFEST.MF
index 97f497ce5..3a1871089 100644
--- a/models/epidemiology/org.eclipse.stem.diseases/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.diseases/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseases
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/.classpath b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/.classpath
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/.settings/org.eclipse.jdt.core.prefs
index c4b62cae1..d9761e77c 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/.settings/org.eclipse.jdt.core.prefs
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,5 @@
-#Tue Sep 01 16:59:50 EDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -18,4 +12,3 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/META-INF/MANIFEST.MF
index 044b2ebb2..70c8f50a9 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.models/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.internal.data.geography,
  org.eclipse.stem.internal.data.geography.models,
  org.eclipse.stem.data.geography.population.human.models
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse.org
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/.classpath b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/.classpath
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/.settings/org.eclipse.jdt.core.prefs
index 13b705f85..d9761e77c 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/.settings/org.eclipse.jdt.core.prefs
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,5 @@
-#Tue Sep 01 16:59:32 EDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -18,4 +12,3 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/META-INF/MANIFEST.MF
index e7a3d8192..9a2ad2a55 100644
--- a/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.internal.diseasemodels.scenarios/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.internal.data,
  org.eclipse.stem.internal.data.geography,
  org.eclipse.stem.internal.data.geography.models
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse.org
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/.classpath b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/.classpath
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/META-INF/MANIFEST.MF
index ebc661875..100fc8d09 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.ui.diseasemodels.example.presentation.ExampleEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.ui.diseasemodels.example.presentation
 Require-Bundle: org.eclipse.stem.diseasemodels.example;visibility:=reexport,
  org.eclipse.emf.ecore.edit;visibility:=reexport,
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/src/org/eclipse/stem/diseasemodels/example/presentation/ExampleEditor.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/src/org/eclipse/stem/diseasemodels/example/presentation/ExampleEditor.java
index 23ff34416..da876e842 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/src/org/eclipse/stem/diseasemodels/example/presentation/ExampleEditor.java
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.example/src/org/eclipse/stem/diseasemodels/example/presentation/ExampleEditor.java
@@ -1035,6 +1035,7 @@ public class ExampleEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Object getAdapter(Class key) {
 		if (key.equals(IContentOutlinePage.class)) {
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/.classpath b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/.classpath
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 128e65db7..000000000
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Mar 30 15:28:43 PDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/META-INF/MANIFEST.MF
index 85e62631a..2e23f0358 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.experimental/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.diseasemodels.experimental.presentation.ExperimentalEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.experimental.presentation,
  org.eclipse.stem.ui.diseasemodels.experimental.adapters
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/.classpath b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/.classpath
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4be10265f..000000000
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Tue Sep 23 09:36:38 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/META-INF/MANIFEST.MF
index 13e2d5b0a..02145dd24 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.diseasemodels.externaldatasource.presentation.ExternalDataSourceEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.externaldatasource.presentation
 Require-Bundle: org.eclipse.stem.diseasemodels.externaldatasource;visibility:=reexport,
  org.eclipse.stem.util.loggers,
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/src/org/eclipse/stem/diseasemodels/externaldatasource/presentation/ExternalDataSourceEditor.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/src/org/eclipse/stem/diseasemodels/externaldatasource/presentation/ExternalDataSourceEditor.java
index d3f27a2f0..d44fb466c 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/src/org/eclipse/stem/diseasemodels/externaldatasource/presentation/ExternalDataSourceEditor.java
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.externaldatasource/src/org/eclipse/stem/diseasemodels/externaldatasource/presentation/ExternalDataSourceEditor.java
@@ -1287,6 +1287,7 @@ public class ExternalDataSourceEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Object getAdapter(Class key) {
 		if (key.equals(IContentOutlinePage.class)) {
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.forcing/.classpath b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.forcing/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.forcing/.classpath
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.forcing/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.forcing/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.forcing/META-INF/MANIFEST.MF
index 98d25f778..df5521392 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.forcing/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.forcing/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.ui.diseasemodels.forcing.presentation.ForcingEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.forcing.presentation,
  org.eclipse.stem.ui.diseasemodels.forcing.presentation
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/.classpath b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/.classpath
index 45f024e85..ed2bc1287 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/.classpath
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

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

+	<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.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/.settings/org.eclipse.jdt.core.prefs b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a3b2bfba4..000000000
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 15 12:07:11 PDT 2009

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF
index 6ae7eb250..b47174925 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel.presentation.GlobalinfluenzamodelEditorPlugin$Implementation

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Export-Package: org.eclipse.stem.diseasemodels.globalinfluenzamodel.presentation,

  org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel.presentation

 Require-Bundle: org.eclipse.core.runtime,

diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/src/org/eclipse/stem/diseasemodels/globalinfluenzamodel/presentation/GlobalinfluenzamodelEditor.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/src/org/eclipse/stem/diseasemodels/globalinfluenzamodel/presentation/GlobalinfluenzamodelEditor.java
index b9233653a..9989040e7 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/src/org/eclipse/stem/diseasemodels/globalinfluenzamodel/presentation/GlobalinfluenzamodelEditor.java
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.globalinfluenzamodel/src/org/eclipse/stem/diseasemodels/globalinfluenzamodel/presentation/GlobalinfluenzamodelEditor.java
@@ -1285,6 +1285,7 @@ public class GlobalinfluenzamodelEditor
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@SuppressWarnings("rawtypes")

 	@Override

 	public Object getAdapter(Class key) {

 		if (key.equals(IContentOutlinePage.class)) {

diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.multipopulation/.classpath b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.multipopulation/.classpath
index 45f024e85..ed2bc1287 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.multipopulation/.classpath
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.multipopulation/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

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

+	<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.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.multipopulation/src/org/eclipse/stem/diseasemodels/multipopulation/presentation/MultipopulationEditor.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.multipopulation/src/org/eclipse/stem/diseasemodels/multipopulation/presentation/MultipopulationEditor.java
index 2cb88af3d..538830874 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.multipopulation/src/org/eclipse/stem/diseasemodels/multipopulation/presentation/MultipopulationEditor.java
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.multipopulation/src/org/eclipse/stem/diseasemodels/multipopulation/presentation/MultipopulationEditor.java
@@ -1283,6 +1283,7 @@ public class MultipopulationEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Object getAdapter(Class key) {
 		if (key.equals(IContentOutlinePage.class)) {
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/.classpath b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/.classpath
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/META-INF/MANIFEST.MF
index 823be1035..f38c66d69 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.stem.diseasemodels.vector.presentation.VectorEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.vector.presentation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/src/org/eclipse/stem/diseasemodels/vector/presentation/VectorEditor.java b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/src/org/eclipse/stem/diseasemodels/vector/presentation/VectorEditor.java
index 3f9e20d20..217b0351f 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/src/org/eclipse/stem/diseasemodels/vector/presentation/VectorEditor.java
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels.vector/src/org/eclipse/stem/diseasemodels/vector/presentation/VectorEditor.java
@@ -1284,6 +1284,7 @@ public class VectorEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Object getAdapter(Class key) {
 		if (key.equals(IContentOutlinePage.class)) {
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/.classpath b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/.classpath
index 304e86186..121e527a9 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/.classpath
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/META-INF/MANIFEST.MF b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/META-INF/MANIFEST.MF
index efc27bcf4..1b7ef5ac1 100644
--- a/models/epidemiology/org.eclipse.stem.ui.diseasemodels/META-INF/MANIFEST.MF
+++ b/models/epidemiology/org.eclipse.stem.ui.diseasemodels/META-INF/MANIFEST.MF
@@ -21,4 +21,4 @@ Require-Bundle: org.eclipse.stem.diseasemodels;visibility:=reexport,
  org.eclipse.stem.analysis,
  org.eclipse.core.expressions;bundle-version="3.4.200"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/models/populations/org.eclipse.stem.populationmodels/.classpath b/models/populations/org.eclipse.stem.populationmodels/.classpath
index 304e86186..121e527a9 100644
--- a/models/populations/org.eclipse.stem.populationmodels/.classpath
+++ b/models/populations/org.eclipse.stem.populationmodels/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/populations/org.eclipse.stem.populationmodels/META-INF/MANIFEST.MF b/models/populations/org.eclipse.stem.populationmodels/META-INF/MANIFEST.MF
index 94a349dc1..46abb3386 100644
--- a/models/populations/org.eclipse.stem.populationmodels/META-INF/MANIFEST.MF
+++ b/models/populations/org.eclipse.stem.populationmodels/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.stem.core;visibility:=reexport,

diff --git a/models/populations/org.eclipse.stem.ui.populationmodels/.classpath b/models/populations/org.eclipse.stem.ui.populationmodels/.classpath
index 304e86186..121e527a9 100644
--- a/models/populations/org.eclipse.stem.ui.populationmodels/.classpath
+++ b/models/populations/org.eclipse.stem.ui.populationmodels/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/models/populations/org.eclipse.stem.ui.populationmodels/plugin.xml b/models/populations/org.eclipse.stem.ui.populationmodels/plugin.xml
index 9c6a90641..3993e18a3 100644
--- a/models/populations/org.eclipse.stem.ui.populationmodels/plugin.xml
+++ b/models/populations/org.eclipse.stem.ui.populationmodels/plugin.xml
@@ -47,12 +47,12 @@
            icon="icons/full/custom16/populationmodel.gif"

            id="org.eclipse.stem.ui.views.populationmodels"

            name="%_UI_PView_Name"/>

-     <view

+     <!--<view

            category="org.eclipse.stem.ui.views"

            class="org.eclipse.stem.ui.views.populationmodel.PopulationInitializerView"

            icon="icons/full/custom16/populationinitializer.gif"

            id="org.eclipse.stem.ui.views.populationinitializer"

-           name="%_UI_PIView_Name"/>      

+           name="%_UI_PIView_Name"/> -->     

   </extension>

   

    <extension point="org.eclipse.ui.editors">

diff --git a/models/populations/org.eclipse.stem.ui.populationmodels/src/org/eclipse/stem/ui/populationmodels/adapters/StandardRelativeValueProviderAdapterFactory.java b/models/populations/org.eclipse.stem.ui.populationmodels/src/org/eclipse/stem/ui/populationmodels/adapters/StandardRelativeValueProviderAdapterFactory.java
index 996e54984..64203345b 100644
--- a/models/populations/org.eclipse.stem.ui.populationmodels/src/org/eclipse/stem/ui/populationmodels/adapters/StandardRelativeValueProviderAdapterFactory.java
+++ b/models/populations/org.eclipse.stem.ui.populationmodels/src/org/eclipse/stem/ui/populationmodels/adapters/StandardRelativeValueProviderAdapterFactory.java
@@ -342,8 +342,8 @@ public class StandardRelativeValueProviderAdapterFactory extends
 		 */
 		@Override
 		public double getDenominator(final EStructuralFeature feature) {
-			long popRef = Activator.getDefault().getPluginPreferences().getLong(PreferenceConstants.REFERENCE_POPULATION);
-			long densRef = Activator.getDefault().getPluginPreferences().getLong(PreferenceConstants.REFERENCE_DENSITY);
+			long popRef = Activator.getDefault().getPreferenceStore().getLong(PreferenceConstants.REFERENCE_POPULATION);
+			long densRef = Activator.getDefault().getPreferenceStore().getLong(PreferenceConstants.REFERENCE_DENSITY);
 	
 			if(popRef == 0) popRef = PreferenceInitializer.DEFAULT_REFERENCE_POPULATION;
 			if(densRef == 0) popRef = PreferenceInitializer.DEFAULT_REFERENCE_DENSITY;
diff --git a/releng/org.eclipse.stem.releng.targetplatforms/STEM-Eclipse38.target b/releng/org.eclipse.stem.releng.targetplatforms/STEM-Eclipse38.target
index a11b5e7ff..25aab5cc9 100644
--- a/releng/org.eclipse.stem.releng.targetplatforms/STEM-Eclipse38.target
+++ b/releng/org.eclipse.stem.releng.targetplatforms/STEM-Eclipse38.target
@@ -1,26 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?pde version="3.8"?>

-

-<target name="STEM - Eclipse Platform 3.8" sequenceNumber="69">

-<locations>

-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

-<unit id="org.eclipse.platform.ide" version="3.8.0.I20120608-1200"/>

-<repository location="http://download.eclipse.org/eclipse/updates/3.8"/>

-</location>

-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

-<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>

-<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>

-<unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>

-<unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>

-<unit id="org.apache.commons.math.source" version="2.1.0.v201105210652"/>

-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/"/>

-</location>

-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

-<unit id="org.eclipse.birt.feature.group" version="4.2.0.v20120611-C_BC7CGWoJMfAnw8Y8QVz0nD0JPl"/>

-<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.0.v20120608-0554"/>

-<unit id="org.eclipse.zest.sdk.feature.group" version="1.4.0.201206112118"/>

-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.6.0.v20120517-1809-67R09E9QuFflXswwIO_z0E3d4k_X"/>

-<repository location="http://download.eclipse.org/releases/juno"/>

-</location>

-</locations>

-</target>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="STEM - Eclipse Platform 3.8" sequenceNumber="74">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="3.8.0.I20120608-1200"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.commons.collections" version="3.2.0.v201005080500"/>
+<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+<unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
+<unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>
+<unit id="org.apache.commons.math.source" version="2.1.0.v201105210652"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.birt.feature.group" version="4.2.0.v20120611-C_BC7CGWoJMfAnw8Y8QVz0nD0JPl"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.0.v20120608-0554"/>
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.4.0.201206112118"/>
+<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.6.0.v20120517-1809-67R09E9QuFflXswwIO_z0E3d4k_X"/>
+<repository location="http://download.eclipse.org/releases/juno"/>
+</location>
+<location path="${eclipse_home}" type="Directory"/>
+</locations>
+</target>
diff --git a/releng/org.eclipse.stem.releng/category.xml b/releng/org.eclipse.stem.releng/category.xml
new file mode 100644
index 000000000..7efc577cc
--- /dev/null
+++ b/releng/org.eclipse.stem.releng/category.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.stem.data.diseasemodels.feature_2.0.0.qualifier.jar" id="org.eclipse.stem.data.diseasemodels.feature" version="2.0.0.qualifier">
+      <category name="org.eclipse.stem.data"/>
+   </feature>
+   <feature url="features/org.eclipse.stem.data.geography.feature_2.0.0.qualifier.jar" id="org.eclipse.stem.data.geography.feature" version="2.0.0.qualifier">
+      <category name="org.eclipse.stem.data"/>
+   </feature>
+   <feature url="features/org.eclipse.stem.data.population.human.feature_2.0.0.qualifier.jar" id="org.eclipse.stem.data.population.human.feature" version="2.0.0.qualifier">
+      <category name="org.eclipse.stem.data"/>
+   </feature>
+   <feature url="features/org.eclipse.stem.data.transportation.feature_2.0.0.qualifier.jar" id="org.eclipse.stem.data.transportation.feature" version="2.0.0.qualifier">
+      <category name="org.eclipse.stem.data"/>
+   </feature>
+   <category-def name="org.eclipse.stem.data" label="STEM Denominator Data"/>
+</site>
diff --git a/tests/org.eclipse.stem.sample/.classpath b/tests/org.eclipse.stem.sample/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.sample/.classpath
+++ b/tests/org.eclipse.stem.sample/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.sample/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.sample/.settings/org.eclipse.jdt.core.prefs
index 73bc73d97..cc4489295 100644
--- a/tests/org.eclipse.stem.sample/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.sample/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,11 @@
-#Mon Jan 21 12:43:56 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
@@ -54,4 +49,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.sample/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.sample/META-INF/MANIFEST.MF
index adf8ae5c0..d6d813c03 100644
--- a/tests/org.eclipse.stem.sample/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.sample/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.stem.jobs,
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.sample,
  org.eclipse.stem.sample.adaption
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.stem.tests.automaticexperiment/.classpath b/tests/org.eclipse.stem.tests.automaticexperiment/.classpath
index 2d1a4302f..8a8f1668c 100644
--- a/tests/org.eclipse.stem.tests.automaticexperiment/.classpath
+++ b/tests/org.eclipse.stem.tests.automaticexperiment/.classpath
@@ -1,6 +1,6 @@
 <?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/J2SE-1.5"/>

+	<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.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/tests/org.eclipse.stem.tests.automaticexperiment/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.automaticexperiment/META-INF/MANIFEST.MF
index 818f311b5..3466c0b74 100644
--- a/tests/org.eclipse.stem.tests.automaticexperiment/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.automaticexperiment/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: STEM Automatic Experiment Test Suite
 Bundle-SymbolicName: org.eclipse.stem.tests.automaticexperiment;singleton:=true
 Bundle-Version: 1.4.1.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.emf.ecore,
  org.junit;visibility:=reexport,
  org.eclipse.stem.analysis,
diff --git a/tests/org.eclipse.stem.tests.automaticexperiment/src/org/eclipse/stem/tests/automaticexperiment/AutomaticExperimentTest.java b/tests/org.eclipse.stem.tests.automaticexperiment/src/org/eclipse/stem/tests/automaticexperiment/AutomaticExperimentTest.java
index 83b5d0db6..5e6e75a8d 100644
--- a/tests/org.eclipse.stem.tests.automaticexperiment/src/org/eclipse/stem/tests/automaticexperiment/AutomaticExperimentTest.java
+++ b/tests/org.eclipse.stem.tests.automaticexperiment/src/org/eclipse/stem/tests/automaticexperiment/AutomaticExperimentTest.java
@@ -99,12 +99,11 @@ public class AutomaticExperimentTest
 	 * @see org.eclipse.stem.core.experiment.Experiment#updateScenario()

 	 * @generated NOT

 	 */

-	@SuppressWarnings({ "unused" })

 	public void testAutomaticExperiment() 

 	{

 		AutomaticExperiment automaticExperiment = getFixture();

 		assertNotNull(automaticExperiment);

-		String algorithmName = automaticExperiment.getErrorAnalysisAlgorithm();

+		//String algorithmName = automaticExperiment.getErrorAnalysisAlgorithm();

 		ErrorAnalysisAlgorithm algorithm = 

 			ErrorAnalysisAlgorithmFactory.INSTANCE.createErrorAnalysisAlgorithm(automaticExperiment);

 		assertNotNull(algorithm);

diff --git a/tests/org.eclipse.stem.tests.core/.classpath b/tests/org.eclipse.stem.tests.core/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.core/.classpath
+++ b/tests/org.eclipse.stem.tests.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.core/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.core/.settings/org.eclipse.jdt.core.prefs
index e4d0cdf24..91f98a6ce 100644
--- a/tests/org.eclipse.stem.tests.core/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,12 @@
-#Mon Jan 21 12:46:01 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -66,4 +61,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.core/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.core/META-INF/MANIFEST.MF
index 6fa81ca02..9d620bdf5 100644
--- a/tests/org.eclipse.stem.tests.core/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.core/META-INF/MANIFEST.MF
@@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.analysis;bundle-version="1.1.0",
  org.eclipse.stem.ui
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.resources
 Bundle-Activator: org.eclipse.stem.core.tests.Activator
diff --git a/tests/org.eclipse.stem.tests.definitions/.classpath b/tests/org.eclipse.stem.tests.definitions/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.definitions/.classpath
+++ b/tests/org.eclipse.stem.tests.definitions/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.definitions/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.definitions/.settings/org.eclipse.jdt.core.prefs
index 854a55563..6f25c0831 100644
--- a/tests/org.eclipse.stem.tests.definitions/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.definitions/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,12 @@
-#Mon Jan 21 12:46:23 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=ignore
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -66,4 +61,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.definitions/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.definitions/META-INF/MANIFEST.MF
index 196b9aa67..ea97b04e5 100644
--- a/tests/org.eclipse.stem.tests.definitions/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.definitions/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.stem.definitions;visibility:=reexport,
  org.eclipse.stem.tests.core,
  org.eclipse.stem.tests.util
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.example/.classpath b/tests/org.eclipse.stem.tests.diseasemodels.example/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.example/.classpath
+++ b/tests/org.eclipse.stem.tests.diseasemodels.example/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.example/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.diseasemodels.example/.settings/org.eclipse.jdt.core.prefs
index 88007c654..c381703ac 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.example/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.diseasemodels.example/.settings/org.eclipse.jdt.core.prefs
@@ -1,22 +1,12 @@
-#Tue Sep 23 09:36:18 EDT 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -75,4 +65,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.example/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.diseasemodels.example/META-INF/MANIFEST.MF
index 689e576a4..0b4fe0b29 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.example/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.diseasemodels.example/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.example.tests
 Require-Bundle: org.eclipse.stem.diseasemodels;visibility:=reexport,
  org.eclipse.stem.diseasemodels.example,
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.experimental/.classpath b/tests/org.eclipse.stem.tests.diseasemodels.experimental/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.experimental/.classpath
+++ b/tests/org.eclipse.stem.tests.diseasemodels.experimental/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.experimental/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.diseasemodels.experimental/META-INF/MANIFEST.MF
index 1f96353db..c6988abd1 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.experimental/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.diseasemodels.experimental/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.experimental.tests
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.diseasemodels.experimental;visibility:=reexport,
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/.classpath b/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/.classpath
+++ b/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs
index 239715a95..c381703ac 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/.settings/org.eclipse.jdt.core.prefs
@@ -1,22 +1,12 @@
-#Tue Sep 23 09:36:27 EDT 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -75,4 +65,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/META-INF/MANIFEST.MF
index 9fc83c00b..d358d86d9 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.diseasemodels.externaldatasource/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.externaldatasource.tests
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.diseasemodels;visibility:=reexport,
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.forcing/.classpath b/tests/org.eclipse.stem.tests.diseasemodels.forcing/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.forcing/.classpath
+++ b/tests/org.eclipse.stem.tests.diseasemodels.forcing/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.forcing/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.diseasemodels.forcing/META-INF/MANIFEST.MF
index cda5ce794..082c8c890 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.forcing/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.diseasemodels.forcing/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.diseasemodels.forcing.tests
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.diseasemodels.forcing;visibility:=reexport,
diff --git a/tests/org.eclipse.stem.tests.diseasemodels.multipopulation/.classpath b/tests/org.eclipse.stem.tests.diseasemodels.multipopulation/.classpath
index 45f024e85..ed2bc1287 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels.multipopulation/.classpath
+++ b/tests/org.eclipse.stem.tests.diseasemodels.multipopulation/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

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

+	<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.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/tests/org.eclipse.stem.tests.diseasemodels/.classpath b/tests/org.eclipse.stem.tests.diseasemodels/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels/.classpath
+++ b/tests/org.eclipse.stem.tests.diseasemodels/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.diseasemodels/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.diseasemodels/.settings/org.eclipse.jdt.core.prefs
index a8c04556c..9d56bf4ae 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.diseasemodels/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,12 @@
-#Mon Jan 21 12:46:46 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=ignore
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -66,4 +61,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.diseasemodels/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.diseasemodels/META-INF/MANIFEST.MF
index 719dd0cb1..0f5ff08e0 100644
--- a/tests/org.eclipse.stem.tests.diseasemodels/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.diseasemodels/META-INF/MANIFEST.MF
@@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.tests.core,
  org.eclipse.stem.tests.definitions,
  org.eclipse.stem.tests.util
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.stem.solvers.fd
diff --git a/tests/org.eclipse.stem.tests.grapheditor/.classpath b/tests/org.eclipse.stem.tests.grapheditor/.classpath
index 2d1a4302f..8a8f1668c 100644
--- a/tests/org.eclipse.stem.tests.grapheditor/.classpath
+++ b/tests/org.eclipse.stem.tests.grapheditor/.classpath
@@ -1,6 +1,6 @@
 <?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/J2SE-1.5"/>

+	<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.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/tests/org.eclipse.stem.tests.graphgenerators/.classpath b/tests/org.eclipse.stem.tests.graphgenerators/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.graphgenerators/.classpath
+++ b/tests/org.eclipse.stem.tests.graphgenerators/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.graphgenerators/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.graphgenerators/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2c450ba90..000000000
--- a/tests/org.eclipse.stem.tests.graphgenerators/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Mar 30 15:27:38 PDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.graphgenerators/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.graphgenerators/META-INF/MANIFEST.MF
index a5d4680b7..db70bccbd 100644
--- a/tests/org.eclipse.stem.tests.graphgenerators/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.graphgenerators/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.graphgenerators.tests,
  org.eclipse.stem.test.graphgenerators.tests
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/tests/org.eclipse.stem.tests.internal.data/.classpath b/tests/org.eclipse.stem.tests.internal.data/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.internal.data/.classpath
+++ b/tests/org.eclipse.stem.tests.internal.data/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.internal.data/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.internal.data/META-INF/MANIFEST.MF
index 6dc592411..478599f35 100644
--- a/tests/org.eclipse.stem.tests.internal.data/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.internal.data/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.internal.data;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
diff --git a/tests/org.eclipse.stem.tests.jobs/.classpath b/tests/org.eclipse.stem.tests.jobs/.classpath
index 0664cb4fb..154485a55 100644
--- a/tests/org.eclipse.stem.tests.jobs/.classpath
+++ b/tests/org.eclipse.stem.tests.jobs/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.stem.tests.jobs/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.jobs/.settings/org.eclipse.jdt.core.prefs
index bfba821e0..d9761e77c 100644
--- a/tests/org.eclipse.stem.tests.jobs/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.jobs/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,5 @@
-#Tue Sep 01 16:57:36 EDT 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -17,4 +12,3 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.jobs/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.jobs/META-INF/MANIFEST.MF
index 7376bc3ca..bd0b0ed49 100644
--- a/tests/org.eclipse.stem.tests.jobs/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.jobs/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.stem.jobs,
  org.eclipse.stem.tests.core
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.stem.tests.populationmodels/.classpath b/tests/org.eclipse.stem.tests.populationmodels/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.populationmodels/.classpath
+++ b/tests/org.eclipse.stem.tests.populationmodels/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.transport/.classpath b/tests/org.eclipse.stem.tests.transport/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.transport/.classpath
+++ b/tests/org.eclipse.stem.tests.transport/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.transport/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.transport/.settings/org.eclipse.jdt.core.prefs
index 9e6695ce5..9ab81b3c6 100644
--- a/tests/org.eclipse.stem.tests.transport/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.transport/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,12 @@
-#Mon Jan 21 12:49:15 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -70,4 +65,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.transport/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.transport/META-INF/MANIFEST.MF
index 620b35797..0bc73f975 100644
--- a/tests/org.eclipse.stem.tests.transport/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.transport/META-INF/MANIFEST.MF
@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.stem.transport;visibility:=reexport,
  org.eclipse.stem.solvers.fd,
  org.junit;visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.stem.tests.ui.ge/.classpath b/tests/org.eclipse.stem.tests.ui.ge/.classpath
index 64c5e31b7..ad32c83a7 100644
--- a/tests/org.eclipse.stem.tests.ui.ge/.classpath
+++ b/tests/org.eclipse.stem.tests.ui.ge/.classpath
@@ -1,6 +1,6 @@
 <?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/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.stem.tests.ui/.classpath b/tests/org.eclipse.stem.tests.ui/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.ui/.classpath
+++ b/tests/org.eclipse.stem.tests.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.ui/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.ui/.settings/org.eclipse.jdt.core.prefs
index 3b3f76f82..cc4489295 100644
--- a/tests/org.eclipse.stem.tests.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,11 @@
-#Mon Jan 21 12:49:37 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
@@ -54,4 +49,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.ui/META-INF/MANIFEST.MF
index e5e5e1502..aee8a8e30 100644
--- a/tests/org.eclipse.stem.tests.ui/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.stem.tests.util,
  org.eclipse.stem.ui,
  org.eclipse.stem.definitions,
  org.eclipse.stem.data.geography
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.tests.ui,
  org.eclipse.stem.ui.views.map
diff --git a/tests/org.eclipse.stem.tests.util/.classpath b/tests/org.eclipse.stem.tests.util/.classpath
index 304e86186..121e527a9 100644
--- a/tests/org.eclipse.stem.tests.util/.classpath
+++ b/tests/org.eclipse.stem.tests.util/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.stem.tests.util/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.stem.tests.util/.settings/org.eclipse.jdt.core.prefs
index 8e334eb41..8ab7636bb 100644
--- a/tests/org.eclipse.stem.tests.util/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.stem.tests.util/.settings/org.eclipse.jdt.core.prefs
@@ -1,17 +1,12 @@
-#Mon Jan 21 12:50:24 EST 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=ignore
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -66,4 +61,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.stem.tests.util/META-INF/MANIFEST.MF b/tests/org.eclipse.stem.tests.util/META-INF/MANIFEST.MF
index d489621fd..924580d02 100644
--- a/tests/org.eclipse.stem.tests.util/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.stem.tests.util/META-INF/MANIFEST.MF
@@ -21,5 +21,5 @@ Export-Package: org.eclipse.stem.tests.util,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.definitions
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.emf.ecore.provider