remove chain name arguments from proper stopper constructors

[fleet.git] / src / com / sun / vlsi / chips / marina / test / ProperStopper.java

diff --git a/src/com/sun/vlsi/chips/marina/test/ProperStopper.java b/src/com/sun/vlsi/chips/marina/test/ProperStopper.java
index d349aa0..7b089a9 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/ProperStopper.java
+++ b/src/com/sun/vlsi/chips/marina/test/ProperStopper.java
@@ -34,9 +34,13 @@ public class ProperStopper {
     private boolean traceFill = false;
     private boolean traceDrain = false;
         
-    private final String controlChain, controlPath, 
-        dataChain, dataPath, 
-        reportChain, reportPath;
+    private final String
+        controlChain = Marina.CONTROL_CHAIN,
+        controlPath, 
+        dataChain = Marina.DATA_CHAIN,
+        dataPath, 
+        reportChain = Marina.REPORT_CHAIN,
+        reportPath;
     private final String captureClock;
     private final ChainControls cc;
     private final ChipModel model;
@@ -239,18 +243,13 @@ public class ProperStopper {
     /** construct a ProperStopper */
     public ProperStopper(String name,
                          String propInst,
-                         String controlChain, String dataChain, 
-                         String reportChain,
                          ChainControls cc, ChipModel model,
                          boolean clockHack,
                          Indenter indenter,
                          String pathToCounter) {
         this.name = name;
-        this.controlChain = controlChain;
         this.controlPath = controlChain+'.'+propInst;
-        this.dataChain = dataChain;
         this.dataPath = dataChain+'.'+propInst;
-        this.reportChain = reportChain;
         this.reportPath = reportChain+'.'+propInst;
         this.model = model;
         this.captureClock =