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-14 15:19:13 +03:00
parent 8eef367bd4
commit 5e09fb44ea
634 changed files with 3751 additions and 3263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/_VisualDVM/Visual/Windows/AnalysisForm.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Interface.AnalysisWindow;

9
src/_VisualDVM/Visual/Windows/ArraysForm.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Current;
import Common.Visual.TextField.StyledTextField;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
@@ -9,10 +8,10 @@ import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
public class ArraysForm implements ArraysWindow {
public JSplitPane SC8;
private JPanel content;
private JPanel arraysPanel;
private JPanel savedArraysPanel;
public JSplitPane SC8;
private JTextField filterName;
private JLabel arraysMatchesLabel;
private JTextField filterLocationName;
@@ -20,7 +19,7 @@ public class ArraysForm implements ArraysWindow {
private JTextField filterFile;
private JTextField filterRegion;
private JPanel savedArraysBackground;
public ArraysForm(){
public ArraysForm() {
LoadSplitters();
Global.mainModule.getProject().declaratedArrays.mountUI(arraysPanel);
Global.mainModule.getProject().db.savedArrays.mountUI(savedArraysPanel);
@@ -108,8 +107,8 @@ public class ArraysForm implements ArraysWindow {
@Override
public void changedUpdate(DocumentEvent e) {
}
}); }
});
}
@Override
public JPanel getContent() {
return content;

66
src/_VisualDVM/Visual/Windows/CallbackForm.java
View File

@@ -1,21 +1,21 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Editor.Viewer;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.TextField.StyledTextField;
import _VisualDVM.Visual.UI;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Editor.Viewer;
import _VisualDVM.Visual.Interface.CallbackWindow;
import _VisualDVM.Visual.Interface.CommentInterface;
import _VisualDVM.Visual.Interface.DescriptionInterface;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
@@ -30,10 +30,11 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
private final JScrollPane bugReportDescriptionAdditionScroll;
private final BaseEditor BugReportDescription;
private final BaseEditor BugReportDescriptionAddition;
private JPanel content;
public JSplitPane SC10;
public DescriptionInterface descriptionInterface;
public CommentInterface commentInterface;
public JSplitPane SC6;
public JSplitPane SC67;
DocumentListener descriptionAdditionListener = new DocumentListener() {
@Override
public void removeUpdate(DocumentEvent e) {
@@ -89,6 +90,12 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
Global.mainModule.getBugReport().comment = BugReportComment.getText();
}
};
//-------------------------------------------
DescriptionTabs descriptionTabs = new DescriptionTabs();
DescriptionFields descriptionFields = new DescriptionFields();
CommentTabs commentTabs = new CommentTabs();
CommentFields commentFields = new CommentFields();
private JPanel content;
//-
private JToolBar accountTools;
private JLabel lAccountName;
@@ -111,29 +118,15 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
private JPanel descriptionPanel;
private JPanel commentPanel;
private JSplitPane SCX;
public JSplitPane SC6;
private JTextField BugReportsKeyFilter;
private JTextField BugReportsSenderNameFilter;
private JTextField BugReportsDescriptionFilter;
private JTextField BugReportsVersionFilter;
private JTextField BugReportsExecutorFilter;
private JTextField BugReportsCommentFilter;
public JSplitPane SC67;
private JPanel workspacesPanel;
private JLabel adminLabel;
private Viewer BugReportSettings;
public void LockMyOnly() {
if (!BugReportsMyOnlyFilter.isSelected()) {
BugReportsMyOnlyFilter.doClick();
}
BugReportsMyOnlyFilter.setEnabled(false);
}
public void UnlockMyOnly() {
BugReportsMyOnlyFilter.setEnabled(true);
if (BugReportsMyOnlyFilter.isSelected()) {
BugReportsMyOnlyFilter.doClick();
}
}
public CallbackForm() {
LoadSplitters();
//---------------------------------
@@ -277,11 +270,18 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
accountTools.add(Global.mainModule.getPass(PassCode.ShutdownComponentsServer).createButton());
accountTools.add(Global.mainModule.getPass(PassCode.PublishComponentsServer).createButton());
}
//-------------------------------------------
DescriptionTabs descriptionTabs = new DescriptionTabs();
DescriptionFields descriptionFields = new DescriptionFields();
CommentTabs commentTabs = new CommentTabs();
CommentFields commentFields = new CommentFields();
public void LockMyOnly() {
if (!BugReportsMyOnlyFilter.isSelected()) {
BugReportsMyOnlyFilter.doClick();
}
BugReportsMyOnlyFilter.setEnabled(false);
}
public void UnlockMyOnly() {
BugReportsMyOnlyFilter.setEnabled(true);
if (BugReportsMyOnlyFilter.isSelected()) {
BugReportsMyOnlyFilter.doClick();
}
}
@Override
public void SwitchScreen(boolean small) {
UI_.Clear(descriptionPanel);
@@ -396,15 +396,15 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
lAccountRole.setText(Utils_.Brackets(Global.mainModule.getAccount().role.getDescription()));
switch (Global.mainModule.getAccount().role) {
case Undefined:
/// UI.Clear(accountPanel);
// accountPanel.add(new CallbackWelcomeForm().content);
// UI.getMainWindow().SwitchTestingTabs(false);
// break;
/// UI.Clear(accountPanel);
// accountPanel.add(new CallbackWelcomeForm().content);
// UI.getMainWindow().SwitchTestingTabs(false);
// break;
case User:
//видит только свои баги.
// EnableBugreports();
// setUserRights();
// break;
// EnableBugreports();
// setUserRights();
// break;
case Developer:
EnableBugreports();
setDeveloperRights();

1
src/_VisualDVM/Visual/Windows/CombineFilesDialog.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.Global;
import _VisualDVM.Utils;

6
src/_VisualDVM/Visual/Windows/CommentFields.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Interface.CommentInterface;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
@@ -14,8 +14,8 @@ public class CommentFields implements CommentInterface {
private JPanel additionPanel;
public CommentFields() {
LoadSplitters();
commentTools.add( Global.mainModule.getPass(PassCode.SaveBugReportComment).createButton());
commentAdditionTools.add( Global.mainModule.getPass(PassCode.AppendBugReportComment).createButton());
commentTools.add(Global.mainModule.getPass(PassCode.SaveBugReportComment).createButton());
commentAdditionTools.add(Global.mainModule.getPass(PassCode.AppendBugReportComment).createButton());
}
@Override
public void setEditorScroll(JScrollPane scroll_in) {

1
src/_VisualDVM/Visual/Windows/CommentTabs.java
View File

@@ -9,7 +9,6 @@ public class CommentTabs implements CommentInterface {
private JPanel editorPanel;
private JPanel additionPanel;
public CommentTabs() {
tabs.setTabComponentAt(0, new TabToolBar("Комментарий", PassCode.SaveBugReportComment) {
@Override
public void leftMouseAction() {

197
src/_VisualDVM/Visual/Windows/ComparisonForm.java
View File

@@ -1,18 +1,17 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.Current_;
import Common.Database.Objects.DBObject;
import Common.Passes.Pass;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Visual.Controls.ShortLabel;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Controls.ShortLabel;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import Common.Utils.TextLog;
import _VisualDVM.Utils;
import Common.Passes.Pass;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
import org.fife.ui.rtextarea.RTextScrollPane;
@@ -23,37 +22,106 @@ import java.util.Vector;
public abstract class ComparisonForm<T> {
public Class<T> t; //класс объектов.
//-->>
private JPanel content;
public JPanel getContent() {
return content;
}
protected JToolBar tools;
private JPanel editorPanel;
protected JLabel lObjectName;
protected JButton bApplyObject;
private JButton bPrevious;
private JButton bNext;
private JButton bCompare;
protected JButton bClose;
//-->>
ComparisonForm<T> this_ = null; //?
ComparisonForm<T> slave = null;
ComparisonForm<T> master = null;
//-->>
protected T object = null;
//-->>
protected BaseEditor Body;
private RTextScrollPane Scroll;
//-->>
public Vector<String> lines = new Vector<>(); //строки с учетом/неучетом пробелов. для сравнения
public Vector<String> visible_lines = new Vector<>(); //строки с нетронутыми пробелами. для отображения
//подсветка.
public LinkedHashMap<Integer, Pair<Integer, Boolean>> colors = new LinkedHashMap<>();
public RSyntaxTextAreaHighlighter slave_highlighter = null; //погонщик рабов
protected JToolBar tools;
protected JLabel lObjectName;
protected JButton bApplyObject;
protected JButton bClose;
//-->>
protected T object = null;
//-->>
protected BaseEditor Body;
//-->>
ComparisonForm<T> this_ = null; //?
ComparisonForm<T> slave = null;
ComparisonForm<T> master = null;
//-->>
private JPanel content;
private JPanel editorPanel;
private JButton bPrevious;
private JButton bNext;
private JButton bCompare;
private RTextScrollPane Scroll;
//-----
private boolean events_on = false;//относится только к мастеру, отвечает за скроллы.
private int current_diff_line = -1;
//--->>
// protected Object ownScrollModel = null;
//---<<
public ComparisonForm(Class<T> t_in, ComparisonForm<T> slave_in) {
//-
Body = new BaseEditor();
Scroll = new RTextScrollPane(Body);
editorPanel.add(Scroll);
// ownScrollModel = Scroll.getVerticalScrollBar().getModel();
//-
t = t_in;
this_ = this;
slave = slave_in;
bPrevious.setVisible(isMaster());
bNext.setVisible(isMaster());
Scroll.setLineNumbersEnabled(true);
bApplyObject.addActionListener(e -> {
ApplyObject();
});
//--->>>
Body.setWhitespaceVisible(true);
Body.setEditable(false);
if (isMaster()) {
//<editor-fold desc="синхронизация скроллов">
slave.Scroll.getVerticalScrollBar().setModel(Scroll.getVerticalScrollBar().getModel());
slave_highlighter = (RSyntaxTextAreaHighlighter) slave.Body.getHighlighter();
//бяк быть не должно при условии что строк одинаковое количество. а это должно выполняться.
Body.addCaretListener(e -> {
if (events_on && isReady() && slave.isReady()) {
try {
int master_lineNum = Body.getCaretLineNumber();
slave.Body.setCaretPosition(slave.Body.getLineStartOffset(master_lineNum));
} catch (Exception ex) {
Utils_.MainLog.PrintException(ex);
}
}
});
//</editor-fold>
slave.master = this;
bPrevious.addActionListener(e -> {
if (current_diff_line != CommonConstants.Nan) {
if (current_diff_line > 0)
current_diff_line--;
else
current_diff_line = colors.size() - 1;
ShowCurrentDiff();
}
});
bNext.addActionListener(e -> {
if (current_diff_line != CommonConstants.Nan) {
if (current_diff_line < colors.size() - 1)
current_diff_line++;
else
current_diff_line = 0;
ShowCurrentDiff();
}
});
bCompare.addActionListener(e -> {
DoComparePass(isReady() && slave.isReady());
});
} else {
//рабу сравнивать не положено.
bCompare.setVisible(false);
}
//--->>>
bClose.addActionListener(e -> {
onClose();
});
}
public JPanel getContent() {
return content;
}
//--->>
public boolean isMaster() {
return slave != null;
}
@@ -84,9 +152,9 @@ public abstract class ComparisonForm<T> {
} else
UI_.Info(log.toString());
}
public void ApplyObject(DBObject object_in){
public void ApplyObject(DBObject object_in) {
RemoveObject();
object = (T)object_in;
object = (T) object_in;
applyObject();
showObject();
}
@@ -222,75 +290,6 @@ public abstract class ComparisonForm<T> {
protected boolean fortranWrapsOn() {
return false;
}
//--->>
// protected Object ownScrollModel = null;
//---<<
public ComparisonForm(Class<T> t_in, ComparisonForm<T> slave_in) {
//-
Body = new BaseEditor();
Scroll = new RTextScrollPane(Body);
editorPanel.add(Scroll);
// ownScrollModel = Scroll.getVerticalScrollBar().getModel();
//-
t = t_in;
this_ = this;
slave = slave_in;
bPrevious.setVisible(isMaster());
bNext.setVisible(isMaster());
Scroll.setLineNumbersEnabled(true);
bApplyObject.addActionListener(e -> {
ApplyObject();
});
//--->>>
Body.setWhitespaceVisible(true);
Body.setEditable(false);
if (isMaster()) {
//<editor-fold desc="синхронизация скроллов">
slave.Scroll.getVerticalScrollBar().setModel(Scroll.getVerticalScrollBar().getModel());
slave_highlighter = (RSyntaxTextAreaHighlighter) slave.Body.getHighlighter();
//бяк быть не должно при условии что строк одинаковое количество. а это должно выполняться.
Body.addCaretListener(e -> {
if (events_on && isReady() && slave.isReady()) {
try {
int master_lineNum = Body.getCaretLineNumber();
slave.Body.setCaretPosition(slave.Body.getLineStartOffset(master_lineNum));
} catch (Exception ex) {
Utils_.MainLog.PrintException(ex);
}
}
});
//</editor-fold>
slave.master = this;
bPrevious.addActionListener(e -> {
if (current_diff_line != CommonConstants.Nan) {
if (current_diff_line > 0)
current_diff_line--;
else
current_diff_line = colors.size() - 1;
ShowCurrentDiff();
}
});
bNext.addActionListener(e -> {
if (current_diff_line != CommonConstants.Nan) {
if (current_diff_line < colors.size() - 1)
current_diff_line++;
else
current_diff_line = 0;
ShowCurrentDiff();
}
});
bCompare.addActionListener(e -> {
DoComparePass(isReady() && slave.isReady());
});
} else {
//рабу сравнивать не положено.
bCompare.setVisible(false);
}
//--->>>
bClose.addActionListener(e -> {
onClose();
});
}
//-->>
private void createUIComponents() {
// TODO: place custom component creation code here

1
src/_VisualDVM/Visual/Windows/CopyProjectFields.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Current;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.VDirectoryChooser;

68
src/_VisualDVM/Visual/Windows/DebugForm.java
View File

@@ -1,13 +1,10 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import javax.swing.*;
public class DebugForm implements DebugWindow, FormWithSplitters {
private JPanel content;
public JSplitPane SC51;
public JSplitPane SC40;
public JTabbedPane debugTabs;
@@ -18,13 +15,6 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
public JSplitPane SC43;
public JSplitPane SC21;
public JSplitPane SC35;
private JPanel compilationTasksPanel;
private JPanel makefilesPanel;
private JPanel modulesPanel;
private JPanel runTasksPanel;
private JPanel runConfigurationsPanel;
private JPanel environmentsPanel;
private JPanel dvmParametersPanel;
//--
//-
public RunTasksComparisonForm singleRunTaskMaster; // одиночные запуски
@@ -32,6 +22,35 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
//
public CompilationTasksComparisonForm singleCompilationTaskMaster; // одиночная компиляция
public CompilationTasksComparisonForm singleCompilationTaskSlave;
private JPanel content;
private JPanel compilationTasksPanel;
private JPanel makefilesPanel;
private JPanel modulesPanel;
private JPanel runTasksPanel;
private JPanel runConfigurationsPanel;
private JPanel environmentsPanel;
private JPanel dvmParametersPanel;
public DebugForm() {
LoadSplitters();
//--
Global.mainModule.getDb().makefiles.mountUI(makefilesPanel);
Global.mainModule.getDb().modules.mountUI(modulesPanel);
Global.mainModule.getDb().runConfigurations.mountUI(runConfigurationsPanel);
Global.mainModule.getDb().environmentValues.mountUI(environmentsPanel);
Global.mainModule.getDb().dvmParameters.mountUI(dvmParametersPanel);
//-
Global.mainModule.getDb().compilationTasks.mountUI(compilationTasksPanel);
Global.mainModule.getDb().runTasks.mountUI(runTasksPanel);
//--
singleCompilationTaskMaster = new CompilationTasksComparisonForm(singleCompilationTaskSlave = new CompilationTasksComparisonForm(null));
singleRunTaskMaster = new RunTasksComparisonForm(singleRunTaskSlave = new RunTasksComparisonForm(null));
//--
//-
SC41.setLeftComponent(singleCompilationTaskMaster.getContent());
SC41.setRightComponent(singleCompilationTaskSlave.getContent());
SC43.setLeftComponent(singleRunTaskMaster.getContent());
SC43.setRightComponent(singleRunTaskSlave.getContent());
}
//--
//--
@Override
@@ -58,13 +77,13 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
}
@Override
public void ShowCurrentRunTask() {
// if (singleRunTaskMaster.isActive()) singleRunTaskMaster.ShowTask();
// else singleRunTaskSlave.ShowTask();
// if (singleRunTaskMaster.isActive()) singleRunTaskMaster.ShowTask();
// else singleRunTaskSlave.ShowTask();
}
@Override
public void ShowNoCurrentRunTask() {
// if (singleRunTaskMaster.isActive()) singleRunTaskMaster.Clear();
// else singleRunTaskSlave.Clear();
// if (singleRunTaskMaster.isActive()) singleRunTaskMaster.Clear();
// else singleRunTaskSlave.Clear();
}
//-
@Override
@@ -74,25 +93,4 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
Global.mainModule.getDb().compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
Global.mainModule.getDb().runTasks.ShowUI();
}
public DebugForm(){
LoadSplitters();
//--
Global.mainModule.getDb().makefiles.mountUI(makefilesPanel);
Global.mainModule.getDb().modules.mountUI(modulesPanel);
Global.mainModule.getDb().runConfigurations.mountUI(runConfigurationsPanel);
Global.mainModule.getDb().environmentValues.mountUI(environmentsPanel);
Global.mainModule.getDb().dvmParameters.mountUI(dvmParametersPanel);
//-
Global.mainModule.getDb().compilationTasks.mountUI(compilationTasksPanel);
Global.mainModule.getDb().runTasks.mountUI(runTasksPanel);
//--
singleCompilationTaskMaster = new CompilationTasksComparisonForm(singleCompilationTaskSlave = new CompilationTasksComparisonForm(null));
singleRunTaskMaster = new RunTasksComparisonForm(singleRunTaskSlave = new RunTasksComparisonForm(null));
//--
//-
SC41.setLeftComponent(singleCompilationTaskMaster.getContent());
SC41.setRightComponent(singleCompilationTaskSlave.getContent());
SC43.setLeftComponent(singleRunTaskMaster.getContent());
SC43.setRightComponent(singleRunTaskSlave.getContent());
}
}

2
src/_VisualDVM/Visual/Windows/DescriptionFields.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Interface.DescriptionInterface;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
public class DescriptionFields implements DescriptionInterface {

14
src/_VisualDVM/Visual/Windows/FileForm.java
View File

@@ -1,12 +1,10 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Visual.Editor.Viewer;
import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
import Common.Visual.Trees.TreeForm;
import _VisualDVM.Visual.UI;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.ProjectData.LanguageName;
@@ -16,10 +14,12 @@ import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree;
import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Editor.Viewer;
import _VisualDVM.Visual.Interface.FileWindow;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import _VisualDVM.Visual.Interface.SPFEditorInterface;
import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
import org.fife.ui.rtextarea.RTextScrollPane;
@@ -37,10 +37,10 @@ public class FileForm implements FileWindow, FormWithSplitters {
//-
public JSplitPane SC1;
public JSplitPane SC12;
//-
private JPanel content;
@Description("IGNORE")
protected boolean events_on = true;
//-
private JPanel content;
private JButton bClose;
private JToolBar Tools;
private JPanel editorPanel;

108
src/_VisualDVM/Visual/Windows/FunctionsForm.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.UI_;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphUI;
import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphUI;
import _VisualDVM.Visual.Interface.FunctionsWindow;
import javafx.util.Pair;
@@ -40,48 +40,6 @@ public class FunctionsForm implements FunctionsWindow {
private JButton bSaveCoordinates;
private JToolBar currentFunctionTools;
private FunctionsGraphForm functionsGraphForm;
@Override
public JPanel getContent() {
return content;
}
@Override
public Pair<Integer, Integer> getFunctionsGraphPanelSizes() {
return new Pair<>(functionsGraphPanel.getWidth(), functionsGraphPanel.getHeight());
}
@Override
public FunctionsGraphForm getFunctionsGraphWindow() {
return functionsGraphForm;
}
@Override
public void ShowFunctions() {
functionsGraphForm.Show();
}
@Override
public void ShowNoFunctions() {
functionsGraphForm.Clear();
}
@Override
public void ShowCurrentFunction() {
lCurrentFunction.setText(Global.mainModule.getFunction().funcName);
}
@Override
public void ShowNoCurrentFunction() {
lCurrentFunction.setText("?");
}
public void ShowFunctionGraphSettings() {
ShowStandardFilter.setSelected(SPF_GetGraphFunctionPositions.showStandardFunctions);
ShowExternalFilter.setSelected(SPF_GetGraphFunctionPositions.showExternalFunctions);
ShowUnreachableFilter.setSelected(SPF_GetGraphFunctionPositions.showUnreachableFunctions);
//-
sIterations.setValue(Global.mainModule.getProject().fgIterations);
sResistance.setValue(Global.mainModule.getProject().fgResistance);
sScreen.setValue(Global.mainModule.getProject().fgScreen);
//-
cbShowByCurrentFunction.setSelected(SPF_GetGraphFunctionPositions.showByCurrentFunction);
ShowIn.setSelected(SPF_GetGraphFunctionPositions.showIn);
ShowOut.setSelected(SPF_GetGraphFunctionPositions.showOut);
sDepth.setValue(SPF_GetGraphFunctionPositions.depth);
}
public FunctionsForm() {
LoadSplitters();
bZoomIn.addActionListener(new ActionListener() {
@@ -127,8 +85,8 @@ public class FunctionsForm implements FunctionsWindow {
FunctionsGraphUI.ffTimer.restart();
});
UI_.MakeSpinnerRapid(sDepth, e -> {
SPF_GetGraphFunctionPositions.depth = (int) sDepth.getValue();
FunctionsGraphUI.ffTimer.restart();
SPF_GetGraphFunctionPositions.depth = (int) sDepth.getValue();
FunctionsGraphUI.ffTimer.restart();
});
//----фильтрация функций
//<editor-fold desc="Фильтрация функций">
@@ -172,19 +130,61 @@ public class FunctionsForm implements FunctionsWindow {
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowIn.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showIn = ShowIn.isSelected();
FunctionsGraphUI.ffTimer.stop();
SPF_GetGraphFunctionPositions.showIn = ShowIn.isSelected();
FunctionsGraphUI.ffTimer.stop();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
});
ShowOut.addActionListener(e -> {
SPF_GetGraphFunctionPositions.showOut = ShowOut.isSelected();
FunctionsGraphUI.ffTimer.stop();
SPF_GetGraphFunctionPositions.showOut = ShowOut.isSelected();
FunctionsGraphUI.ffTimer.stop();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
});
//---------------------------------------------------------
filtersBar.add( Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).createButton(), 0);
filtersBar.add( Global.mainModule.getPass(PassCode.ApplyCurrentFunction).createButton(), 6);
filtersBar.setPreferredSize(new Dimension(0,30));
filtersBar.add(Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).createButton(), 0);
filtersBar.add(Global.mainModule.getPass(PassCode.ApplyCurrentFunction).createButton(), 6);
filtersBar.setPreferredSize(new Dimension(0, 30));
}
@Override
public JPanel getContent() {
return content;
}
@Override
public Pair<Integer, Integer> getFunctionsGraphPanelSizes() {
return new Pair<>(functionsGraphPanel.getWidth(), functionsGraphPanel.getHeight());
}
@Override
public FunctionsGraphForm getFunctionsGraphWindow() {
return functionsGraphForm;
}
@Override
public void ShowFunctions() {
functionsGraphForm.Show();
}
@Override
public void ShowNoFunctions() {
functionsGraphForm.Clear();
}
@Override
public void ShowCurrentFunction() {
lCurrentFunction.setText(Global.mainModule.getFunction().funcName);
}
@Override
public void ShowNoCurrentFunction() {
lCurrentFunction.setText("?");
}
public void ShowFunctionGraphSettings() {
ShowStandardFilter.setSelected(SPF_GetGraphFunctionPositions.showStandardFunctions);
ShowExternalFilter.setSelected(SPF_GetGraphFunctionPositions.showExternalFunctions);
ShowUnreachableFilter.setSelected(SPF_GetGraphFunctionPositions.showUnreachableFunctions);
//-
sIterations.setValue(Global.mainModule.getProject().fgIterations);
sResistance.setValue(Global.mainModule.getProject().fgResistance);
sScreen.setValue(Global.mainModule.getProject().fgScreen);
//-
cbShowByCurrentFunction.setSelected(SPF_GetGraphFunctionPositions.showByCurrentFunction);
ShowIn.setSelected(SPF_GetGraphFunctionPositions.showIn);
ShowOut.setSelected(SPF_GetGraphFunctionPositions.showOut);
sDepth.setValue(SPF_GetGraphFunctionPositions.depth);
}
private void createUIComponents() {
// TODO: place custom component creation code here

68
src/_VisualDVM/Visual/Windows/MainForm.java
View File

@@ -1,14 +1,14 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Form;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Interface.*;
import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;
@@ -26,6 +26,15 @@ public class MainForm extends Form implements MainWindow {
private JPanel Content;
private JTabbedPane globalTabs;
private JPanel mainPanel;
public MainForm() {
mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
InstallWelcomePanel();
InstallCallbackPanel();
InstallTestsPanel();
InstallTestingPanel();
ShowUpdatesIcon();
//----------------------
}
@Override
protected JPanel getMainPanel() {
return Content;
@@ -62,15 +71,6 @@ public class MainForm extends Form implements MainWindow {
//--
Global.FinishApplication();
}
public MainForm() {
mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
InstallWelcomePanel();
InstallCallbackPanel();
InstallTestsPanel();
InstallTestingPanel();
ShowUpdatesIcon();
//----------------------
}
private void InstallWelcomePanel() {
globalTabs.insertTab("Начало работы",
null,
@@ -80,7 +80,7 @@ public class MainForm extends Form implements MainWindow {
}
private void InstallProjectPanel() {
globalTabs.insertTab("", null,
(projectForm = new ProjectForm()).content,Global.mainModule.getProject().description, 0);
(projectForm = new ProjectForm()).content, Global.mainModule.getProject().description, 0);
globalTabs.setTabComponentAt(0,
new TabToolBar("Проект: " + Global.mainModule.getProject().name, PassCode.CloseCurrentProject) {
@Override
@@ -127,26 +127,26 @@ public class MainForm extends Form implements MainWindow {
testingForm.getContent(),
"Система тестирования", 3);
}
/*
public void ShowCurrentCompiler() {
String res = "";
if (Current.HasMachine()) {
res += "@" + Current.getMachine().getURL();
if (Current.HasUser()) {
res = Current.getUser().login + res;
} else res = "?" + res;
/*
public void ShowCurrentCompiler() {
String res = "";
if (Current.HasMachine()) {
res += "@" + Current.getMachine().getURL();
if (Current.HasUser()) {
res = Current.getUser().login + res;
} else res = "?" + res;
if (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm)) {
res += "DVM система: " + Current.getCompiler().description;
} else {
res += "DVM система: ?";
}
} else {
res += "?@?";
}
globalTabs.setTitleAt(2, res);
}
*/
if (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm)) {
res += "DVM система: " + Current.getCompiler().description;
} else {
res += "DVM система: ?";
}
} else {
res += "?@?";
}
globalTabs.setTitleAt(2, res);
}
*/
@Override
public void ShowCheckedTestsCount() {
int res = 0;
@@ -218,7 +218,7 @@ public class MainForm extends Form implements MainWindow {
public void SwitchTestingTabs(boolean flag) {
globalTabs.setEnabledAt(2, flag);
globalTabs.setEnabledAt(3, flag);
// globalTabs.setEnabledAt(4, flag);
// globalTabs.setEnabledAt(4, flag);
}
@Override
public TestingWindow getTestingWindow() {

12
src/_VisualDVM/Visual/Windows/ProfilesFields.java
View File

@@ -1,23 +1,21 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import javax.swing.*;
import java.awt.*;
public class ProfilesFields implements DialogFields, FormWithSplitters {
private JPanel content;
public JSplitPane SC61;
private JPanel content;
private JPanel profilesPanel;
private JPanel settingsPanel;
public ProfilesFields() {
(Global.mainModule.getDb()).sapforProfiles.mountUI(profilesPanel);
(Global.mainModule.getDb()).sapforProfilesSettings.mountUI(settingsPanel);
}
@Override
public Component getContent() {
return content;
}
public ProfilesFields(){
(Global.mainModule.getDb()).sapforProfiles.mountUI(profilesPanel);
(Global.mainModule.getDb()).sapforProfilesSettings.mountUI(settingsPanel);
}
}

4
src/_VisualDVM/Visual/Windows/ProfilesForm.java
View File

@@ -1,9 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Dialog;
import Common.Database.Objects.DBForm.DBForm;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.GlobalDatabase;
//todo разобраться с DBform
public class ProfilesForm extends Dialog<Object, ProfilesFields> {
private DBForm info = null;

43
src/_VisualDVM/Visual/Windows/ProjectForm.java
View File

@@ -1,20 +1,21 @@
package _VisualDVM.Visual.Windows;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Visual.Editor.Viewer;
import _VisualDVM.Visual.Menus.ProjectMenuBar.ProjectMenuBar;
import Common.Visual.Trees.TreeForm;
import _VisualDVM.Visual.UI;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.UI.FilesTree;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree;
import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree2;
import _VisualDVM.ProjectData.SapforData.Includes.UI.IncludesTree;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Editor.Viewer;
import _VisualDVM.Visual.Interface.*;
import _VisualDVM.Visual.Menus.ProjectMenuBar.ProjectMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;
@@ -22,10 +23,12 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
private final ArraysWindow arraysForm;
private final FunctionsWindow functionsForm;
private final AnalysisWindow analysisForm;
private final JScrollPane FastAccessScroll;
public JSplitPane SC3;
//</editor-fold>
public JPanel content;
public TreeForm includesForm;
ProjectMenuBar menuBar;
private JTabbedPane projectTabs;
private TreeForm filesForm;
private Viewer projectDescription = null;
@@ -40,24 +43,9 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
private JPanel arraysFormPanel;
private JPanel functionsFormPanel;
private JPanel analysisFormPanel;
private final JScrollPane FastAccessScroll;
private JPanel projectViewPanel;
private JPanel projectTreesBackground;
private JPanel projectBackground;
ProjectMenuBar menuBar;
//-
@Override
public ArraysWindow getArraysWindow() {
return arraysForm;
}
@Override
public FunctionsWindow getFunctionsWindow() {
return functionsForm;
}
@Override
public AnalysisWindow getAnalysisWindow() {
return analysisForm;
}
public ProjectForm() {
LoadSplitters();
//-
@@ -66,7 +54,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
functionsFormPanel.add((functionsForm = new FunctionsForm()).getContent());
analysisFormPanel.add((analysisForm = new AnalysisForm()).getContent());
//-
FastAccessScroll = new JScrollPane(UI.fastAccessMenuBar) {
FastAccessScroll = new JScrollPane(MainModule_.object.fastAccessMenuBar) {
{
getHorizontalScrollBar().setPreferredSize(new Dimension(0, 10));
setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);
@@ -88,6 +76,19 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
CollapseProjectTrees();
//--
}
//-
@Override
public ArraysWindow getArraysWindow() {
return arraysForm;
}
@Override
public FunctionsWindow getFunctionsWindow() {
return functionsForm;
}
@Override
public AnalysisWindow getAnalysisWindow() {
return analysisForm;
}
@Override
public void SaveSplitters() {
FormWithSplitters.super.SaveSplitters();

102
src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
View File

@@ -1,43 +1,71 @@
package _VisualDVM.Visual.Windows;
import Common.Database.Objects.DBObject;
import Common.Passes.Pass;
import Common.Utils.TextLog;
import Common.Visual.Controls.ShortLabel;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import _VisualDVM.Visual.Controls.ShortLabel;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import Common.Utils.TextLog;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class SapforPackagesComparisonForm {
public boolean comparisonMode = false;
//-->>
private JPanel content;
public JPanel getContent() {
return content;
}
public JScrollPane treeScroll = null;
protected JToolBar tools;
protected JLabel lObjectName;
//-->>
protected SapforPackage object = null;
//-->>
protected SapforTasksPackageTree Body;
//-->>
SapforPackagesComparisonForm this_ = null; //?
SapforPackagesComparisonForm slave = null;
SapforPackagesComparisonForm master = null;
//-->>
private JPanel content;
private JButton bApplyObject;
private JButton bPrevious;
private JButton bNext;
private JButton bCompare;
private JButton bClose;
private JPanel treePanel;
//-->>
SapforPackagesComparisonForm this_ = null; //?
SapforPackagesComparisonForm slave = null;
SapforPackagesComparisonForm master = null;
//-->>
protected SapforPackage object = null;
//-->>
protected SapforTasksPackageTree Body;
public JScrollPane treeScroll = null;
public SapforPackagesComparisonForm(SapforPackagesComparisonForm slave_in) {
//-
this_ = this;
slave = slave_in;
bPrevious.setVisible(isMaster());
bNext.setVisible(isMaster());
bApplyObject.addActionListener(e -> {
ApplyObject();
});
//--->>>
if (isMaster()) {
slave.master = this;
bPrevious.addActionListener(e -> {
});
bNext.addActionListener(e -> {
});
bCompare.addActionListener(e -> {
DoComparePass();
});
} else {
//рабу сравнивать не положено.
bCompare.setVisible(false);
}
//--->>>
bClose.addActionListener(e -> {
onClose();
});
}
public JPanel getContent() {
return content;
}
//--->>
public boolean isMaster() {
return slave != null;
@@ -71,7 +99,7 @@ public class SapforPackagesComparisonForm {
TextLog log = new TextLog();
if (Global.mainModule.Check(log, Current.SapforPackage)) {
object = Global.mainModule.getSapforPackage();
if (object.isLoaded() || ( Global.mainModule.getPass(PassCode.DownloadSapforPackage).Do(object))) {
if (object.isLoaded() || (Global.mainModule.getPass(PassCode.DownloadSapforPackage).Do(object))) {
showObject();
}
} else
@@ -80,7 +108,7 @@ public class SapforPackagesComparisonForm {
public void ApplyObject(DBObject object_in) {
RemoveObject();
object = (SapforPackage) object_in;
if (object.isLoaded() || ( Global.mainModule.getPass(PassCode.DownloadSapforPackage).Do(object))) {
if (object.isLoaded() || (Global.mainModule.getPass(PassCode.DownloadSapforPackage).Do(object))) {
showObject();
}
}
@@ -139,34 +167,6 @@ public class SapforPackagesComparisonForm {
protected String getText() {
return "";
}
public SapforPackagesComparisonForm(SapforPackagesComparisonForm slave_in) {
//-
this_ = this;
slave = slave_in;
bPrevious.setVisible(isMaster());
bNext.setVisible(isMaster());
bApplyObject.addActionListener(e -> {
ApplyObject();
});
//--->>>
if (isMaster()) {
slave.master = this;
bPrevious.addActionListener(e -> {
});
bNext.addActionListener(e -> {
});
bCompare.addActionListener(e -> {
DoComparePass();
});
} else {
//рабу сравнивать не положено.
bCompare.setVisible(false);
}
//--->>>
bClose.addActionListener(e -> {
onClose();
});
}
//-->>
private void createUIComponents() {
// TODO: place custom component creation code here

4
src/_VisualDVM/Visual/Windows/SapforVersionComparisonState.java
View File

@@ -5,8 +5,8 @@ public enum SapforVersionComparisonState {
CompilationErrors,
RunOutput,
RunErrors;
public String getDescription(){
switch (this){
public String getDescription() {
switch (this) {
case CompilationOutput:
return "Поток вывода парсера";
case CompilationErrors:

24
src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
View File

@@ -1,39 +1,33 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import javax.swing.*;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Vector;
public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_json> {
private final JComboBox<ProjectFile> cbFile;
//--
protected LinkedHashMap<SapforVersionComparisonState, JButton> buttons = null;
protected ProjectFile file = null;
//почти полный клон VersionsComparsionForm. В будущем нужен рефакторинг. Наверное.
Current current;
private final JComboBox<ProjectFile> cbFile;
protected ProjectFile file = null;
private SapforVersionsComparisonForm getMaster() {
return (SapforVersionsComparisonForm) master;
}
private SapforVersionsComparisonForm getSlave() {
return (SapforVersionsComparisonForm) slave;
}
public SapforVersionsComparisonForm(SapforVersionsComparisonForm slave_in, Current current_in) {
super(SapforVersion_json.class, slave_in);
current = current_in;
bApplyObject.setVisible(false);
bClose.setVisible(false);
cbFile = new JComboBox<>();
tools.add( Global.mainModule.getPass(
tools.add(Global.mainModule.getPass(
(current.equals(Current.SapforEtalonVersion) ? PassCode.OpenSapforEtalonVersion : PassCode.OpenSapforVersion
)).createButton(), 3);
tools.add(cbFile, 4);
@@ -73,6 +67,12 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
++i;
}
}
private SapforVersionsComparisonForm getMaster() {
return (SapforVersionsComparisonForm) master;
}
private SapforVersionsComparisonForm getSlave() {
return (SapforVersionsComparisonForm) slave;
}
public void SelectFile(ProjectFile file_in) {
file = file_in;
if (isMaster()) {

114
src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Windows.Form;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Trees.StyledTree;
import Common.Visual.UI_;
import Common.Visual.Windows.Form;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rtextarea.SearchContext;
@@ -22,6 +22,8 @@ import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.util.LinkedHashMap;
public class SearchReplaceForm extends Form {
public static String lastProjectPath = "";
public static LinkedHashMap<String, Long> matches = new LinkedHashMap<>();
public JPanel MainPanel;
public boolean forward = true;
SearchContext context = null;
@@ -39,6 +41,58 @@ public class SearchReplaceForm extends Form {
private JCheckBox loopOn;
private JLabel lCount;
private SearchResult result = null;
//------------------
//-
private JButton bSearchInFiles;
private JPanel filesTreePanel;
private JLabel lFilesMatchesCount;
public SearchReplaceForm() {
context = new SearchContext();
//-
context.setRegularExpression(true);
//-
rbDown.addActionListener(e -> SwitchDirection(!forward));
rbUp.addActionListener(e -> SwitchDirection(!forward));
bAll.addActionListener(e -> onAll());
bNext.addActionListener(e -> onNext());
replaceOn.addActionListener(e -> {
setMode(replaceOn.isSelected());
});
bNext.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER)
bNext.doClick();
}
});
tfFind.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_ENTER:
bNext.requestFocus();
bNext.doClick();
break;
}
}
});
bSearchInFiles.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
try {
showNoFilesMatches();
lastProjectPath = Global.mainModule.getProject().Home.getAbsolutePath();
matches = Global.mainModule.getProject().getMatches(
tfFind.getText(),
registerOn.isSelected(),
wholeWordOn.isSelected());
showFilesMatches();
} catch (Exception ex) {
ex.printStackTrace();
}
}
});
}
//https://techarks.ru/qa/java/kak-uznat-kakoj-iz-jlist-s-Y4/
public void ClearMarkers() {
//сброс выделения. решается подсовыванием пустой строки
@@ -135,13 +189,6 @@ public class SearchReplaceForm extends Form {
tfFind = new StyledTextField();
tfReplace = new StyledTextField();
}
//------------------
//-
private JButton bSearchInFiles;
private JPanel filesTreePanel;
private JLabel lFilesMatchesCount;
public static String lastProjectPath = "";
public static LinkedHashMap<String, Long> matches = new LinkedHashMap<>();
public void dropFilesMatches() {
matches = new LinkedHashMap<>();
}
@@ -202,51 +249,4 @@ public class SearchReplaceForm extends Form {
Refresh();
// setAlwaysOnTop(true);
}
public SearchReplaceForm() {
context = new SearchContext();
//-
context.setRegularExpression(true);
//-
rbDown.addActionListener(e -> SwitchDirection(!forward));
rbUp.addActionListener(e -> SwitchDirection(!forward));
bAll.addActionListener(e -> onAll());
bNext.addActionListener(e -> onNext());
replaceOn.addActionListener(e -> {
setMode(replaceOn.isSelected());
});
bNext.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER)
bNext.doClick();
}
});
tfFind.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_ENTER:
bNext.requestFocus();
bNext.doClick();
break;
}
}
});
bSearchInFiles.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
try {
showNoFilesMatches();
lastProjectPath = Global.mainModule.getProject().Home.getAbsolutePath();
matches = Global.mainModule.getProject().getMatches(
tfFind.getText(),
registerOn.isSelected(),
wholeWordOn.isSelected());
showFilesMatches();
} catch (Exception ex) {
ex.printStackTrace();
}
}
});
}
}

9
src/_VisualDVM/Visual/Windows/TabToolBar.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
@@ -17,7 +17,7 @@ public class TabToolBar extends VisualiserMenuBar {
addSeparator();
//-
for (PassCode code : passes)
add( Global.mainModule.getPass(code).createTabButton());
add(Global.mainModule.getPass(code).createTabButton());
MouseAdapter adapter = new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
@@ -27,9 +27,10 @@ public class TabToolBar extends VisualiserMenuBar {
addMouseListener(adapter);
title.addMouseListener(adapter);
}
public void leftMouseAction(){}
public void leftMouseAction() {
}
@Override
public void setSizeLimits() {
// setPreferredSize(new Dimension(-1, 18));
// setPreferredSize(new Dimension(-1, 18));
}
}

16
src/_VisualDVM/Visual/Windows/TasksComparisonForm.java
View File

@@ -1,9 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import javax.swing.*;
@@ -11,6 +9,8 @@ import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Vector;
public abstract class TasksComparisonForm<T extends DBObject> extends ComparisonForm<T> {
protected TasksComparisonState status = TasksComparisonState.CompilationOutput;
protected LinkedHashMap<TasksComparisonState, JButton> buttons = null;
public TasksComparisonForm(Class<T> t_in, ComparisonForm<T> slave_in) {
super(t_in, slave_in);
buttons = new LinkedHashMap<>();
@@ -20,7 +20,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
for (TasksComparisonState state : TasksComparisonState.values()) {
if (!forbidden.contains(state)) {
MenuBarButton button = new MenuBarButton();
button.setIcon( "/icons/" + state.toString() + ".png");
button.setIcon("/icons/" + state.toString() + ".png");
button.setToolTipText(state.getDescription());
button.addActionListener(e -> {
ChangeState(state);
@@ -56,23 +56,19 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
++i;
}
}
}
protected TasksComparisonState status = TasksComparisonState.CompilationOutput;
protected LinkedHashMap<TasksComparisonState, JButton> buttons = null;
protected void DropTabsSelection() {
for (JButton button : buttons.values()){
for (JButton button : buttons.values()) {
button.setBorderPainted(false);
button.repaint();
button.revalidate();
}
}
public void ChangeState(TasksComparisonState status_in) {
status = status_in;
DropTabsSelection();
ClearText();
JButton button = buttons.get(status_in);
JButton button = buttons.get(status_in);
button.setBorderPainted(false);
button.repaint();
button.revalidate();
@@ -92,7 +88,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
}
@Override
protected String getText() {
return isReady()?getTextByTab():"объект не назначен";
return isReady() ? getTextByTab() : "объект не назначен";
}
//-----------перегружаемые
protected abstract String getTextByTab();

5
src/_VisualDVM/Visual/Windows/TasksComparisonState.java
View File

@@ -2,12 +2,11 @@ package _VisualDVM.Visual.Windows;
public enum TasksComparisonState {
CompilationOutput,
CompilationErrors,
RunOutput,
RunErrors,
Sts;
public String getDescription(){
switch (this){
public String getDescription() {
switch (this) {
case CompilationOutput:
return "Поток вывода компиляции";
case CompilationErrors:

45
src/_VisualDVM/Visual/Windows/TestingForm.java
View File

@@ -1,13 +1,9 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.Utils_;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common.Visual.TextField.StyledTextField;
import _VisualDVM.Visual.UI;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Credentials.Credentials;
import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -16,17 +12,22 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import _VisualDVM.Visual.Interface.TestingWindow;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
public class TestingForm implements FormWithSplitters, TestingWindow {
private JPanel content;
@Override
public JPanel getContent() {
return content;
}
//-
private final DVMRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
private final DVMRunTasksComparisonForm dvmTestingRunSlave;
//-
private final SapforPackagesComparisonForm sapforPackageTreeMaster; //сравнение деревьев пакетов SAPFOR.
private final SapforPackagesComparisonForm sapforPackageTreeSlave;
//--
private final SapforVersionsComparisonForm sapforVersionMaster; //сравнение версий тестов SAPFOR.
private final SapforVersionsComparisonForm sapforVersionSlave;
public JSplitPane SC50;
public JSplitPane SC65;
public JSplitPane SC66;
@@ -41,6 +42,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JSplitPane SC80;
public JSplitPane SC83;
public JSplitPane SC85;
private JPanel content;
//---
private JTabbedPane testingTabs;
private JPanel dvmPackagesTab;
@@ -72,23 +74,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JCheckBox filterFinished;
private JButton bTest;
private JButton bDownloadTestProject;
//-
private final DVMRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
private final DVMRunTasksComparisonForm dvmTestingRunSlave;
//-
private final SapforPackagesComparisonForm sapforPackageTreeMaster; //сравнение деревьев пакетов SAPFOR.
private final SapforPackagesComparisonForm sapforPackageTreeSlave;
//--
private final SapforVersionsComparisonForm sapforVersionMaster; //сравнение версий тестов SAPFOR.
private final SapforVersionsComparisonForm sapforVersionSlave;
private boolean events_on=true;
private boolean events_on = true;
private final PropertyChangeListener sc65Listener = new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (events_on) {
events_on=false;
events_on = false;
SC66.setDividerLocation(SC65.getDividerLocation());
events_on=true;
events_on = true;
}
}
};
@@ -96,9 +89,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (events_on) {
events_on=false;
events_on = false;
SC65.setDividerLocation(SC66.getDividerLocation());
events_on=true;
events_on = true;
}
}
};
@@ -147,6 +140,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
if (Global.properties.collapseCredentials)
CollapseCredentials();
}
@Override
public JPanel getContent() {
return content;
}
//-
@Override
public void ShowAll() {

12
src/_VisualDVM/Visual/Windows/TestsForm.java
View File

@@ -5,11 +5,16 @@ import _VisualDVM.Visual.Interface.TestsWindow;
import javax.swing.*;
public class TestsForm implements TestsWindow, FormWithSplitters {
private JPanel content;
public JSplitPane SC45;
private JPanel content;
private JPanel groupsBackground;
private JPanel groupsPanel;
private JPanel testsPanel;
public TestsForm() {
LoadSplitters();
Global.testingServer.db.groups.mountUI(groupsPanel);
Global.testingServer.db.tests.mountUI(testsPanel);
}
@Override
public JPanel getContent() {
return content;
@@ -18,9 +23,4 @@ public class TestsForm implements TestsWindow, FormWithSplitters {
public void ShowAll() {
Global.testingServer.db.groups.ShowUI();
}
public TestsForm(){
LoadSplitters();
Global.testingServer.db.groups.mountUI(groupsPanel);
Global.testingServer.db.tests.mountUI(testsPanel);
}
}

10
src/_VisualDVM/Visual/Windows/VariantsForm.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Visual.Trees.TreeForm;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionsTableForm;
@@ -13,18 +12,18 @@ import java.awt.event.ActionListener;
public class VariantsForm implements VariantsWindow {
public JSplitPane SC4;
public JSplitPane SC5;
//--
public TreeForm distributionForm1;
private JButton BDistributed;
private JButton bMultiplied;
private JPanel dimensionsPanel;
private JPanel distributionPanel;
// private JLabel SelectedVariantsCount;
// private JLabel SelectedVariantsCount;
private JLabel VisibleVariantsCount;
private JLabel TotalVariantsCount;
private JPanel variantsPanel;
private JPanel content;
private JToolBar variantsFilterTools1;
//--
public TreeForm distributionForm1;
private DimensionsTableForm dimensionsForm;
//--
public VariantsForm() {
@@ -90,7 +89,7 @@ public class VariantsForm implements VariantsWindow {
}
@Override
public void ShowCheckedVariantsCount() {
// SelectedVariantsCount.setText(Current.getProject().CheckedVariantsCounter.toString());
// SelectedVariantsCount.setText(Current.getProject().CheckedVariantsCounter.toString());
}
@Override
public void ShowVariants() {
@@ -106,7 +105,6 @@ public class VariantsForm implements VariantsWindow {
}
@Override
public void ShowNoCheckedVariantsCount() {
//SelectedVariantsCount.setText("0");
}
@Override

15
src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
View File

@@ -2,24 +2,17 @@ package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import javax.swing.*;
import java.util.Vector;
public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
private final JComboBox<DBProjectFile> cbFile;
protected DBProjectFile file = null;
private VersionsComparisonForm getMaster() {
return (VersionsComparisonForm) master;
}
private VersionsComparisonForm getSlave() {
return (VersionsComparisonForm) slave;
}
public VersionsComparisonForm(VersionsComparisonForm slave_in) {
super(db_project_info.class, slave_in);
cbFile = new JComboBox<>();
@@ -51,6 +44,12 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
}
});
}
private VersionsComparisonForm getMaster() {
return (VersionsComparisonForm) master;
}
private VersionsComparisonForm getSlave() {
return (VersionsComparisonForm) slave;
}
@Override
protected Current getCurrentObjectName() {
return Current.Version;

6
src/_VisualDVM/Visual/Windows/VersionsForm.java
View File

@@ -1,23 +1,23 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.UI_;
import Common.Visual.Trees.TreeForm;
import _VisualDVM.Visual.UI;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.Project.UI.VersionsTree;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.Interface.FormWithSplitters;
import _VisualDVM.Visual.Interface.VariantsWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;
public class VersionsForm implements FormWithSplitters, VersionsWindow {
private final db_project_info root;
private JPanel content;
//-
public JSplitPane SC2;
public JSplitPane SC9;
public VersionsComparisonForm MasterComparsionForm;
public VersionsComparisonForm SlaveComparsionForm;
private JPanel content;
private JPanel versionsPanel;
private JTabbedPane versionsTabs;
private JPanel variantsFormPanel;

2
src/_VisualDVM/Visual/Windows/WelcomeForm.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.DragDrop.FileDrop;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class WelcomeForm {