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-22 15:25:06 +03:00
parent 319e6575c8
commit 38b2896e4a
102 changed files with 738 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@ package _VisualDVM.Repository.BugReport;
import Common.Database.Tables.DBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.UI.BugReportsForm;
@@ -14,21 +13,9 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
super(String.class, BugReport.class);
}
@Override
public String getSingleDescription() {
return "отчёт об ошибке";
}
@Override
public String getPluralDescription() {
return "отчёты об ошибках";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new BugReportsForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.BugReport;
}
public Vector<BugReport> getAllDrafts() throws Exception {
return Data.values().stream().filter(bugReport -> bugReport.state.equals(BugReportState.draft)).collect(Collectors.toCollection(Vector::new));
}

18
src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
View File

@@ -5,6 +5,7 @@ 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.BugReport;
@@ -24,10 +25,23 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
public static String filterVersion = "";
public static boolean filterOpenedOnly = false;
public static boolean filterMyOnly = false;
//--
//-
public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
//--
@Override
public Current CurrentName() {
return Current.BugReport;
}
@Override
public String getSingleDescription() {
return "отчёт об ошибке";
}
@Override
public String getPluralDescription() {
return "отчёты об ошибках";
}
@Override
public String[] getUIColumnNames() {
return new String[]{
@@ -78,7 +92,7 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,

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

@@ -1,54 +1,15 @@
package _VisualDVM.Repository.Component;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Repository.Component.UI.ComponentsForm;
import javax.swing.*;
import java.util.Vector;
public class ComponentsSet extends DataSet<ComponentType, Component> {
public ComponentsSet() {
super(ComponentType.class, Component.class);
}
@Override
public String getSingleDescription() {
return "компонент";
}
@Override
public String getPluralDescription() {
return "компоненты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ComponentsForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.Component;
}
@Override
public Vector<Component> getSelectedItems() {
Vector<Component> target = new Vector<>();
Component visualiser = null;
Component server = null;
//------------------------
for (Component component : super.getSelectedItems()) {
switch (component.getComponentType()) {
case Visualizer_2:
server = component;
break;
case Visualiser:
visualiser = component;
break;
default:
target.add(component);
break;
}
}
if (visualiser != null)
target.add(visualiser);
if (server != null)
target.add(server);
return target;
}
}

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

@@ -7,16 +7,30 @@ import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Component;
import javax.swing.*;
import java.util.Vector;
public class ComponentsForm extends DataSetControlForm<Component> {
public ComponentsForm(DataSet<?, Component> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.Component;
}
@Override
public String getSingleDescription() {
return "компонент";
}
@Override
public String getPluralDescription() {
return "компоненты";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -55,7 +69,7 @@ public class ComponentsForm extends DataSetControlForm<Component> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.InstallComponentFromFolder,
return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog) {
@@ -74,4 +88,29 @@ public class ComponentsForm extends DataSetControlForm<Component> {
}
};
}
@Override
public Vector<Component> getSelectedItems() {
Vector<Component> target = new Vector<>();
Component visualiser = null;
Component server = null;
//------------------------
for (Component component : super.getSelectedItems()) {
switch (component.getComponentType()) {
case Visualizer_2:
server = component;
break;
case Visualiser:
visualiser = component;
break;
default:
target.add(component);
break;
}
}
if (visualiser != null)
target.add(visualiser);
if (server != null)
target.add(server);
return target;
}
}

14
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.UI.SubscriberWorkspacesForm;
@@ -19,19 +18,6 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
}
//--
@Override
public String getSingleDescription() {
return "рабочая папка";
}
@Override
public String getPluralDescription() {
return "рабочие папки";
}
@Override
public Current CurrentName() {
return Current.SubscriberWorkspace;
}
//-
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SubscriberWorkspacesForm(this, mountPanel);
}

15
src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.Repository.SubscriberWorkspace.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
@@ -12,6 +13,18 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.SubscriberWorkspace;
}
@Override
public String getSingleDescription() {
return "рабочая папка";
}
@Override
public String getPluralDescription() {
return "рабочие папки";
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"URL",
@@ -32,7 +45,7 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
return new DataMenuBar(getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
}
@Override
public boolean isObjectVisible(SubscriberWorkspace object) {

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

@@ -7,7 +7,6 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;
@@ -21,22 +20,10 @@ public class SubsribersDBTable extends DBTable<String, Subscriber> {
super(String.class, Subscriber.class);
}
@Override
public String getSingleDescription() {
return "адресат";
}
@Override
public String getPluralDescription() {
return "адресаты";
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SubsribersForm(this, mountPanel);
}
@Override
public Current CurrentName() {
return Current.Subscriber;
}
@Override
public DBObjectDialog<Subscriber, SubscriberFields> getDialog() {
return new SubscriberForm();
}

15
src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.Repository.Subscribes.UI;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
@@ -13,6 +14,18 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
super(dataSource_in, mountPanel_in);
}
@Override
public Current CurrentName() {
return Current.Subscriber;
}
@Override
public String getSingleDescription() {
return "адресат";
}
@Override
public String getPluralDescription() {
return "адресаты";
}
@Override
public boolean hasCheckBox() {
return true;
}
@@ -45,7 +58,7 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(),
return new DataMenuBar(getPluralDescription(),
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,