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

no message

Browse Source
This commit is contained in:
02090095
2024-10-14 15:30:52 +03:00
parent 5e09fb44ea
commit 066ebfaa71
26 changed files with 48 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/MainModule_.java
View File

@@ -13,7 +13,7 @@ import java.util.LinkedHashMap;
import java.util.Vector;
//Основной объект визуализатора.
public abstract class MainModule_<D extends VisualiserDatabase> {
public static MainModule_ object = null; //текущий экземпляр. всегда один.
public static MainModule_ instance = null; //текущий экземпляр. всегда один.
//--
public FastAccessMenuBar fastAccessMenuBar = null;
public PassForm passForm = null;
@@ -33,7 +33,7 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
ex.printStackTrace();
}
//---
object = this;
instance = this;
System.out.println("main module created");
}
//БАЗА ДАННЫХ И ТЕКУЩИЕ ОБЪЕКТЫ
@@ -93,7 +93,7 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
return passes.get(code);
}
public String getPassDescription(String passName) {
return ((PassCode_) Enum.valueOf(MainModule_.object.getPassCodesEnum(), passName)).getDescription();
return ((PassCode_) Enum.valueOf(MainModule_.instance.getPassCodesEnum(), passName)).getDescription();
}
public Vector<Pass> getFirstAccessPasses() {
Vector<PassStats> sortedStats = new Vector<>(getDb().passStats.Data.values());

2
src/Common/Passes/ObjectPass.java
View File

@@ -9,7 +9,7 @@ public abstract class ObjectPass<D extends DBObject> extends Pass<D> {
d = d_in;
}
protected Database getDb() {
return MainModule_.object.getDb();
return MainModule_.instance.getDb();
}
; //источник данных
public DBTable getTable() {

14
src/Common/Passes/Pass.java
View File

@@ -8,7 +8,7 @@ import Common.Visual.Controls.PassControl;
import Common.Visual.Controls.StablePassMenuItem;
import Common.Visual.UI_;
import Common.Visual.Windows.PassForm;
import _VisualDVM.Global;
import _VisualDVM.Global; //избавиться когда мейн модуль станет обязательным
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -90,11 +90,11 @@ public class Pass<T> {
public void UpdateStatsIfNeed() {
if (hasStats()) {
try {
MainModule_.object.getDb().passStats.IncPassStat(getName());
MainModule_.instance.getDb().passStats.IncPassStat(getName());
} catch (Exception ex) {
Utils_.MainLog.PrintException(ex);
}
MainModule_.object.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
MainModule_.instance.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
}
}
public boolean isDone() {
@@ -107,7 +107,7 @@ public class Pass<T> {
return getClass().getSimpleName();
}
public String getDescription() {
return MainModule_.object.getPassDescription(getName());
return MainModule_.instance.getPassDescription(getName());
}
public String getStartDescription() {
return getDescription();
@@ -195,7 +195,7 @@ public class Pass<T> {
ToPrint.add(this.getStartDescription());
}
if (necessary() != null) {
Pass next = MainModule_.object.getPass(necessary());
Pass next = MainModule_.instance.getPass(necessary());
if (resetsNecessary() || !next.isDone())
next.createStack_r(ToDo, ToPrint);
}
@@ -266,10 +266,10 @@ public class Pass<T> {
animation_sem.acquire();
//---
form = null;
MainModule_.object.passForm = null;
MainModule_.instance.passForm = null;
System.gc();
//--
MainModule_.object.passForm = form = new PassForm(this);
MainModule_.instance.passForm = form = new PassForm(this);
dispatcher = new SwingWorker() {
@Override
protected Object doInBackground() {

6
src/_VisualDVM/Visual/Windows/TabToolBar.java → src/Common/Visual/Controls/TabToolBar.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Global;
package Common.Visual.Controls;
import Common.MainModule_;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
@@ -17,7 +17,7 @@ public class TabToolBar extends VisualiserMenuBar {
addSeparator();
//-
for (PassCode code : passes)
add(Global.mainModule.getPass(code).createTabButton());
add(MainModule_.instance.getPass(code).createTabButton());
MouseAdapter adapter = new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {

2
src/_VisualDVM/Visual/Interface/VisualizerForm.java → src/Common/Visual/VisualizerForm.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Visual.Interface;
package Common.Visual;
import javax.swing.*;
public interface VisualizerForm {
//просто некая панель, на которой может быть все что угодно. монтируется на панель родителя,

2
src/_VisualDVM/Passes/All/DropFastAccess.java
View File

@@ -14,6 +14,6 @@ public class DropFastAccess extends Pass {
}
@Override
protected void showDone() throws Exception {
MainModule_.object.fastAccessMenuBar.Drop();
MainModule_.instance.fastAccessMenuBar.Drop();
}
}

2
src/_VisualDVM/Passes/All/UpdateSetting.java
View File

@@ -120,7 +120,7 @@ public class UpdateSetting extends Pass<DBSetting> {
break;
case FastAccessPassesCount:
if (Global.mainModule.HasProject())
MainModule_.object.fastAccessMenuBar.Refresh();
MainModule_.instance.fastAccessMenuBar.Refresh();
break;
case ShowFullArraysDeclarations:
if (Global.mainModule.HasProject())

4
src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java
View File

@@ -28,8 +28,8 @@ public class MessagesServer {
InputStreamReader(client.getInputStream()));
String line;
while ((line = in.readLine()) != null) {
if (MainModule_.object.passForm != null)
MainModule_.object.passForm.Result.ShowSapforMessage(line);
if (MainModule_.instance.passForm != null)
MainModule_.instance.passForm.Result.ShowSapforMessage(line);
}
} catch (Exception ex) {
// UI.Print(DebugPrintLevel.MessagesServer, "соединение сброшено!");

1
src/_VisualDVM/Visual/Interface/AnalysisWindow.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
public interface AnalysisWindow extends FormWithSplitters, VisualizerForm {
void ShowProjectMaxDim();
void ShowNoProjectMaxDim();

1
src/_VisualDVM/Visual/Interface/ArraysWindow.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
public interface ArraysWindow extends VisualizerForm, FormWithSplitters {
void ShowArrays();
void ShowNoArrays();

1
src/_VisualDVM/Visual/Interface/CallbackWindow.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
public interface CallbackWindow extends VisualizerForm {
void ShowAccount();
void ShowBugReports();

2
src/_VisualDVM/Visual/Interface/CommentInterface.java
View File

@@ -1,4 +1,6 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
import javax.swing.*;
public interface CommentInterface extends VisualizerForm, FormWithSplitters {
void setEditorScroll(JScrollPane scroll_in);

2
src/_VisualDVM/Visual/Interface/DescriptionInterface.java
View File

@@ -1,4 +1,6 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
import javax.swing.*;
public interface DescriptionInterface extends VisualizerForm, FormWithSplitters {
void setEditorScroll(JScrollPane scroll_in);

1
src/_VisualDVM/Visual/Interface/FileWindow.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
public interface FileWindow extends VisualizerForm {
void ShowText();
void ShowLanguage();

1
src/_VisualDVM/Visual/Interface/FunctionsWindow.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import javafx.util.Pair;
public interface FunctionsWindow extends VisualizerForm, FormWithSplitters {

1
src/_VisualDVM/Visual/Interface/ScenariosWindow.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
public interface ScenariosWindow extends FormWithSplitters, VisualizerForm {
void ShowAll();
void FocusSapforTasksPackages();

1
src/_VisualDVM/Visual/Interface/StatisticsWindow.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
public interface StatisticsWindow extends VisualizerForm {
void ShowAll();
}

1
src/_VisualDVM/Visual/Interface/TestingWindow.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;

1
src/_VisualDVM/Visual/Interface/VariantsWindow.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.VisualizerForm;
public interface VariantsWindow extends VisualizerForm, FormWithSplitters {
void ShowProjectDistribution();
void ShowNoProjectDistribution();

1
src/_VisualDVM/Visual/Interface/VersionsWindow.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.Trees.TreeForm;
import Common.Visual.VisualizerForm;
import _VisualDVM.ProjectData.Project.db_project_info;
public interface VersionsWindow extends VisualizerForm {
VariantsWindow getVariantsWindow();

2
src/_VisualDVM/Visual/UI.java
View File

@@ -127,7 +127,7 @@ public class UI {
testingBar = new TestingBar();
credentialsBar = new CredentialsBar();
versionsMenuBar = new VersionsMenuBar();
MainModule_.object.fastAccessMenuBar = new FastAccessMenuBar();
MainModule_.instance.fastAccessMenuBar = new FastAccessMenuBar();
//---------------------------------------------------->>
UI_.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
UI_.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());

1
src/_VisualDVM/Visual/Windows/CommentTabs.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.Controls.TabToolBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Interface.CommentInterface;

1
src/_VisualDVM/Visual/Windows/DescriptionTabs.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.Controls.TabToolBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Interface.DescriptionInterface;

1
src/_VisualDVM/Visual/Windows/MainForm.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.Controls.TabToolBar;
import Common.Visual.UI_;
import Common.Visual.Windows.Form;
import _VisualDVM.Global;

3
src/_VisualDVM/Visual/Windows/ProjectForm.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Controls.TabToolBar;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI_;
import _VisualDVM.Global;
@@ -54,7 +55,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
functionsFormPanel.add((functionsForm = new FunctionsForm()).getContent());
analysisFormPanel.add((analysisForm = new AnalysisForm()).getContent());
//-
FastAccessScroll = new JScrollPane(MainModule_.object.fastAccessMenuBar) {
FastAccessScroll = new JScrollPane(MainModule_.instance.fastAccessMenuBar) {
{
getHorizontalScrollBar().setPreferredSize(new Dimension(0, 10));
setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);