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 16:16:41 +03:00
parent 066ebfaa71
commit 702529147d
13 changed files with 56 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.idea/workspace.xml generated
View File

@@ -7,32 +7,19 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Mode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Mode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DropFastAccess.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/AnalysisWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/AnalysisWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ArraysWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ArraysWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CallbackWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CallbackWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CommentInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/CommentInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/DescriptionInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/DescriptionInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FileWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FileWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FunctionsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FunctionsWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ScenariosWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/ScenariosWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/StatisticsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/StatisticsWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VariantsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VariantsWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VersionsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VersionsWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/VisualizerForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/VisualizerForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CommentTabs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CommentTabs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionTabs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/DescriptionTabs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TabToolBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/TabToolBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

33
src/Common/MainModule_.java
View File

@@ -5,18 +5,17 @@ import Common.Database.VisualiserDatabase;
import Common.Passes.Pass;
import Common.Passes.PassCode_;
import Common.Utils.TextLog;
import Common.Visual.Windows.PassForm;
import Common.Visual.UIModule_;
import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.Vector;
//Основной объект визуализатора.
public abstract class MainModule_<D extends VisualiserDatabase> {
public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModule_> {
public static MainModule_ instance = null; //текущий экземпляр. всегда один.
//--
public FastAccessMenuBar fastAccessMenuBar = null;
public PassForm passForm = null;
//--
D db;
Class<D> db_class;
@@ -24,18 +23,24 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
//--
LinkedHashMap<PassCode_, Pass> passes;
//--
public MainModule_(Class<D> db_class_in) {
objects = new LinkedHashMap<>();
createPasses();
try {
db_class = db_class_in;
} catch (Exception ex) {
ex.printStackTrace();
}
//---
instance = this;
System.out.println("main module created");
U ui=null;
Class<U> ui_class;
public U getUI(){
return ui;
}
//--
public MainModule_(Class<D> db_class_in, Class<U> ui_class_in) throws Exception {
objects = new LinkedHashMap<>();
db_class = db_class_in;
createPasses();
ui_class=ui_class_in;
//---
if (ui_class!=null)
ui = ui_class_in.newInstance();
instance = this;
}
//ИНТЕРФЕЙС
public boolean hasUI(){return ui!=null;}
//БАЗА ДАННЫХ И ТЕКУЩИЕ ОБЪЕКТЫ
public D getDb() {
return db;

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

@@ -266,10 +266,10 @@ public class Pass<T> {
animation_sem.acquire();
//---
form = null;
MainModule_.instance.passForm = null;
MainModule_.instance.getUI().DropPassForm();;
System.gc();
//--
MainModule_.instance.passForm = form = new PassForm(this);
form = MainModule_.instance.getUI().SetPassForm(new PassForm(this));
dispatcher = new SwingWorker() {
@Override
protected Object doInBackground() {

11
src/Common/Visual/UIModule_.java Normal file
View File

@@ -0,0 +1,11 @@
package Common.Visual;
import Common.Visual.Windows.PassForm;
public class UIModule_ {
PassForm passForm = null;//текущая форма прохода. нужна для
public boolean HasPassForm(){return passForm!=null;}
public PassForm GetPassForm(){return passForm;}
public PassForm SetPassForm(PassForm passForm_in){
return passForm = passForm_in;
}
public void DropPassForm(){passForm=null;}
}

1
src/_VisualDVM/Global.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM;
import Common.Database.Tables.DataSet;
import Common.Mode;
import Common.Utils.Loggable;
import Common.Utils.Utils_;
import Common.Visual.UI_;

2
src/_VisualDVM/GlobalProperties.java
View File

@@ -10,7 +10,7 @@ import java.lang.reflect.Field;
import java.nio.file.Paths;
public class GlobalProperties {
@Expose
public Common.Mode Mode = Common.Mode.Normal;
public _VisualDVM.Mode Mode = _VisualDVM.Mode.Normal;
@Expose
public String ServerAddress = "alex-freenas.ddns.net";
@Expose

7
src/_VisualDVM/MainModule.java
View File

@@ -34,11 +34,12 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.Visual.MainUI;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
import java.util.Vector;
public class MainModule extends MainModule_<GlobalDatabase> {
public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
//--
Vector<PassCode> accountRoleDependentPasses = new Vector_<>(
PassCode.AddSubscriber,
@@ -59,8 +60,8 @@ public class MainModule extends MainModule_<GlobalDatabase> {
PassCode.StartTestingServer,
PassCode.PublishTestingServer
);
public MainModule() {
super(GlobalDatabase.class);
public MainModule() throws Exception {
super(GlobalDatabase.class, MainUI.class);
}
@Override
public Class getPassCodesEnum() {

2
src/Common/Mode.java → src/_VisualDVM/Mode.java
View File

@@ -1,4 +1,4 @@
package Common;
package _VisualDVM;
public enum Mode {
Undefined,
Normal,

2
src/_VisualDVM/ProjectData/Messages/Message.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Messages;
import Common.Mode;
import _VisualDVM.Mode;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Constants;

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_.instance.passForm != null)
MainModule_.instance.passForm.Result.ShowSapforMessage(line);
if (MainModule_.instance.getUI().HasPassForm())
MainModule_.instance.getUI().GetPassForm().Result.ShowSapforMessage(line);
}
} catch (Exception ex) {
// UI.Print(DebugPrintLevel.MessagesServer, "соединение сброшено!");

2
src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.Common.MachineProcess;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Mode;
import _VisualDVM.Mode;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.TestingSystem.SAPFOR;
import Common.CommonConstants;
import Common.Mode;
import _VisualDVM.Mode;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;

4
src/_VisualDVM/Visual/MainUI.java Normal file
View File

@@ -0,0 +1,4 @@
package _VisualDVM.Visual;
import Common.Visual.UIModule_;
public class MainUI extends UIModule_ {
}