no message

This commit is contained in:
2024-10-09 23:37:58 +03:00
parent eb278676cc
commit d1ffab1e70
299 changed files with 1844 additions and 1539 deletions

View File

@@ -14,8 +14,8 @@ import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
import _VisualDVM.Visual.Menus.MainEditorMenu;
import _VisualDVM.ProjectData.SapforData.Loops.Loop;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import _VisualDVM.Visual.Interface.SPFEditorInterface;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
@@ -69,7 +69,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
//текст изменился, значит M ка более не актуальна.
file.father.dropLastModification();
}
Pass_2021.passes.get(PassCode_2021.Save).Reset();
Pass.passes.get(PassCode.Save).Reset();
}
}
});
@@ -185,13 +185,13 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
}
@Override
protected void saveFont() {
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(
Pass.passes.get(PassCode.UpdateSetting).Do(
SettingName.EditorFontSize,
getFont().getSize());
}
@Override
protected void saveText() {
Pass_2021.passes.get(PassCode_2021.Save).Do();
Pass.passes.get(PassCode.Save).Do();
}
@Override
protected StyledPopupMenu createMenu() {

View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
@@ -23,7 +23,7 @@ public class FileGraphTree extends DataTree {
@Override
public void ShowCurrentObject() throws Exception {
Current.getFile().form.EventsOff();
Object o = CurrentAnchestor.get(getCurrent());
Object o = Current_.get(getCurrent());
Current.getFile().form.getEditor().gotoLine((o instanceof FileObjectWithMessages) ? (((FileObjectWithMessages) o).line) : 1);
Current.getFile().form.ShowMessages();
Current.getFile().form.EventsOn();

View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Visual.DragDrop.FileDrop;
@@ -9,8 +9,8 @@ import _VisualDVM.Visual.UI;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
@@ -25,18 +25,18 @@ public class FilesTree extends StyledTree {
public void keyPressed(KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_DELETE:
forkFD(PassCode_2021.DeleteFile, PassCode_2021.DeleteDirectory);
forkFD(PassCode.DeleteFile, PassCode.DeleteDirectory);
break;
case KeyEvent.VK_ADD: //num lock +
case KeyEvent.VK_EQUALS: //+
Pass_2021.passes.get(PassCode_2021.IncludeFile).Do();
Pass.passes.get(PassCode.IncludeFile).Do();
break;
case KeyEvent.VK_SUBTRACT: //num lock -
case KeyEvent.VK_MINUS: //-
Pass_2021.passes.get(PassCode_2021.ExcludeFile).Do();
Pass.passes.get(PassCode.ExcludeFile).Do();
break;
case KeyEvent.VK_F2:
forkFD(PassCode_2021.RenameFile, PassCode_2021.RenameDirectory);
forkFD(PassCode.RenameFile, PassCode.RenameDirectory);
break;
case KeyEvent.VK_ENTER:
LeftMouseAction2();
@@ -46,14 +46,14 @@ public class FilesTree extends StyledTree {
}
);
new FileDrop(System.out, this, files -> {
Pass_2021.passes.get(PassCode_2021.ImportFiles).Do(files);
Pass.passes.get(PassCode.ImportFiles).Do(files);
});
CurrentAnchestor.set(Current.File, null);
Current_.set(Current.File, null);
}
private static void forkFD(PassCode_2021 file_pass, PassCode_2021 folder_pass) {
private static void forkFD(PassCode file_pass, PassCode folder_pass) {
DefaultMutableTreeNode node = Current.getProjectNode();
if (node != null)
Pass_2021.passes.get((node.getUserObject() instanceof DBProjectFile) ?
Pass.passes.get((node.getUserObject() instanceof DBProjectFile) ?
file_pass : folder_pass).Do();
}
@Override
@@ -67,16 +67,16 @@ public class FilesTree extends StyledTree {
@Override
public void SelectionAction(TreePath e) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent();
CurrentAnchestor.set(Current.ProjectNode, node);
Current_.set(Current.ProjectNode, node);
Object o = node.getUserObject();
if (o instanceof File) {
CurrentAnchestor.set(Current.SelectedDirectory, o);
CurrentAnchestor.set(Current.SelectedFile, null);
Current_.set(Current.SelectedDirectory, o);
Current_.set(Current.SelectedFile, null);
UI.getMainWindow().getProjectWindow().ShowNoSelectedFile();
} else if (o instanceof DBProjectFile) {
CurrentAnchestor.set(Current.SelectedFile, o);
Current_.set(Current.SelectedFile, o);
File file = ((DBProjectFile) o).file;
CurrentAnchestor.set(Current.SelectedDirectory, file.getParentFile());
Current_.set(Current.SelectedDirectory, file.getParentFile());
UI.getMainWindow().getProjectWindow().ShowSelectedFile();
}
UI.getMainWindow().getProjectWindow().ShowSelectedDirectory();
@@ -89,7 +89,7 @@ public class FilesTree extends StyledTree {
//очень важно. иначе по открытии файла дерево остается в фокусе.
//и не происходит прокрутки скролла к строке!!
UI.getMainWindow().getProjectWindow().FocusFileTabs();
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(o);
Pass.passes.get(PassCode.OpenCurrentFile).Do(o);
}
}
}