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-08 16:20:45 +03:00
parent e7939713e7
commit cba2c8ec34
17 changed files with 292 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GlobalData/FormsParams/DBForm.java
View File

@@ -6,12 +6,12 @@ import com.sun.org.glassfish.gmbal.Description;
import java.awt.*;
public class DBForm extends DBObject {
@Description("PRIMARY KEY,UNIQUE, NOT NULL")
public FormType type = FormType.Undefined;
public String type = null;
public int X = 0;
public int Y = 0;
public int Width = 0;
public int Height = 0;
public DBForm(FormType type_, Window window) {
public DBForm(String type_, Window window) {
type = type_;
Init(window);
}

6
src/GlobalData/FormsParams/FormsDBTable.java
View File

@@ -1,12 +1,12 @@
package GlobalData.FormsParams;
import Common.Database.Tables.DBTable;
import Common_old.UI.Windows.FormType;
public class FormsDBTable extends DBTable<FormType, DBForm> {
public class FormsDBTable extends DBTable<String, DBForm> {
public FormsDBTable() {
super(FormType.class, DBForm.class);
super(String.class, DBForm.class);
}
@Override
public String getSingleDescription() {
return "параметры окны";
return "параметры окна";
}
}

3
src/GlobalData/GlobalDatabase.java
View File

@@ -50,7 +50,7 @@ public class GlobalDatabase extends VisualiserDatabase {
public DVMParameterDBTable dvmParameters;
public CredentialsDBTable credentials;
//----- ДАННЫЕ ВИЗУАЛИЗАТОРА---------------------------------
public FormsDBTable forms;
public MainFormParamsDBTable mainFormParams;
public SettingsDBTable settings;
public LastProjectsDBTable lastProjects;
@@ -77,7 +77,6 @@ public class GlobalDatabase extends VisualiserDatabase {
addTable(runConfigurations = new RunConfigurationsDBTable());
addTable(environmentValues = new EnvironmentValuesDBTable());
addTable(credentials = new CredentialsDBTable());
addTable(forms = new FormsDBTable());
addTable(settings = new SettingsDBTable());
addTable(mainFormParams = new MainFormParamsDBTable());
addTable(lastProjects = new LastProjectsDBTable());

5
src/GlobalData/Tasks/CompilationTask/CompilationTask.java
View File

@@ -1,5 +1,6 @@
package GlobalData.Tasks.CompilationTask;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import GlobalData.GlobalDatabase;
@@ -73,8 +74,8 @@ public class CompilationTask extends Task {
@Override
public boolean isVisible() {
return
Current.CheckID(Current.Machine, machine_id) &&
Current.CheckID(Current.User, user_id) &&
CurrentAnchestor.matchCurrentID(Current.Machine, machine_id) &&
CurrentAnchestor.matchCurrentID(Current.User, user_id) &&
Current.HasProject() &&
belongsToProject(Current.getProject());
}

7
src/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -1,5 +1,6 @@
package GlobalData.Tasks.RunTask;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import GlobalData.GlobalDatabase;
@@ -52,9 +53,9 @@ public class RunTask extends Task {
@Override
public boolean isVisible() {
return
Current.CheckID(Current.Machine, machine_id) &&
Current.CheckID(Current.User, user_id) &&
Current.CheckID(Current.RunConfiguration, run_configuration_id) &&
CurrentAnchestor.matchCurrentID(Current.Machine, machine_id) &&
CurrentAnchestor.matchCurrentID(Current.User, user_id) &&
CurrentAnchestor.matchCurrentID(Current.RunConfiguration, run_configuration_id) &&
Current.HasProject() &&
belongsToProject(Current.getProject()) &&
Current.HasCompilationTask() &&