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-24 23:40:24 +03:00
parent f811d9b3ac
commit 36c11ac93f
153 changed files with 765 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,8 +31,8 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
}
//--
@Override
protected Current CurrentName() {
return Current.BugReport;
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {

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

@@ -1,5 +1,6 @@
package _VisualDVM.Repository.Component;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -26,7 +27,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
public ComponentsSet() {
super(ComponentType.class, Component.class);
put(ComponentType.Visualiser, visualiser = new Visualiser());
put(ComponentType.Sapfor_F, (Component) Global.mainModule.set(Current.Sapfor, new Sapfor_F()));
put(ComponentType.Sapfor_F, (Component)MainModule_.instance.set(Current.Sapfor, new Sapfor_F()));
put(ComponentType.Visualizer_2, visualizer_2);
put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer());
put(ComponentType.Instruction, new Instruction());
@@ -46,7 +47,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
//--
public void refreshUpdatesStatus() {
if (getUI() != null)
getUI().Refresh();
getUI().RedrawControl();
validateStates();
if (Global.mainModule.getUI().hasMainWindow())
Global.mainModule.getUI().getMainWindow().ShowUpdatesIcon();

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

@@ -19,8 +19,8 @@ public class ComponentsForm extends DataSetControlForm<Component> {
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.Component;
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {

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

@@ -2,10 +2,10 @@ 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;
import _VisualDVM.Repository.Subscribes.Subscriber;
import javax.swing.*;
public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
@@ -13,8 +13,8 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.SubscriberWorkspace;
protected boolean needsCurrent() {
return true;
}
@Override
public String[] getUIColumnNames() {
@@ -41,7 +41,8 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
}
@Override
public boolean isObjectVisible(SubscriberWorkspace object) {
return super.isObjectVisible(object) && Global.mainModule.HasSubscriber() && Global.mainModule.getSubscriber().address.equals(object.email) &&
(Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(Global.mainModule.getSubscriber().address));
Subscriber subscriber = Global.componentsServer.db.subscribers.getUI().getCurrent();
return super.isObjectVisible(object) && (subscriber != null) && subscriber.address.equals(object.email) &&
(Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(subscriber.address));
}
}

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

@@ -16,8 +16,8 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
super(dataSource_in, mountPanel_in);
}
@Override
protected Current CurrentName() {
return Current.Subscriber;
protected boolean needsCurrent() {
return true;
}
@Override
protected boolean hasCheckBox() {
@@ -46,7 +46,7 @@ public class SubsribersForm extends DataSetControlForm<Subscriber> {
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(1).setVisible(Global.componentsServer.db.bugReports.getUI().getCurrent() != null);
columns.get(3).setVisible(admin);
columns.get(4).setVisible(admin);
}