[Javapathfinder-devel] javapathfinder/src/gov/nasa/jpf Config.java,1.4,1.5 JPF.java,1.4,1.5

[pcm <pcm...@us...>]

Update of /cvsroot/javapathfinder/javapathfinder/src/gov/nasa/jpf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23004/src/gov/nasa/jpf

Modified Files:
	Config.java JPF.java 
Log Message:
changed the config dump back to using a provided PrintWriter, so that debuging
the config doesn't rely on it's proper functioning (since logging is controlled
by config). This also takes care of missing output because of insufficient
log level (-show always prints)


Index: JPF.java
===================================================================
RCS file: /cvsroot/javapathfinder/javapathfinder/src/gov/nasa/jpf/JPF.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- JPF.java	18 May 2005 06:41:44 -0000	1.4
+++ JPF.java	8 Jun 2005 23:47:02 -0000	1.5
@@ -228,7 +228,7 @@
     }
     
     if (isPrintConfigRequest(args)) {
-      conf.print(logger);
+      conf.print(new PrintWriter(System.out));
     }
     
     if (conf.getTargetArg() != null) {

Index: Config.java
===================================================================
RCS file: /cvsroot/javapathfinder/javapathfinder/src/gov/nasa/jpf/Config.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Config.java	18 May 2005 06:41:44 -0000	1.4
+++ Config.java	8 Jun 2005 23:47:02 -0000	1.5
@@ -703,34 +703,30 @@
     return -1;
   }
 
-  public void print(Logger log) {
-    if (log.isLoggable(Level.CONFIG)) {
-      StringWriter sw = new StringWriter(1024);
-      PrintWriter pw = new PrintWriter(sw, true);
-      pw.println("----------- dictionary contents");
-
-      // just how much do you have to do to get a sorted printout :(
-      TreeSet kset = new TreeSet();
-      for (Enumeration e = propertyNames(); e.hasMoreElements();) {
-        kset.add(e.nextElement());
-      }
-      for (Iterator it = kset.iterator(); it.hasNext();) {
-        String key = (String) it.next();
-        Object val = getProperty(key);
-        pw.print(key);
-        pw.print(" = ");
-        pw.println(val);
-      }
-
-      if ((freeArgs != null) && (freeArgs.length > 0)) {
-        pw.println("----------- free arguments");
-        for (int i = 0; i < freeArgs.length; i++) {
-          pw.println(freeArgs[i]);
-        }
+  public void print (PrintWriter pw) {
+    pw.println("----------- dictionary contents");
+    
+    // just how much do you have to do to get a sorted printout :(
+    TreeSet kset = new TreeSet();
+    for (Enumeration e = propertyNames(); e.hasMoreElements();) {
+      kset.add(e.nextElement());
+    }
+    for (Iterator it = kset.iterator(); it.hasNext();) {
+      String key = (String) it.next();
+      String val = getExpandedString(key);
+      pw.print(key);
+      pw.print(" = ");
+      pw.println(val);
+    }
+    
+    if ((freeArgs != null) && (freeArgs.length > 0)) {
+      pw.println("----------- free arguments");
+      for (int i = 0; i < freeArgs.length; i++) {
+        pw.println(freeArgs[i]);
       }
-
-      log.config(sw.toString());
     }
+    
+    pw.flush();
   }
 
   public void printStatus(Logger log) {