diff options
| author | Vikas Chandra | 2014-03-21 14:37:27 +0000 |
|---|---|---|
| committer | Michael Rennie | 2014-03-21 17:17:35 +0000 |
| commit | 786257822d7d70bb25c2c61cb8af4e78ad043093 (patch) | |
| tree | 339aa140d9e06d421d6b022022d09621427a7e39 | |
| parent | 0d37b007e56be031614ec16da9e9154d6547e3c6 (diff) | |
| download | eclipse.pde.ui-786257822d7d70bb25c2c61cb8af4e78ad043093.tar.gz eclipse.pde.ui-786257822d7d70bb25c2c61cb8af4e78ad043093.tar.xz eclipse.pde.ui-786257822d7d70bb25c2c61cb8af4e78ad043093.zip | |
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
2 files changed, 10 insertions, 7 deletions
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/java8/Java8TypeAnnotationTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/java8/Java8TypeAnnotationTests.java index 94cb932e0c..75462de54b 100644 --- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/java8/Java8TypeAnnotationTests.java +++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/java8/Java8TypeAnnotationTests.java @@ -170,11 +170,11 @@ public class Java8TypeAnnotationTests extends ApiBuilderTest { } public void test4I() throws Exception { - //x4(true); TODO uncomment in Luna + x4(true); } public void test4F() throws Exception { - //x4(false); TODO uncomment in Luna + x4(false); } /** * Tests there are problems with API tools annotations used in type annotation case in method decls @@ -186,11 +186,11 @@ public class Java8TypeAnnotationTests extends ApiBuilderTest { } public void test5I() throws Exception { - //x5(true); TODO uncomment in Luna + x5(true); } public void test5F() throws Exception { - //x5(false); TODO uncomment in Luna + x5(false); } /** * Tests there are problems with API tools annotations used in type annotation case in field decls @@ -202,11 +202,11 @@ public class Java8TypeAnnotationTests extends ApiBuilderTest { } public void test6I() throws Exception { - //x6(true); TODO uncomment in Luna + x6(true); } public void test6F() throws Exception { - //x6(false); TODO uncomment in Luna + x6(false); } /** * Tests there are problems with API tools annotations used in type annotation case in type decls diff --git a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiFileGenerationTask.java b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiFileGenerationTask.java index 29a03f78a0..7e62b0cd9a 100644 --- a/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiFileGenerationTask.java +++ b/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/ApiFileGenerationTask.java @@ -564,7 +564,7 @@ public class ApiFileGenerationTask extends Task { * @return The derived {@link JavaCore#COMPILER_COMPLIANCE} from the BREE in * the manifest map, or {@link JavaCore#VERSION_1_3} if there is no * BREE entry in the map or if the BREE entry does not directly map - * to one of {"1.3", "1.4", "1.5", "1.6", "1.7"}. + * to one of {"1.3", "1.4", "1.5", "1.6", "1.7","1.8"}. */ private String resolveCompliance(Map<String, String> manifestmap) { if (manifestmap != null) { @@ -582,6 +582,9 @@ public class ApiFileGenerationTask extends Task { if ("JavaSE-1.7".equals(eename)) { //$NON-NLS-1$ return JavaCore.VERSION_1_7; } + if ("JavaSE-1.8".equals(eename)) { //$NON-NLS-1$ + return JavaCore.VERSION_1_8; + } } } return JavaCore.VERSION_1_3; |