Skip to content

Commit d79b3c9

Browse files
committed
Merge commit '87988e0' into development
2 parents b80e69a + 87988e0 commit d79b3c9

18 files changed

Lines changed: 1286 additions & 245 deletions

pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.source>25</maven.compiler.source>
1212
<maven.compiler.target>25</maven.compiler.target>
1313
<attach.version>4.0.10</attach.version>
14-
<javafx.version>25</javafx.version>
15-
<log4j.version>2.22.1</log4j.version>
14+
<javafx.version>25.0.2</javafx.version>
15+
<log4j.version>2.25.3</log4j.version>
1616
</properties>
1717

1818
<repositories>
@@ -133,7 +133,7 @@
133133
<dependency>
134134
<groupId>org.controlsfx</groupId>
135135
<artifactId>controlsfx</artifactId>
136-
<version>11.2.2</version>
136+
<version>11.2.3</version>
137137
</dependency>
138138
<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-web -->
139139
<dependency>
@@ -156,44 +156,44 @@
156156
<dependency>
157157
<groupId>org.xerial</groupId>
158158
<artifactId>sqlite-jdbc</artifactId>
159-
<version>3.50.3.0</version>
159+
<version>3.51.1.0</version>
160160
</dependency>
161161
<!-- https://mvnrepository.com/artifact/com.mysql/mysql-connector-j -->
162162
<dependency>
163163
<groupId>com.mysql</groupId>
164164
<artifactId>mysql-connector-j</artifactId>
165-
<version>9.4.0</version>
165+
<version>9.5.0</version>
166166
</dependency>
167167
<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
168168
<dependency>
169169
<groupId>org.postgresql</groupId>
170170
<artifactId>postgresql</artifactId>
171-
<version>42.7.8</version>
171+
<version>42.7.9</version>
172172
</dependency>
173173
<!--
174174
https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc -->
175175
<dependency>
176176
<groupId>com.microsoft.sqlserver</groupId>
177177
<artifactId>mssql-jdbc</artifactId>
178-
<version>13.2.0.jre11</version>
178+
<version>13.2.1.jre11</version>
179179
</dependency>
180180
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-dbcp2 -->
181181
<dependency>
182182
<groupId>org.apache.commons</groupId>
183183
<artifactId>commons-dbcp2</artifactId>
184-
<version>2.13.0</version>
184+
<version>2.14.0</version>
185185
</dependency>
186186
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
187187
<dependency>
188188
<groupId>org.apache.commons</groupId>
189189
<artifactId>commons-lang3</artifactId>
190-
<version>3.18.0</version>
190+
<version>3.20.0</version>
191191
</dependency>
192192
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
193193
<dependency>
194194
<groupId>commons-io</groupId>
195195
<artifactId>commons-io</artifactId>
196-
<version>2.20.0</version>
196+
<version>2.21.0</version>
197197
</dependency>
198198
<!-- Add dependency for Java 25-->
199199
<dependency>

sqlbrowserfx.properties

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# classic, flat-dark, flat-dark2, flat-gray, flat-purple
1+
#
2+
#Tue Jan 27 17:16:39 EET 2026
23
sqlbrowserfx.css.theme=flat-dark
3-
#sqlbrowserfx.jmetro.theme=dark
4-
# normal, simple, advanced
5-
sqlbrowserfx.mode=advanced
64
sqlbrowserfx.default.editmode.cell=false
7-
sqlbrowserfx.root.path=/home/paris/eclipse-workspace
5+
sqlbrowserfx.mode=advanced
6+
sqlbrowserfx.root.path=/home/paris/angular-workspace
87
sqlconnector.enable.autocommit=true

src/main/java/gr/sqlbrowserfx/SqlBrowserFXApp.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@
7373
import javafx.scene.input.KeyCode;
7474
import javafx.scene.input.KeyEvent;
7575
import javafx.scene.layout.BorderPane;
76-
import javafx.scene.layout.Priority;
77-
import javafx.scene.layout.VBox;
7876
import javafx.scene.paint.Color;
7977
import javafx.scene.text.Font;
8078
import javafx.scene.text.TextAlignment;

src/main/java/gr/sqlbrowserfx/nodes/FileSearchPopOver.java

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public interface Action {
3636
private final ListView<String> filesListView;
3737
private String rootPath = ((String) PropertiesLoader.getProperty("sqlbrowserfx.root.path", String.class, "~/"))
3838
.replaceAll("\"", "");
39+
private Label descLabel;
3940

4041
public FileSearchPopOver(Action action) {
4142
super();
@@ -88,32 +89,41 @@ protected void updateItem(String item, boolean empty) {
8889
// TODO: add open button if has any value
8990
ImageView descIcon = JavaFXUtils.createIcon("/icons/settings.png");
9091

91-
Label descLabel = new Label("File Search in: " + rootPath, descIcon);
92+
descLabel = new Label("File Search in: " + rootPath, descIcon);
9293
descLabel.setOnMouseClicked(event -> {
9394
this.hide();
94-
DirectoryChooser dirChooser = new DirectoryChooser();
95-
File selectedDir = dirChooser.showDialog(this.getOwnerWindow());
96-
this.rootPath = selectedDir.getAbsolutePath();
97-
descLabel.setText("File Search in: " + rootPath);
95+
var dirChooser = new DirectoryChooser();
96+
var initialDir = new File(this.rootPath);
97+
dirChooser.setInitialDirectory(initialDir);
98+
var selectedDir = dirChooser.showDialog(this.getOwnerWindow());
99+
if (selectedDir != null) {
100+
this.rootPath = selectedDir.getAbsolutePath();
101+
descLabel.setText("File Search in: " + rootPath);
102+
PropertiesLoader.storeProperty("./sqlbrowserfx.properties", "sqlbrowserfx.root.path", this.rootPath);
103+
}
98104
});
99105
descLabel.setTooltip(new Tooltip("Click to change root path"));
100106

101107
this.setContentNode(new CustomVBox(descLabel, searchField, filesListView));
108+
109+
this.setOnShowing(event -> {
110+
PropertiesLoader.loadProperties();
111+
rootPath = ((String) PropertiesLoader.getProperty("sqlbrowserfx.root.path", String.class, "~/"))
112+
.replaceAll("\"", "");
113+
this.descLabel.setText("File Search in: " + rootPath);
114+
});
115+
this.setOnShown(event -> searchField.requestFocus());
116+
this.setHideOnEscape(true);
102117
this.setOnHidden(event -> {
103118
if (executor != null) {
104119
executor.shutdownNow();
105120
}
106121
});
107-
108-
this.setOnShown(event -> searchField.requestFocus());
109-
this.setHideOnEscape(true);
110122

111123
filesListView.setOnKeyPressed(keyEvent -> {
112124
if (keyEvent.getCode() == KeyCode.ENTER) {
113125
String filePath = filesListView.getSelectionModel().getSelectedItem();
114126
action.run(new File(filePath));
115-
} else if (keyEvent.getCode() == KeyCode.ESCAPE) {
116-
this.hide();
117127
}
118128
});
119129
filesListView.setOnMouseClicked(mouseEvent -> {

0 commit comments

Comments
 (0)