Update for cadoodle compat

CommonWealthRobotics · Jul 15, 2024 · 1b5f66d · 1b5f66d
1 parent 12543ae
commit 1b5f66d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 172 deletions.
diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel
diff --git a/libraries/dockfx b/libraries/dockfx
diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/tabs/AbstractBowlerStudioTab.java b/src/main/java/com/neuronrobotics/bowlerstudio/tabs/AbstractBowlerStudioTab.java
@@ -11,8 +11,8 @@
 import com.neuronrobotics.sdk.common.BowlerAbstractDevice;
 import com.neuronrobotics.sdk.common.IConnectionEventListener;
 import com.neuronrobotics.sdk.common.IDeviceConnectionEventListener;
-import com.sun.javafx.scene.control.behavior.TabPaneBehavior;
-import com.sun.javafx.scene.control.skin.TabPaneSkin;
+//import com.sun.javafx.scene.control.behavior.TabPaneBehavior;
+//import com.sun.javafx.scene.control.skin.TabPaneSkin;
 
 import eu.mihosoft.vrl.v3d.CSG;
 import javafx.application.Platform;
@@ -101,9 +101,9 @@ public void requestClose() {
     	BowlerStudioModularFrame.getBowlerStudioModularFrame().closeTab(this);
     }
 //
-    private TabPaneBehavior getBehavior() {
-        return ((TabPaneSkin) getTabPane().getSkin()).getBehavior();
-    }
+//    private TabPaneBehavior getBehavior() {
+//        return ((TabPaneSkin) getTabPane().getSkin()).getBehavior();
+//    }
 
 	public void setActive(boolean a){
 		active=a;

diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/tabs/LocalFileScriptTab.java b/src/main/java/com/neuronrobotics/bowlerstudio/tabs/LocalFileScriptTab.java
@@ -33,7 +33,7 @@
 import javax.swing.text.Highlighter.HighlightPainter;
 
 import javafx.application.Platform;
-import javafx.embed.swing.MySwingNode;
+//import javafx.embed.swing.MySwingNode;
 import javafx.embed.swing.SwingNode;
 import javafx.event.EventHandler;
 import javafx.scene.layout.VBox;
@@ -282,7 +282,7 @@ public void mouseClicked(MouseEvent e) {
 
 		spscrollPane = new RTextScrollPane(textArea);
 
-		swingNode = new MySwingNode(this);
+		swingNode = new javafx.embed.swing.SwingNode();
 		// swingNode=new javafx.embed.swing.SwingNode();
 
 		getScripting().setFocusTraversable(false);

diff --git a/src/main/java/javafx/embed/swing/MySwingNode.java b/src/main/java/javafx/embed/swing/MySwingNode.java
+0 −2		libs/.gitignore
+ −		libs/asm-all-3.1.jar
+ −		libs/jbullet-2.72.2.4-sources.jar
+ −		libs/jbullet-2.72.2.4.jar
+ −		libs/jl1.0.jar
+ −		libs/jsapi.jar
+ −		libs/kabeja-0.4.jar
+ −		libs/kabeja-svg-0.4.jar
+ −		libs/kabeja-xslt.jar
+ −		libs/mbrola.jar
+ −		libs/nrV4J-3.8.1.jar
+ −		libs/rosjava-0.1.6.jar
+ −		libs/stack-alloc.jar
+53 −84		build.gradle
+110 −0		gradle/master.gradle
+25 −0		gradle/spotless.gradle
+ −		gradle/wrapper/gradle-wrapper.jar
+31 −20		gradlew
+20 −1		gradlew.bat
+35 −6		pom.xml
+13 −3		src/main/java/org/dockfx/DockEvent.java
+28 −22		src/main/java/org/dockfx/DockNode.java
+19 −12		src/main/java/org/dockfx/DockPane.java
+12 −3		src/main/java/org/dockfx/DockPos.java
+48 −52		src/main/java/org/dockfx/DockTitleBar.java
+16 −0		src/main/java/org/dockfx/EnumConverter.java
+9 −0		src/main/java/org/dockfx/IWindowsProvider.java
+39 −0		src/main/java/org/dockfx/demo/README.md
+120 −143		src/main/java/org/dockfx/pane/ContentTabPane.java
+3 −12		src/main/java/org/dockfx/pane/DockNodeTab.java
+2,157 −2,312		src/main/java/org/dockfx/pane/skin/ContentTabPaneSkin.java
+1 −6		src/main/resources/org/dockfx/default.css