Skip to content

Commit 08108bd

Browse files
committed
Java 19
1 parent 52e084b commit 08108bd

File tree

3 files changed

+22
-27
lines changed

3 files changed

+22
-27
lines changed

Diff for: pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<packaging>jar</packaging>
1818

1919
<properties>
20-
<maven.compiler.source>18</maven.compiler.source>
21-
<maven.compiler.target>18</maven.compiler.target>
20+
<maven.compiler.source>19</maven.compiler.source>
21+
<maven.compiler.target>19</maven.compiler.target>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<ikonli.version>12.3.1</ikonli.version>
24-
<javafx.version>18.0.2</javafx.version>
24+
<javafx.version>19</javafx.version>
2525
<junit.jupiter.version>5.9.0</junit.jupiter.version>
2626
<jave.version>3.3.1</jave.version>
2727
</properties>
@@ -42,10 +42,10 @@
4242
<artifactId>maven-compiler-plugin</artifactId>
4343
<version>3.8.1</version>
4444
<configuration>
45-
<source>18</source>
46-
<target>18</target>
47-
<release>18</release>
48-
<executable>javac18</executable>
45+
<source>19</source>
46+
<target>19</target>
47+
<release>19</release>
48+
<executable>javac19</executable>
4949
<encoding>UTF-8</encoding>
5050
</configuration>
5151
</plugin>
@@ -229,7 +229,7 @@
229229
<dependency>
230230
<groupId>org.controlsfx</groupId>
231231
<artifactId>controlsfx</artifactId>
232-
<version>11.1.1</version>
232+
<version>11.1.2</version>
233233
</dependency>
234234
<dependency>
235235
<groupId>com.jfoenix</groupId>
@@ -253,7 +253,7 @@
253253
<dependency>
254254
<groupId>org.xerial</groupId>
255255
<artifactId>sqlite-jdbc</artifactId>
256-
<version>3.39.2.1</version>
256+
<version>3.39.3.0</version>
257257
</dependency>
258258

259259
<!-- Apache Commons -->
@@ -288,7 +288,7 @@
288288
<dependency>
289289
<groupId>org.json</groupId>
290290
<artifactId>json</artifactId>
291-
<version>20220320</version>
291+
<version>20220924</version>
292292
</dependency>
293293

294294
<!-- JAVA-GOOGLE-SPEECH-API -->

Diff for: src/main/java/com/goxr3plus/xr3player/controllers/windows/ConsoleWindowController.java

+9-17
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public class ConsoleWindowController extends StackPane {
4545
@FXML
4646
private BorderPane borderPane;
4747

48-
@FXML
49-
private JFXTextField commandTextField;
48+
// @FXML
49+
// private JFXTextField commandTextField;
5050

5151
@FXML
5252
private Button go;
@@ -65,7 +65,7 @@ public class ConsoleWindowController extends StackPane {
6565
private final Logger logger = Logger.getLogger(getClass().getName());
6666

6767
/** The Window */
68-
private Stage window;
68+
private final Stage window = new Stage();
6969

7070
/**
7171
* The Speech Recognition of the Application
@@ -85,13 +85,6 @@ public enum ConsoleTab {
8585
*/
8686
public ConsoleWindowController() {
8787

88-
89-
}
90-
91-
private Stage initFromConstructor() {
92-
Stage window;
93-
window = new Stage();
94-
9588
// ------------------------------------FXMLLOADER
9689
final FXMLLoader loader = new FXMLLoader(
9790
getClass().getResource(InfoTool.WINDOW_FXMLS + "ConsoleWindowController.fxml"));
@@ -108,22 +101,21 @@ private Stage initFromConstructor() {
108101
window.initStyle(StageStyle.UTILITY);
109102
window.setScene(new Scene(this));
110103
this.focusedProperty().addListener((observable, oldValue, newValue) -> {
111-
if (window.isFocused())
112-
commandTextField.requestFocus();
104+
// if (window.isFocused())
105+
// commandTextField.requestFocus();
113106
});
114107
window.getScene().setOnKeyReleased(k -> {
115108
if (k.getCode() == KeyCode.ESCAPE)
116109
window.close();
117110
});
118-
return window;
111+
119112
}
120113

121114
/**
122115
* Called as soon as .fxml is initialized
123116
*/
124117
@FXML
125118
private void initialize() {
126-
window = initFromConstructor();
127119

128120
// -- cssTextArea
129121
cssTextArea.setEditable(false);
@@ -140,11 +132,11 @@ private void initialize() {
140132
borderPane.setCenter(vsPane);
141133

142134
// commandTextField
143-
commandTextField.setOnAction(a -> procceedCommand(commandTextField.getText()));
135+
// commandTextField.setOnAction(a -> procceedCommand(commandTextField.getText()));
144136

145137
// go
146-
go.setOnAction(a -> procceedCommand(commandTextField.getText()));
147-
go.disableProperty().bind(commandTextField.textProperty().isEmpty());
138+
// go.setOnAction(a -> procceedCommand(commandTextField.getText()));
139+
// go.disableProperty().bind(commandTextField.textProperty().isEmpty());
148140

149141
// close
150142
close.setOnAction(a -> window.close());

Diff for: version.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"latest": 162
3+
}

0 commit comments

Comments
 (0)