M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

рефакторинг получения шрифта статуса в таблицах

Browse Source
This commit is contained in:
02090095
2024-05-16 21:56:34 +03:00
parent 630d6b3985
commit 264fc3b955
11 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.idea/workspace.xml generated
View File

@@ -8,12 +8,16 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/StatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/StatusEnum.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Tables/StatusEnumRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

4
src/Common/UI/StatusEnum.java
View File

@@ -4,10 +4,8 @@ import Common.UI.Themes.VisualiserFonts;
import java.awt.*;
public interface StatusEnum {
default Font getFont() {
return Current.getTheme().Fonts.get(VisualiserFonts.UnknownState);
}
default String getDescription() {
return toString();
}
default VisualiserFonts getFont() {return VisualiserFonts.UnknownState;}
}

4
src/Common/UI/Tables/StatusEnumRenderer.java
View File

@@ -1,7 +1,9 @@
package Common.UI.Tables;
import Common.Current;
import Common.UI.StatusEnum;
import javax.swing.*;
import java.util.Currency;
public class StatusEnumRenderer extends RendererCell<StatusEnum> {
@Override
public StatusEnum Init(JTable table, Object value, int row, int column) {
@@ -11,7 +13,7 @@ public class StatusEnumRenderer extends RendererCell<StatusEnum> {
public void Display() {
if (value != null) {
setText(value.getDescription());
setFont(value.getFont());
setFont(Current.getTheme().Fonts.get(value.getFont()));
}
}
}

14
src/GlobalData/Tasks/TaskState.java
View File

@@ -92,7 +92,7 @@ public enum TaskState implements StatusEnum {
}
}
@Override
public Font getFont() {
public VisualiserFonts getFont() {
switch (this) {
case FailedToQueue:
case NoSuchTask:
@@ -102,18 +102,18 @@ public enum TaskState implements StatusEnum {
case WrongTestFormat:
case InternalError:
case Canceled:
return Current.getTheme().Fonts.get(VisualiserFonts.BadState);
return VisualiserFonts.BadState;
case Queued:
case Running:
return Current.getTheme().Fonts.get(VisualiserFonts.ProgressState);
return VisualiserFonts.ProgressState;
case Done:
return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
return VisualiserFonts.GoodState;
case Crushed:
return Current.getTheme().Fonts.get(VisualiserFonts.Fatal);
return VisualiserFonts.Fatal;
case Finished:
return Current.getTheme().Fonts.get(VisualiserFonts.BlueState);
return VisualiserFonts.BlueState;
case WorkspaceReady:
return Current.getTheme().Fonts.get(VisualiserFonts.ReadyState);
return VisualiserFonts.ReadyState;
default:
return StatusEnum.super.getFont();
}

4
src/GlobalData/User/UserState.java
View File

@@ -9,8 +9,8 @@ public enum UserState implements StatusEnum {
ready, //рудимент.
ready_to_work;//пользователь готов к работе,все установлено.
@Override
public Font getFont() {
return this == UserState.ready_to_work ? Current.getTheme().Fonts.get(VisualiserFonts.GoodState) : StatusEnum.super.getFont();
public VisualiserFonts getFont() {
return this == UserState.ready_to_work ? VisualiserFonts.GoodState : StatusEnum.super.getFont();
}
@Override
public String getDescription() {

6
src/Repository/BugReport/BugReportState.java
View File

@@ -10,12 +10,12 @@ public enum BugReportState implements Serializable, StatusEnum {
closed,
draft;
@Override
public Font getFont() {
public VisualiserFonts getFont() {
switch (this) {
case active:
return Current.getTheme().Fonts.get(VisualiserFonts.BadState);
return VisualiserFonts.BadState;
case closed:
return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
return VisualiserFonts.GoodState;
default:
return StatusEnum.super.getFont();
}

10
src/Repository/Component/ComponentState.java
View File

@@ -13,18 +13,18 @@ public enum ComponentState implements StatusEnum {
Needs_publish,
Unknown_version;
@Override
public Font getFont() {
public VisualiserFonts getFont() {
switch (this) {
case Actual:
return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
return VisualiserFonts.GoodState;
case Not_found:
case Unknown_version:
case Old_version:
return Current.getTheme().Fonts.get(VisualiserFonts.BadState);
return VisualiserFonts.BadState;
case Needs_update:
return Current.getTheme().Fonts.get(VisualiserFonts.ProgressState);
return VisualiserFonts.ProgressState;
case Needs_publish:
return Current.getTheme().Fonts.get(VisualiserFonts.BlueState);
return VisualiserFonts.BlueState;
default:
return StatusEnum.super.getFont();
}

8
src/TestingSystem/Common/TasksPackageState.java
View File

@@ -43,17 +43,17 @@ public enum TasksPackageState implements StatusEnum {
}
}
@Override
public Font getFont() {
public VisualiserFonts getFont() {
switch (this) {
case TestsSynchronize:
case Analysis:
case Draft:
return Current.getTheme().Fonts.get(VisualiserFonts.BlueState);
return VisualiserFonts.BlueState;
case CompilationExecution:
case RunningExecution:
return Current.getTheme().Fonts.get(VisualiserFonts.ProgressState);
return VisualiserFonts.ProgressState;
case Done:
return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
return VisualiserFonts.GoodState;
default:
return StatusEnum.super.getFont();
}

8
src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
View File

@@ -21,14 +21,14 @@ public enum ComparisonState implements StatusEnum {
}
}
@Override
public Font getFont() {
public VisualiserFonts getFont() {
switch (this) {
case Unknown:
return Current.getTheme().Fonts.get(VisualiserFonts.UnknownState);
return VisualiserFonts.UnknownState;
case Match:
return Current.getTheme().Fonts.get(VisualiserFonts.GoodState);
return VisualiserFonts.GoodState;
case NotMatch:
return Current.getTheme().Fonts.get(VisualiserFonts.BadState);
return VisualiserFonts.BadState;
default:
return StatusEnum.super.getFont();
}

27
src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
View File

@@ -1,5 +1,9 @@
package TestingSystem.SAPFOR.ServerSapfor;
import Common.Current;
import Common.UI.StatusEnum;
import Common.UI.Themes.VisualiserFonts;
import java.awt.*;
public enum ServerSapforState implements StatusEnum {
Queued,
RepositorySynchronization,
@@ -7,20 +11,37 @@ public enum ServerSapforState implements StatusEnum {
Done,
DoneWithErrors;
@Override
public VisualiserFonts getFont() {
switch (this){
case Queued:
return VisualiserFonts.UnknownState;
case Done:
return VisualiserFonts.GoodState;
case DoneWithErrors:
return VisualiserFonts.BadState;
case Compilation:
case RepositorySynchronization:
return VisualiserFonts.ProgressState;
default:
return VisualiserFonts.UnknownState;
}
}
@Override
public String getDescription() {
switch (this) {
case Queued:
return "в очереди";
case RepositorySynchronization:
return "синхронизация репозитория";
return "синхронизация";
case Compilation:
return "сборка";
case Done:
return "сборка успешно";
return "успешно";
case DoneWithErrors:
return "сборка с ошибками";
return "с ошибками";
default:
return StatusEnum.super.getDescription();
}
}
}

2
src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -22,7 +22,7 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
}
@Override
public String[] getUIColumnNames() {
return new String[]{"версия", "дата сборки", "статус"};
return new String[]{"версия", "дата сборки", "сборка"};
}
@Override
public Object getFieldAt(ServerSapfor object, int columnIndex) {