M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

промежуточный. частичный рефакторинг с прицелом на библиотечную часть

Browse Source
This commit is contained in:
02090095
2024-10-07 00:58:29 +03:00
parent c211ffb82b
commit 6b1576461d
798 changed files with 3007 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ProjectData/SapforData/Arrays/ArrayDecl.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Arrays;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
// это то что отображается в боковом графе файла. не путать с сапфоровским ProjectArray

14
src/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -1,17 +1,17 @@
package ProjectData.SapforData.Arrays;
import Common.Current;
import Common.Database.DataSet;
import Common.Global;
import Common.UI.DataSetControlForm;
import Common_old.Current;
import Common.Database.Tables.DataSet;
import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import java.util.Vector;
import static Common.UI.Tables.TableEditors.EditorHyperlinks;
import static Common.UI.Tables.TableRenderers.RendererHiddenList;
import static Common.UI.Tables.TableRenderers.RendererHyperlinks;
import static Common_old.UI.Tables.TableEditors.EditorHyperlinks;
import static Common_old.UI.Tables.TableRenderers.RendererHiddenList;
import static Common_old.UI.Tables.TableRenderers.RendererHyperlinks;
public class ArraysSet extends DataSet<Long, ProjectArray> {
public ArraysSet() {
super(Long.class, ProjectArray.class);

2
src/ProjectData/SapforData/Arrays/Distribution/Dimension.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Arrays.Distribution;
import Common.Database.DBObject;
import Common.Database.Objects.DBObject;
import ProjectData.SapforData.Arrays.ProjectArray;
public class Dimension extends DBObject {
//--------------------------------------

6
src/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -1,8 +1,8 @@
package ProjectData.SapforData.Arrays;
import Common.Current;
import Common.Database.DBObject;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import ProjectData.DBArray.DBArray;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.Arrays.Distribution.Dimension;

2
src/ProjectData/SapforData/Arrays/Templates/TemplateDimension.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Arrays.Templates;
import Common.Database.DBObject;
import Common.Database.Objects.DBObject;
import ProjectData.SapforData.Arrays.ProjectArray;
import ProjectData.SapforData.Regions.ParallelRegion;
//для генерации вариантов и для управления распределением измерений.

2
src/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Arrays.Templates;
import Common.Current;
import Common_old.Current;
public enum TemplateDimensionState {
multiplied, //0
distributed; //1

6
src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
View File

@@ -1,7 +1,7 @@
package ProjectData.SapforData.Arrays.UI;
import Common.Current;
import Common.UI.Tables.RendererCell;
import Common.UI.Themes.VisualiserFonts;
import Common_old.Current;
import Common_old.UI.Tables.RendererCell;
import Common_old.UI.Themes.VisualiserFonts;
import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import javax.swing.*;

8
src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
View File

@@ -1,8 +1,8 @@
package ProjectData.SapforData.Arrays.UI;
import Common.Current;
import Common.UI.Tables.DBObjectEditor;
import Common.UI.Themes.VisualiserFonts;
import Common.UI.UI;
import Common_old.Current;
import Common_old.UI.Tables.DBObjectEditor;
import Common_old.UI.Themes.VisualiserFonts;
import Common_old.UI.UI;
import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import javax.swing.*;

14
src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
View File

@@ -1,17 +1,17 @@
package ProjectData.SapforData.Arrays.UI;
import Common.Current;
import Common.UI.ControlForm;
import Common.UI.Tables.Grid.GridAnchestor;
import Common.UI.Tables.StyledTable;
import Common.UI.UI;
import Common_old.Current;
import Common_old.UI.ControlForm;
import Common_old.UI.Tables.Grid.GridAnchestor;
import Common_old.UI.Tables.StyledTable;
import Common_old.UI.UI;
import ProjectData.SapforData.Arrays.ProjectArray;
import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import java.awt.*;
import java.util.Vector;
import static Common.UI.Tables.TableEditors.EditorDimension;
import static Common.UI.Tables.TableRenderers.RendererDimension;
import static Common_old.UI.Tables.TableEditors.EditorDimension;
import static Common_old.UI.Tables.TableRenderers.RendererDimension;
public class DimensionsTableForm extends ControlForm<StyledTable> {
public DimensionsTableForm() {
super(StyledTable.class);

4
src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Arrays.UI;
import Common.UI.Menus.GraphMenu;
import Common.UI.Trees.StyledTree;
import Common_old.UI.Menus.GraphMenu;
import Common_old.UI.Trees.StyledTree;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;

2
src/ProjectData/SapforData/Arrays/UI/FileArraysTree.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Arrays.UI;
import Common.Current;
import Common_old.Current;
import ProjectData.Files.UI.FileGraphTree;
public class FileArraysTree extends FileGraphTree {
public FileArraysTree() {

10
src/ProjectData/SapforData/Arrays/UI/RulesTree.java
View File

@@ -1,14 +1,14 @@
package ProjectData.SapforData.Arrays.UI;
import Common.Current;
import Common.UI.Menus.GraphMenu;
import Common.UI.Trees.StyledTree;
import Common.UI.Trees.TreeRenderers;
import Common_old.Current;
import Common_old.UI.Menus.GraphMenu;
import Common_old.UI.Trees.StyledTree;
import Common_old.UI.Trees.TreeRenderers;
import ProjectData.SapforData.Regions.ParallelRegion;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
import static Common.UI.Trees.TreeRenderers.RendererRule;
import static Common_old.UI.Trees.TreeRenderers.RendererRule;
public class RulesTree extends StyledTree {
public RulesTree() {
super(Current.getProject().align_rules_root);

6
src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
View File

@@ -1,7 +1,7 @@
package ProjectData.SapforData.Arrays.UI;
import Common.Current;
import Common.UI.Themes.VisualiserFonts;
import Common.UI.Trees.StyledTreeCellRenderer;
import Common_old.Current;
import Common_old.UI.Themes.VisualiserFonts;
import Common_old.UI.Trees.StyledTreeCellRenderer;
import ProjectData.SapforData.Regions.ParallelRegion;
import javax.swing.*;

8
src/ProjectData/SapforData/FileObject.java
View File

@@ -1,8 +1,8 @@
package ProjectData.SapforData;
import Common.Current;
import Common.Database.iDBObject;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.Current;
import Common.Database.Objects.iDBObject;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import com.sun.org.glassfish.gmbal.Description;
//объект принадлежащий файлу и относящийся к его строке.

2
src/ProjectData/SapforData/FileObjectWithMessages.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData;
import Common.UI.Themes.VisualiserFonts;
import Common_old.UI.Themes.VisualiserFonts;
import ProjectData.Files.DBProjectFile;
import ProjectData.Messages.Errors.MessageError;
import ProjectData.Messages.Message;

4
src/ProjectData/SapforData/Functions/FuncCall.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Functions;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
import Visual_DVM_2021.Passes.PassCode_2021;

4
src/ProjectData/SapforData/Functions/FuncCallH.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Functions;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;

2
src/ProjectData/SapforData/Functions/FuncCoordinates.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Functions;
import Common.Database.DBObject;
import Common.Database.Objects.DBObject;
import com.sun.org.glassfish.gmbal.Description;
public class FuncCoordinates extends DBObject {
@Description("PRIMARY KEY, UNIQUE")

2
src/ProjectData/SapforData/Functions/FuncCoordinatesDBTable.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Functions;
import Common.Database.DBTable;
import Common.Database.Tables.DBTable;
public class FuncCoordinatesDBTable extends DBTable<String, FuncCoordinates> {
public FuncCoordinatesDBTable() {
super(String.class, FuncCoordinates.class);

2
src/ProjectData/SapforData/Functions/FuncInfo.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Functions;
import Common.Utils.Index;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
import com.mxgraph.model.mxCell;

2
src/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Functions.UI;
import Common.Current;
import Common_old.Current;
import ProjectData.Files.UI.FileGraphTree;
public class FileFunctionsTree extends FileGraphTree {
public FileFunctionsTree() {

6
src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
View File

@@ -1,7 +1,7 @@
package ProjectData.SapforData.Functions.UI.Graph;
import Common.Current;
import Common.UI.ControlForm;
import Common.UI.UI;
import Common_old.Current;
import Common_old.UI.ControlForm;
import Common_old.UI.UI;
import com.mxgraph.swing.mxGraphComponent;
import java.awt.*;

10
src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
View File

@@ -1,9 +1,9 @@
package ProjectData.SapforData.Functions.UI.Graph;
import Common.Current;
import Common.UI.Menus.VisualiserMenuItem;
import Common.UI.Menus.StyledPopupMenu;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.Current;
import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.UI.Menus.StyledPopupMenu;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;

6
src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
View File

@@ -1,7 +1,7 @@
package ProjectData.SapforData.Functions.UI.Graph;
import Common.Current;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.Current;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.SapforData.Functions.FuncCoordinates;
import ProjectData.SapforData.Functions.FuncInfo;
import ProjectData.SapforData.Functions.FunctionType;

2
src/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Functions.UI.Graph;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import com.mxgraph.swing.mxGraphComponent;
import javafx.util.Pair;

6
src/ProjectData/SapforData/Functions/UI/InlineMenu.java
View File

@@ -1,7 +1,7 @@
package ProjectData.SapforData.Functions.UI;
import Common.Current;
import Common.UI.Menus.SelectionTreeMenu;
import Common.UI.Trees.SelectableTree;
import Common_old.Current;
import Common_old.UI.Menus.SelectionTreeMenu;
import Common_old.UI.Trees.SelectableTree;
import ProjectData.SapforData.Functions.FuncInfo;
public class InlineMenu extends SelectionTreeMenu {
public InlineMenu(SelectableTree tree_in) {

4
src/ProjectData/SapforData/Functions/UI/InlineMenu2.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Functions.UI;
import Common.UI.Menus.SelectionTreeMenu;
import Common.UI.Trees.SelectableTree;
import Common_old.UI.Menus.SelectionTreeMenu;
import Common_old.UI.Trees.SelectableTree;
import ProjectData.SapforData.Functions.FuncCallH;
import javax.swing.tree.DefaultMutableTreeNode;

8
src/ProjectData/SapforData/Functions/UI/InlineTree.java
View File

@@ -1,8 +1,8 @@
package ProjectData.SapforData.Functions.UI;
import Common.Current;
import Common.UI.Menus.GraphMenu;
import Common.UI.Trees.SelectableTree;
import Common.UI.Trees.TreeRenderers;
import Common_old.Current;
import Common_old.UI.Menus.GraphMenu;
import Common_old.UI.Trees.SelectableTree;
import Common_old.UI.Trees.TreeRenderers;
import ProjectData.SapforData.FileObject;
public class InlineTree extends SelectableTree {
public InlineTree() {

8
src/ProjectData/SapforData/Functions/UI/InlineTree2.java
View File

@@ -1,8 +1,8 @@
package ProjectData.SapforData.Functions.UI;
import Common.Current;
import Common.UI.Menus.GraphMenu;
import Common.UI.Trees.SelectableTree;
import Common.UI.Trees.TreeRenderers;
import Common_old.Current;
import Common_old.UI.Menus.GraphMenu;
import Common_old.UI.Trees.SelectableTree;
import Common_old.UI.Trees.TreeRenderers;
import ProjectData.SapforData.FileObject;
public class InlineTree2 extends SelectableTree {
public InlineTree2() {

2
src/ProjectData/SapforData/Includes/DependencyInfo.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Includes;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import ProjectData.SapforData.FileObject;
public class DependencyInfo extends FileObject {
public DependencyInfo(String file_in) {

2
src/ProjectData/SapforData/Includes/FileInfo.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Includes;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import ProjectData.SapforData.FileObject;
import javax.swing.*;

6
src/ProjectData/SapforData/Includes/UI/IncludesMenu.java
View File

@@ -1,7 +1,7 @@
package ProjectData.SapforData.Includes.UI;
import Common.Current;
import Common.UI.Menus.SelectionTreeMenu;
import Common.UI.Trees.SelectableTree;
import Common_old.Current;
import Common_old.UI.Menus.SelectionTreeMenu;
import Common_old.UI.Trees.SelectableTree;
import ProjectData.SapforData.Includes.FileInfo;
public class IncludesMenu extends SelectionTreeMenu {
public IncludesMenu(SelectableTree tree_in) {

8
src/ProjectData/SapforData/Includes/UI/IncludesTree.java
View File

@@ -1,8 +1,8 @@
package ProjectData.SapforData.Includes.UI;
import Common.Current;
import Common.UI.Menus.GraphMenu;
import Common.UI.Trees.SelectableTree;
import Common.UI.Trees.TreeRenderers;
import Common_old.Current;
import Common_old.UI.Menus.GraphMenu;
import Common_old.UI.Trees.SelectableTree;
import Common_old.UI.Trees.TreeRenderers;
public class IncludesTree extends SelectableTree {
public IncludesTree() {
super(Current.getProject().includes_root);

2
src/ProjectData/SapforData/Loops/EGoto.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Loops;
import Common.UI.Themes.VisualiserFonts;
import Common_old.UI.Themes.VisualiserFonts;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
public class EGoto extends FileObjectWithMessages {

2
src/ProjectData/SapforData/Loops/IGoto.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Loops;
import Common.UI.Themes.VisualiserFonts;
import Common_old.UI.Themes.VisualiserFonts;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
public class IGoto extends FileObjectWithMessages {

2
src/ProjectData/SapforData/Loops/IO.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Loops;
import Common.UI.Themes.VisualiserFonts;
import Common_old.UI.Themes.VisualiserFonts;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
public class IO extends FileObjectWithMessages {

2
src/ProjectData/SapforData/Loops/Loop.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Loops;
import Common.UI.Themes.VisualiserFonts;
import Common_old.UI.Themes.VisualiserFonts;
import Common.Utils.Index;
import ProjectData.Files.DBProjectFile;
import ProjectData.Messages.Message;

4
src/ProjectData/SapforData/Loops/LoopState.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Loops;
import Common.UI.Themes.VisualiserFonts;
import Common.UI.UI;
import Common_old.UI.Themes.VisualiserFonts;
import Common_old.UI.UI;
import javax.swing.text.Highlighter;
public enum LoopState {

2
src/ProjectData/SapforData/Loops/NonRectIter.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Loops;
import Common.UI.Themes.VisualiserFonts;
import Common_old.UI.Themes.VisualiserFonts;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
public class NonRectIter extends FileObjectWithMessages {

2
src/ProjectData/SapforData/Loops/Stop.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Loops;
import Common.UI.Themes.VisualiserFonts;
import Common_old.UI.Themes.VisualiserFonts;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
public class Stop extends FileObjectWithMessages {

2
src/ProjectData/SapforData/Loops/UI/FileLoopsTree.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Loops.UI;
import Common.Current;
import Common_old.Current;
import ProjectData.Files.UI.FileGraphTree;
public class FileLoopsTree extends FileGraphTree {
public FileLoopsTree() {

6
src/ProjectData/SapforData/Regions/ParallelRegion.java
View File

@@ -1,8 +1,8 @@
package ProjectData.SapforData.Regions;
import Common.Current;
import Common.Database.DBObject;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.Arrays.Distribution.AlignRule;
import ProjectData.SapforData.Arrays.Distribution.DataDirective;

10
src/ProjectData/SapforData/Regions/RegionsSet.java
View File

@@ -1,12 +1,12 @@
package ProjectData.SapforData.Regions;
import Common.Current;
import Common.Database.DataSet;
import Common.UI.DataSetControlForm;
import Common_old.Current;
import Common.Database.Tables.DataSet;
import Common_old.UI.DataSetControlForm;
import java.math.BigInteger;
import static Common.UI.Tables.TableRenderers.RendererMultiline;
import static Common.UI.Tables.TableRenderers.RendererTopLeft;
import static Common_old.UI.Tables.TableRenderers.RendererMultiline;
import static Common_old.UI.Tables.TableRenderers.RendererTopLeft;
public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
//суррогат. нужен только для сохры столбцов. во всяком случае пока.
public RegionsSet() {

4
src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Regions.UI;
import Common.Current;
import Common.UI.Tables.StyledCellLabel;
import Common_old.Current;
import Common_old.UI.Tables.StyledCellLabel;
import ProjectData.SapforData.Arrays.ProjectArray;
import javafx.util.Pair;

2
src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Regions.UI;
import Common.UI.Windows.Dialog.DialogFields;
import Common_old.UI.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

4
src/ProjectData/SapforData/Variants/ParallelVariant.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Variants;
import Common.Database.DBObject;
import Common.UI.UI;
import Common.Database.Objects.DBObject;
import Common_old.UI.UI;
import ProjectData.PredictorStatistic.PredictorStatistics_2021;
import ProjectData.Project.db_project_info;
import ProjectData.SapforData.Arrays.ProjectArray;

2
src/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Variants.UI;
import Common.UI.Tables.MaskedIntegerValueRenderer;
import Common_old.UI.Tables.MaskedIntegerValueRenderer;
public class VariantRankRenderer extends MaskedIntegerValueRenderer {
@Override
public long getMask() {

8
src/ProjectData/SapforData/Variants/VariantsSet.java
View File

@@ -1,9 +1,9 @@
package ProjectData.SapforData.Variants;
import Common.Current;
import Common.Database.DataSet;
import Common.UI.DataSetControlForm;
import Common_old.Current;
import Common.Database.Tables.DataSet;
import Common_old.UI.DataSetControlForm;
import static Common.UI.Tables.TableRenderers.*;
import static Common_old.UI.Tables.TableRenderers.*;
public class VariantsSet extends DataSet<String, ParallelVariant> {
public VariantsSet() {
super(String.class, ParallelVariant.class);