распаковка с учетом интов
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package _VisualDVM.ProjectData.SapforData.Loops;
|
||||
import Common.Visual.Fonts.VisualiserFonts;
|
||||
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
||||
import _VisualDVM.ProjectData.Messages.Message;
|
||||
import _VisualDVM.ProjectData.SapforData.FileObject;
|
||||
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
|
||||
import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
|
||||
import com.google.gson.annotations.Expose;
|
||||
@@ -34,24 +34,33 @@ public class Loop extends FileObjectWithMessages {
|
||||
// @Expose
|
||||
// public List<NonRectIter> non_rect_iters = new Vector<>();
|
||||
@Expose
|
||||
public List<EGoto> extGotos = new Vector<>();
|
||||
public List<Integer> extGotos = new Vector<>();
|
||||
@Expose
|
||||
public List<IGoto> intGotos = new Vector<>();
|
||||
public List<Integer> intGotos = new Vector<>();
|
||||
@Expose
|
||||
public List<IO> ios = new Vector<>();
|
||||
public List<Integer> ios = new Vector<>();
|
||||
@Expose
|
||||
public List<Stop> stops = new Vector<>();
|
||||
public List<Integer> stops = new Vector<>();
|
||||
@Expose
|
||||
public List<Loop> children = new Vector<>();
|
||||
//--
|
||||
public List<FileObjectWithMessages> getAllChildren(){
|
||||
public List<FileObjectWithMessages> getGraphNodes(DBProjectFile dbProjectFile){
|
||||
List<FileObjectWithMessages> all_children = new Vector<>();
|
||||
//-
|
||||
if (hasNonRectangularBounds!=0)
|
||||
all_children.add(new NonRectIter(dbProjectFile, line));
|
||||
//-
|
||||
all_children.addAll(funcCalls);
|
||||
// all_children.addAll(non_rect_iters);
|
||||
all_children.addAll(extGotos);
|
||||
all_children.addAll(intGotos);
|
||||
all_children.addAll(ios);
|
||||
all_children.addAll(stops);
|
||||
//-
|
||||
for (int line_: extGotos)
|
||||
all_children.add(new EGoto(dbProjectFile, line_));
|
||||
for (int line_: intGotos)
|
||||
all_children.add(new IGoto(dbProjectFile, line_));
|
||||
for (int line_: ios)
|
||||
all_children.add(new IO(dbProjectFile, line_));
|
||||
for (int line_: stops)
|
||||
all_children.add(new Stop(dbProjectFile, line_));
|
||||
//-
|
||||
all_children.addAll(children);
|
||||
return all_children;
|
||||
}
|
||||
@@ -80,10 +89,4 @@ public class Loop extends FileObjectWithMessages {
|
||||
for (Loop loop: children)
|
||||
loop.toMap_r(loops_map);
|
||||
}
|
||||
@Override
|
||||
public void setFile(String file_in) {
|
||||
super.setFile(file_in);
|
||||
for (FileObject fileObject: getAllChildren())
|
||||
fileObject.setFile(file_in);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user