move to java 6
diff --git a/plugins/org.eclipse.dltk.javascript.core.manipulation/.classpath b/plugins/org.eclipse.dltk.javascript.core.manipulation/.classpath
index 2fe6748..dbc112b 100644
--- a/plugins/org.eclipse.dltk.javascript.core.manipulation/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.core.manipulation/.classpath
@@ -1,8 +1,8 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="generated"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.core.manipulation/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.core.manipulation/.settings/org.eclipse.jdt.core.prefs
index a574f91..8717e6c 100644
--- a/plugins/org.eclipse.dltk.javascript.core.manipulation/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.core.manipulation/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Thu Nov 11 01:46:24 CET 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.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
 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
 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_annotation=0
@@ -88,9 +87,12 @@
 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_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not 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
diff --git a/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF
index 7bdaff2..653e4e0 100644
--- a/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.core.manipulation/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@
  org.eclipse.dltk.javascript.parser,
  org.eclipse.emf.ecore.change,
  org.eclipse.text
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: com.ibm.icu.text
 Export-Package: org.eclipse.dltk.internal.javascript.corext.refactoring,
diff --git a/plugins/org.eclipse.dltk.javascript.core/.classpath b/plugins/org.eclipse.dltk.javascript.core/.classpath
index 64c5e31..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.core/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.core/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.core/.settings/org.eclipse.jdt.core.prefs
index 9362a2e..8717e6c 100644
--- a/plugins/org.eclipse.dltk.javascript.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Wed Oct 27 22:59:24 CEST 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.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
 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
 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_annotation=0
@@ -88,9 +87,12 @@
 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_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not 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
diff --git a/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF
index ad7f625..c926ed0 100644
--- a/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.core/META-INF/MANIFEST.MF
@@ -30,5 +30,5 @@
  org.eclipse.dltk.javascript.typeinfo.model.impl,
  org.eclipse.dltk.javascript.typeinfo.model.util,
  org.eclipse.dltk.javascript.validation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.dltk.javascript.debug.ui/.classpath b/plugins/org.eclipse.dltk.javascript.debug.ui/.classpath
index 304e861..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.debug.ui/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.debug.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.debug.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.debug.ui/.settings/org.eclipse.jdt.core.prefs
index 45d8b24..61f2158 100644
--- a/plugins/org.eclipse.dltk.javascript.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.debug.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Sat Sep 24 21:54:08 CEST 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.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
 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
 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
@@ -81,7 +80,12 @@
 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_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=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/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF
index 1eacfa7..5d47738 100644
--- a/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF
@@ -35,4 +35,4 @@
  org.eclipse.dltk.javascript.internal.debug.ui.launcher
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.dltk.javascript.internal.debug.ui.JavaScriptDebugUIPlugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.dltk.javascript.debug/.classpath b/plugins/org.eclipse.dltk.javascript.debug/.classpath
index 304e861..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.debug/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.debug/.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="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"/>

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.debug/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.debug/.settings/org.eclipse.jdt.core.prefs
index eae8067..61f2158 100644
--- a/plugins/org.eclipse.dltk.javascript.debug/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.debug/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Sat Sep 24 21:53:55 CEST 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.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
 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
 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
@@ -81,7 +80,12 @@
 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_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=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/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF
index 05bbc5c..91fe41e 100644
--- a/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.debug/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@
 Bundle-Activator: org.eclipse.dltk.javascript.internal.debug.JavaScriptDebugPlugin
 Export-Package: org.eclipse.dltk.javascript.internal.debug
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.dltk.javascript.formatter/.classpath b/plugins/org.eclipse.dltk.javascript.formatter/.classpath
index 64c5e31..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.formatter/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.formatter/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.formatter/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.formatter/.settings/org.eclipse.jdt.core.prefs
index 05f8690..8717e6c 100644
--- a/plugins/org.eclipse.dltk.javascript.formatter/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.formatter/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Fri Nov 26 19:03:12 NOVT 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.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
 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
 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_annotation=0
@@ -88,9 +87,12 @@
 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_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not 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
diff --git a/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF
index fe8272e..3e5c0aa 100644
--- a/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.formatter/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@
  org.eclipse.dltk.ui,
  org.eclipse.dltk.javascript.ui,
  org.eclipse.dltk.javascript.parser
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.dltk.javascript.formatter,
  org.eclipse.dltk.javascript.formatter.preferences
diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/.classpath b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/.classpath
index 64c5e31..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/.settings/org.eclipse.jdt.core.prefs
index 2f8f82d..c537b63 100644
--- a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Aug 10 19:42:29 NOVST 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.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 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/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF
index b4d3622..e38d6bb 100644
--- a/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.jdt.integration.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: DLTK JS JDT UI
 Bundle-SymbolicName: org.eclipse.dltk.javascript.jdt.integration.ui;singleton:=true
 Bundle-Version: 5.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration/.classpath b/plugins/org.eclipse.dltk.javascript.jdt.integration/.classpath
index 64c5e31..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.jdt.integration/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.jdt.integration/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.jdt.integration/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.jdt.integration/.settings/org.eclipse.jdt.core.prefs
index 6913249..c537b63 100644
--- a/plugins/org.eclipse.dltk.javascript.jdt.integration/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.jdt.integration/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Sat Sep 26 02:40:50 NOVST 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.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/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF
index 4161428..0755cde 100644
--- a/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.jdt.integration/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@
  org.eclipse.dltk.core;bundle-version="0.0.0",
  org.eclipse.dltk.javascript.core,
  org.eclipse.jdt.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.dltk.javascript.jdt.integration;x-friends:="org.eclipse.dltk.javascript.jdt.integration.ui"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/.classpath b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/.classpath
index 64c5e31..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/.settings/org.eclipse.jdt.core.prefs
index 8a877ba..4a782df 100644
--- a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Wed Jan 20 14:16:22 NOVT 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.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
 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
 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
diff --git a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF
index bce5563..4f5cf71 100644
--- a/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.jsjdtdebugger/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@
  org.eclipse.dltk.debug,
  org.eclipse.dltk.javascript.core
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %pluginProvider
 Export-Package: org.eclipse.dltk.javascript.jsjdtdebugger,
  org.eclipse.dltk.javascript.jsjdtdebugger.preferences
diff --git a/plugins/org.eclipse.dltk.javascript.launching/.classpath b/plugins/org.eclipse.dltk.javascript.launching/.classpath
index 64c5e31..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.launching/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.launching/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.launching/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.launching/.settings/org.eclipse.jdt.core.prefs
index f6428bf..4a782df 100644
--- a/plugins/org.eclipse.dltk.javascript.launching/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.launching/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Thu Nov 19 13:11:36 NOVT 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.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
 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
 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
diff --git a/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF
index 182fdd1..234ae7b 100644
--- a/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.launching/META-INF/MANIFEST.MF
@@ -23,5 +23,5 @@
 Export-Package: org.eclipse.dltk.javascript.console,
  org.eclipse.dltk.javascript.launching,
  org.eclipse.dltk.javascript.internal.launching
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.dltk.javascript.parser/.classpath b/plugins/org.eclipse.dltk.javascript.parser/.classpath
index 64c5e31..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.parser/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.parser/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.parser/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.parser/.settings/org.eclipse.jdt.core.prefs
index 981c3cf..c8722ff 100644
--- a/plugins/org.eclipse.dltk.javascript.parser/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.parser/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 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.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
@@ -78,7 +78,7 @@
 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_annotation=0
@@ -157,9 +157,12 @@
 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_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not 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
diff --git a/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF
index 771167c..7d7b943 100644
--- a/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.parser/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
  org.eclipse.core.resources,
  org.eclipse.dltk.core;bundle-version="0.0.0",
  org.antlr.runtime;bundle-version="[3.0.0,3.0.9)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.dltk.javascript.ast,
  org.eclipse.dltk.javascript.core,
diff --git a/plugins/org.eclipse.dltk.javascript.ui/.classpath b/plugins/org.eclipse.dltk.javascript.ui/.classpath
index 64c5e31..8a8f166 100644
--- a/plugins/org.eclipse.dltk.javascript.ui/.classpath
+++ b/plugins/org.eclipse.dltk.javascript.ui/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/plugins/org.eclipse.dltk.javascript.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.dltk.javascript.ui/.settings/org.eclipse.jdt.core.prefs
index af188e3..4a782df 100644
--- a/plugins/org.eclipse.dltk.javascript.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.dltk.javascript.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Wed Sep 30 15:11:19 NOVST 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.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
 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
 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
diff --git a/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF
index a67f5fc..c200101 100644
--- a/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.ui/META-INF/MANIFEST.MF
@@ -39,4 +39,4 @@
  org.eclipse.dltk.javascript.ui,
  org.eclipse.dltk.javascript.ui.text,
  org.eclipse.dltk.javascript.ui.typeinfo
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.dltk.javascript.formatter.tests/.classpath b/tests/org.eclipse.dltk.javascript.formatter.tests/.classpath
index 64c5e31..8a8f166 100644
--- a/tests/org.eclipse.dltk.javascript.formatter.tests/.classpath
+++ b/tests/org.eclipse.dltk.javascript.formatter.tests/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/tests/org.eclipse.dltk.javascript.formatter.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.dltk.javascript.formatter.tests/.settings/org.eclipse.jdt.core.prefs
index 8c1aa77..8717e6c 100644
--- a/tests/org.eclipse.dltk.javascript.formatter.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.dltk.javascript.formatter.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,14 @@
-#Wed Dec 01 09:56:59 NOVT 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.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
 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
 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_annotation=0
@@ -88,9 +87,12 @@
 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_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not 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
diff --git a/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF
index a732571..8981f0f 100644
--- a/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.dltk.javascript.formatter.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: JavaScript Tests Plug-in
 Bundle-SymbolicName: org.eclipse.dltk.javascript.formatter.tests;singleton:=true
 Bundle-Version: 5.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.dltk.core;bundle-version="0.0.0",
  org.eclipse.dltk.formatter.tests,
  org.eclipse.dltk.ui,
diff --git a/tests/org.eclipse.dltk.javascript.parser.tests/.classpath b/tests/org.eclipse.dltk.javascript.parser.tests/.classpath
index 64c5e31..8a8f166 100644
--- a/tests/org.eclipse.dltk.javascript.parser.tests/.classpath
+++ b/tests/org.eclipse.dltk.javascript.parser.tests/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/tests/org.eclipse.dltk.javascript.parser.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.dltk.javascript.parser.tests/.settings/org.eclipse.jdt.core.prefs
index a941087..e8e5493 100644
--- a/tests/org.eclipse.dltk.javascript.parser.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.dltk.javascript.parser.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Mon Nov 29 14:11:50 NOVT 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.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 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
 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_annotation=0
@@ -84,9 +83,12 @@
 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_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not 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
diff --git a/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF
index 4f8a449..3830abd 100644
--- a/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.dltk.javascript.parser.tests/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@
  org.antlr.runtime;bundle-version="[3.0.0,3.0.9)",
  com.google.guava
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.dltk.javascript.parser.tests
diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/.classpath b/tests/org.eclipse.dltk.javascript.ui.tests/.classpath
index 64c5e31..8a8f166 100644
--- a/tests/org.eclipse.dltk.javascript.ui.tests/.classpath
+++ b/tests/org.eclipse.dltk.javascript.ui.tests/.classpath
@@ -1,7 +1,7 @@
-<?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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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/JavaSE-1.6"/>

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

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

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

+</classpath>

diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.dltk.javascript.ui.tests/.settings/org.eclipse.jdt.core.prefs
index 8450d57..e8e5493 100644
--- a/tests/org.eclipse.dltk.javascript.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.dltk.javascript.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,10 @@
-#Thu Nov 25 14:21:01 NOVT 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.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 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
 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_annotation=0
@@ -84,9 +83,12 @@
 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_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not 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
diff --git a/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF
index f92690d..6f21611 100644
--- a/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.dltk.javascript.ui.tests/META-INF/MANIFEST.MF
@@ -22,4 +22,4 @@
  com.google.guava,
  org.eclipse.dltk.javascript.parser
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6