From 8dc77269550a0c098e96fd93c357dbc42c4628e8 Mon Sep 17 00:00:00 2001 From: Laurent Clouet <4409640-laurent.clouet@users.noreply.gitlab.com> Date: Sat, 8 Jun 2024 04:10:06 +0000 Subject: [PATCH] Ref: use lombok for data class --- src/main/java/com/sheepit/client/Stats.java | 47 ++----------------- .../sheepit/client/standalone/GuiText.java | 2 +- .../client/standalone/GuiTextOneLine.java | 2 +- .../standalone/swing/activity/Working.java | 2 +- 4 files changed, 7 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/sheepit/client/Stats.java b/src/main/java/com/sheepit/client/Stats.java index 157059f..a4cf3d1 100644 --- a/src/main/java/com/sheepit/client/Stats.java +++ b/src/main/java/com/sheepit/client/Stats.java @@ -19,7 +19,10 @@ package com.sheepit.client; -public class Stats { +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data @AllArgsConstructor public class Stats { private int remainingFrame; private long creditsEarned; private int creditsEarnedSession; @@ -27,48 +30,6 @@ public class Stats { private int waitingProject; private int connectedMachine; - public Stats(int frame, long credits, int creditsSession, int renderables, int waitings, int machines) { - remainingFrame = frame; - creditsEarned = credits; - creditsEarnedSession = creditsSession; - renderableProject = renderables; - waitingProject = waitings; - connectedMachine = machines; - } - - public Stats() { - remainingFrame = 0; - creditsEarned = 0; - creditsEarnedSession = 0; - renderableProject = 0; - waitingProject = 0; - connectedMachine = 0; - } - - public int getRemainingFrame() { - return remainingFrame; - } - - public int getCreditsEarnedDuringSession() { - return creditsEarnedSession; - } - - public long getCreditsEarned() { - return creditsEarned; - } - - public int getRenderableProject() { - return renderableProject; - } - - public int getWaitingProject() { - return waitingProject; - } - - public int getConnectedMachine() { - return connectedMachine; - } - @Override public String toString() { return "Stats [remainingFrame=" + remainingFrame + ", creditsEarned=" + creditsEarned + ", creditsEarnedSession=" + creditsEarnedSession + ", renderableProject=" + renderableProject + ", waitingProject=" + waitingProject + ", connectedMachine=" + connectedMachine + "]"; diff --git a/src/main/java/com/sheepit/client/standalone/GuiText.java b/src/main/java/com/sheepit/client/standalone/GuiText.java index fb3a953..f9b7f84 100644 --- a/src/main/java/com/sheepit/client/standalone/GuiText.java +++ b/src/main/java/com/sheepit/client/standalone/GuiText.java @@ -148,7 +148,7 @@ public class GuiText implements Gui { @Override public void displayStats(Stats stats) { System.out.println(String.format("%s Frames remaining: %d", this.df.format(new Date()), stats.getRemainingFrame())); - System.out.println(String.format("%s Credits earned: %d", this.df.format(new Date()), stats.getCreditsEarnedDuringSession())); + System.out.println(String.format("%s Credits earned: %d", this.df.format(new Date()), stats.getCreditsEarnedSession())); } @Override public void displayUploadQueueStats(int queueSize, long queueVolume) { diff --git a/src/main/java/com/sheepit/client/standalone/GuiTextOneLine.java b/src/main/java/com/sheepit/client/standalone/GuiTextOneLine.java index 1a72bbb..084e62c 100644 --- a/src/main/java/com/sheepit/client/standalone/GuiTextOneLine.java +++ b/src/main/java/com/sheepit/client/standalone/GuiTextOneLine.java @@ -160,7 +160,7 @@ public class GuiTextOneLine implements Gui { } @Override public void displayStats(Stats stats) { - creditsEarned = String.valueOf(stats.getCreditsEarnedDuringSession()); + creditsEarned = String.valueOf(stats.getCreditsEarnedSession()); updateLine(); } diff --git a/src/main/java/com/sheepit/client/standalone/swing/activity/Working.java b/src/main/java/com/sheepit/client/standalone/swing/activity/Working.java index 28f2974..7fe7409 100644 --- a/src/main/java/com/sheepit/client/standalone/swing/activity/Working.java +++ b/src/main/java/com/sheepit/client/standalone/swing/activity/Working.java @@ -348,7 +348,7 @@ public class Working implements Activity { public void displayStats(Stats stats) { DecimalFormat df = new DecimalFormat("##,##,##,##,##,##,##0"); remainingFrameContent.setText(df.format(stats.getRemainingFrame())); - creditEarned.setText(df.format(stats.getCreditsEarnedDuringSession())); + creditEarned.setText(df.format(stats.getCreditsEarnedSession())); user_info_points_total_value.setText(df.format(stats.getCreditsEarned())); renderable_projects_value.setText(df.format(stats.getRenderableProject())); waiting_projects_value.setText(df.format(stats.getWaitingProject()));