Save monitoringYN configuration using changed key format

Author: Dokyeongyun

src/main/java/root/core/service/implement/FilePropertyService.java

@@ -101,15 +101,14 @@ public List<MonitoringYN> getServerMonitoringYnList(String presetConfigFileName)
 	}
 
 	private List<MonitoringYN> getMonitoringYNList(List<String> aliasList, List<MonitoringType> monitoringTypeList) {
-		System.out.println(aliasList);
-		System.out.println(monitoringTypeList);
 
 		List<MonitoringYN> result = new ArrayList<>();
 		for (String serverAlias : aliasList) {
 			MonitoringYN monitoringYn = new MonitoringYN(serverAlias);
 			List<MonitoringTypeAndYN> list = new ArrayList<>();
 			for (MonitoringType monitoringType : monitoringTypeList) {
-				String yn = propRepo.getMonitoringConfigResource(serverAlias + "." + monitoringType.getName());
+				String yn = propRepo
+						.getMonitoringConfigResource(monitoringType.getName().replace(" ", "_") + "." + serverAlias);
 				if (!StringUtils.isEmpty(yn)) {
 					list.add(new MonitoringTypeAndYN(monitoringType, yn.equals("Y") ? true : false));
 				} else {

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

@@ -13,7 +13,6 @@
 import org.apache.log4j.Logger;
 
 import com.jfoenix.controls.JFXComboBox;
-import com.jfoenix.controls.JFXToggleButton;
 
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView;
@@ -103,6 +102,8 @@ public class SettingMenuController implements Initializable {
 
 	Map<String, String> monitoringPresetMap = new HashMap<>();
 
+	MonitoringYNVBox monitoringYNVBox = new MonitoringYNVBox();
+
 	@Override
 	public void initialize(URL location, ResourceBundle resources) {
 
@@ -354,14 +355,20 @@ public void saveConnInfoSettings(ActionEvent e) {
 	 */
 	public void saveMonitoringSettings(ActionEvent e) {
 		// TODO move this logic to PropertyService
-		PropertiesConfiguration config = propRepo.getConfiguration("monitoringConfig");
+		PropertiesConfiguration config = new PropertiesConfiguration();
 		String presetName = monitoringPresetComboBox.getSelectionModel().getSelectedItem();
 		String monitoringFilePath = monitoringPresetMap.get(presetName);
 
 		if (!monitoringFilePath.isEmpty()) {
-			for (Node n : monitoringElementsVBox.lookupAll("JFXToggleButton")) {
-				JFXToggleButton thisToggle = (JFXToggleButton) n;
-				config.setProperty(thisToggle.getId(), thisToggle.isSelected());
+
+			Map<MonitoringType, Map<String, Boolean>> selection = monitoringYNVBox.getToggleSelection();
+
+			for (MonitoringType type : selection.keySet()) {
+				Map<String, Boolean> aliasMap = selection.get(type);
+				for (String alias : aliasMap.keySet()) {
+					String key = StringUtils.join(type.getName().replace(" ", "_"), ".", alias);
+					config.setProperty(key, aliasMap.get(alias) ? "Y" : "N");
+				}
 			}
 			propRepo.save(monitoringFilePath, config);
 
@@ -381,8 +388,8 @@ public void saveMonitoringSettings(ActionEvent e) {
 	 * @param serverYnList
 	 */
 	private void createMonitoringElements(VBox rootVBox, List<MonitoringYN> dbYnList, List<MonitoringYN> serverYnList) {
+		monitoringYNVBox = new MonitoringYNVBox();
 
-		MonitoringYNVBox monitoringYNVBox = new MonitoringYNVBox();
 		for (MonitoringYN dbYn : dbYnList) {
 			for (MonitoringTypeAndYN typeAndYn : dbYn.getMonitoringTypeList()) {
 				MonitoringType type = typeAndYn.getMonitoringType();

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

@@ -37,7 +37,7 @@ public void addParentToggle(MonitoringType type, String text) {
 		if (!toggleGroupVBoxs.containsKey(type)) {
 			ToggleGroupVBox toggleGroupVBox = new ToggleGroupVBox();
 			toggleGroupVBox.setParentToggle(text);
-			
+
 			toggleGroupVBoxs.put(type, toggleGroupVBox);
 			getChildren().add(toggleGroupVBox);
 		}
@@ -86,4 +86,15 @@ public void initSelection(List<MonitoringYN> list) {
 			}
 		}
 	}
+
+	public Map<MonitoringType, Map<String, Boolean>> getToggleSelection() {
+		Map<MonitoringType, Map<String, Boolean>> result = new HashMap<>();
+
+		for (MonitoringType type : toggleGroupVBoxs.keySet()) {
+			ToggleGroupVBox toggleGroup = toggleGroupVBoxs.get(type);
+			result.put(type, toggleGroup.getChildSelection());
+		}
+
+		return result;
+	}
 }

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

@@ -1,7 +1,9 @@
 package root.javafx.CustomView;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -27,12 +29,12 @@ public class ToggleGroupVBox extends VBox {
 	public ToggleGroupVBox() {
 
 		parentToggleHBox.setToggleAction(new EventHandler<ActionEvent>() {
-			
+
 			@Override
 			public void handle(ActionEvent event) {
 				for (ToggleHBox t : childToggleList) {
 					t.setToggleSelected(parentToggleHBox.isToggleSelected());
-				}	
+				}
 			}
 		});
 
@@ -101,4 +103,26 @@ private boolean isAllNotSelected() {
 		}
 		return isAllNotSelected;
 	}
+
+	/**
+	 * Group의 부모 토글 버튼의 우측 라벨 텍스트를 반환한다.
+	 * 
+	 * @return
+	 */
+	public String getParentLabelText() {
+		return parentToggleHBox.getLabelText();
+	}
+
+	/**
+	 * Group의 자식 토글 버튼의 선택여부를 반환한다.
+	 * 
+	 * @return
+	 */
+	public Map<String, Boolean> getChildSelection() {
+		Map<String, Boolean> result = new HashMap<>();
+		for (ToggleHBox child : childToggleList) {
+			result.put(child.getLabelText(), child.isToggleSelected());
+		}
+		return result;
+	}
 }