Remove fixed tableViews in run menu and replace that MonitoringResultTableViewAP

Author: Dokyeongyun

src/main/java/root/javafx/Controller/RunMenuController.java

@@ -100,22 +100,7 @@ public class RunMenuController implements Initializable {
 	AnchorPane scrollAP;
 
 	@FXML
-	SplitPane upperSplitPane;
-
-	@FXML
-	SplitPane lowerSplitPane;
-
-	@FXML
-	AnchorPane archiveAP;
-
-	@FXML
-	AnchorPane tableSpaceAP;
-
-	@FXML
-	AnchorPane asmDiskAP;
-
-	@FXML
-	AnchorPane osDiskAP;
+	SplitPane resultSplitPane;
 
 	@FXML
 	AnchorPane step4AP;
@@ -126,10 +111,8 @@ public class RunMenuController implements Initializable {
 	@FXML
 	HBox step3ToStep4Arrow;
 
-	private MonitoringTableView<ArchiveUsage> archiveTable;
-	private MonitoringTableView<TableSpaceUsage> tableSpaceTable;
-	private MonitoringTableView<ASMDiskUsage> asmDiskTable;
-	private MonitoringTableView<OSDiskUsage> osDiskTable;
+	private MonitoringResultTableViewAP dbResults = new MonitoringResultTableViewAP();
+	private MonitoringResultTableViewAP serverResults = new MonitoringResultTableViewAP();
 
 	@Override
 	public void initialize(URL location, ResourceBundle resources) {
@@ -141,7 +124,7 @@ public void initialize(URL location, ResourceBundle resources) {
 		initRunStep3();
 
 		/* 4. 실행결과 */
-		// initRunStep4();
+		initRunStep4();
 	}
 
 	/**
@@ -175,20 +158,6 @@ private void setAnchorPaneAnchor(Node node, double top, double right, double bot
 		AnchorPane.setLeftAnchor(node, left);
 	}
 
-	/**
-	 * 모니터링 실행 결과 TableView를 부모 AnchorPane에 추가한다.
-	 * 
-	 * @param <T>    모니터링 타입
-	 * @param parent 부모 AnchorPane
-	 * @return 생성된 TableView
-	 */
-	private <T extends MonitoringResult> MonitoringTableView<T> addMonitoringTableView(AnchorPane parent) {
-		MonitoringTableView<T> tableView = new MonitoringTableView<>();
-		setAnchorPaneAnchor(tableView, 20, 0, 0, 0);
-		parent.getChildren().add(tableView);
-		return tableView;
-	}
-
 	/**
 	 * 설정된 모니터링 접속정보를 보여주는 TreeView를 생성 및 추가한다.
 	 * 
@@ -240,16 +209,14 @@ private void addMonitoringPresetPreview(List<MonitoringYN> dbYnList, List<Monito
 	 * @param e
 	 */
 	public void runMonitoring(ActionEvent e) {
-		initRunStep4();
-
 		String connInfoConfigFilePath = connInfoFileListComboBox.getSelectionModel().getSelectedItem();
 		String presetName = presetFileListComboBox.getSelectionModel().getSelectedItem();
 		String presetConfigFilePath = propService.getMonitoringPresetFilePath(presetName);
 		propService.loadConnectionInfoConfig(connInfoConfigFilePath);
 		propService.loadMonitoringInfoConfig(presetConfigFilePath);
 
-		UsageUIType usageUIType = usageUITypeCB.getSelectionModel().getSelectedItem();
-		setUsageColumnUIType(usageUIType);
+//		UsageUIType usageUIType = usageUITypeCB.getSelectionModel().getSelectedItem();
+//		setUsageColumnUIType(usageUIType);
 
 		boolean isSave = resultSaveToggleBtn.isSelected();
 
@@ -270,9 +237,10 @@ public void runMonitoring(ActionEvent e) {
 			List<ArchiveUsage> archiveUsageList = usecase.getCurrentArchiveUsage();
 			List<TableSpaceUsage> tableSpaceUsageList = usecase.getCurrentTableSpaceUsage();
 			List<ASMDiskUsage> asmDiskUsageList = usecase.getCurrentASMDiskUsage();
-			setMonitoringResult(archiveTable, archiveUsageList);
-			setMonitoringResult(tableSpaceTable, tableSpaceUsageList);
-			setMonitoringResult(asmDiskTable, asmDiskUsageList);
+			
+			dbResults.setTableData(MonitoringType.ARCHIVE, archiveUsageList);
+			dbResults.setTableData(MonitoringType.TABLE_SPACE, tableSpaceUsageList);
+			dbResults.setTableData(MonitoringType.ASM_DISK, asmDiskUsageList);
 		}
 
 		List<String> serverNames = propService.getMonitoringServerNameList();
@@ -292,7 +260,7 @@ public void runMonitoring(ActionEvent e) {
 			}
 
 			List<OSDiskUsage> osDiskUsageList = usecase.getCurrentOSDiskUsage();
-			setMonitoringResult(osDiskTable, osDiskUsageList);
+			serverResults.setTableData(MonitoringType.OS_DISK, osDiskUsageList);
 
 //			AlertLogCommandPeriod alcp = new AlertLogCommandPeriod(jsch.getAlc(),
 //					DateUtils.addDate(DateUtils.getToday("yyyy-MM-dd"), 0, 0, -1), DateUtils.getToday("yyyy-MM-dd"));
@@ -440,29 +408,27 @@ private void initRunStep4() {
 		step3ToStep4Arrow.setPrefWidth(Control.USE_COMPUTED_SIZE);
 
 		// 4-1. 실행결과 TableView 생성 및 Column 추가
-		archiveTable = addMonitoringTableView(archiveAP);
-		archiveTable.addColumn("Archive", "archiveName");
-		archiveTable.addColumn("사용량(%)", "usedPercent");
-
-		tableSpaceTable = addMonitoringTableView(tableSpaceAP);
-		tableSpaceTable.addColumn("테이블스페이스", "tableSpaceName");
-		tableSpaceTable.addColumn("사용량(%)", "usedPercent");
-
-		asmDiskTable = addMonitoringTableView(asmDiskAP);
-		asmDiskTable.addColumn("디스크 그룹", "asmDiskGroupName");
-		asmDiskTable.addColumn("디스크 타입", "asmDiskGroupType");
-		asmDiskTable.addColumn("사용량(%)", "usedPercent");
-
-		osDiskTable = addMonitoringTableView(osDiskAP);
-		osDiskTable.addColumn("파일 시스템", "fileSystem");
-		osDiskTable.addColumn("마운트 위치", "mountedOn");
-		osDiskTable.addColumn("사용량(%)", "usedPercent");
+		// DB
+		dbResults.addTableViewColumn(MonitoringType.ARCHIVE, "Archive", "archiveName");
+		dbResults.addTableViewColumn(MonitoringType.ARCHIVE, "사용량(%)", "usedPercent");
+		dbResults.addTableViewColumn(MonitoringType.TABLE_SPACE, "테이블스페이스", "tableSpaceName");
+		dbResults.addTableViewColumn(MonitoringType.TABLE_SPACE, "사용량(%)", "usedPercent");
+		dbResults.addTableViewColumn(MonitoringType.ASM_DISK, "디스크 그룹", "asmDiskGroupName");
+		dbResults.addTableViewColumn(MonitoringType.ASM_DISK, "디스크 타입", "asmDiskGroupType");
+		dbResults.addTableViewColumn(MonitoringType.ASM_DISK, "사용량(%)", "usedPercent");
+
+		// Server
+		serverResults.addTableViewColumn(MonitoringType.OS_DISK, "파일 시스템", "fileSystem");
+		serverResults.addTableViewColumn(MonitoringType.OS_DISK, "마운트 위치", "mountedOn");
+		serverResults.addTableViewColumn(MonitoringType.OS_DISK, "사용량(%)", "usedPercent");
+
+		resultSplitPane.getItems().addAll(dbResults, serverResults);
 	}
 
-	private void setUsageColumnUIType(UsageUIType usageUIType) {
-		archiveTable.setUsageUIType(usageUIType);
-		tableSpaceTable.setUsageUIType(usageUIType);
-		asmDiskTable.setUsageUIType(usageUIType);
-		osDiskTable.setUsageUIType(usageUIType);
-	}
+//	private void setUsageColumnUIType(UsageUIType usageUIType) {
+//		archiveTable.setUsageUIType(usageUIType);
+//		tableSpaceTable.setUsageUIType(usageUIType);
+//		asmDiskTable.setUsageUIType(usageUIType);
+//		osDiskTable.setUsageUIType(usageUIType);
+//	}
 }