Skip to content

Commit f769383

Browse files
DokyeongyunDokyeongyun
committed
Remove files transferred to the Utils module and Import dependency
1 parent e59d76c commit f769383

23 files changed

+169
-2078
lines changed

‎DBMonitoringWindowApp/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ repositories {
99
}
1010

1111
dependencies {
12+
13+
// Another module
14+
implementation project(':Utils')
15+
1216
// Quartz Scheduler
1317
implementation 'org.quartz-scheduler:quartz:2.3.2'
1418

‎DBMonitoringWindowApp/src/main/java/root/javafx/Controller/AlertLogMonitoringMenuController.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import root.javafx.CustomView.NumberTextFormatter;
5050
import root.javafx.CustomView.TagBar;
5151
import root.javafx.CustomView.dateCell.DisableAfterTodayDateCell;
52-
import root.utils.AlertUtils;
52+
import root.javafx.utils.AlertUtils;
5353

5454
@Slf4j
5555
public class AlertLogMonitoringMenuController implements Initializable {
@@ -101,35 +101,35 @@ public AlertLogMonitoringMenuController() {
101101
}
102102

103103
/**
104-
* 실행메뉴 화면 진입시 초기화를 수행한다.
104+
* ����޴� ȭ�� ���Խ� �ʱ�ȭ�� �����Ѵ�.
105105
*/
106106
@Override
107107
public void initialize(URL location, ResourceBundle resources) {
108108

109-
// 접속정보 설정 프로퍼티 파일
109+
// �������� ���� ������Ƽ ����
110110
List<String> connInfoFiles = propService.getConnectionInfoList();
111111
if (connInfoFiles != null && connInfoFiles.size() != 0) {
112112
// Connection Info ComboBox
113113
runConnInfoFileComboBox.getItems().addAll(connInfoFiles);
114114
runConnInfoFileComboBox.getSelectionModel().selectFirst();
115115

116-
// remember.properties 파일에서, 최근 사용된 설정파일 경로가 있다면 해당 설정파일을 불러온다.
116+
// remember.properties ���Ͽ���, �ֱ� ���� �������� ��ΰ� �ִٸ� �ش� ���������� �ҷ��´�.
117117
String lastUseConnInfoFilePath = propService.getLastUseConnectionInfoFilePath();
118118
if (lastUseConnInfoFilePath != null) {
119119
runConnInfoFileComboBox.getSelectionModel().select(lastUseConnInfoFilePath);
120120
}
121121
} else {
122-
AlertUtils.showAlert(AlertType.INFORMATION, "접속정보 설정", "설정된 접속정보가 없습니다.\n[설정]메뉴로 이동합니다.");
122+
AlertUtils.showAlert(AlertType.INFORMATION, "�������� ����", "������ ���������� �����ϴ�.\n[����]�޴��� �̵��մϴ�.");
123123
return;
124124
}
125125

126-
// ComboBox 변경 이벤트
126+
// ComboBox ���� �̺�Ʈ
127127
runConnInfoFileComboBox.getSelectionModel().selectedItemProperty()
128128
.addListener((options, oldValue, newValue) -> {
129-
// TODO 각 Tab별 콤보박스 아이템 변경
129+
// TODO �� Tab�� �޺��ڽ� ������ ����
130130
});
131131

132-
// AlertLog 화면의 UI 요소를 초기화한다.
132+
// AlertLog ȭ���� UI ��Ҹ� �ʱ�ȭ�Ѵ�.
133133
initAlertLogMonitoringElements();
134134
}
135135

@@ -156,25 +156,25 @@ private void changeAlertLogListViewData(String serverID) {
156156
}
157157

158158
/**
159-
* AlertLog AnchorPane의 UI 요소들의 값을 초기화한다.
159+
* AlertLog AnchorPane�� UI ��ҵ��� ���� �ʱ�ȭ�Ѵ�.
160160
*/
161161
private void initAlertLogMonitoringElements() {
162-
// ComboBox 변경 이벤트
162+
// ComboBox ���� �̺�Ʈ
163163
alertLogServerComboBox.getSelectionModel().selectedItemProperty().addListener((options, oldValue, newValue) -> {
164164
changeAlertLogListViewData(newValue);
165165
});
166166
alertLogServerComboBox.getItems().addAll(propService.getMonitoringServerNameList());
167167
alertLogServerComboBox.getSelectionModel().selectFirst();
168168

169-
// AlertLog 조회기간 기본값 설정
169+
// AlertLog ��ȸ�Ⱓ �⺻�� ����
170170
alertLogStartDayDP.setValue(LocalDate.now().minusDays(1));
171171
alertLogEndDayDP.setValue(LocalDate.now());
172172

173-
// AlertLog 조회기간 오늘 이후 날짜 선택 불가
173+
// AlertLog ��ȸ�Ⱓ ���� ���� ��¥ ���� �Ұ�
174174
alertLogStartDayDP.setDayCellFactory(picker -> new DisableAfterTodayDateCell());
175175
alertLogEndDayDP.setDayCellFactory(picker -> new DisableAfterTodayDateCell());
176176

177-
// AlertLog 조회기간 변경 이벤트
177+
// AlertLog ��ȸ�Ⱓ ���� �̺�Ʈ
178178
alertLogStartDayDP.valueProperty().addListener((ov, oldValue, newValue) -> {
179179
if (alertLogEndDayDP.getValue().isBefore(newValue)) {
180180
alertLogEndDayDP.setValue(newValue);
@@ -220,33 +220,33 @@ public void handle(KeyEvent e) {
220220
}
221221

222222
/**
223-
* [실행] - 모니터링 실행 시, 입력값 검사
223+
* [����] - ����͸� ���� ��, �Է°� �˻�
224224
*
225225
* @return
226226
*/
227227
private boolean validateInput() {
228228
String alertHeaderText = "";
229229
String alertContentText = "";
230230

231-
// 1. AlertLog 조회기간
232-
alertHeaderText = "AlertLog 조회기간";
231+
// 1. AlertLog ��ȸ�Ⱓ
232+
alertHeaderText = "AlertLog ��ȸ�Ⱓ";
233233

234234
LocalDate alertLogStartDay = alertLogStartDayDP.getValue();
235235
LocalDate alertLogEndDay = alertLogEndDayDP.getValue();
236236
if (alertLogStartDay == null || alertLogEndDay == null) {
237-
alertContentText = "조회기간을 입력해주세요.";
237+
alertContentText = "��ȸ�Ⱓ�� �Է����ּ���.";
238238
AlertUtils.showAlert(AlertType.ERROR, alertHeaderText, alertContentText);
239239
return false;
240240
}
241241

242242
try {
243243
if (!alertLogStartDay.isBefore(alertLogEndDay) && !alertLogStartDay.isEqual(alertLogEndDay)) {
244-
alertContentText = "조회시작일은 조회종료일보다 이전 날짜여야 합니다.";
244+
alertContentText = "��ȸ�������� ��ȸ�����Ϻ��� ���� ��¥���� �մϴ�.";
245245
AlertUtils.showAlert(AlertType.ERROR, alertHeaderText, alertContentText);
246246
return false;
247247
}
248248
} catch (Exception e) {
249-
alertContentText = "조회기간이 올바르지 않습니다.";
249+
alertContentText = "��ȸ�Ⱓ�� �ùٸ��� �ʽ��ϴ�.";
250250
AlertUtils.showAlert(AlertType.ERROR, alertHeaderText, alertContentText);
251251
return false;
252252
}
@@ -255,7 +255,7 @@ private boolean validateInput() {
255255
}
256256

257257
public void monitoringAlertLog(ActionEvent e) throws Exception {
258-
// 입력값 검사
258+
// �Է°� �˻�
259259
if (!validateInput()) {
260260
return;
261261
}
@@ -300,7 +300,7 @@ public void prevAlertLog(ActionEvent e) {
300300

301301
int toIndex = Integer.parseInt(input) - 1;
302302
if (toIndex == 0) {
303-
updateStatusMessage("첫번째 Log입니다.");
303+
updateStatusMessage("ù��° Log�Դϴ�.");
304304
return;
305305
}
306306

@@ -316,7 +316,7 @@ public void nextAlertLog(ActionEvent e) {
316316

317317
int toIndex = Integer.parseInt(input) + 1;
318318
if (toIndex > alertLogLV.getItems().size()) {
319-
updateStatusMessage("마지막 Log입니다.");
319+
updateStatusMessage("������ Log�Դϴ�.");
320320
return;
321321
}
322322

@@ -333,31 +333,31 @@ public void focusAlertLog(Event e) {
333333
int toIndex = Integer.parseInt(input);
334334
alertLogLV.scrollTo(toIndex - 1);
335335
alertLogLV.getSelectionModel().select(toIndex - 1);
336-
updateStatusMessage(String.format("[%d]번째 Log로 이동합니다.", toIndex));
336+
updateStatusMessage(String.format("[%d]��° Log�� �̵��մϴ�.", toIndex));
337337
}
338338

339339
private boolean validateAlertLogNavigatorInput(String input) {
340340
if (StringUtils.isEmpty(input)) {
341-
updateStatusMessage("조회를 원하는 Log index를 입력해주세요.");
341+
updateStatusMessage("��ȸ�� ���ϴ� Log index�� �Է����ּ���.");
342342
return false;
343343
}
344344

345345
int toIndex = 0;
346346
try {
347347
toIndex = Integer.parseInt(input);
348348
} catch (NumberFormatException ex) {
349-
updateStatusMessage("숫자만 입력하실 수 있습니다.");
349+
updateStatusMessage("���ڸ� �Է��Ͻ� �� �ֽ��ϴ�.");
350350
return false;
351351
}
352352

353353
int alertLogSize = alertLogLV.getItems().size();
354354
if (alertLogSize == 0) {
355-
updateStatusMessage("Alert Log 조회 후 이용해주세요.");
355+
updateStatusMessage("Alert Log ��ȸ �� �̿����ּ���.");
356356
return false;
357357
}
358358

359359
if (toIndex <= 0 || toIndex > alertLogSize) {
360-
updateStatusMessage(String.format("Log index를 올바르게 입력해주세요. (가능한 입력값 범위: 1 ~ %d)", alertLogSize));
360+
updateStatusMessage(String.format("Log index�� �ùٸ��� �Է����ּ���. (������ �Է°� ����: 1 ~ %d)", alertLogSize));
361361
return false;
362362
}
363363

‎DBMonitoringWindowApp/src/main/java/root/javafx/Controller/HistoryMenuController.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import root.core.usecase.constracts.ServerMonitoringUsecase;
3333
import root.core.usecase.implement.DBCheckUsecaseImpl;
3434
import root.core.usecase.implement.ServerMonitoringUsecaseImpl;
35-
import root.utils.AlertUtils;
35+
import root.javafx.utils.AlertUtils;
3636

3737
public class HistoryMenuController implements Initializable {
3838

@@ -70,37 +70,37 @@ public HistoryMenuController() {
7070
}
7171

7272
/**
73-
* 실행메뉴 화면 진입시 초기화를 수행한다.
73+
* ����޴� ȭ�� ���Խ� �ʱ�ȭ�� �����Ѵ�.
7474
*/
7575
@Override
7676
public void initialize(URL location, ResourceBundle resources) {
7777

78-
// 접속정보 설정 프로퍼티 파일
78+
// �������� ���� ������Ƽ ����
7979
List<String> connInfoFiles = propService.getConnectionInfoList();
8080
if (connInfoFiles != null && connInfoFiles.size() != 0) {
8181
// Connection Info ComboBox
8282
runConnInfoFileComboBox.getItems().addAll(connInfoFiles);
8383
runConnInfoFileComboBox.getSelectionModel().selectFirst();
8484

85-
// remember.properties 파일에서, 최근 사용된 설정파일 경로가 있다면 해당 설정파일을 불러온다.
85+
// remember.properties ���Ͽ���, �ֱ� ���� �������� ��ΰ� �ִٸ� �ش� ���������� �ҷ��´�.
8686
String lastUseConnInfoFilePath = propService.getLastUseConnectionInfoFilePath();
8787
if (lastUseConnInfoFilePath != null) {
8888
runConnInfoFileComboBox.getSelectionModel().select(lastUseConnInfoFilePath);
8989
}
9090
} else {
91-
AlertUtils.showAlert(AlertType.INFORMATION, "접속정보 설정", "설정된 DB/Server 접속정보가 없습니다.\n[설정]메뉴로 이동합니다.");
91+
AlertUtils.showAlert(AlertType.INFORMATION, "�������� ����", "������ DB/Server ���������� �����ϴ�.\n[����]�޴��� �̵��մϴ�.");
9292
return;
9393
}
9494

95-
// ComboBox 변경 이벤트
95+
// ComboBox ���� �̺�Ʈ
9696
runConnInfoFileComboBox.getSelectionModel().selectedItemProperty()
9797
.addListener((options, oldValue, newValue) -> {
98-
// TODO 각 Tab별 콤보박스 아이템 변경
98+
// TODO �� Tab�� �޺��ڽ� ������ ����
9999
});
100100

101-
String dbComboBoxLabel = "DB 선택";
101+
String dbComboBoxLabel = "DB ����";
102102
List<String> dbComboBoxItems = propService.getMonitoringDBNameList();
103-
String serverComboBoxLabel = "Server 선택";
103+
String serverComboBoxLabel = "Server ����";
104104
List<String> serverComboBoxItems = propService.getMonitoringServerNameList();
105105

106106
initAndAddMonitoringAnchorPane(archiveUsageMAP, archiveUsageTabAP, dbComboBoxLabel, dbComboBoxItems);
@@ -110,7 +110,7 @@ public void initialize(URL location, ResourceBundle resources) {
110110
}
111111

112112
/**
113-
* 모니터링 AnchorPane 추가하고 요소를 초기화한다.
113+
* ����͸� AnchorPane �߰��ϰ� ��Ҹ� �ʱ�ȭ�Ѵ�.
114114
*
115115
* @param <T>
116116
* @param monitoringAP
@@ -121,13 +121,13 @@ public void initialize(URL location, ResourceBundle resources) {
121121
*/
122122
private <T extends MonitoringResult> void initAndAddMonitoringAnchorPane(MonitoringAPController<T> monitoringAP,
123123
AnchorPane parentAP, String labelText, List<String> comboBoxItems) {
124-
monitoringAP.setAliasComboBoxLabelText(labelText); // ComboBox 좌측 Lebel Text 설정
125-
monitoringAP.setAliasComboBoxItems(comboBoxItems); // ComboBox Items 설정
126-
parentAP.getChildren().add(monitoringAP); // Monitoring AnchorPane을 부모 Node에 추가
124+
monitoringAP.setAliasComboBoxLabelText(labelText); // ComboBox ���� Lebel Text ����
125+
monitoringAP.setAliasComboBoxItems(comboBoxItems); // ComboBox Items ����
126+
parentAP.getChildren().add(monitoringAP); // Monitoring AnchorPane�� �θ� Node�� �߰�
127127
}
128128

129129
/**
130-
* [실행] - 모니터링을 시작한다.
130+
* [����] - ����͸��� �����Ѵ�.
131131
*
132132
* @param e
133133
*/

‎DBMonitoringWindowApp/src/main/java/root/javafx/Controller/HomeController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import javafx.fxml.FXML;
99
import javafx.scene.layout.AnchorPane;
1010
import root.javafx.DI.DependencyInjection;
11-
import root.utils.SceneUtils;
11+
import root.javafx.utils.SceneUtils;
1212

1313
public class HomeController {
1414

‎DBMonitoringWindowApp/src/main/java/root/javafx/Controller/LeftMenuController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
import javafx.event.ActionEvent;
66
import root.javafx.DI.DependencyInjection;
7-
import root.utils.SceneUtils;
7+
import root.javafx.utils.SceneUtils;
88

99
public class LeftMenuController {
1010

1111
/**
12-
* 좌측 상단 Home Icon(fxId: homeBtn) onAction Event
12+
* ���� ��� Home Icon(fxId: homeBtn) onAction Event
1313
*
1414
* @param e
1515
* @throws IOException
@@ -19,7 +19,7 @@ public void goHomeStage(ActionEvent e) throws IOException {
1919
}
2020

2121
/**
22-
* 설정 메뉴로 이동한다.
22+
* ���� �޴��� �̵��Ѵ�.
2323
*
2424
* @param e
2525
* @throws IOException
@@ -29,7 +29,7 @@ public void goSettingMenu(ActionEvent e) throws IOException {
2929
}
3030

3131
/**
32-
* 실행 메뉴로 이동한다.
32+
* ���� �޴��� �̵��Ѵ�.
3333
*
3434
* @param e
3535
* @throws IOException
@@ -39,7 +39,7 @@ public void goRunMenu(ActionEvent e) throws IOException {
3939
}
4040

4141
/**
42-
* 모니터링 기록 조회 메뉴로 이동한다.
42+
* ����͸� ��� ��ȸ �޴��� �̵��Ѵ�.
4343
*
4444
* @param e
4545
* @throws IOException
@@ -49,7 +49,7 @@ public void goHistoryMenu(ActionEvent e) throws IOException {
4949
}
5050

5151
/**
52-
* Alert Log 모니터링 메뉴로 이동한다.
52+
* Alert Log ����͸� �޴��� �̵��Ѵ�.
5353
*
5454
* @param e
5555
*/

0 commit comments

Comments
 (0)