no message
This commit is contained in:
1
.idea/workspace.xml
generated
1
.idea/workspace.xml
generated
@@ -11,7 +11,6 @@
|
|||||||
<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/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/FastAccessMenuBar.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
|
|||||||
@@ -131,5 +131,16 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
//---
|
//---
|
||||||
public int getFirstAccessPassesCount(){return 0;}
|
public int getFirstAccessPassesCount() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
public boolean confirmPassesStart() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
public boolean confirmPassesDone(){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
public boolean focusPassesResult(){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ import Common.Visual.Controls.PassControl;
|
|||||||
import Common.Visual.Controls.StablePassMenuItem;
|
import Common.Visual.Controls.StablePassMenuItem;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
import Common.Visual.Windows.PassForm;
|
import Common.Visual.Windows.PassForm;
|
||||||
import _VisualDVM.Global;
|
|
||||||
import _VisualDVM.GlobalData.Settings.SettingName;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
@@ -202,22 +200,23 @@ public class Pass<T> {
|
|||||||
next.createStack_r(ToDo, ToPrint);
|
next.createStack_r(ToDo, ToPrint);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//todo обращение к пропертиес как то пофиксить
|
|
||||||
public boolean Do(Object... args) {
|
public boolean Do(Object... args) {
|
||||||
Stack<Pass> ToDo = new Stack<>();
|
Stack<Pass> ToDo = new Stack<>();
|
||||||
Vector<String> ToPrint = new Vector<>();
|
Vector<String> ToPrint = new Vector<>();
|
||||||
createStack_r(ToDo, ToPrint);
|
createStack_r(ToDo, ToPrint);
|
||||||
if (Global.properties.ConfirmPassesStart && !ToPrint.isEmpty() &&
|
|
||||||
|
if (
|
||||||
|
MainModule_.instance.confirmPassesStart() && !ToPrint.isEmpty() &&
|
||||||
!UI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
|
!UI.Question("Выполнить проход(ы):\n" + String.join("\n", ToPrint))
|
||||||
) return false;
|
) return false;
|
||||||
while (ToDo.size() > 1) {
|
while (ToDo.size() > 1) {
|
||||||
if (!ToDo.pop().start()) return false;
|
if (!ToDo.pop().start()) return false;
|
||||||
}
|
}
|
||||||
if (start(args)) {
|
if (start(args)) {
|
||||||
if (Global.properties.FocusPassesResult)
|
if (MainModule_.instance.focusPassesResult())
|
||||||
FocusResult();
|
FocusResult();
|
||||||
//-
|
//-
|
||||||
if (Global.properties.ShowPassesDone && !ToPrint.isEmpty()
|
if (MainModule_.instance.confirmPassesDone() && !ToPrint.isEmpty()
|
||||||
) {
|
) {
|
||||||
UI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
|
UI.Info("Проход(ы)\n\n" + String.join("\n", ToPrint) +
|
||||||
"\nуспешно выполнен(ы)!");
|
"\nуспешно выполнен(ы)!");
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package Common.Visual.Menus;
|
|||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
import Common.Passes.Pass;
|
import Common.Passes.Pass;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
import _VisualDVM.Global;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package _VisualDVM;
|
package _VisualDVM;
|
||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
import Common.Passes.Pass;
|
|
||||||
import Common.Utils.Vector_;
|
import Common.Utils.Vector_;
|
||||||
import _VisualDVM.GlobalData.Account.Account;
|
import _VisualDVM.GlobalData.Account.Account;
|
||||||
import _VisualDVM.GlobalData.Compiler.Compiler;
|
import _VisualDVM.GlobalData.Compiler.Compiler;
|
||||||
@@ -335,4 +334,16 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
|
|||||||
public int getFirstAccessPassesCount() {
|
public int getFirstAccessPassesCount() {
|
||||||
return getDb().settings.get(SettingName.FastAccessPassesCount).toInt32();
|
return getDb().settings.get(SettingName.FastAccessPassesCount).toInt32();
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
public boolean confirmPassesStart() {
|
||||||
|
return hasUI()&&Global.properties.ConfirmPassesStart;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean confirmPassesDone() {
|
||||||
|
return hasUI()&&Global.properties.ShowPassesDone;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean focusPassesResult() {
|
||||||
|
return hasUI()&&Global.properties.FocusPassesResult;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import Common.Visual.Windows.Dialog.*;
|
|||||||
import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
|
import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Settings.DBSetting;
|
import _VisualDVM.GlobalData.Settings.DBSetting;
|
||||||
import _VisualDVM.GlobalData.Settings.SettingName;
|
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Utils;
|
import _VisualDVM.Utils;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user