Skip to content

Commit a065399

Browse files
DokyeongyunDokyeongyun
committed
Add UsageUIType ComboBox in run menu step3
1 parent a83c09f commit a065399

File tree

4 files changed

+59
-4
lines changed

4 files changed

+59
-4
lines changed

‎src/main/java/root/core/service/contracts/PropertyService.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import root.core.domain.JschConnectionInfo;
88
import root.core.domain.MonitoringYN;
99
import root.core.domain.enums.RoundingDigits;
10+
import root.core.domain.enums.UsageUIType;
1011
import root.utils.UnitUtils.FileSize;
1112

1213
public interface PropertyService {
@@ -91,4 +92,11 @@ public interface PropertyService {
9192
* @return
9293
*/
9394
RoundingDigits getDefaultRoundingDigits();
95+
96+
/**
97+
* 기본값으로 설정된 사용량 컬럼 UI 타입을 반환한다.
98+
*
99+
* @return
100+
*/
101+
UsageUIType getDefaultUsageUIType();
94102
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import root.core.domain.MonitoringYN.MonitoringTypeAndYN;
1919
import root.core.domain.enums.MonitoringType;
2020
import root.core.domain.enums.RoundingDigits;
21+
import root.core.domain.enums.UsageUIType;
2122
import root.core.repository.constracts.PropertyRepository;
2223
import root.core.service.contracts.PropertyService;
2324
import root.utils.UnitUtils.FileSize;
@@ -193,4 +194,12 @@ public FileSize getDefaultFileSizeUnit() {
193194
public RoundingDigits getDefaultRoundingDigits() {
194195
return RoundingDigits.find(propRepo.getCommonResource("unit.rounding"));
195196
}
197+
198+
/**
199+
* 기본값으로 설정된 사용량 컬럼 UI 타입을 반환한다.
200+
*/
201+
@Override
202+
public UsageUIType getDefaultUsageUIType() {
203+
return UsageUIType.find(propRepo.getCommonResource("usage-ui-type"));
204+
}
196205
}

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import java.net.URL;
44
import java.util.ArrayList;
55
import java.util.Arrays;
6+
import java.util.HashMap;
67
import java.util.List;
8+
import java.util.Map;
79
import java.util.ResourceBundle;
810
import java.util.stream.Collectors;
911

@@ -40,6 +42,7 @@
4042
import root.core.domain.TableSpaceUsage;
4143
import root.core.domain.enums.MonitoringType;
4244
import root.core.domain.enums.RoundingDigits;
45+
import root.core.domain.enums.UsageUIType;
4346
import root.core.repository.constracts.DBCheckRepository;
4447
import root.core.repository.constracts.ServerCheckRepository;
4548
import root.core.repository.implement.DBCheckRepositoryImpl;
@@ -85,6 +88,9 @@ public class RunMenuController implements Initializable {
8588

8689
@FXML
8790
JFXComboBox<RoundingDigits> roundingDigitsCB;
91+
92+
@FXML
93+
JFXComboBox<UsageUIType> usageUITypeCB;
8894

8995
@FXML
9096
JFXToggleButton resultSaveToggleBtn;
@@ -400,8 +406,24 @@ public RoundingDigits fromString(String digits) {
400406
return RoundingDigits.find(digits);
401407
}
402408
});
409+
410+
// 3-3. 사용량 컬럼 UI 타입
411+
// 사용량 표시방법 콤보박스 아이템 설정
412+
usageUITypeCB.getItems().addAll(UsageUIType.values());
413+
usageUITypeCB.getSelectionModel().select(propService.getDefaultUsageUIType());
414+
usageUITypeCB.setConverter(new StringConverter<UsageUIType>() {
415+
@Override
416+
public String toString(UsageUIType uiType) {
417+
return uiType.getName();
418+
}
419+
420+
@Override
421+
public UsageUIType fromString(String string) {
422+
return UsageUIType.find(string);
423+
}
424+
});
403425

404-
// 3-3. 모니터링 결과 저장 여부
426+
// 3-4. 모니터링 결과 저장 여부
405427
resultSaveToggleBtn.selectedProperty().set(true);
406428
}
407429

‎src/main/resources/fxml/RunMenu.fxml‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
<padding>
211211
<Insets left="5.0" />
212212
</padding></JFXComboBox>
213-
<Label layoutX="10.0" layoutY="10.0" text="모니터링 결과 저장 여부" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="120.0">
213+
<Label layoutX="10.0" layoutY="10.0" text="모니터링 결과 저장 여부" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="180.0">
214214
<graphic>
215215
<FontAwesomeIconView glyphName="ASTERISK" size="9" strokeWidth="0.0" />
216216
</graphic>
@@ -221,12 +221,12 @@
221221
<Font name="Noto Sans Korean Regular" size="12.0" />
222222
</font>
223223
</Label>
224-
<JFXToggleButton fx:id="resultSaveToggleBtn" alignment="CENTER_LEFT" selected="true" size="5.0" style="-fx-background-color: #eaeaea;" text="저장하기" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="140.0">
224+
<JFXToggleButton fx:id="resultSaveToggleBtn" alignment="CENTER_LEFT" selected="true" size="5.0" style="-fx-background-color: #eaeaea;" text="저장하기" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="200.0">
225225
<font>
226226
<Font name="Noto Sans Korean Bold Bold" size="10.0" />
227227
</font>
228228
</JFXToggleButton>
229-
<JFXButton fx:id="monitoringRunBtn" alignment="CENTER" contentDisplay="TOP" graphicTextGap="10.0" layoutX="74.0" layoutY="319.0" onAction="#runMonitoring" ripplerFill="#90cfaa" style="-fx-background-radius: 20px;" text="모니터링 실행" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="200.0">
229+
<JFXButton fx:id="monitoringRunBtn" alignment="CENTER" contentDisplay="TOP" graphicTextGap="10.0" layoutX="74.0" layoutY="319.0" onAction="#runMonitoring" ripplerFill="#90cfaa" style="-fx-background-radius: 20px;" text="모니터링 실행" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="260.0">
230230
<graphic>
231231
<FontAwesomeIconView fill="#438661" glyphName="PLAY_CIRCLE" size="30">
232232
<font>
@@ -241,6 +241,22 @@
241241
<Cursor fx:constant="HAND" />
242242
</cursor>
243243
</JFXButton>
244+
<Label layoutX="10.0" layoutY="10.0" text="사용량 컬럼 UI 타입" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="120.0">
245+
<graphic>
246+
<FontAwesomeIconView glyphName="ASTERISK" size="9" strokeWidth="0.0" />
247+
</graphic>
248+
<padding>
249+
<Insets left="5.0" right="5.0" />
250+
</padding>
251+
<font>
252+
<Font name="Noto Sans Korean Regular" size="12.0" />
253+
</font>
254+
</Label>
255+
<JFXComboBox fx:id="usageUITypeCB" layoutX="10.0" layoutY="10.0" minHeight="22.0" minWidth="-Infinity" styleClass="basic-font" stylesheets="@../css/javaFx.css" unFocusColor="#ececec" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="140.0">
256+
<padding>
257+
<Insets left="5.0" />
258+
</padding>
259+
</JFXComboBox>
244260
</children>
245261
</AnchorPane>
246262
<Label alignment="CENTER" layoutX="111.0" layoutY="42.0" text="3. 기타 설정 및 실행" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="15.0">

0 commit comments

Comments
 (0)