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-16 00:13:09 +03:00
parent 5c432c0ea4
commit b79474fdd1
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -6,9 +6,7 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

2
properties
View File

@@ -33,7 +33,7 @@
"InstructionPath": "", "InstructionPath": "",
"PerformanceAnalyzerPath": "", "PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10, "ComponentsBackUpsCount": 10,
"AutoCheckTesting": false, "AutoCheckTesting": true,
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": true, "EmailOnTestingProgress": true,
"eraseTestingWorkspaces": true "eraseTestingWorkspaces": true

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

@@ -11,7 +11,6 @@ import Common.Visual.Tables.ColumnFilter;
import Common.Visual.UI; import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -261,19 +260,19 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return null; return null;
} }
public boolean CheckCurrent(TextLog log) { public boolean CheckCurrent(TextLog log) {
return Global.mainModule.Check(log, CurrentName()); return MainModule_.instance.Check(log, CurrentName());
} }
public boolean hasCurrent() { public boolean hasCurrent() {
return Global.mainModule.get(CurrentName()) != null; return MainModule_.instance.get(CurrentName()) != null;
} }
public void dropCurrent() { public void dropCurrent() {
Global.mainModule.set(CurrentName(), null); MainModule_.instance.set(CurrentName(), null);
} }
public D getCurrent() { public D getCurrent() {
return (D) Global.mainModule.get(CurrentName()); return (D) MainModule_.instance.get(CurrentName());
} }
public void setCurrent(D o) { public void setCurrent(D o) {
Global.mainModule.set(CurrentName(), o); MainModule_.instance.set(CurrentName(), o);
} }
public Vector<D> getCheckedOrCurrent() { public Vector<D> getCheckedOrCurrent() {
Vector<D> res = new Vector<>(); Vector<D> res = new Vector<>();