Skip to content

Commit e7026c2

Browse files
committed
Replace stub method to real method (ConnInfoControl's getNewConnInfoAP())
1 parent 8a5ecd4 commit e7026c2

File tree

4 files changed

+11
-28
lines changed

4 files changed

+11
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ public interface ConnInfoControl<T extends ConnectionInfoAP> {
1111

1212
ConnectionTestService getConnectionTestService(ConnectionInfoAP curAP);
1313

14-
void getNewConnInfoAP();
14+
ConnectionInfoAP getNewConnInfoAP();
1515
}

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

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,11 @@
2424
import javafx.scene.text.Text;
2525
import lombok.AllArgsConstructor;
2626
import lombok.Data;
27-
import root.core.repository.constracts.PropertyRepository;
28-
import root.core.repository.implement.PropertyRepositoryImpl;
2927
import root.javafx.Service.ConnectionTestService;
3028
import root.utils.AlertUtils;
3129

3230
public class ConnectionInfoVBox extends VBox {
3331

34-
/* Dependency Injection */
35-
private PropertyRepository propertyRepository = PropertyRepositoryImpl.getInstance();
36-
3732
@FXML
3833
Label menuTitleLB;
3934

@@ -141,21 +136,7 @@ public void testConnection(ActionEvent e) {
141136
}
142137

143138
public void addNewConnInfo(ActionEvent e) {
144-
connInfoControl.getNewConnInfoAP();
145-
/*
146-
if (childAPClazz == DBConnectionInfoAnchorPane.class) {
147-
DBConnectionInfoAnchorPane dbConnAP = new DBConnectionInfoAnchorPane();
148-
dbConnAP.init();
149-
dbConnAP.setInitialValue(new JdbcConnectionInfo());
150-
addConnectionInfoAP(2, dbConnAP);
151-
152-
} else if (childAPClazz == ServerConnectionInfoAnchorPane.class) {
153-
ServerConnectionInfoAnchorPane serverConnAP = new ServerConnectionInfoAnchorPane();
154-
serverConnAP.setInitialValue(new JschConnectionInfo());
155-
addConnectionInfoAP(2, serverConnAP);
156-
157-
}
158-
*/
139+
addConnectionInfoAP(2, connInfoControl.getNewConnInfoAP());
159140
}
160141

161142
public void removeConnInfo(ActionEvent e) {
@@ -196,7 +177,6 @@ public void setMenuTitle(String menuTitle, FontAwesomeIcon menuIcon) {
196177
menuIconIV.setIcon(menuIcon);
197178
}
198179

199-
200180
// When connectionInfo index changed, this method always will be invoked.
201181
private void bringFrontConnInfoAnchorPane(long index) {
202182
connInfoIdx = index;

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ public ConnectionTestService getConnectionTestService(ConnectionInfoAP curAP) {
4444
}
4545

4646
@Override
47-
public void getNewConnInfoAP() {
48-
// TODO Auto-generated method stub
49-
System.out.println("DB getNewConnInfoAP()");
47+
public ConnectionInfoAP getNewConnInfoAP() {
48+
DBConnectionInfoAnchorPane dbConnAP = new DBConnectionInfoAnchorPane();
49+
dbConnAP.init();
50+
dbConnAP.setInitialValue(new JdbcConnectionInfo());
51+
return dbConnAP;
5052
}
5153
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ public ConnectionTestService getConnectionTestService(ConnectionInfoAP curAP) {
3535
}
3636

3737
@Override
38-
public void getNewConnInfoAP() {
39-
// TODO Auto-generated method stub
40-
System.out.println("Server getNewConnInfoAP()");
38+
public ConnectionInfoAP getNewConnInfoAP() {
39+
ServerConnectionInfoAnchorPane serverConnAP = new ServerConnectionInfoAnchorPane();
40+
serverConnAP.setInitialValue(new JschConnectionInfo());
41+
return serverConnAP;
4142
}
4243

4344
}

0 commit comments

Comments
 (0)