Commit 3d79d1fe authored by Alexander Weigl's avatar Alexander Weigl

fix dynamical taclets + richtextfx new version

parent 4dbfb023
Pipeline #15833 passed with stages
in 9 minutes and 37 seconds
set L=lib/components/
set PATH=%PATH%;C:\Users\weigl\Downloads\apache-maven-3.5.2\bin
call mvn install:install-file -Dfile=%L%/key.core.jar -DgroupId=key-project-psdbg -DartifactId=key.core -Dversion=2.7-SNAPSHOT -Dpackaging=jar
call mvn install:install-file -Dfile=%L%/key.ui.jar -DgroupId=key-project-psdbg -DartifactId=key.ui -Dversion=2.7-SNAPSHOT -Dpackaging=jar
call mvn install:install-file -Dfile=%L%/key.util.jar -DgroupId=key-project-psdbg -DartifactId=key.util -Dversion=2.7-SNAPSHOT -Dpackaging=jar
call mvn install:install-file -Dfile=%L%/../libs/recoderKey.jar -DgroupId=key-project-psdbg -DartifactId=recoder -Dversion=2.7 -Dpackaging=jar
\ No newline at end of file
...@@ -30,9 +30,9 @@ import org.antlr.v4.runtime.Token; ...@@ -30,9 +30,9 @@ import org.antlr.v4.runtime.Token;
/** /**
* @author Alexander Weigl * @author Alexander Weigl
*/ */
@Data @RequiredArgsConstructor public class Position implements Copyable<Position> { @Data @Value @RequiredArgsConstructor public class Position implements Copyable<Position> {
@NonNull final int lineNumber; private final int lineNumber;
@NonNull final int charInLine; private final int charInLine;
public Position() { public Position() {
this(-1, -1); this(-1, -1);
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<dependency> <dependency>
<groupId>org.fxmisc.richtext</groupId> <groupId>org.fxmisc.richtext</groupId>
<artifactId>richtextfx</artifactId> <artifactId>richtextfx</artifactId>
<version>0.7-M5</version> <version>0.8.1</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.controlsfx/controlsfx --> <!-- https://mvnrepository.com/artifact/org.controlsfx/controlsfx -->
......
...@@ -43,7 +43,6 @@ import org.controlsfx.control.PopOver; ...@@ -43,7 +43,6 @@ import org.controlsfx.control.PopOver;
import org.fxmisc.richtext.CharacterHit; import org.fxmisc.richtext.CharacterHit;
import org.fxmisc.richtext.CodeArea; import org.fxmisc.richtext.CodeArea;
import org.fxmisc.richtext.MouseOverTextEvent; import org.fxmisc.richtext.MouseOverTextEvent;
import org.fxmisc.richtext.model.NavigationActions;
import org.fxmisc.richtext.model.StyleSpans; import org.fxmisc.richtext.model.StyleSpans;
import org.reactfx.collection.LiveList; import org.reactfx.collection.LiveList;
import org.reactfx.value.Val; import org.reactfx.value.Val;
...@@ -149,7 +148,7 @@ public class ScriptArea extends CodeArea { ...@@ -149,7 +148,7 @@ public class ScriptArea extends CodeArea {
int characterPosition = hit.getInsertionIndex(); int characterPosition = hit.getInsertionIndex();
//System.out.println("characterPosition = " + characterPosition); //System.out.println("characterPosition = " + characterPosition);
// move the caret to that character's position // move the caret to that character's position
this.moveTo(characterPosition, NavigationActions.SelectionPolicy.CLEAR); //this.moveTo(characterPosition, NavigationActions.SelectionPolicy.CLEAR);
}); });
mainScript.addListener((observable) -> updateMainScriptMarker()); mainScript.addListener((observable) -> updateMainScriptMarker());
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<VBox> <VBox>
<!--<BreadCrumbBar fx:id="frames"/>--> <!--<BreadCrumbBar fx:id="frames"/>-->
<HBox alignment="BASELINE_LEFT"> <HBox alignment="BASELINE_LEFT">
<Label labelFor="$frames" text="Contexts:" /> <Label labelFor="$frames" text="Contexts:"/>
<ComboBox fx:id="frames" HBox.hgrow="ALWAYS"/> <ComboBox fx:id="frames" HBox.hgrow="ALWAYS"/>
</HBox> </HBox>
<ListView fx:id="goalView"/> <ListView fx:id="goalView"/>
......
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