sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #614 from eclipse/cd_issue517

Browse source 
[#517] Move More Code to JavaVersion
This commit is contained in:
Christian Dietrich 2018-01-15 16:07:42 +01:00 committed by GitHub
commit 4519cb8ff3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java Normal file
View file

@ -0,0 +1,34 @@
/*******************************************************************************
* Copyright (c) 2018 itemis AG (http://www.itemis.eu) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.eclipse.xtext.util;
import static org.junit.Assert.*;
import org.junit.Test;
/**
* @author Christian Dietrich - Initial contribution and API
*/
public class JavaVersionTest {
@Test
public void testFromQualifier() {
assertEquals(JavaVersion.JAVA9, JavaVersion.fromQualifier("9"));
assertEquals(JavaVersion.JAVA9, JavaVersion.fromQualifier("1.9"));
assertEquals(JavaVersion.JAVA8, JavaVersion.fromQualifier("8"));
assertEquals(JavaVersion.JAVA8, JavaVersion.fromQualifier("1.8"));
assertEquals(JavaVersion.JAVA7, JavaVersion.fromQualifier("7"));
assertEquals(JavaVersion.JAVA7, JavaVersion.fromQualifier("1.7"));
assertEquals(JavaVersion.JAVA6, JavaVersion.fromQualifier("6"));
assertEquals(JavaVersion.JAVA6, JavaVersion.fromQualifier("1.6"));
assertEquals(JavaVersion.JAVA5, JavaVersion.fromQualifier("1.5"));
assertNull(JavaVersion.fromQualifier("1.4"));
assertNull(JavaVersion.fromQualifier("5"));
}
}

6
org.eclipse.xtext.util/src/org/eclipse/xtext/util/JavaVersion.java
View file

@ -46,6 +46,12 @@ public enum JavaVersion {
JAVA9("Java 9", new String[] {"9", "1.9"}, "JavaSE-9", "-1.9")
;
// if you introduce a new JavaVersion don't forget to adapt
// - org.eclipse.xtext.xbase.testing.InMemoryJavaCompiler.toClassFmt(JavaVersion)
// - org.eclipse.xtext.xbase.compiler.InMemoryJavaCompiler.toClassFmt(JavaVersion)
// - org.eclipse.xtext.java.resource.JavaDerivedStateComputer.toJdtVersion(JavaVersion)
// - org.eclipse.xtext.xbase.idea.facet.XbaseGeneratorConfigProvider.getTargetJavaVersion(XbaseGeneratorConfigurationState, Module)
private final String label;
private final String[] qualifiers;
private final String bree;