no message
This commit is contained in:
@@ -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_;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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() {
|
||||
|
||||
10
src/_VisualDVM/Mode.java
Normal file
10
src/_VisualDVM/Mode.java
Normal file
@@ -0,0 +1,10 @@
|
||||
package _VisualDVM;
|
||||
public enum Mode {
|
||||
Undefined,
|
||||
Normal,
|
||||
Server,
|
||||
Testing,
|
||||
Package,
|
||||
MachineQueue,
|
||||
LocalMachineQueue
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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, "соединение сброшено!");
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
4
src/_VisualDVM/Visual/MainUI.java
Normal file
@@ -0,0 +1,4 @@
|
||||
package _VisualDVM.Visual;
|
||||
import Common.Visual.UIModule_;
|
||||
public class MainUI extends UIModule_ {
|
||||
}
|
||||
Reference in New Issue
Block a user