no message
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package _VisualDVM.GlobalData.User;
|
||||
import Common.CommonConstants;
|
||||
import _VisualDVM.Current;
|
||||
import Common.Database.Objects.iDBObject;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.GlobalData.Machine.Machine;
|
||||
import _VisualDVM.TestingSystem.DVM.UserConnection;
|
||||
@@ -16,6 +16,9 @@ public class User extends iDBObject {
|
||||
public UserAuthentication authentication = UserAuthentication.password;
|
||||
public String workspace = ""; //рабочая папка визуализатора пользователя на машине. полный путь.
|
||||
public UserState state = UserState.initial;
|
||||
//-
|
||||
@Description("IGNORE")
|
||||
public UserConnection connection = null;
|
||||
/*
|
||||
@Description("DEFAULT '?'")
|
||||
public String email = "?";
|
||||
@@ -58,7 +61,6 @@ public class User extends iDBObject {
|
||||
public File getLocalModulesDir() {
|
||||
return Paths.get(workspace, "modules").toFile();
|
||||
}
|
||||
|
||||
public File getHeaderCodeFile() {
|
||||
return Paths.get(workspace, "modules", "Process_r.h").toFile();
|
||||
}
|
||||
@@ -74,7 +76,4 @@ public class User extends iDBObject {
|
||||
public File getLauncherFile() {
|
||||
return Paths.get(workspace, "modules", "launcher").toFile();
|
||||
}
|
||||
//-
|
||||
@Description("IGNORE")
|
||||
public UserConnection connection = null;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package _VisualDVM.GlobalData.User;
|
||||
import Common.Visual.StatusEnum;
|
||||
import Common.Visual.Fonts.VisualiserFonts;
|
||||
import Common.Visual.StatusEnum;
|
||||
public enum UserState implements StatusEnum {
|
||||
initial, //на пользователя еще не заходили.
|
||||
ready, //рудимент.
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
package _VisualDVM.GlobalData.User;
|
||||
import _VisualDVM.Current;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Tables.TableRenderers;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Visual.UI;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Tables.FKBehaviour;
|
||||
import Common.Database.Tables.FKCurrentObjectBehaviuor;
|
||||
import Common.Database.Tables.FKDataBehaviour;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Tables.TableRenderers;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.GlobalData.Machine.MachineType;
|
||||
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
|
||||
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
|
||||
import _VisualDVM.GlobalData.User.UI.UserFields;
|
||||
import _VisualDVM.Visual.UI;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
public class UsersDBTable extends iDBTable<User> {
|
||||
@@ -59,7 +59,7 @@ public class UsersDBTable extends iDBTable<User> {
|
||||
}
|
||||
@Override
|
||||
public void ProcessResult() {
|
||||
Result.machine_id =Global.mainModule.getMachine().id;
|
||||
Result.machine_id = Global.mainModule.getMachine().id;
|
||||
Result.login = fields.tfLogin.getText();
|
||||
Result.authentication = UserAuthentication.password;
|
||||
Result.password = new String(fields.tfPassword.getPassword());
|
||||
@@ -81,16 +81,15 @@ public class UsersDBTable extends iDBTable<User> {
|
||||
@Override
|
||||
public void ShowCurrentObject() throws Exception {
|
||||
super.ShowCurrentObject();
|
||||
// UI.getMainWindow().ShowCurrentCompiler();
|
||||
// UI.getMainWindow().ShowCurrentCompiler();
|
||||
UI.credentialsBar.ShowUser();
|
||||
}
|
||||
@Override
|
||||
public void ShowNoCurrentObject() throws Exception {
|
||||
super.ShowNoCurrentObject();
|
||||
// UI.getMainWindow().ShowCurrentCompiler();
|
||||
// UI.getMainWindow().ShowCurrentCompiler();
|
||||
UI.credentialsBar.ShowNoUser();
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
@Override
|
||||
|
||||
@@ -3,7 +3,7 @@ import Common.Visual.Menus.DataMenuBar;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
public class UsersMenuBar extends DataMenuBar {
|
||||
public UsersMenuBar() {
|
||||
super("пользователи", PassCode.AddUser,
|
||||
super("пользователи", PassCode.AddUser,
|
||||
PassCode.EditUser,
|
||||
PassCode.InitialiseUser,
|
||||
PassCode.DeleteUser);
|
||||
|
||||
Reference in New Issue
Block a user