diff --git a/com.ibm.wala.cast.java.test/.classpath b/com.ibm.wala.cast.java.test/.classpath
index 9a9a8521f..8a8f1668c 100644
--- a/com.ibm.wala.cast.java.test/.classpath
+++ b/com.ibm.wala.cast.java.test/.classpath
@@ -1,9 +1,7 @@
-
-
+
-
-
+
diff --git a/com.ibm.wala.cast.java.test/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.java.test/.settings/org.eclipse.jdt.core.prefs
index 49b1aca7f..984e2f992 100644
--- a/com.ibm.wala.cast.java.test/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.cast.java.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
-#Thu Jul 03 14:59:06 EDT 2008
+#Mon Dec 01 14:18:28 EST 2008
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=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.5
+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
@@ -60,7 +60,7 @@ 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
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -104,11 +104,9 @@ org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
@@ -134,7 +132,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
index 7b6342ca8..2a22db082 100644
--- a/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
@@ -11,5 +11,6 @@ Require-Bundle: com.ibm.wala.core.tests,
com.ibm.wala.core,
org.eclipse.core.runtime,
org.junit4
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: com.ibm.wala.cast.java.test
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.ibm.wala.cast.java/.classpath b/com.ibm.wala.cast.java/.classpath
index e1a743212..388a458dc 100644
--- a/com.ibm.wala.cast.java/.classpath
+++ b/com.ibm.wala.cast.java/.classpath
@@ -1,9 +1,9 @@
-
+
-
-
-
+
+
+
diff --git a/com.ibm.wala.cast.java/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.java/.settings/org.eclipse.jdt.core.prefs
index 49b1aca7f..42a2d67c5 100644
--- a/com.ibm.wala.cast.java/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.cast.java/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
-#Thu Jul 03 14:59:06 EDT 2008
+#Mon Dec 01 14:18:42 EST 2008
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=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.5
+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
@@ -60,7 +60,7 @@ 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
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -104,11 +104,9 @@ org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
@@ -134,7 +132,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
index 716945aac..630c51656 100644
--- a/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: com.ibm.wala.cast.java.JavaSourcePlugin
Bundle-Vendor: rfuhrer@watson.ibm.com
Require-Bundle: com.ibm.wala.cast;visibility:=reexport,
com.ibm.wala.core;visibility:=reexport
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: com.ibm.wala.cast.java,
com.ibm.wala.cast.java.analysis.typeInference,
com.ibm.wala.cast.java.client,
@@ -41,3 +41,4 @@ Export-Package: com.ibm.wala.cast.java,
Bundle-ClassPath: .,
lib/java_cup.jar,
lib/polyglot.jar
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.ibm.wala.cast.test/.classpath b/com.ibm.wala.cast.test/.classpath
index 35a261deb..a5801c265 100644
--- a/com.ibm.wala.cast.test/.classpath
+++ b/com.ibm.wala.cast.test/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.cast.test/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.test/.settings/org.eclipse.jdt.core.prefs
index 940cc87eb..9e1571d38 100644
--- a/com.ibm.wala.cast.test/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.cast.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
-#Thu Jul 03 14:59:06 EDT 2008
+#Mon Dec 01 14:19:05 EST 2008
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=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.5
+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
@@ -60,7 +60,7 @@ 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
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -132,7 +132,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
index 796874087..b343b7fc1 100644
--- a/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Require-Bundle:
com.ibm.wala.cast,
com.ibm.wala.core,
org.junit4
-Eclipse-LazyStart: false
Export-Package: com.ibm.wala.cast.test
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.ibm.wala.cast/.classpath b/com.ibm.wala.cast/.classpath
index cf063e073..794b9cab0 100644
--- a/com.ibm.wala.cast/.classpath
+++ b/com.ibm.wala.cast/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs
index 49b1aca7f..b7e396f0a 100644
--- a/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
-#Thu Jul 03 14:59:06 EDT 2008
+#Mon Dec 01 14:18:51 EST 2008
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=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.5
+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
@@ -60,7 +60,7 @@ 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
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -104,11 +104,9 @@ org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
@@ -134,7 +132,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/com.ibm.wala.cast/META-INF/MANIFEST.MF b/com.ibm.wala.cast/META-INF/MANIFEST.MF
index e3fe4f030..5a92533c0 100644
--- a/com.ibm.wala.cast/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.cast/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: com.ibm.wala.cast.plugin.AstPlugin
Bundle-Vendor: IBM
Require-Bundle: org.eclipse.core.runtime,
com.ibm.wala.core
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: com.ibm.wala.cast.analysis.typeInference,
com.ibm.wala.cast.ipa.callgraph,
com.ibm.wala.cast.ipa.cha,
@@ -23,4 +23,5 @@ Export-Package: com.ibm.wala.cast.analysis.typeInference,
com.ibm.wala.cast.tree.visit,
com.ibm.wala.cast.types,
com.ibm.wala.cast.util
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.ibm.wala.core.testdata/.classpath b/com.ibm.wala.core.testdata/.classpath
index 021596729..8a8f1668c 100644
--- a/com.ibm.wala.core.testdata/.classpath
+++ b/com.ibm.wala.core.testdata/.classpath
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
index 49b1aca7f..68f6ffd36 100644
--- a/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
-#Thu Jul 03 14:59:06 EDT 2008
+#Mon Dec 01 14:23:14 EST 2008
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=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.5
+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
@@ -18,10 +18,11 @@ 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
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.forbiddenReference=ignore
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
@@ -38,7 +39,10 @@ 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=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=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
@@ -51,16 +55,20 @@ org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
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=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
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
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -104,11 +112,9 @@ org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
@@ -134,7 +140,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF b/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
index a8d4943f3..b488cc53c 100644
--- a/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
@@ -4,3 +4,4 @@ Bundle-Name: Testdata Plug-in
Bundle-SymbolicName: com.ibm.wala.core.testdata
Bundle-Version: 1.0.0
Bundle-Vendor: IBM
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.ibm.wala.core.testdata/src/demandpa/TestException.java b/com.ibm.wala.core.testdata/src/demandpa/TestException.java
index 11390f6aa..5cd0e303b 100644
--- a/com.ibm.wala.core.testdata/src/demandpa/TestException.java
+++ b/com.ibm.wala.core.testdata/src/demandpa/TestException.java
@@ -50,8 +50,7 @@ public class TestException {
}
}
- public static void foo(@SuppressWarnings("unused")
- Object o) throws IllegalAccessException {
+ public static void foo(Object o) throws IllegalAccessException {
throw new IllegalAccessException();
}
}
diff --git a/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlyCS.java b/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlyCS.java
index fd68681d0..6628a59c7 100644
--- a/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlyCS.java
+++ b/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlyCS.java
@@ -40,8 +40,7 @@ package demandpa;
public class TestOnTheFlyCS {
static class C1 {
- void doSomething(@SuppressWarnings("unused")
- Object o) {
+ void doSomething(Object o) {
}
}
diff --git a/com.ibm.wala.core.testdata/src/demandpa/TestUtil.java b/com.ibm.wala.core.testdata/src/demandpa/TestUtil.java
index 9de624f1d..5faedbf0d 100644
--- a/com.ibm.wala.core.testdata/src/demandpa/TestUtil.java
+++ b/com.ibm.wala.core.testdata/src/demandpa/TestUtil.java
@@ -46,12 +46,10 @@ package demandpa;
*/
public class TestUtil {
- public static void makeVarUsed(@SuppressWarnings("unused")
- Object o) {
+ public static void makeVarUsed(Object o) {
}
- public static void testThisVar(@SuppressWarnings("unused")
- Object o) {
+ public static void testThisVar(Object o) {
}
}
diff --git a/com.ibm.wala.core.testdata/src/reflection/Reflect10.java b/com.ibm.wala.core.testdata/src/reflection/Reflect10.java
index f688e2e8d..7541873c1 100644
--- a/com.ibm.wala.core.testdata/src/reflection/Reflect10.java
+++ b/com.ibm.wala.core.testdata/src/reflection/Reflect10.java
@@ -7,7 +7,6 @@ import java.lang.reflect.Method;
* Test of Method.invoke
*/
public class Reflect10 {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
Class c = Class.forName("java.lang.Integer");
diff --git a/com.ibm.wala.core.testdata/src/reflection/Reflect11.java b/com.ibm.wala.core.testdata/src/reflection/Reflect11.java
index f548b234a..86d0cc984 100644
--- a/com.ibm.wala.core.testdata/src/reflection/Reflect11.java
+++ b/com.ibm.wala.core.testdata/src/reflection/Reflect11.java
@@ -7,7 +7,6 @@ import java.lang.reflect.Method;
* Test of Method.invoke
*/
public class Reflect11 {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
Class c = Class.forName("java.lang.Integer");
diff --git a/com.ibm.wala.core.testdata/src/reflection/Reflect12.java b/com.ibm.wala.core.testdata/src/reflection/Reflect12.java
index aa49c9631..1a7a3af42 100644
--- a/com.ibm.wala.core.testdata/src/reflection/Reflect12.java
+++ b/com.ibm.wala.core.testdata/src/reflection/Reflect12.java
@@ -7,7 +7,6 @@ import java.lang.reflect.Method;
* Test of Method.invoke
*/
public class Reflect12 {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
Class c = Class.forName("reflection.Helper");
diff --git a/com.ibm.wala.core.testdata/src/reflection/Reflect13.java b/com.ibm.wala.core.testdata/src/reflection/Reflect13.java
index ae6168544..3f76234e1 100644
--- a/com.ibm.wala.core.testdata/src/reflection/Reflect13.java
+++ b/com.ibm.wala.core.testdata/src/reflection/Reflect13.java
@@ -7,7 +7,6 @@ import java.lang.reflect.Method;
* Test of Method.invoke
*/
public class Reflect13 {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
Class c = Class.forName("reflection.Helper");
diff --git a/com.ibm.wala.core.testdata/src/reflection/Reflect14.java b/com.ibm.wala.core.testdata/src/reflection/Reflect14.java
index fa8fe7f40..3b2820941 100644
--- a/com.ibm.wala.core.testdata/src/reflection/Reflect14.java
+++ b/com.ibm.wala.core.testdata/src/reflection/Reflect14.java
@@ -8,7 +8,6 @@ import java.lang.reflect.Modifier;
* Test of Method.invoke
*/
public class Reflect14 {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
Class c = Class.forName("reflection.Helper");
diff --git a/com.ibm.wala.core.testdata/src/reflection/Reflect15.java b/com.ibm.wala.core.testdata/src/reflection/Reflect15.java
index c9da576b4..3e995341a 100644
--- a/com.ibm.wala.core.testdata/src/reflection/Reflect15.java
+++ b/com.ibm.wala.core.testdata/src/reflection/Reflect15.java
@@ -7,7 +7,6 @@ import java.lang.reflect.InvocationTargetException;
* Test of Class.getConstructors().
*/
public class Reflect15 {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
IllegalAccessException, InvocationTargetException {
Class c = Class.forName("reflection.Helper");
diff --git a/com.ibm.wala.core.testdata/src/reflection/Reflect22.java b/com.ibm.wala.core.testdata/src/reflection/Reflect22.java
index 300833592..cde494032 100644
--- a/com.ibm.wala.core.testdata/src/reflection/Reflect22.java
+++ b/com.ibm.wala.core.testdata/src/reflection/Reflect22.java
@@ -8,7 +8,6 @@ import java.lang.reflect.InvocationTargetException;
* Test of Constructor.newInstance
*/
public class Reflect22 {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws ClassNotFoundException, SecurityException,
NoSuchMethodException, IllegalAccessException, InstantiationException,
IllegalArgumentException, InvocationTargetException {
diff --git a/com.ibm.wala.core.testdata/src/reflection/Reflect23.java b/com.ibm.wala.core.testdata/src/reflection/Reflect23.java
index 53888cb19..addd35681 100644
--- a/com.ibm.wala.core.testdata/src/reflection/Reflect23.java
+++ b/com.ibm.wala.core.testdata/src/reflection/Reflect23.java
@@ -9,7 +9,6 @@ import java.lang.reflect.Modifier;
* Test of Constructor.newInstance
*/
public class Reflect23 {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws ClassNotFoundException, SecurityException,
NoSuchMethodException, IllegalAccessException, InstantiationException,
IllegalArgumentException, InvocationTargetException {
diff --git a/com.ibm.wala.core.testdata/src/reflection/Reflect8.java b/com.ibm.wala.core.testdata/src/reflection/Reflect8.java
index 0427d114a..e76a2895f 100644
--- a/com.ibm.wala.core.testdata/src/reflection/Reflect8.java
+++ b/com.ibm.wala.core.testdata/src/reflection/Reflect8.java
@@ -7,7 +7,6 @@ import java.lang.reflect.InvocationTargetException;
* Test of Class.getConstructors().
*/
public class Reflect8 {
- @SuppressWarnings("unchecked")
public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
IllegalAccessException, InvocationTargetException {
Class c = Class.forName("java.lang.Integer");
diff --git a/com.ibm.wala.core.tests/.classpath b/com.ibm.wala.core.tests/.classpath
index 9f23b089a..21f14cf26 100644
--- a/com.ibm.wala.core.tests/.classpath
+++ b/com.ibm.wala.core.tests/.classpath
@@ -1,8 +1,8 @@
+
+
-
-
diff --git a/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs
index e9da2e50a..3a1fbe5a2 100644
--- a/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
-#Thu Jul 03 14:59:05 EDT 2008
+#Mon Dec 01 14:24:21 EST 2008
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=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.5
+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
@@ -60,7 +60,7 @@ 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
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -104,11 +104,9 @@ org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
@@ -134,7 +132,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
index e98b64d63..8ab7e55f2 100644
--- a/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@ Export-Package: com.ibm.wala.core.tests.basic,
com.ibm.wala.examples.drivers,
com.ibm.wala.examples.properties,
com.ibm.wala.demandpa.driver
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/DemandCastChecker.java b/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/DemandCastChecker.java
index 9cb2a6021..a7f2a4f07 100644
--- a/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/DemandCastChecker.java
+++ b/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/DemandCastChecker.java
@@ -200,7 +200,6 @@ public class DemandCastChecker {
return Pair.make(retCG, retPA);
}
- @SuppressWarnings("unused")
private static RefinementPolicyFactory chooseRefinePolicyFactory(ClassHierarchy cha) {
if (true) {
return new TunedRefinementPolicy.Factory(cha);
diff --git a/com.ibm.wala.core/.classpath b/com.ibm.wala.core/.classpath
index dcc145b0d..ff913e95b 100644
--- a/com.ibm.wala.core/.classpath
+++ b/com.ibm.wala.core/.classpath
@@ -1,9 +1,9 @@
+
+
-
-
diff --git a/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs
index e8ed61391..94b068604 100644
--- a/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs
+++ b/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
-#Thu Jul 03 14:59:07 EDT 2008
+#Mon Dec 01 14:19:16 EST 2008
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=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.5
+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
@@ -73,7 +73,7 @@ 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
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -117,11 +117,9 @@ org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
@@ -147,7 +145,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/com.ibm.wala.core/META-INF/MANIFEST.MF b/com.ibm.wala.core/META-INF/MANIFEST.MF
index 85841dab6..dafa0a6cf 100644
--- a/com.ibm.wala.core/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.core/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: com.ibm.wala.shrike;visibility:=reexport,
org.eclipse.pde.core,
org.eclipse.pde.runtime,
org.eclipse.pde.ui
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: .,
com.ibm.wala.accessPath,
com.ibm.wala.analysis.pointers,
@@ -87,3 +87,4 @@ Export-Package: .,
com.ibm.wala.util.tables,
com.ibm.wala.util.warnings,
com.ibm.wala.viz
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyCollapsedSupergraph.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyCollapsedSupergraph.java
index cbf656d20..e21222689 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyCollapsedSupergraph.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyCollapsedSupergraph.java
@@ -111,7 +111,6 @@ public class PartiallyCollapsedSupergraph extends AbstractGraph