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

переименования в единый стиль полей массивов и регионов

Browse Source
This commit is contained in:
02090095
2025-05-17 18:07:07 +03:00
parent 0cb4022969
commit cba4425cd7
9 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/_VisualDVM/ProjectData/SapforData/Arrays/AlignRule.java
View File

@@ -9,9 +9,9 @@ import java.math.BigInteger;
import java.util.Vector;
public class AlignRule {
@Expose
public String packed_alignArray_address;
public String packedAlignArrayAddress;
@Expose
public String packed_alignWith_address;
public String packedAlignWithAddress;
@Expose
public Vector<IntegerPairJson> alignRule;
@Expose
@@ -41,13 +41,13 @@ public class AlignRule {
}
public void Init(){
//--
if (packed_alignArray_address!=null)
alignArray_address = new BigInteger(packed_alignArray_address);
if (packed_alignWith_address!=null)
alignWith_address = new BigInteger(packed_alignWith_address);
if (packedAlignArrayAddress !=null)
alignArray_address = new BigInteger(packedAlignArrayAddress);
if (packedAlignWithAddress !=null)
alignWith_address = new BigInteger(packedAlignWithAddress);
//--
packed_alignArray_address = null;
packed_alignWith_address = null;
packedAlignArrayAddress = null;
packedAlignWithAddress = null;
}
private static Pair<String, String> convertDigitToPositive(int digit) {
String buf = "";

10
src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
View File

@@ -8,17 +8,17 @@ public class ArrayDecl extends FileObjectWithMessages {
@Expose
public String file = "";
@Expose
public String array_name;
public String arrayName;
@Expose
public int array_loc;
public int arrayLoc;
//--
public ArrayDecl(String array_name_in, int array_loc_in, DBProjectFile father_in, int lineNum_in) {
super(father_in, lineNum_in);
array_name = array_name_in;
array_loc = array_loc_in;
arrayName = array_name_in;
arrayLoc = array_loc_in;
}
@Override
public String Description() {
return ArrayLocation.fromInt(array_loc).getDescription() + " массив " + Utils_.Brackets(array_name);
return ArrayLocation.fromInt(arrayLoc).getDescription() + " массив " + Utils_.Brackets(arrayName);
}
}

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

@@ -24,7 +24,7 @@ public class ProjectArray extends DBObject {
@Expose
public long id;
@Expose
public String packed_address;
public String packedAddress;
@Expose
public String name;
@Expose
@@ -78,7 +78,7 @@ public class ProjectArray extends DBObject {
Vector<String> res = new Vector<>();
res.add(">");
res.add("id=" + id);
res.add("packed_address=" + packed_address);
res.add("packed_address=" + packedAddress);
res.add("name=" + name);
res.add("shortName=" + shortName);
res.add("dimSize=" + dimSize);
@@ -153,7 +153,7 @@ public class ProjectArray extends DBObject {
public void Init() {
//короткое имя+ функция/модуль/комон+ размерность
UniqKey = shortName + locName + dimSize;
if (packed_address != null) address = new BigInteger(packed_address);
if (packedAddress != null) address = new BigInteger(packedAddress);
for (ArrayDecl arrayDecl : declPlaces)
arrayDecl.file = Utils_.toW(arrayDecl.file);
//-- полей нет в json поэтому они null