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

рефакторинг интерфейса таблиц. все же, вывел их в полноценные классы,с указанием типа объектов к ним относящихся

Browse Source
This commit is contained in:
02090095
2024-10-20 17:27:58 +03:00
parent 10422327ba
commit 3f42f61c76
81 changed files with 1637 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/_VisualDVM/Repository/BugReport/BugReport.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.Repository.BugReport;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.rDBObject;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.Component.ComponentType;
import com.sun.org.glassfish.gmbal.Description;

72
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -2,17 +2,11 @@ package _VisualDVM.Repository.BugReport;
import Common.Database.Tables.DBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.UI.BugReportsForm;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.Comparator;
import java.util.Vector;
import java.util.stream.Collectors;
@@ -30,69 +24,7 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
"Отправитель",
"Исполнитель",
"Проект",
"Завершенность",
"Дата создания",
"Дата изменения",
"Статус"};
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport();
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setMaxWidth(600);
columns.get(5).setRendererClass(RendererProgressBar.class);
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererDate.class);
columns.get(8).setRendererClass(RendererStatusEnum.class);
}
@Override
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
@Override
protected void createControl() {
//https://stackoverflow.com/questions/9091208/jtable-enter-key
super.createControl();
final String solve = "Solve";
KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
control.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(enter, solve);
control.getActionMap().put(solve, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
});
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
};
return new BugReportsForm(this, mountPanel);
}
@Override
public Comparator<BugReport> getComparator() {

5
src/_VisualDVM/Repository/BugReport/BugReportInterface.java → src/_VisualDVM/Repository/BugReport/UI/BugReportInterface.java
View File

@@ -1,13 +1,16 @@
package _VisualDVM.Repository.BugReport;
package _VisualDVM.Repository.BugReport.UI;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Subscribes.Subscriber;
import java.io.File;
import java.nio.file.Paths;
import java.util.Vector;
//todo слить с формой.
public class BugReportInterface {
public static String filterKey = "";
public static String filterSenderName = "";

80
src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java Normal file
View File

@@ -0,0 +1,80 @@
package _VisualDVM.Repository.BugReport.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
public class BugReportsForm extends DataSetControlForm<BugReport> {
public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
"Отправитель",
"Исполнитель",
"Проект",
"Завершенность",
"Дата создания",
"Дата изменения",
"Статус"};
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport();
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setMaxWidth(600);
columns.get(5).setRendererClass(RendererProgressBar.class);
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererDate.class);
columns.get(8).setRendererClass(RendererStatusEnum.class);
}
@Override
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
@Override
protected void createControl() {
//https://stackoverflow.com/questions/9091208/jtable-enter-key
super.createControl();
final String solve = "Solve";
KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
control.getInputMap(JTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(enter, solve);
control.getActionMap().put(solve, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
}
});
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
}

45
src/_VisualDVM/Repository/Component/ComponentsSet.java
View File

@@ -10,6 +10,7 @@ import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.UI.ComponentsForm;
import javax.swing.*;
import java.util.Vector;
@@ -27,49 +28,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Компонент",
"Текущая версия",
"Актуальная версия",
"Дата сборки",
"Статус"};
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererMaskedNanInteger.class);
columns.get(4).setRendererClass(RendererMaskedNanInteger.class);
columns.get(6).setRendererClass(RendererStatusEnum.class);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog) {
{
addMenus(
new VisualiserMenu(
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
}
}
);
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
};
}
};
return new ComponentsForm(this, mountPanel);
}
@Override
public Current CurrentName() {

77
src/_VisualDVM/Repository/Component/UI/ComponentsForm.java
View File

@@ -1,43 +1,60 @@
package _VisualDVM.Repository.Component.UI;
import Common.Visual.Windows.Dialog.Dialog;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Component;
import java.awt.*;
public class ComponentsForm extends Dialog<Object, ComponentsFields> {
public ComponentsForm() {
super(ComponentsFields.class);
import javax.swing.*;
public class ComponentsForm extends DataSetControlForm<Component> {
public ComponentsForm(DataSet<?, Component> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean NeedsScroll() {
return false;
public boolean hasCheckBox() {
return true;
}
@Override
public int getDefaultWidth() {
return Global.properties.ComponentsWindowWidth;
public String[] getUIColumnNames() {
return new String[]{
"Компонент",
"Текущая версия",
"Актуальная версия",
"Дата сборки",
"Статус"};
}
@Override
public int getDefaultHeight() {
return Global.properties.ComponentsWindowHeight;
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setRendererClass(RendererMaskedNanInteger.class);
columns.get(4).setRendererClass(RendererMaskedNanInteger.class);
columns.get(6).setRendererClass(RendererStatusEnum.class);
}
@Override
public void CreateButtons() {
}
@Override
public void Init(Object... params) {
Global.Components.ShowUI();
}
@Override
public void LoadSize() {
setMinimumSize(new Dimension(650, 250));
Dimension dimension = new Dimension(getDefaultWidth(), getDefaultHeight());
setPreferredSize(dimension);
setSize(dimension);
}
@Override
public void onClose() {
super.onClose();
Global.properties.ComponentsWindowWidth = getWidth();
Global.properties.ComponentsWindowHeight = getHeight();
Global.properties.Update();
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog) {
{
addMenus(
new VisualiserMenu(
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
}
}
);
Global.mainModule.getPass(PassCode.PublishComponent).setControlsVisible(false);
}
};
}
}

43
src/_VisualDVM/Repository/Component/UI/ComponentsWindow.java Normal file
View File

@@ -0,0 +1,43 @@
package _VisualDVM.Repository.Component.UI;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Global;
import java.awt.*;
public class ComponentsWindow extends Dialog<Object, ComponentsFields> {
public ComponentsWindow() {
super(ComponentsFields.class);
}
@Override
public boolean NeedsScroll() {
return false;
}
@Override
public int getDefaultWidth() {
return Global.properties.ComponentsWindowWidth;
}
@Override
public int getDefaultHeight() {
return Global.properties.ComponentsWindowHeight;
}
@Override
public void CreateButtons() {
}
@Override
public void Init(Object... params) {
Global.Components.ShowUI();
}
@Override
public void LoadSize() {
setMinimumSize(new Dimension(650, 250));
Dimension dimension = new Dimension(getDefaultWidth(), getDefaultHeight());
setPreferredSize(dimension);
setSize(dimension);
}
@Override
public void onClose() {
super.onClose();
Global.properties.ComponentsWindowWidth = getWidth();
Global.properties.ComponentsWindowHeight = getHeight();
Global.properties.Update();
}
}

2
src/_VisualDVM/Repository/Server/ComponentsServer.java
View File

@@ -13,7 +13,7 @@ import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReportsDatabase;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.EmailMessage;

32
src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
View File

@@ -15,6 +15,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
import _VisualDVM.Repository.Subscribes.UI.SubscriberForm;
import _VisualDVM.Repository.Subscribes.UI.SubsribersForm;
import javax.swing.*;
import java.util.LinkedHashMap;
@@ -32,36 +33,7 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DataSetControlForm(this, mountPanel) {
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
"Роль",
"Рассылка"};
}
@Override
protected void AdditionalInitColumns() {
boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin);
columns.get(0).setVisible(admin);
columns.get(1).setVisible(Global.mainModule.getBugReport() != null);
columns.get(3).setVisible(admin);
columns.get(4).setVisible(admin);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
};
return new SubsribersForm(this, mountPanel);
}
@Override
public Current CurrentName() {

43
src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java Normal file
View File

@@ -0,0 +1,43 @@
package _VisualDVM.Repository.Subscribes.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Subscribes.Subscriber;
import javax.swing.*;
public class SubsribersForm extends DataSetControlForm<Subscriber> {
public SubsribersForm(DataSet<?, Subscriber> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public boolean hasCheckBox() {
return true;
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
"Роль",
"Рассылка"};
}
@Override
protected void AdditionalInitColumns() {
boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin);
columns.get(0).setVisible(admin);
columns.get(1).setVisible(Global.mainModule.getBugReport() != null);
columns.get(3).setVisible(admin);
columns.get(4).setVisible(admin);
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
}