Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2013-05-16 07:06:16 -0400
committerTom Schindl2013-05-16 07:06:16 -0400
commitb675bea4b989c511e84b894d98d3f0c1e95f7d1f (patch)
tree228b86212e8f2a47a3b5bda7d98c1990654977f0
parent07b1314f22d61f9fb42d62029e286eb2064dc6c1 (diff)
downloadorg.eclipse.efxclipse-b675bea4b989c511e84b894d98d3f0c1e95f7d1f.tar.gz
org.eclipse.efxclipse-b675bea4b989c511e84b894d98d3f0c1e95f7d1f.tar.xz
org.eclipse.efxclipse-b675bea4b989c511e84b894d98d3f0c1e95f7d1f.zip
compiling against JDK8
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java14
-rwxr-xr-xbundles/runtime/org.eclipse.fx.emf.edit.ui/.classpath2
-rw-r--r--bundles/runtime/org.eclipse.fx.emf.edit.ui/src/org/eclipse/fx/emf/edit/ui/AdapterFactoryObservableList.java1
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/.classpath2
-rwxr-xr-xreleng/org.eclipse.fx.ide.releng/pom.xml3
-rwxr-xr-xreleng/org.eclipse.fx.releng/pom.xml27
-rwxr-xr-xreleng/org.eclipse.fx.releng/pom_jdt8.xml244
7 files changed, 263 insertions, 30 deletions
diff --git a/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java b/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java
index c9bdbe1ff..0ec7d4b21 100755
--- a/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java
+++ b/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java
@@ -17,6 +17,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import java.util.Spliterator;
+import java.util.function.Consumer;
import javafx.beans.InvalidationListener;
import javafx.beans.binding.Bindings;
@@ -357,6 +359,18 @@ public class AdapterFactory {
list.clear();
return list.addAll(col);
}
+
+//FIXME Java8
+// Default methods NOT YET supported by JDT-Core
+// @Override
+ public void forEach(Consumer<? super E> action) {
+ list.forEach(action);
+ }
+
+// @Override
+ public Spliterator<E> spliterator() {
+ return list.spliterator();
+ }
}
static class WrappedValue<E> implements ObservableWritableValue<E> {
diff --git a/bundles/runtime/org.eclipse.fx.emf.edit.ui/.classpath b/bundles/runtime/org.eclipse.fx.emf.edit.ui/.classpath
index 1fa3e6803..098194ca4 100755
--- a/bundles/runtime/org.eclipse.fx.emf.edit.ui/.classpath
+++ b/bundles/runtime/org.eclipse.fx.emf.edit.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/bundles/runtime/org.eclipse.fx.emf.edit.ui/src/org/eclipse/fx/emf/edit/ui/AdapterFactoryObservableList.java b/bundles/runtime/org.eclipse.fx.emf.edit.ui/src/org/eclipse/fx/emf/edit/ui/AdapterFactoryObservableList.java
index 293f4b7b7..52978ceb7 100644
--- a/bundles/runtime/org.eclipse.fx.emf.edit.ui/src/org/eclipse/fx/emf/edit/ui/AdapterFactoryObservableList.java
+++ b/bundles/runtime/org.eclipse.fx.emf.edit.ui/src/org/eclipse/fx/emf/edit/ui/AdapterFactoryObservableList.java
@@ -250,6 +250,7 @@ public class AdapterFactoryObservableList<T> implements ObservableList<T> {
throw new UnsupportedOperationException(CHANGES_THROUGH_MODEL);
}
+//FIXME Java8
// Default methods NOT YET supported by JDT-Core
// @Override
public void forEach(Consumer<? super T> action) {
diff --git a/demos/org.eclipse.fx.demo.contacts.app/.classpath b/demos/org.eclipse.fx.demo.contacts.app/.classpath
index 1fa3e6803..098194ca4 100755
--- a/demos/org.eclipse.fx.demo.contacts.app/.classpath
+++ b/demos/org.eclipse.fx.demo.contacts.app/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/releng/org.eclipse.fx.ide.releng/pom.xml b/releng/org.eclipse.fx.ide.releng/pom.xml
index d7977c8f2..c7d8cb13d 100755
--- a/releng/org.eclipse.fx.ide.releng/pom.xml
+++ b/releng/org.eclipse.fx.ide.releng/pom.xml
@@ -80,7 +80,8 @@
<repository>
<id>efx-runtime</id>
<layout>p2</layout>
- <url>http://downloads.efxclipse.org/eclipse.org/p2/runtime/nightly/site/</url>
+ <!-- url>http://downloads.efxclipse.org/eclipse.org/p2/runtime/nightly/site/</url-->
+ <url>file:///Users/tomschindl/git/efxclipse/releng/org.eclipse.fx.updatesite/target/site</url>
</repository>
<!--
<repository>
diff --git a/releng/org.eclipse.fx.releng/pom.xml b/releng/org.eclipse.fx.releng/pom.xml
index 9ea480db0..870fa8deb 100755
--- a/releng/org.eclipse.fx.releng/pom.xml
+++ b/releng/org.eclipse.fx.releng/pom.xml
@@ -19,8 +19,6 @@
<mockito-version>1.8.4</mockito-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<platform-version>[3.7,3.8)</platform-version>
- <local-repo>/var/lib/jenkins/.m2/repository</local-repo>
- <jdt-core-version>3.9.0-SNAPSHOT</jdt-core-version>
</properties>
<modules>
@@ -88,13 +86,6 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
- <pluginRepository>
- <id>local-repo</id>
- <url>${local-repo}</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
</pluginRepositories>
<build>
@@ -155,26 +146,8 @@
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
- <!-- dependencies>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- <version>${jdt-core-version}</version>
- </dependency>
- </dependencies-->
-
<configuration>
<encoding>UTF-8</encoding>
- <!-- source>1.8</source>
- <target>1.7</target-->
- <!-- mvn install:install-file -Dfile=/Users/tomschindl/Applications/javafx-sdk2.2.0-beta/rt/lib/jfxrt.jar -DgroupId=javafx -DartifactId=javafx.mvn -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -DgeneratePom=true -->
- <!-- extraClasspathElements>
- <extraClasspathElement>
- <groupId>javafx</groupId>
- <artifactId>javafx.mvn</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </extraClasspathElement>
- </extraClasspathElements-->
</configuration>
</plugin>
<plugin>
diff --git a/releng/org.eclipse.fx.releng/pom_jdt8.xml b/releng/org.eclipse.fx.releng/pom_jdt8.xml
new file mode 100755
index 000000000..086f3febe
--- /dev/null
+++ b/releng/org.eclipse.fx.releng/pom_jdt8.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <name>e(fx)clipse build</name>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+ <groupId>org.eclipse.fx</groupId>
+ <artifactId>releng</artifactId>
+ <version>0.8.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <properties>
+ <tycho-version>0.16.0</tycho-version>
+ <junit-version>4.8.1</junit-version>
+ <mockito-version>1.8.4</mockito-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <platform-version>[3.7,3.8)</platform-version>
+ <local-repo>/Users/tomschindl/.m2/repository</local-repo>
+ <!-- local-repo>/var/lib/jenkins/.m2/repository</local-repo -->
+ <jdt-core-version>3.9.0-SNAPSHOT</jdt-core-version>
+ </properties>
+
+ <modules>
+ <!-- OSGI Support -->
+ <module>../../bundles/runtime/org.eclipse.fx.javafx</module>
+ <module>../../bundles/runtime/org.eclipse.fx.osgi</module>
+ <module>../../bundles/runtime/org.eclipse.fx.osgi.util</module>
+ <!-- Core Modules -->
+ <module>../../bundles/runtime/org.eclipse.fx.core</module>
+ <module>../../bundles/runtime/org.eclipse.fx.core.databinding</module>
+ <module>../../bundles/runtime/org.eclipse.fx.core.p2</module>
+ <module>../../bundles/runtime/org.eclipse.fx.core.log4j</module>
+ <module>../../bundles/runtime/org.eclipse.fx.core.guice</module>
+ <!-- UI Modules -->
+ <module>../../bundles/runtime/org.eclipse.fx.ui.databinding</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.application</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.di</module>
+ <!-- module>../../bundles/runtime/org.eclipse.fx.ui.di.interopt</module-->
+ <module>../../bundles/runtime/org.eclipse.fx.ui.animation</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.panes</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.services</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.dialogs</module>
+ <!-- EMF -->
+ <module>../../bundles/runtime/org.eclipse.fx.emf.edit.ui</module>
+ <module>../../bundles/runtime/org.eclipse.fx.emf.databinding</module>
+
+ <!-- e4 -->
+ <module>../../bundles/runtime/org.eclipse.fx.ui.keybindings</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.keybindings.generic</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.keybindings.e4</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.base</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.renderers.base</module>
+
+ <module>../../bundles/runtime/org.eclipse.fx.ui.theme</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.fx</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.fx.controls</module>
+ <module>../../bundles/runtime/org.eclipse.fx.ui.workbench.renderers.fx</module>
+
+ <!-- 3.x / 4.x SDK -->
+ <!-- module>../../bundles/runtime/org.eclipse.fx.ui.workbench3</module -->
+
+ <!-- Format Conversion -->
+ <module>../../bundles/runtime/org.eclipse.fx.formats.svg</module>
+
+ <!-- Features -->
+ <module>../runtime/org.eclipse.fx.core.feature</module>
+ <module>../runtime/org.eclipse.fx.target.feature</module>
+
+ <module>../org.eclipse.fx.updatesite</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>juno</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/juno</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>tycho</id>
+ <url>http://repository.sonatype.org/content/groups/sonatype-public-grid</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>local-repo</id>
+ <url>${local-repo}</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <build>
+
+ <!-- build plugins -->
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+
+
+ <!-- defines the default settings for the used plugins -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>${jdt-core-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+ <version>${jdt-core-version}</version>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <source>1.8</source>
+ <target>1.8</target>
+ <debug>true</debug>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>plugin-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <!-- version>${tycho-version}</version-->
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <archiveSite>true</archiveSite>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit-version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project> \ No newline at end of file

Back to the top