Commit 28868b11 authored by Alexander Weigl's avatar Alexander Weigl

working javafx11

parent 0e0d6cdd
Pipeline #39596 failed with stages
in 40 seconds
plugins {
id 'org.openjfx.javafxplugin' version '0.0.7'
id "org.jetbrains.gradle.plugin.idea-ext" version "0.5"
}
apply plugin: 'idea'
group = 'org.dockfx'
description = 'DockFX'
......@@ -12,11 +5,6 @@ description = 'DockFX'
// jvmArgs '--add-modules', 'java.xml.bind'
//}
def exports = ["--add-exports", "javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED",
"--add-exports", "javafx.controls/com.sun.javafx.scene.control.skin=ALL-UNNAMED",
"--add-exports", "javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED"
]
/*idea.project.settings {
compiler {
javac {
......@@ -26,16 +14,3 @@ def exports = ["--add-exports", "javafx.graphics/com.sun.javafx.stage=ALL-UNNAME
}
}
}*/
javafx {
modules = ['javafx.controls', 'javafx.fxml', 'javafx.graphics']
}
tasks.withType(JavaCompile) {
options.compilerArgs = exports
options.compilerArgs << "-Xlint:none" << "-nowarn"
options.fork = true
options.forkOptions.executable = "javac"
}
plugins {
id "com.github.ben-manes.versions" version "0.17.0"
id 'io.franzbecker.gradle-lombok' version '2.0' apply false
id 'org.openjfx.javafxplugin' version '0.0.7'
id "org.jetbrains.gradle.plugin.idea-ext" version "0.5"
}
allprojects {
......@@ -9,9 +12,11 @@ allprojects {
}
subprojects {
// apply plugin: 'io.franzbecker.gradle-lombok'
apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'io.franzbecker.gradle-lombok'
apply plugin: 'org.openjfx.javafxplugin'
apply plugin: "org.jetbrains.gradle.plugin.idea-ext"
sourceCompatibility = 11
targetCompatibility = 11
......@@ -19,6 +24,12 @@ subprojects {
options.encoding = 'UTF-8'
}
lombok { // optional: values below are the defaults
version = "1.18.4"
sha256 = "39f3922deb679b1852af519eb227157ef2dd0a21eec3542c8ce1b45f2df39742"
}
repositories {
mavenLocal()
maven { url "http://repo.maven.apache.org/maven2" }
......@@ -28,8 +39,7 @@ subprojects {
task printClasspath {
doLast {// sourceSets.test.runtimeClasspath.
sourceSets.test.runtimeClasspath.each {println it}
sourceSets.test.runtimeClasspath.each { println it }
}
}
......@@ -44,4 +54,24 @@ subprojects {
testCompile group: 'junit', name: 'junit', version: '4.12'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.16.20'
}
def javaExports = ["--add-exports", "javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED",
"--add-exports", "javafx.controls/com.sun.javafx.scene.control.skin=ALL-UNNAMED",
"--add-exports", "javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED",
]
javafx {
modules = ['javafx.controls', 'javafx.fxml', 'javafx.graphics', 'javafx.web']
}
tasks.withType(JavaCompile) {
options.compilerArgs = javaExports
options.compilerArgs << "-Xlint:none" << "-nowarn"
options.fork = true
options.forkOptions.executable = "javac"
}
}
plugins {
id 'com.intershop.gradle.jaxb' version '2.0.0'
}
description = 'lint'
jaxb {
javaGen {
lint {
schema = file('src/main/xsd/lint-issues.xsd')
packageName = "edu.kit.iti.formal.psdbg.lint"
//binding = file('binding.xjb')
//args << "--add-modules java.xml.bind"
}
}
}
compileJava.dependsOn jaxbJavaGenLint
/*
sourceSets {
main{
java{
srcDir "$buildDir/xjc/generated-sources"
srcDir "src/main/java"
}
}
}*/
print(sourceSets.main.java.srcDirs)
/*plugins {
id 'org.unbroken-dome.xjc' version '1.1.3'
}
xjcGenerate {
source = fileTree('src/main/xsd') { include '*.xsd' }
targetPackage = "edu.kit.iti.formal.psdbg.lint"
//bindingFiles = fileTree('src/main/jaxb') { include '*.xjb' }
//catalogs = fileTree('src/main/catalog') { include '*.cat' }
}
compileJava.dependsOn xjcGenerate
*/
dependencies {
compile group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.9.5'
compile group: 'it.unibo.alice.tuprolog', name: 'tuprolog', version: '3.2.1'
compile project(':lang')
compile project(':rt')
/* xjcClasspath 'com.sun.xml.bind:jaxb-xjc:2.2.7-b41'
xjcClasspath 'com.sun.xml.bind:jaxb-impl:2.2.7-b41'
xjcClasspath 'javax.xml.bind:jaxb-api:2.2.7'
xjcClasspath 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.1'
*/
compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
}
//
// Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 generiert
// Siehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren.
// Generiert: 2018.01.19 um 04:46:36 PM CET
//
package edu.kit.iti.formal.psdbg.lint;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
/**
* <p>Java-Klasse für issue complex type.
*
* <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
*
* <pre>
* &lt;complexType name="issue"&gt;
* &lt;simpleContent&gt;
* &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema&gt;string"&gt;
* &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
* &lt;attribute name="severity"&gt;
* &lt;simpleType&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
* &lt;enumeration value="info"/&gt;
* &lt;enumeration value="warn"/&gt;
* &lt;enumeration value="error"/&gt;
* &lt;/restriction&gt;
* &lt;/simpleType&gt;
* &lt;/attribute&gt;
* &lt;attribute name="rulename"&gt;
* &lt;simpleType&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
* &lt;pattern value="[a-zA-Z_]+"/&gt;
* &lt;/restriction&gt;
* &lt;/simpleType&gt;
* &lt;/attribute&gt;
* &lt;/extension&gt;
* &lt;/simpleContent&gt;
* &lt;/complexType&gt;
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "issue", propOrder = {
"value"
})
public class Issue {
@XmlValue
protected String value;
@XmlAttribute(name = "id", required = true)
protected int id;
@XmlAttribute(name = "severity")
protected String severity;
@XmlAttribute(name = "rulename")
protected String rulename;
/**
* Ruft den Wert der value-Eigenschaft ab.
*
* @return
* possible object is
* {@link String }
*
*/
public String getValue() {
return value;
}
/**
* Legt den Wert der value-Eigenschaft fest.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setValue(String value) {
this.value = value;
}
/**
* Ruft den Wert der id-Eigenschaft ab.
*
*/
public int getId() {
return id;
}
/**
* Legt den Wert der id-Eigenschaft fest.
*
*/
public void setId(int value) {
this.id = value;
}
/**
* Ruft den Wert der severity-Eigenschaft ab.
*
* @return
* possible object is
* {@link String }
*
*/
public String getSeverity() {
return severity;
}
/**
* Legt den Wert der severity-Eigenschaft fest.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setSeverity(String value) {
this.severity = value;
}
/**
* Ruft den Wert der rulename-Eigenschaft ab.
*
* @return
* possible object is
* {@link String }
*
*/
public String getRulename() {
return rulename;
}
/**
* Legt den Wert der rulename-Eigenschaft fest.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setRulename(String value) {
this.rulename = value;
}
}
//
// Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 generiert
// Siehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren.
// Generiert: 2018.01.19 um 04:46:36 PM CET
//
package edu.kit.iti.formal.psdbg.lint;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java-Klasse für issues complex type.
*
* <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
*
* <pre>
* &lt;complexType name="issues"&gt;
* &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence maxOccurs="unbounded"&gt;
* &lt;element name="issue" type="{http://formal.iti.kit.edu/lint-issues-1.0}issue"/&gt;
* &lt;/sequence&gt;
* &lt;attribute name="version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" fixed="1.0" /&gt;
* &lt;/restriction&gt;
* &lt;/complexContent&gt;
* &lt;/complexType&gt;
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "issues", propOrder = {
"issue"
})
public class Issues {
@XmlElement(required = true)
protected List<Issue> issue;
@XmlAttribute(name = "version", required = true)
protected String version;
/**
* Gets the value of the issue property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
* This is why there is not a <CODE>set</CODE> method for the issue property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
* getIssue().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link Issue }
*
*
*/
public List<Issue> getIssue() {
if (issue == null) {
issue = new ArrayList<Issue>();
}
return this.issue;
}
/**
* Ruft den Wert der version-Eigenschaft ab.
*
* @return
* possible object is
* {@link String }
*
*/
public String getVersion() {
if (version == null) {
return "1.0";
} else {
return version;
}
}
/**
* Legt den Wert der version-Eigenschaft fest.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setVersion(String value) {
this.version = value;
}
}
......@@ -2,6 +2,7 @@ package edu.kit.iti.formal.psdbg.lint;
import edu.kit.iti.formal.psdbg.lint.checkers.IssuesId;
import javax.naming.spi.ObjectFactory;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
......
......@@ -3,5 +3,6 @@ description = ''
dependencies {
compile project(':rt')
compile project(':keydeps')
compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
// compile project(':matcher')
}
plugins {
id "com.github.voplex95.lesscompiler" version "1.0.3"
id 'org.openjfx.javafxplugin' version '0.0.7'
}
apply plugin: 'antlr'
......@@ -8,10 +7,6 @@ apply plugin: 'antlr'
description = 'ui'
javafx {
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.graphics', 'javafx.web' ]
}
generateGrammarSource {
arguments += ["-long-messages", "-package","antlrgrammars"]
}
......@@ -25,14 +20,14 @@ lessCompile {
processResources.dependsOn lessCompile
dependencies {
compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '1.7.22-4'
compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '8.15'
compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '2.0.26-9.1.2'
compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '9.1.2'
// compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '2.0.26-9.1.2'
// compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '9.1.2'
compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.9.0'
compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.9.2'
//compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '1.0.0-SNAPSHOT'
compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.12'
compile group: 'org.controlsfx', name: 'controlsfx', version: '9.0.0'
compile group: 'org.antlr', name: 'antlr4', version: '4.7'
antlr group: 'org.antlr', name: 'antlr4', version: '4.7'
......@@ -44,7 +39,7 @@ dependencies {
compile project(':lint')
}
def mainClassName = 'edu.kit.iti.formal.psdbg.gui.ProofScriptDebugger'
def mainClassName = 'edu.kit.iti.formal.psdbg.gui.PSDBG'
task runApp(type: JavaExec) {
standardInput = System.in
......
package edu.kit.iti.formal.psdbg.gui;
/**
* @author Alexander Weigl
* @version 1 (05.02.19)
*/
public class PSDBG {
public static void main(String[] args) {
ProofScriptDebugger.main(args);//Workaround
}
}
......@@ -2,8 +2,6 @@ package edu.kit.iti.formal.psdbg.gui.controls;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.graph.Graph;
import com.google.common.graph.GraphBuilder;
import de.uka.ilkd.key.proof.Node;
import de.uka.ilkd.key.proof.Proof;
import edu.kit.iti.formal.psdbg.ShortCommandPrinter;
......@@ -14,12 +12,13 @@ import edu.kit.iti.formal.psdbg.interpreter.dbg.ProofTreeManager;
import edu.kit.iti.formal.psdbg.parser.ast.*;
import javafx.scene.control.TreeItem;
import javafx.util.Pair;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.val;
import sun.reflect.generics.tree.Tree;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* @author A. Weigl, S.Grebing
......
package edu.kit.iti.formal.psdbg.gui.controls;
import com.sun.javafx.css.Style;
import de.uka.ilkd.key.proof.Node;
import edu.kit.iti.formal.psdbg.gui.controller.DebuggerMain;
import edu.kit.iti.formal.psdbg.gui.controller.Events;
import edu.kit.iti.formal.psdbg.gui.controls.ScriptTree.*;
import edu.kit.iti.formal.psdbg.gui.model.DebuggerMainModel;
import edu.kit.iti.formal.psdbg.interpreter.KeYProofFacade;
import edu.kit.iti.formal.psdbg.interpreter.dbg.PTreeNode;
import javafx.beans.binding.Bindings;
import javafx.beans.property.MapProperty;
import javafx.beans.property.SimpleMapProperty;
import javafx.collections.FXCollections;
import javafx.fxml.FXML;
import javafx.scene.control.*;
import javafx.scene.control.ContextMenu;
import javafx.scene.control.TreeCell;
import javafx.scene.control.TreeItem;
import javafx.scene.control.TreeView;
import javafx.scene.control.cell.TextFieldTreeCell;
import javafx.scene.layout.Background;
import javafx.scene.layout.BackgroundFill;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.CornerRadii;
import javafx.util.StringConverter;
import lombok.Getter;
import lombok.Setter;
import java.awt.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment