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-25 00:43:03 +03:00
parent aa490e4181
commit 9482abefcc
12 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -8,7 +8,13 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" 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/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

9
src/Common/Database/Database.java
View File

@@ -5,6 +5,7 @@ import Common.Database.Objects.iDBObject;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import java.io.File;
@@ -284,5 +285,13 @@ public abstract class Database {
}
}
//---
public boolean Check(TextLog log, Class... tablesClasses) {
for (Class tableClass : tablesClasses) {
DBTable table = getTable(tableClass);
if (table.getUI() != null)
table.getUI().Check(log);
}
return log.isEmpty();
}
public abstract PassCode_ getSynchronizePassCode(); //если бд есть на сервере.
}

11
src/Common/Database/SQLITE/SQLiteDatabase.java
View File

@@ -256,14 +256,5 @@ public abstract class SQLiteDatabase extends Database {
}
//--
//https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
//получение "текущих" объектов. скорее временная мера.
public boolean Check(TextLog log, Class... tablesClasses) {
for (Class tableClass : tablesClasses) {
getTable(tableClass).getUI().Check(log);
}
return log.isEmpty();
}
public boolean matchCurrentID(Class tableClass, int id_in) {
return getTable(tableClass).getUI().matchCurrentID(id_in);
}
}

4
src/Common/Database/Tables/DataSet.java
View File

@@ -64,10 +64,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
ui.Show(key);
}
}
public void RefreshUI(){
if ((ui != null) && ui.isShown())
ui.RedrawControl();
}
//СОДЕРЖИМОЕ
public D getFirstRecord() {
return Data.values().stream().findFirst().orElse(null);

5
src/Common/MainModule_.java
View File

@@ -87,11 +87,6 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
Log.Writeln_(name.getDescription() + " не выбран(а)");
return Log.isEmpty();
}
/*
public boolean matchCurrentID(Current_ name, int id) {
return (get(name) != null) && (((iDBObject) get(name)).id == id);
}
*/
//ПРОХОДЫ
public abstract Class getPassCodesEnum();
public abstract String getAllPassesClassPrefix();

3
src/Common/Passes/EditObjectPass.java
View File

@@ -24,7 +24,8 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
protected void showFinish() throws Exception {
getTable().ShowUI(target.getPK());
for (Class dep : getTable().getFKDependencies().keySet()) {
getDb().getTable(dep).RefreshUI();
if (getDb().getTable(dep).getUI()!=null)
getDb().getTable(dep).getUI().RedrawControl();
}
}
}

3
src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java
View File

@@ -8,6 +8,7 @@ import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Passes.All.Run;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -50,7 +51,7 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
@Override
public boolean isObjectVisible(EnvironmentValue object) {
return super.isObjectVisible(object) &&
MainModule_.instance.getDb().matchCurrentID(RunConfiguration.class,object.run_configuration_id );
MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().matchCurrentID(object.run_configuration_id );
}
@Override
protected DBObjectDialog<EnvironmentValue, ? extends DialogFields> getDialog() {

5
src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java
View File

@@ -63,8 +63,9 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
@Override
public boolean isObjectVisible(CompilationTask object) {
return super.isObjectVisible(object) &&
MainModule_.instance.getDb().matchCurrentID(Machine.class, object.machine_id) &&
MainModule_.instance.getDb().matchCurrentID(User.class, object.user_id) &&
MainModule_.instance.getDb().getTable(Machine.class).getUI().matchCurrentID(object.machine_id) &&
MainModule_.instance.getDb().getTable(User.class).getUI().matchCurrentID(object.user_id) &&
Global.mainModule.HasProject() &&
object.belongsToProject(Global.mainModule.getProject());
}

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

@@ -60,7 +60,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
}
@Override
protected void showFinish() throws Exception {
server.db.bugReports.RefreshUI();
server.db.bugReports.getUI().RedrawControl();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override

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

@@ -68,7 +68,7 @@ public class PublishBugReport extends Pass<BugReport> {
}
@Override
protected void showDone() throws Exception {
Global.componentsServer.db.bugReports.RefreshUI();
Global.componentsServer.db.bugReports.getUI().RedrawControl();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
}

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

@@ -60,7 +60,7 @@ public class ShowCompilerVersion extends Pass<String> {
@Override
protected void showDone() throws Exception {
if (needsShow) {
(Global.mainModule.getDb()).compilers.RefreshUI();
(Global.mainModule.getDb()).compilers.getUI().RedrawControl();
ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm();
ff.ShowDialog("Версия", target);
}

4
src/_VisualDVM/Passes/All/UpdateBugReportField.java
View File

@@ -50,7 +50,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
BugReport.class.getField(fieldNames.get(i)).set(target, fieldValues.get(i));
target.change_date = new Date().getTime();
server.db.Update(target);
server.db.bugReports.RefreshUI();
server.db.bugReports.getUI().RedrawControl();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
} else
return canUpdate();
@@ -82,7 +82,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
}
@Override
protected void showFinish() throws Exception {
Global.componentsServer.db.bugReports.RefreshUI();
Global.componentsServer.db.bugReports.getUI().RedrawControl();
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
@Override