Skip to content

Commit 43d8030

Browse files
committed
Refactoring: Change UsageUI type interface to abstract class because it is not Interface
1 parent d32315e commit 43d8030

File tree

7 files changed

+27
-23
lines changed

7 files changed

+27
-23
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import javafx.event.ActionEvent;
1818
import javafx.fxml.FXML;
1919
import javafx.fxml.FXMLLoader;
20-
import javafx.scene.Node;
2120
import javafx.scene.control.Alert.AlertType;
2221
import javafx.scene.control.DatePicker;
2322
import javafx.scene.control.Label;
@@ -33,6 +32,7 @@
3332
import root.core.repository.implement.ReportFileRepo;
3433
import root.core.usecase.constracts.ReportUsecase;
3534
import root.core.usecase.implement.ReportUsecaseImpl;
35+
import root.javafx.CustomView.UsageUI.UsageUI;
3636
import root.javafx.CustomView.UsageUI.UsageUIFactory;
3737
import root.utils.AlertUtils;
3838
import root.utils.UnitUtils.FileSize;
@@ -180,9 +180,9 @@ public <E> void addAndSetPropertyTableColumn(Class<E> fieldType, String fieldNam
180180
TableCell<T, Double> cell = new TableCell<>();
181181
cell.itemProperty().addListener((observableValue, o, newValue) -> {
182182
if (newValue != null) {
183-
Node usageUI = UsageUIFactory.create(usageUIType, newValue, 90);
183+
UsageUI usageUI = UsageUIFactory.create(usageUIType, newValue, 90);
184184
cell.graphicProperty()
185-
.bind(Bindings.when(cell.emptyProperty()).then((Node) null).otherwise(usageUI));
185+
.bind(Bindings.when(cell.emptyProperty()).then((UsageUI) null).otherwise(usageUI));
186186
}
187187
});
188188
return (TableCell<T, E>) cell;

src/main/java/root/javafx/CustomView/UsageUI/UsageBarUI.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import javafx.fxml.FXMLLoader;
77
import javafx.scene.control.Label;
88
import javafx.scene.control.ProgressBar;
9-
import javafx.scene.layout.AnchorPane;
109
import root.core.domain.enums.UsageStatus;
1110

12-
public class UsageBarUI extends AnchorPane implements UsageUI {
11+
public class UsageBarUI extends UsageUI {
1312

1413
@FXML
1514
ProgressBar usageUI;

src/main/java/root/javafx/CustomView/UsageUI/UsageCircleUI.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import javafx.fxml.FXMLLoader;
77
import javafx.scene.control.Label;
88
import javafx.scene.control.ProgressIndicator;
9-
import javafx.scene.layout.HBox;
109
import root.core.domain.enums.UsageStatus;
1110

12-
public class UsageCircleUI extends HBox implements UsageUI {
11+
public class UsageCircleUI extends UsageUI {
1312

1413
@FXML
1514
ProgressIndicator usageUI;

src/main/java/root/javafx/CustomView/UsageUI/UsageTextUI.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
import javafx.fxml.FXML;
66
import javafx.fxml.FXMLLoader;
77
import javafx.scene.control.Label;
8-
import javafx.scene.layout.AnchorPane;
98
import root.core.domain.enums.UsageStatus;
109

11-
public class UsageTextUI extends AnchorPane implements UsageUI {
10+
public class UsageTextUI extends UsageUI {
1211

1312
@FXML
1413
Label usageLB;
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package root.javafx.CustomView.UsageUI;
22

3-
public interface UsageUI {
4-
5-
public void setUsageText();
3+
import javafx.scene.layout.AnchorPane;
64

7-
public void setUsage();
5+
public abstract class UsageUI extends AnchorPane {
86

9-
public void setColor();
7+
abstract void setUsageText();
8+
9+
abstract void setUsage();
10+
11+
abstract void setColor();
1012
}

src/main/java/root/javafx/CustomView/UsageUI/UsageUIFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package root.javafx.CustomView.UsageUI;
22

3-
import javafx.scene.Node;
43
import root.core.domain.enums.UsageUIType;
54

65
public class UsageUIFactory {
76

87
private UsageUIFactory() {
98
}
109

11-
public static Node create(UsageUIType usageUIType, double usage, double baseline) {
10+
public static UsageUI create(UsageUIType usageUIType, double usage, double baseline) {
1211
switch (usageUIType) {
1312
case NUMERIC:
1413
return new UsageTextUI(usage, baseline);

src/main/resources/fxml/usageUI/UsageCircleUI.fxml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,21 @@
33
<?import javafx.geometry.Insets?>
44
<?import javafx.scene.control.Label?>
55
<?import javafx.scene.control.ProgressIndicator?>
6+
<?import javafx.scene.layout.AnchorPane?>
67
<?import javafx.scene.layout.HBox?>
78

8-
<fx:root alignment="CENTER_LEFT" stylesheets="@../../css/usageUI.css" type="HBox" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
9+
10+
<fx:root type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
911
<children>
10-
<ProgressIndicator fx:id="usageUI" progress="0.21" />
11-
<Label fx:id="usageLB" text="-">
12-
<HBox.margin>
13-
<Insets left="5.0" />
14-
</HBox.margin>
15-
</Label>
12+
<HBox alignment="CENTER_LEFT" stylesheets="@../../css/usageUI.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
13+
<children>
14+
<ProgressIndicator fx:id="usageUI" progress="0.21" />
15+
<Label fx:id="usageLB" text="-">
16+
<HBox.margin>
17+
<Insets left="5.0" />
18+
</HBox.margin>
19+
</Label>
20+
</children>
21+
</HBox>
1622
</children>
1723
</fx:root>

0 commit comments

Comments
 (0)