no message

This commit is contained in:
2024-10-17 20:31:06 +03:00
parent 3b5bffe998
commit 7b56eae371
13 changed files with 24 additions and 38 deletions

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$/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java" 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" />

View File

@@ -1,13 +0,0 @@
package Common.Visual;
import Common.Current_;
public interface DataControl_OLD {
//todo скорее всего устареет.
default Current_ getCurrent() {
return null;
}
//-?
default void ShowCurrentObject() throws Exception {
}
default void ShowNoCurrentObject() throws Exception {
}
}

View File

@@ -1,22 +1,23 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.Current_;
import Common.MainModule_; import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.DataControl_OLD;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
public class DataTree extends StyledTree implements DataControl_OLD { public class DataTree extends StyledTree{
public DataTree(DefaultMutableTreeNode root_in) { public DataTree(DefaultMutableTreeNode root_in) {
super(root_in); super(root_in);
} }
public void ChangeCurrentObject(DefaultMutableTreeNode node) { public void ChangeCurrentObject(DefaultMutableTreeNode node) {
if (getCurrent() != null) if (currentName() != null)
MainModule_.instance.set(getCurrent(), node.getUserObject()); MainModule_.instance.set(currentName(), node.getUserObject());
}
public Current_ currentName() {
return null;
} }
@Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
} }
@Override
public void ShowNoCurrentObject() throws Exception { public void ShowNoCurrentObject() throws Exception {
} }
@Override @Override

View File

@@ -9,7 +9,7 @@ public class SelectableTree extends DataTree {
} }
@Override @Override
public void LeftMouseAction1() { public void LeftMouseAction1() {
Object element = MainModule_.instance.get(getCurrent()); Object element = MainModule_.instance.get(currentName());
if ((element instanceof Selectable)) { if ((element instanceof Selectable)) {
((Selectable) element).SwitchSelection(); ((Selectable) element).SwitchSelection();
updateUI(); updateUI();

View File

@@ -11,7 +11,7 @@ public class RemoteFilesTree extends DataTree {
return RendererTreeRemoteFile.class; return RendererTreeRemoteFile.class;
} }
@Override @Override
public Current getCurrent() { public Current currentName() {
return Current.RemoteFile; return Current.RemoteFile;
} }
@Override @Override

View File

@@ -72,7 +72,7 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
}); });
} }
@Override @Override
public Current getCurrent() { public Current currentName() {
return Current.ComponentServerBackup; return Current.ComponentServerBackup;
} }
}; };

View File

@@ -17,13 +17,13 @@ public class FileGraphTree extends DataTree {
return GraphTreeCellRenderer.class; return GraphTreeCellRenderer.class;
} }
@Override @Override
public Current getCurrent() { public Current currentName() {
return Current.FileGraphElement; return Current.FileGraphElement;
} }
@Override @Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
Global.mainModule.getFile().form.EventsOff(); Global.mainModule.getFile().form.EventsOff();
Object o = Global.mainModule.get(getCurrent()); Object o = Global.mainModule.get(currentName());
Global.mainModule.getFile().form.getEditor().gotoLine((o instanceof FileObjectWithMessages) ? (((FileObjectWithMessages) o).line) : 1); Global.mainModule.getFile().form.getEditor().gotoLine((o instanceof FileObjectWithMessages) ? (((FileObjectWithMessages) o).line) : 1);
Global.mainModule.getFile().form.ShowMessages(); Global.mainModule.getFile().form.ShowMessages();
Global.mainModule.getFile().form.EventsOn(); Global.mainModule.getFile().form.EventsOn();

View File

@@ -34,7 +34,7 @@ public class VersionsTree extends DataTree {
return RendererProjectVersion.class; return RendererProjectVersion.class;
} }
@Override @Override
public Current getCurrent() { public Current currentName() {
return Current.Version; return Current.Version;
} }
public void SelectCurrentProject() { public void SelectCurrentProject() {
@@ -48,7 +48,7 @@ public class VersionsTree extends DataTree {
public void LeftMouseAction1() { public void LeftMouseAction1() {
if (Global.versions_multiselection) { if (Global.versions_multiselection) {
// только если есть режим выбора версий. // только если есть режим выбора версий.
Object element = Global.mainModule.get(getCurrent()); Object element = Global.mainModule.get(currentName());
if ((element instanceof Selectable)) { if ((element instanceof Selectable)) {
((Selectable) element).SwitchSelection(); ((Selectable) element).SwitchSelection();
updateUI(); updateUI();

View File

@@ -14,12 +14,12 @@ public class InlineTree extends SelectableTree {
return SelectionTreeCellRenderer.class; return SelectionTreeCellRenderer.class;
} }
@Override @Override
public Current getCurrent() { public Current currentName() {
return Current.InlineGraphElement; return Current.InlineGraphElement;
} }
@Override @Override
public void ShowCurrentObject() { public void ShowCurrentObject() {
Object o = Global.mainModule.get(getCurrent()); Object o = Global.mainModule.get(currentName());
if (o instanceof FileObject) { if (o instanceof FileObject) {
((FileObject) o).Show(false); ((FileObject) o).Show(false);
} }

View File

@@ -14,7 +14,7 @@ public class InlineTree2 extends SelectableTree {
return SelectionTreeCellRenderer.class; return SelectionTreeCellRenderer.class;
} }
@Override @Override
public Current getCurrent() { public Current currentName() {
return Current.InlineGraphElement2; return Current.InlineGraphElement2;
} }
@Override @Override
@@ -23,7 +23,7 @@ public class InlineTree2 extends SelectableTree {
} }
@Override @Override
public void ShowCurrentObject() { public void ShowCurrentObject() {
Object o = Global.mainModule.get(getCurrent()); Object o = Global.mainModule.get(currentName());
if (o instanceof FileObject) { if (o instanceof FileObject) {
((FileObject) o).Show(false); ((FileObject) o).Show(false);
} }

View File

@@ -9,7 +9,7 @@ public class IncludesTree extends SelectableTree {
super(Global.mainModule.getProject().includes_root); super(Global.mainModule.getProject().includes_root);
} }
@Override @Override
public Current getCurrent() { public Current currentName() {
return Current.IncludeGraphElement; return Current.IncludeGraphElement;
} }
@Override @Override

View File

@@ -26,7 +26,7 @@ public class SapforTasksPackageTree extends DataTree {
return RendererTreeSapforVersions.class; return RendererTreeSapforVersions.class;
} }
@Override @Override
public Current getCurrent() { public Current currentName() {
return current; return current;
} }
public void selectSamePath_r(TreePath example, int index, DefaultMutableTreeNode node, Vector<DefaultMutableTreeNode> res) { public void selectSamePath_r(TreePath example, int index, DefaultMutableTreeNode node, Vector<DefaultMutableTreeNode> res) {

View File

@@ -43,7 +43,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
m_select_for_current.addActionListener(new AbstractAction() { m_select_for_current.addActionListener(new AbstractAction() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Object o = Global.mainModule.get(tree.getCurrent()); Object o = Global.mainModule.get(tree.currentName());
if (o instanceof Selectable) { if (o instanceof Selectable) {
((Selectable) o).SelectAllChildren(true); ((Selectable) o).SelectAllChildren(true);
} }
@@ -56,7 +56,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
m_unselect_for_current.addActionListener(new AbstractAction() { m_unselect_for_current.addActionListener(new AbstractAction() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Object o = Global.mainModule.get(tree.getCurrent()); Object o = Global.mainModule.get(tree.currentName());
if (o instanceof Selectable) { if (o instanceof Selectable) {
((Selectable) o).SelectAllChildren(false); ((Selectable) o).SelectAllChildren(false);
} }
@@ -70,7 +70,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
public abstract void SelectAll(boolean select); public abstract void SelectAll(boolean select);
@Override @Override
public void CheckElementsVisibility() { public void CheckElementsVisibility() {
Object current = Global.mainModule.get(tree.getCurrent()); Object current = Global.mainModule.get(tree.currentName());
if ((current != null) && (current.getClass().equals(getTargetClass()))) { if ((current != null) && (current.getClass().equals(getTargetClass()))) {
String name = ((Selectable) current).getSelectionText(); String name = ((Selectable) current).getSelectionText();
m_select_for_current.setText("Выбрать всё для " + m_select_for_current.setText("Выбрать всё для " +