remove fields

soot-oss · Jan 8, 2025 · b4add46 · b4add46
1 parent 30d00cc
commit b4add46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/sootup.core/src/main/java/sootup/core/graph/StmtGraph.java b/sootup.core/src/main/java/sootup/core/graph/StmtGraph.java
@@ -66,9 +66,6 @@
  */
 public abstract class StmtGraph<V extends BasicBlock<V>> implements Iterable<Stmt> {
 
-  public final JimplePrinter jimplePrinter = new JimplePrinter();
-  public final BriefStmtPrinter briefStmtPrinter = new BriefStmtPrinter();
-
   public abstract Stmt getStartingStmt();
 
   public abstract BasicBlock<?> getStartingStmtBlock();
@@ -357,10 +354,8 @@ public boolean equals(Object o) {
       return false;
     }
 
-    briefStmtPrinter.buildTraps(this);
-    List<Trap> currTraps = briefStmtPrinter.getTraps();
-    briefStmtPrinter.buildTraps(otherGraph);
-    List<Trap> otherGraphTraps = briefStmtPrinter.getTraps();
+    List<Trap> currTraps = new BriefStmtPrinter(this).getTraps();
+    List<Trap> otherGraphTraps = new BriefStmtPrinter(otherGraph).getTraps();
     if (!currTraps.equals(otherGraphTraps)) {
       return false;
     }
@@ -453,7 +448,7 @@ public Stmt next() {
   public String toString() {
     StringWriter writer = new StringWriter();
     try (PrintWriter writerOut = new PrintWriter(new EscapedWriter(writer))) {
-      jimplePrinter.printTo(this, writerOut);
+      new JimplePrinter().printTo(this, writerOut);
     }
     return writer.toString();
   }

diff --git a/sootup.core/src/main/java/sootup/core/util/printer/BriefStmtPrinter.java b/sootup.core/src/main/java/sootup/core/util/printer/BriefStmtPrinter.java
@@ -22,6 +22,7 @@
  * #L%
  */
 
+import sootup.core.graph.StmtGraph;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.common.ref.IdentityRef;
 import sootup.core.jimple.common.ref.JCaughtExceptionRef;
@@ -37,6 +38,10 @@ public BriefStmtPrinter() {
     super();
   }
 
+  public BriefStmtPrinter(StmtGraph stmtGraph) {
+    buildTraps(stmtGraph);
+  }
+
   @Override
   public void method(SootMethod m) {
     handleIndent();