Refactoring: Add 'UsageUI' interface to guide proper use and Add UsageTextUI

Author: Dokyeongyun

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

@@ -9,7 +9,7 @@
 import javafx.scene.layout.AnchorPane;
 import root.core.domain.enums.UsageStatus;
 
-public class UsageBarUI extends AnchorPane {
+public class UsageBarUI extends AnchorPane implements UsageUI {
 
 	@FXML
 	ProgressBar usageUI;
@@ -39,15 +39,18 @@ public UsageBarUI(double usage, double baseline) {
 		setColor();
 	}
 
-	private void setUsageText() {
+	@Override
+	public void setUsageText() {
 		usageLB.setText(usage == -1 ? "ERROR" : usage + "%");
 	}
 
-	private void setUsage() {
+	@Override
+	public void setUsage() {
 		usageUI.setProgress(usage == -1 ? ProgressBar.INDETERMINATE_PROGRESS : usage / 100.0);
 	}
 
-	private void setColor() {
+	@Override
+	public void setColor() {
 		UsageStatus type = usage >= baseline ? UsageStatus.DANGEROUS : UsageStatus.NORMAL;
 		usageUI.setStyle("-fx-accent2:" + type.getColor());
 	}

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

@@ -9,7 +9,7 @@
 import javafx.scene.layout.HBox;
 import root.core.domain.enums.UsageStatus;
 
-public class UsageCircleUI extends HBox {
+public class UsageCircleUI extends HBox implements UsageUI {
 
 	@FXML
 	ProgressIndicator usageUI;
@@ -39,15 +39,18 @@ public UsageCircleUI(double usage, double baseline) {
 		setColor();
 	}
 
-	private void setUsageText() {
+	@Override
+	public void setUsageText() {
 		usageLB.setText(usage == -1 ? "ERROR" : usage + "%");
 	}
 
-	private void setUsage() {
+	@Override
+	public void setUsage() {
 		usageUI.setProgress(usage == -1 ? 0 : usage / 100.0);
 	}
 
-	private void setColor() {
+	@Override
+	public void setColor() {
 		String color = usage >= baseline ? UsageStatus.DANGEROUS.getColor() : UsageStatus.NORMAL.getColor();
 		usageUI.setStyle("-fx-progress-color: " + color);
 	}

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

@@ -0,0 +1,53 @@
+package root.javafx.CustomView.UsageUI;
+
+import java.io.IOException;
+
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Label;
+import javafx.scene.layout.AnchorPane;
+import root.core.domain.enums.UsageStatus;
+
+public class UsageTextUI extends AnchorPane implements UsageUI {
+
+	@FXML
+	Label usageLB;
+
+	private double usage;
+
+	private double baseline;
+
+	public UsageTextUI(double usage, double baseline) {
+		this.usage = usage;
+		this.baseline = baseline;
+
+		try {
+			FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/usageUI/UsageTextUI.fxml"));
+			loader.setController(this);
+			loader.setRoot(this);
+			loader.load();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		setUsage();
+		setUsageText();
+		setColor();
+	}
+
+	@Override
+	public void setUsageText() {
+		usageLB.setText(usage == -1 ? "ERROR" : usage + "%");
+	}
+
+	@Override
+	public void setUsage() {
+		usageLB.setText(usage == -1 ? "ERROR" : usage + "%");
+	}
+
+	@Override
+	public void setColor() {
+		UsageStatus type = usage >= baseline ? UsageStatus.DANGEROUS : UsageStatus.NORMAL;
+		usageLB.setStyle("-fx-text-fill:" + (type == UsageStatus.NORMAL ? "black" : type.getColor()));
+	}
+}

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

@@ -0,0 +1,10 @@
+package root.javafx.CustomView.UsageUI;
+
+public interface UsageUI {
+	
+	public void setUsageText();
+
+	public void setUsage();
+
+	public void setColor();
+}

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

@@ -1,7 +1,6 @@
 package root.javafx.CustomView.UsageUI;
 
 import javafx.scene.Node;
-import javafx.scene.control.Label;
 import root.core.domain.enums.UsageUIType;
 
 public class UsageUIFactory {
@@ -12,7 +11,7 @@ private UsageUIFactory() {
 	public static Node create(UsageUIType usageUIType, double usage, double baseline) {
 		switch (usageUIType) {
 		case NUMERIC:
-			return new Label(usage + "%");
+			return new UsageTextUI(usage, baseline);
 		case GRAPHIC_BAR:
 			return new UsageBarUI(usage, baseline);
 		case GRAPHIC_PIE:

src/main/resources/fxml/usageUI/UsageTextUI.fxml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
+
+<fx:root stylesheets="@../../css/usageUI.css" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Label fx:id="usageLB" alignment="CENTER" contentDisplay="CENTER" layoutX="97.5999984741211" layoutY="1.600000023841858" text="-" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+   </children>
+</fx:root>