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

++

Browse Source 
решение проблемы совместимости с java 1.8._4xx
This commit is contained in:
02090095
2025-04-21 15:27:20 +03:00
parent e8c748eb7e
commit b37e20e4a4
71 changed files with 361 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/AlignRule.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.SapforData.Arrays.Distribution;
import Common.Utils.Index;
import Common.Utils.Pair;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javafx.util.Pair;
import java.math.BigInteger;
import java.util.Vector;

2
src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/DataDirective.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Arrays.Distribution;
import Common.Utils.Pair;
import _VisualDVM.ProjectData.SapforData.Arrays.ArrayLocation;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import javafx.util.Pair;
import java.math.BigInteger;
import java.util.LinkedHashMap;

2
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -12,7 +13,6 @@ import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimensionState
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateLink;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar;
import javafx.util.Pair;
import javax.swing.*;
import java.math.BigInteger;

2
src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateLink.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Arrays.Templates;
import Common.Utils.Index;
import javafx.util.Pair;
import Common.Utils.Pair;
import java.util.Vector;
public class TemplateLink {

9
src/_VisualDVM/ProjectData/SapforData/FileObject.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.ProjectData.SapforData;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import Common.Visual.Selectable;
import _VisualDVM.Global;
@@ -11,6 +10,9 @@ public class FileObject implements Selectable {
public String file = "";
@Expose
public int line = 1;
//Selectable----
@Description("IGNORE")
boolean selected = false;
public FileObject() {
}
public FileObject(String file_in) {
@@ -22,9 +24,6 @@ public class FileObject implements Selectable {
public void Show(boolean focus) {
Global.mainModule.getUI().getMainWindow().getProjectWindow().GotoFile(file, line, focus);
}
//Selectable----
@Description("IGNORE")
boolean selected=false;
public String getSelectionText() {
return "файл " + Utils_.Brackets(file) + " строка: " + line;
}
@@ -37,7 +36,7 @@ public class FileObject implements Selectable {
selected = flag;
}
//-------
public void setFile(String file_in){
public void setFile(String file_in) {
file = file_in;
}
}

2
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
View File

@@ -7,7 +7,7 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description;
public class FuncCall extends FileObjectWithMessages{
public class FuncCall extends FileObjectWithMessages {
//JSON------------------------------------------
@Expose
public String funcName = "";

1
src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java
View File

@@ -26,7 +26,6 @@ public class FuncInfo extends FileObjectWithMessages {
@Expose
public List<FunctionParameterJson> params = new Vector<>();
//END OF JSON-----------------------------------------
public FunctionType type = FunctionType.Default;
//вызовы функций в теле этой функции
@Expose

2
src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionParameterJson.java
View File

@@ -1,7 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.Json;
import com.google.gson.annotations.Expose;
import java.util.List;
public class FunctionParameterJson {
@Expose
public Integer inoutType;

1
src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsJson.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.ProjectData.SapforData.Functions.Json;
import _VisualDVM.ProjectData.SapforData.Loops.Json.FileLoopsJson;
import com.google.gson.annotations.Expose;
import java.util.List;

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

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import javafx.util.Pair;
import Common.Utils.Pair;
import java.util.LinkedHashMap;
import java.util.Vector;

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

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import com.mxgraph.swing.mxGraphComponent;
import javafx.util.Pair;
import java.util.Collections;
import java.util.LinkedHashMap;

59
src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java
View File

@@ -10,24 +10,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Vector;
public class Loop extends FileObjectWithMessages {
@Expose
private int lineNumAfterLoop;
@Expose
private int perfectLoop;
@Expose
private int hasNonRectangularBounds;
@Expose
private int loopState;
public LoopState getLoopState(){
switch (loopState){
case 1:
return LoopState.GoodLoop;
case 2:
return LoopState.BadLoop;
default:
return LoopState.Loop;
}
}
//---
@Expose
public List<Integer> extGotos = new Vector<>();
@@ -42,28 +24,45 @@ public class Loop extends FileObjectWithMessages {
public List<FuncCall> funcCalls = new Vector<>();
@Expose
public List<Loop> children = new Vector<>();
@Expose
private int lineNumAfterLoop;
@Expose
private int perfectLoop;
@Expose
private int hasNonRectangularBounds;
@Expose
private int loopState;
public LoopState getLoopState() {
switch (loopState) {
case 1:
return LoopState.GoodLoop;
case 2:
return LoopState.BadLoop;
default:
return LoopState.Loop;
}
}
//--
public List<FileObjectWithMessages> getGraphNodes(DBProjectFile dbProjectFile){
public List<FileObjectWithMessages> getGraphNodes(DBProjectFile dbProjectFile) {
List<FileObjectWithMessages> all_children = new Vector<>();
//-
if (hasNonRectangularBounds!=0)
if (hasNonRectangularBounds != 0)
all_children.add(new NonRectIter(dbProjectFile, line));
//-
all_children.addAll(funcCalls);
//-
for (int line_: extGotos)
for (int line_ : extGotos)
all_children.add(new EGoto(dbProjectFile, line_));
for (int line_: intGotos)
for (int line_ : intGotos)
all_children.add(new IGoto(dbProjectFile, line_));
for (int line_: ios)
for (int line_ : ios)
all_children.add(new IO(dbProjectFile, line_));
for (int line_: stops)
for (int line_ : stops)
all_children.add(new Stop(dbProjectFile, line_));
//-
for (FileObjectWithMessages fileObjectWithMessages: all_children){
for (FileObjectWithMessages fileObjectWithMessages : all_children) {
fileObjectWithMessages.CheckMessagesPresence();
}
all_children.addAll(children); //у них уже проверено. (?)
return all_children;
}
@@ -87,18 +86,18 @@ public class Loop extends FileObjectWithMessages {
public VisualiserFonts getFont() {
return getLoopState().getFont();
}
public void toMap_r(LinkedHashMap<Integer, Loop> loops_map){
public void toMap_r(LinkedHashMap<Integer, Loop> loops_map) {
CheckMessagesPresence();
loops_map.put(line, this);
for (Loop loop: children)
for (Loop loop : children)
loop.toMap_r(loops_map);
}
@Override
public void setFile(String file_in) {
super.setFile(file_in);
for (FuncCall funcCall: funcCalls)
for (FuncCall funcCall : funcCalls)
funcCall.setFile(file_in);
for (Loop child: children)
for (Loop child : children)
child.setFile(file_in);
}
}

2
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.AlignRule;
import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.DataDirective;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import javafx.util.Pair;
import java.math.BigInteger;
import java.util.LinkedHashMap;

2
src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Regions.UI;
import Common.MainModule_;
import Common.Utils.Pair;
import Common.Visual.Tables.StyledCellLabel;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javafx.util.Pair;
import javax.swing.*;
import javax.swing.event.ChangeListener;

2
src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Variants;
import Common.Database.Objects.DBObject;
import Common.Utils.Pair;
import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatistics_2021;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import javafx.util.Pair;
import java.io.File;
import java.math.BigInteger;