Fixes for warnings. Lots of fixes.

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

39 files changed, 93 insertions, 66 deletions

diff --git a/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.classpath b/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.classpath
index 304e861..121e527 100644
--- a/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.classpath
+++ b/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.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/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.settings/org.eclipse.jdt.core.prefs b/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.settings/org.eclipse.jdt.core.prefs
index 8c3b561..35cab35 100644
--- a/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.settings/org.eclipse.jdt.core.prefs
+++ b/geography/org.eclipse.stem.data.geography.infrastructure.transportation/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Sep 01 17:02:34 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/geography/org.eclipse.stem.data.geography.infrastructure.transportation/META-INF/MANIFEST.MF b/geography/org.eclipse.stem.data.geography.infrastructure.transportation/META-INF/MANIFEST.MF
index b214691..d6da5a8 100644
--- a/geography/org.eclipse.stem.data.geography.infrastructure.transportation/META-INF/MANIFEST.MF
+++ b/geography/org.eclipse.stem.data.geography.infrastructure.transportation/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Bundle-Activator: org.eclipse.stem.data.geography.infrastructure.transportation.
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.data.geography
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.data.geography.infrastructure.transportation
 Bundle-Vendor: %providerName
diff --git a/geography/org.eclipse.stem.data.geography.models/.classpath b/geography/org.eclipse.stem.data.geography.models/.classpath
index 304e861..121e527 100644
--- a/geography/org.eclipse.stem.data.geography.models/.classpath
+++ b/geography/org.eclipse.stem.data.geography.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/geography/org.eclipse.stem.data.geography.models/.settings/org.eclipse.jdt.core.prefs b/geography/org.eclipse.stem.data.geography.models/.settings/org.eclipse.jdt.core.prefs
index 985479c..8000cd6 100644
--- a/geography/org.eclipse.stem.data.geography.models/.settings/org.eclipse.jdt.core.prefs
+++ b/geography/org.eclipse.stem.data.geography.models/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,11 @@
-#Tue Feb 10 16:16:08 EST 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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+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
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/geography/org.eclipse.stem.data.geography.models/META-INF/MANIFEST.MF b/geography/org.eclipse.stem.data.geography.models/META-INF/MANIFEST.MF
index 1447762..84a6918 100644
--- a/geography/org.eclipse.stem.data.geography.models/META-INF/MANIFEST.MF
+++ b/geography/org.eclipse.stem.data.geography.models/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.stem.data.geography.models.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.geography.models
 Bundle-Vendor: Eclipse.org
diff --git a/geography/org.eclipse.stem.data.geography/.classpath b/geography/org.eclipse.stem.data.geography/.classpath
index 304e861..121e527 100644
--- a/geography/org.eclipse.stem.data.geography/.classpath
+++ b/geography/org.eclipse.stem.data.geography/.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/geography/org.eclipse.stem.data.geography/.settings/org.eclipse.jdt.core.prefs b/geography/org.eclipse.stem.data.geography/.settings/org.eclipse.jdt.core.prefs
index 0307302..0ee8b1a 100644
--- a/geography/org.eclipse.stem.data.geography/.settings/org.eclipse.jdt.core.prefs
+++ b/geography/org.eclipse.stem.data.geography/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Feb 23 19:54:54 EST 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.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -67,4 +66,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=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/geography/org.eclipse.stem.data.geography/META-INF/MANIFEST.MF b/geography/org.eclipse.stem.data.geography/META-INF/MANIFEST.MF
index 0b4b2ab..316a3a1 100644
--- a/geography/org.eclipse.stem.data.geography/META-INF/MANIFEST.MF
+++ b/geography/org.eclipse.stem.data.geography/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.stem.data.geography.Activator
 Require-Bundle: org.eclipse.stem.core,
  org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.data.geography,
  org.eclipse.stem.data.geography.centers
diff --git a/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/ISOKey.java b/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/ISOKey.java
index 86222ed..6c7f3ce 100644
--- a/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/ISOKey.java
+++ b/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/ISOKey.java
@@ -86,6 +86,7 @@ public class ISOKey implements Comparable<ISOKey> {
 	 * @return the value of string compareTo
 	 * @see java.lang.Comparable#compareTo(java.lang.Object)
 	 */
+	@Override
 	public int compareTo(final ISOKey isoKey) {
 		return this.key.compareTo(isoKey.key);
 	}
diff --git a/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/PluginCenterReader.java b/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/PluginCenterReader.java
index 984441e..53a127c 100644
--- a/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/PluginCenterReader.java
+++ b/geography/org.eclipse.stem.data.geography/src/org/eclipse/stem/data/geography/centers/PluginCenterReader.java
@@ -220,6 +220,7 @@ public class PluginCenterReader extends GeographicMapper{
 			retVal[i] = filtered.get(i);

 		}

 		Arrays.sort(retVal, new Comparator<URL>() {

+			@Override

 			public int compare(URL ua, URL ub) {

 				return ua.getPath().compareTo(ub.toString());

 			}

diff --git a/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.classpath b/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.classpath
index 304e861..121e527 100644
--- a/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.classpath
+++ b/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.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/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.settings/org.eclipse.jdt.core.prefs b/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.settings/org.eclipse.jdt.core.prefs
index 193ba7c..7d05b86 100644
--- a/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.settings/org.eclipse.jdt.core.prefs
+++ b/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,11 @@
-#Tue Sep 01 16:58:21 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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+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.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
@@ -18,4 +21,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/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/META-INF/MANIFEST.MF b/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/META-INF/MANIFEST.MF
index 93c0254..a075ff2 100644
--- a/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/META-INF/MANIFEST.MF
+++ b/geography/org.eclipse.stem.internal.data.geography.infrastructure.transportation/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: STEM Internal Infrastructure Data
 Bundle-SymbolicName: org.eclipse.stem.internal.data.geography.infrastructure.transportation
 Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.stem.definitions,
  org.eclipse.stem.internal.data.geography,
  org.eclipse.stem.internal.data,
diff --git a/geography/org.eclipse.stem.internal.data.geography.models/.classpath b/geography/org.eclipse.stem.internal.data.geography.models/.classpath
index 304e861..121e527 100644
--- a/geography/org.eclipse.stem.internal.data.geography.models/.classpath
+++ b/geography/org.eclipse.stem.internal.data.geography.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/geography/org.eclipse.stem.internal.data.geography.models/META-INF/MANIFEST.MF b/geography/org.eclipse.stem.internal.data.geography.models/META-INF/MANIFEST.MF
index d237233..139b7c4 100644
--- a/geography/org.eclipse.stem.internal.data.geography.models/META-INF/MANIFEST.MF
+++ b/geography/org.eclipse.stem.internal.data.geography.models/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.stem.data.geography,
  org.eclipse.stem.definitions,
  org.eclipse.stem.data.geography.models
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.internal.data.geography.models,
  org.eclipse.stem.internal.data.specifications
 Bundle-Vendor: Eclipse.org
diff --git a/geography/org.eclipse.stem.internal.data.geography/.classpath b/geography/org.eclipse.stem.internal.data.geography/.classpath
index 304e861..121e527 100644
--- a/geography/org.eclipse.stem.internal.data.geography/.classpath
+++ b/geography/org.eclipse.stem.internal.data.geography/.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/geography/org.eclipse.stem.internal.data.geography/.settings/org.eclipse.jdt.core.prefs b/geography/org.eclipse.stem.internal.data.geography/.settings/org.eclipse.jdt.core.prefs
index 7297304..7d05b86 100644
--- a/geography/org.eclipse.stem.internal.data.geography/.settings/org.eclipse.jdt.core.prefs
+++ b/geography/org.eclipse.stem.internal.data.geography/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,11 @@
-#Tue Sep 01 16:56:21 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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+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.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
@@ -18,4 +21,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/geography/org.eclipse.stem.internal.data.geography/META-INF/MANIFEST.MF b/geography/org.eclipse.stem.internal.data.geography/META-INF/MANIFEST.MF
index 0deba3f..09d3438 100644
--- a/geography/org.eclipse.stem.internal.data.geography/META-INF/MANIFEST.MF
+++ b/geography/org.eclipse.stem.internal.data.geography/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: STEM Internal Geography Data
 Bundle-SymbolicName: org.eclipse.stem.internal.data.geography;singleton:=true
 Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.internal.data.geography,
  org.eclipse.stem.internal.data.geography.graphsynchronizer,
  org.eclipse.stem.internal.data.geography.propertydata,
diff --git a/org.eclipse.stem.internal.data/.classpath b/org.eclipse.stem.internal.data/.classpath
index 304e861..121e527 100644
--- a/org.eclipse.stem.internal.data/.classpath
+++ b/org.eclipse.stem.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/org.eclipse.stem.internal.data/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.stem.internal.data/.settings/org.eclipse.jdt.core.prefs
index 9626cef..b99a31b 100644
--- a/org.eclipse.stem.internal.data/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.stem.internal.data/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,11 @@
-#Mon Jan 21 12:42:32 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.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+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
@@ -67,4 +71,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/org.eclipse.stem.internal.data/META-INF/MANIFEST.MF b/org.eclipse.stem.internal.data/META-INF/MANIFEST.MF
index d863619..9fbda3d 100644
--- a/org.eclipse.stem.internal.data/META-INF/MANIFEST.MF
+++ b/org.eclipse.stem.internal.data/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.diseasemodels,
  org.eclipse.stem.transport
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.stem.internal.data,
  org.eclipse.stem.internal.data.generatedplugin,
  org.eclipse.stem.internal.data.generatedplugin.impl,
diff --git a/org.eclipse.stem.internal.data/src/org/eclipse/stem/internal/data/DataGenerator.java b/org.eclipse.stem.internal.data/src/org/eclipse/stem/internal/data/DataGenerator.java
index 6e76647..f82705f 100644
--- a/org.eclipse.stem.internal.data/src/org/eclipse/stem/internal/data/DataGenerator.java
+++ b/org.eclipse.stem.internal.data/src/org/eclipse/stem/internal/data/DataGenerator.java
@@ -152,6 +152,7 @@ abstract public class DataGenerator {
 			// Yes
 			// Get all of the property files from the directory...
 			final File[] propertyFiles = directory.listFiles(new FileFilter() {
+				@Override
 				public boolean accept(File pathname) {
 					final String name = pathname.getName();
 
@@ -169,6 +170,7 @@ abstract public class DataGenerator {
 
 			// Now get the sub-directories...
 			final File[] subDirectories = directory.listFiles(new FileFilter() {
+				@Override
 				public boolean accept(File pathname) {
 					return pathname.isDirectory()
 							&& !pathname.getName().equals(".svn")
diff --git a/population/org.eclipse.stem.data.geography.population.human.models/.classpath b/population/org.eclipse.stem.data.geography.population.human.models/.classpath
index 304e861..121e527 100644
--- a/population/org.eclipse.stem.data.geography.population.human.models/.classpath
+++ b/population/org.eclipse.stem.data.geography.population.human.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/population/org.eclipse.stem.data.geography.population.human.models/.settings/org.eclipse.jdt.core.prefs b/population/org.eclipse.stem.data.geography.population.human.models/.settings/org.eclipse.jdt.core.prefs
index 7eee551..7d05b86 100644
--- a/population/org.eclipse.stem.data.geography.population.human.models/.settings/org.eclipse.jdt.core.prefs
+++ b/population/org.eclipse.stem.data.geography.population.human.models/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,11 @@
-#Tue Sep 01 17:01:47 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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+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.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
@@ -18,4 +21,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/population/org.eclipse.stem.data.geography.population.human.models/META-INF/MANIFEST.MF b/population/org.eclipse.stem.data.geography.population.human.models/META-INF/MANIFEST.MF
index 3473397..7fff215 100644
--- a/population/org.eclipse.stem.data.geography.population.human.models/META-INF/MANIFEST.MF
+++ b/population/org.eclipse.stem.data.geography.population.human.models/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.stem.data.geography.population.human.models.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.stem.data.geography.population.human.models
 Bundle-Vendor: Eclipse.org
diff --git a/population/org.eclipse.stem.data.geography.population.human/.classpath b/population/org.eclipse.stem.data.geography.population.human/.classpath
index 304e861..121e527 100644
--- a/population/org.eclipse.stem.data.geography.population.human/.classpath
+++ b/population/org.eclipse.stem.data.geography.population.human/.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/population/org.eclipse.stem.data.geography.population.human/.settings/org.eclipse.jdt.core.prefs b/population/org.eclipse.stem.data.geography.population.human/.settings/org.eclipse.jdt.core.prefs
index c045682..7d05b86 100644
--- a/population/org.eclipse.stem.data.geography.population.human/.settings/org.eclipse.jdt.core.prefs
+++ b/population/org.eclipse.stem.data.geography.population.human/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,11 @@
-#Tue Sep 01 17:00:10 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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+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.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
@@ -18,4 +21,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/population/org.eclipse.stem.data.geography.population.human/META-INF/MANIFEST.MF b/population/org.eclipse.stem.data.geography.population.human/META-INF/MANIFEST.MF
index bbfb549..7756ad0 100644
--- a/population/org.eclipse.stem.data.geography.population.human/META-INF/MANIFEST.MF
+++ b/population/org.eclipse.stem.data.geography.population.human/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.stem.data.geography.population.human;singleton:
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.stem.data.geography.population.human.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.geography.population.human
 Bundle-Vendor: Eclipse.org
diff --git a/population/org.eclipse.stem.internal.data.geography.population.human.models/.classpath b/population/org.eclipse.stem.internal.data.geography.population.human.models/.classpath
index 304e861..121e527 100644
--- a/population/org.eclipse.stem.internal.data.geography.population.human.models/.classpath
+++ b/population/org.eclipse.stem.internal.data.geography.population.human.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/population/org.eclipse.stem.internal.data.geography.population.human.models/.settings/org.eclipse.jdt.core.prefs b/population/org.eclipse.stem.internal.data.geography.population.human.models/.settings/org.eclipse.jdt.core.prefs
index 3a812aa..7d05b86 100644
--- a/population/org.eclipse.stem.internal.data.geography.population.human.models/.settings/org.eclipse.jdt.core.prefs
+++ b/population/org.eclipse.stem.internal.data.geography.population.human.models/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,11 @@
-#Tue Sep 01 17:01:23 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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+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.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
@@ -18,4 +21,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/population/org.eclipse.stem.internal.data.geography.population.human.models/META-INF/MANIFEST.MF b/population/org.eclipse.stem.internal.data.geography.population.human.models/META-INF/MANIFEST.MF
index 01a5b1b..c35b8f1 100644
--- a/population/org.eclipse.stem.internal.data.geography.population.human.models/META-INF/MANIFEST.MF
+++ b/population/org.eclipse.stem.internal.data.geography.population.human.models/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.internal.data.geography.models,
  org.eclipse.stem.data.geography.population.human,
  org.eclipse.stem.data.geography.population.human.models
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse.org
diff --git a/population/org.eclipse.stem.internal.data.geography.population.human/.classpath b/population/org.eclipse.stem.internal.data.geography.population.human/.classpath
index ba6f468..a2c2dbc 100644
--- a/population/org.eclipse.stem.internal.data.geography.population.human/.classpath
+++ b/population/org.eclipse.stem.internal.data.geography.population.human/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.stem.internal.data.geography.population"/>
-	<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/population/org.eclipse.stem.internal.data.geography.population.human/META-INF/MANIFEST.MF b/population/org.eclipse.stem.internal.data.geography.population.human/META-INF/MANIFEST.MF
index e7c6ff9..05e7ee0 100644
--- a/population/org.eclipse.stem.internal.data.geography.population.human/META-INF/MANIFEST.MF
+++ b/population/org.eclipse.stem.internal.data.geography.population.human/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: STEM Internal Human Population Data
 Bundle-SymbolicName: org.eclipse.stem.internal.data.geography.population.human
 Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse.org
diff --git a/population/org.eclipse.stem.internal.data.geography.population/.classpath b/population/org.eclipse.stem.internal.data.geography.population/.classpath
index 304e861..121e527 100644
--- a/population/org.eclipse.stem.internal.data.geography.population/.classpath
+++ b/population/org.eclipse.stem.internal.data.geography.population/.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/population/org.eclipse.stem.internal.data.geography.population/.settings/org.eclipse.jdt.core.prefs b/population/org.eclipse.stem.internal.data.geography.population/.settings/org.eclipse.jdt.core.prefs
index 01426fa..8000cd6 100644
--- a/population/org.eclipse.stem.internal.data.geography.population/.settings/org.eclipse.jdt.core.prefs
+++ b/population/org.eclipse.stem.internal.data.geography.population/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,11 @@
-#Tue Jan 27 12:14:09 EST 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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+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
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/population/org.eclipse.stem.internal.data.geography.population/META-INF/MANIFEST.MF b/population/org.eclipse.stem.internal.data.geography.population/META-INF/MANIFEST.MF
index e431805..57090d3 100644
--- a/population/org.eclipse.stem.internal.data.geography.population/META-INF/MANIFEST.MF
+++ b/population/org.eclipse.stem.internal.data.geography.population/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: STEM Internal Population Data
 Bundle-SymbolicName: org.eclipse.stem.internal.data.geography.population
 Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.stem.core,
  org.eclipse.stem.definitions,
  org.eclipse.stem.data.geography,
diff --git a/population/org.eclipse.stem.internal.data.population.human/.classpath b/population/org.eclipse.stem.internal.data.population.human/.classpath
index 59f0444..b14c1ae 100644
--- a/population/org.eclipse.stem.internal.data.population.human/.classpath
+++ b/population/org.eclipse.stem.internal.data.population.human/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.stem.internal.data"/>
-	<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/population/org.eclipse.stem.internal.data.population.human/META-INF/MANIFEST.MF b/population/org.eclipse.stem.internal.data.population.human/META-INF/MANIFEST.MF
index f04480b..413e269 100644
--- a/population/org.eclipse.stem.internal.data.population.human/META-INF/MANIFEST.MF
+++ b/population/org.eclipse.stem.internal.data.population.human/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Population Plug-in
 Bundle-SymbolicName: org.eclipse.stem.internal.data.population.human
 Bundle-Version: 1.0.1.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.stem.internal.data,
  org.eclipse.stem.core