[Jrobin-commits] src ComplexDemo.java,1.4,1.5 Demo.java,1.9,1.10 PlottableDemo.java,1.2,1.3

[<sa...@us...>]

Update of /cvsroot/jrobin/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20910

Modified Files:
	ComplexDemo.java Demo.java PlottableDemo.java 
Log Message:
minor improvements

Index: ComplexDemo.java
===================================================================
RCS file: /cvsroot/jrobin/src/ComplexDemo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ComplexDemo.java	10 Nov 2003 08:52:27 -0000	1.4
--- ComplexDemo.java	19 Feb 2004 13:05:04 -0000	1.5
***************
*** 42,50 ****
  
  	private static String getPath(String ext) {
! 		return Util.getJRobinDemoDirectory() + filename + "." + ext;
  	}
  
  	private static String getPath(int version, String ext) {
! 		return Util.getJRobinDemoDirectory() + filename + version + "." + ext;
  	}
  
--- 42,50 ----
  
  	private static String getPath(String ext) {
! 		return Util.getJRobinDemoPath(filename + "." + ext);
  	}
  
  	private static String getPath(int version, String ext) {
! 		return Util.getJRobinDemoPath(filename + version + "." + ext);
  	}
  

Index: Demo.java
===================================================================
RCS file: /cvsroot/jrobin/src/Demo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Demo.java	19 Feb 2004 12:23:56 -0000	1.9
--- Demo.java	19 Feb 2004 13:05:04 -0000	1.10
***************
*** 39,43 ****
  	
  	static final Random RANDOM = new Random(SEED);
- 	static final String HOME = Util.getJRobinDemoDirectory();
  	static final String FILE = "demo";
  
--- 39,42 ----
***************
*** 55,65 ****
  		long start = START;
  		long end = END;
! 		String rrdPath = getFullPath(FILE + ".rrd");
! 		String xmlPath = getFullPath(FILE + ".xml");
! 		String rrdRestoredPath = getFullPath(FILE + "_restored.rrd");
! 		String pngPath = getFullPath(FILE + ".png");
! 		String jpegPath = getFullPath(FILE + ".jpeg");
! 		String gifPath = getFullPath(FILE + ".gif");
! 		String logPath = getFullPath(FILE + ".log");
  		PrintWriter log = new PrintWriter(
  			new BufferedOutputStream(new FileOutputStream(logPath, false))
--- 54,64 ----
  		long start = START;
  		long end = END;
! 		String rrdPath = Util.getJRobinDemoPath(FILE + ".rrd");
! 		String xmlPath = Util.getJRobinDemoPath(FILE + ".xml");
! 		String rrdRestoredPath = Util.getJRobinDemoPath(FILE + "_restored.rrd");
! 		String pngPath = Util.getJRobinDemoPath(FILE + ".png");
! 		String jpegPath = Util.getJRobinDemoPath(FILE + ".jpeg");
! 		String gifPath = Util.getJRobinDemoPath(FILE + ".gif");
! 		String logPath = Util.getJRobinDemoPath(FILE + ".log");
  		PrintWriter log = new PrintWriter(
  			new BufferedOutputStream(new FileOutputStream(logPath, false))
***************
*** 175,182 ****
  		System.out.println(msg);
  	}
- 
- 	static String getFullPath(String path) {
- 		return HOME + path;
- 	}
  }
  
--- 174,177 ----

Index: PlottableDemo.java
===================================================================
RCS file: /cvsroot/jrobin/src/PlottableDemo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PlottableDemo.java	26 Jan 2004 12:38:01 -0000	1.2
--- PlottableDemo.java	19 Feb 2004 13:05:04 -0000	1.3
***************
*** 1,4 ****
--- 1,6 ----
  import org.jrobin.graph.*;
  import org.jrobin.core.RrdException;
+ import org.jrobin.core.Util;
+ 
  import java.awt.*;
  import java.io.IOException;
***************
*** 38,42 ****
  		gdef.setTimeAxis(TimeAxisUnit.DAY, 1, TimeAxisUnit.DAY, 1, "dd", true);
  		RrdGraph g = new RrdGraph(gdef);
! 		g.saveAsPNG("plottable2.png", 400, 200);
  	}
  }
--- 40,46 ----
  		gdef.setTimeAxis(TimeAxisUnit.DAY, 1, TimeAxisUnit.DAY, 1, "dd", true);
  		RrdGraph g = new RrdGraph(gdef);
! 		String filename = Util.getJRobinDemoPath("plottable.png");
! 		g.saveAsPNG(filename, 400, 200);
! 		System.out.println("Graph saved to " + filename);
  	}
  }