Skip to content

Commit 8fc4b43

Browse files
committed
Activate the ConnectionTest button according to inputed connInfo values
1 parent b2c2c68 commit 8fc4b43

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

src/main/java/root/javafx/CustomView/ConnInfoControl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
public interface ConnInfoControl<T> {
99

1010
void save(String configFilePath, Collection<StatefulAP> statefulAP);
11+
12+
boolean canConnectionTest(ConnectionInfoAP curAP);
1113

1214
ConnectionTestService getConnectionTestService(ConnectionInfoAP curAP);
1315

src/main/java/root/javafx/CustomView/ConnectionInfoVBox.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void saveConnInfoSettings(String configFilePath) {
106106

107107
public void addConnInfoList(List<T> connInfoList) {
108108
if (connInfoList.isEmpty()) {
109-
addConnectionInfoAP(2, connInfoControl.getNewConnInfoAP());
109+
connInfoNoDataAP.toFront();
110110
return;
111111
}
112112

@@ -208,7 +208,7 @@ private void bringFrontConnInfoAnchorPane(long index) {
208208
prevConnInfoBtn.setDisable(true);
209209
nextConnInfoBtn.setDisable(true);
210210
} else {
211-
connTestBtn.setDisable(false);
211+
connTestBtn.setDisable(connInfoControl.canConnectionTest(this.connInfoAPMap.get(index).getAp()));
212212
connInfoRemoveBtn.setDisable(false);
213213
prevConnInfoBtn.setDisable(false);
214214
nextConnInfoBtn.setDisable(false);

src/main/java/root/javafx/CustomView/DBConnInfoControl.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ public void save(String configFilePath, Collection<StatefulAP> statefulAP) {
3030
}
3131
propertyRepository.saveDBConnectionInfo(configFilePath, config);
3232
}
33-
33+
34+
@Override
35+
public boolean canConnectionTest(ConnectionInfoAP curAP) {
36+
return ((DBConnectionInfoAnchorPane) curAP).isAnyEmptyInput();
37+
}
38+
3439
@Override
3540
public ConnectionTestService getConnectionTestService(ConnectionInfoAP curAP) {
3641
String jdbcUrl = ((TextField) curAP.lookup("#urlTF")).getText();

src/main/java/root/javafx/CustomView/ServerConnInfoControl.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ public void save(String configFilePath, Collection<StatefulAP> statefulAP) {
2727
propertyRepository.saveServerConnectionInfo(configFilePath, config);
2828
}
2929

30+
@Override
31+
public boolean canConnectionTest(ConnectionInfoAP curAP) {
32+
// TODO Auto-generated method stub
33+
return true;
34+
}
35+
3036
@Override
3137
public ConnectionTestService getConnectionTestService(ConnectionInfoAP curAP) {
3238
// TODO Auto-generated method stub
@@ -47,5 +53,4 @@ public ConnectionInfoAP getConnInfoAP(JschConnectionInfo connInfo) {
4753
serverConnAP.setInitialValue(connInfo);
4854
return serverConnAP;
4955
}
50-
5156
}

0 commit comments

Comments
 (0)