[Jrobin-commits] src/org/jrobin/graph FetchSourceList.java,1.2,1.3 Grapher.java,1.17,1.18 RrdExporter.java,1.3,1.4

[Arne V. <cob...@us...>]

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

Modified Files:
	FetchSourceList.java Grapher.java RrdExporter.java 
Log Message:
JRobin 1.4.0
- Minor tweaks
- Added LazyDemo demo

Index: Grapher.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/Grapher.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Grapher.java	10 Jul 2004 00:07:03 -0000	1.17
--- Grapher.java	13 Jul 2004 16:20:07 -0000	1.18
***************
*** 285,288 ****
--- 285,290 ----
  	protected boolean shouldGenerate( long prevGenTime ) throws RrdException, IOException
  	{
+ 		FetchSourceList fetchSources = graphDef.getFetchSources();
+ 
  		fetchSources.openAll();
  

Index: RrdExporter.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdExporter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RrdExporter.java	11 Jul 2004 22:04:13 -0000	1.3
--- RrdExporter.java	13 Jul 2004 16:20:07 -0000	1.4
***************
*** 48,56 ****
  	protected Source[] sources;
  	protected HashMap sourceIndex;
- 	protected FetchSourceList fetchSources;
  
  	RrdExporter( RrdExportDef def )
  	{
! 		rrdOpener = new RrdOpener( false, true );
  		setExportDef( def );
  	}
--- 48,55 ----
  	protected Source[] sources;
  	protected HashMap sourceIndex;
  
  	RrdExporter( RrdExportDef def )
  	{
! 		setRrdOpener( new RrdOpener( false, true ) );
  		setExportDef( def );
  	}
***************
*** 58,62 ****
  	RrdExporter( RrdExportDef def, RrdOpener rrdOpener )
  	{
! 		this.rrdOpener	= rrdOpener;
  		setExportDef( def );
  	}
--- 57,61 ----
  	RrdExporter( RrdExportDef def, RrdOpener rrdOpener )
  	{
! 		setRrdOpener( rrdOpener );
  		setExportDef( def );
  	}
***************
*** 65,76 ****
  	{
  		this.def 			= def;
- 		this.fetchSources	= def.getFetchSources();
- 		fetchSources.setRrdOpener( rrdOpener );
  	}
  
  	void setRrdOpener( RrdOpener rrdOpener )
  	{
! 		if ( fetchSources != null )
! 			fetchSources.setRrdOpener( rrdOpener );
  	}
  
--- 64,72 ----
  	{
  		this.def 			= def;
  	}
  
  	void setRrdOpener( RrdOpener rrdOpener )
  	{
! 		this.rrdOpener = rrdOpener;
  	}
  
***************
*** 87,94 ****
--- 83,94 ----
  	protected void calculateSeries( int maxRows ) throws RrdException, IOException
  	{
+ 		FetchSourceList fetchSources;
  		ValueExtractor ve;
  		FetchSource src;
  		String[] varList;
  
+ 		fetchSources			= def.getFetchSources();
+ 		fetchSources.setRrdOpener( rrdOpener );
+ 
  		long finalEndTime 		= Long.MAX_VALUE;
  		boolean changingEndTime = false;

Index: FetchSourceList.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/FetchSourceList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FetchSourceList.java	29 Jun 2004 09:34:39 -0000	1.2
--- FetchSourceList.java	13 Jul 2004 16:20:07 -0000	1.3
***************
*** 50,53 ****
--- 50,54 ----
  
  	private boolean persistent;
+ 	private boolean openerLocked;
  	private boolean opened;
  
***************
*** 69,73 ****
  	public FetchSourceList( int defaultSize )
  	{
! 		this( defaultSize, false );
  	}
  
--- 70,74 ----
  	public FetchSourceList( int defaultSize )
  	{
! 		this( defaultSize, false, false );
  	}
  
***************
*** 82,92 ****
  	 * @param persistent True if the list is persistent, false if not.
  	 */
! 	public FetchSourceList( int defaultSize, boolean persistent )
  	{
! 		map				= new HashMap( defaultSize );
! 		list			= new ArrayList( defaultSize );
  
! 		opened			= false;
! 		this.persistent	= persistent;
  	}
  
--- 83,94 ----
  	 * @param persistent True if the list is persistent, false if not.
  	 */
! 	public FetchSourceList( int defaultSize, boolean persistent, boolean lockOpener )
  	{
! 		map					= new HashMap( defaultSize );
! 		list				= new ArrayList( defaultSize );
  
! 		opened				= false;
! 		this.persistent		= persistent;
! 		this.openerLocked	= lockOpener;
  	}
  
***************
*** 103,109 ****
  	 * 					for RrdDb retrieval.
  	 */
! 	public FetchSourceList( int defaultSize, boolean persistent, RrdOpener rrdOpener )
  	{
! 		this( defaultSize, persistent );
  
  		this.rrdOpener	= rrdOpener;
--- 105,111 ----
  	 * 					for RrdDb retrieval.
  	 */
! 	public FetchSourceList( int defaultSize, boolean persistent, boolean lockOpener, RrdOpener rrdOpener )
  	{
! 		this( defaultSize, persistent , lockOpener);
  
  		this.rrdOpener	= rrdOpener;
***************
*** 122,126 ****
  	{
  		// Only allow RrdOpener change if not persistent
! 		if ( !persistent )
  			this.rrdOpener	= rrdOpener;
  	}
--- 124,128 ----
  	{
  		// Only allow RrdOpener change if not persistent
! 		if ( !persistent && !openerLocked )
  			this.rrdOpener	= rrdOpener;
  	}
***************
*** 143,151 ****
  	 * @param persistent True if the list should behave as persistent.
  	 */
! 	public void setPersistent( boolean persistent ) {
  		this.persistent = persistent;
  	}
  
  	/**
  	 * Returns the number of FetchSources hold in the list.
  	 * @return Number of different FetchSources.
--- 145,170 ----
  	 * @param persistent True if the list should behave as persistent.
  	 */
! 	public void setPersistent( boolean persistent )
! 	{
  		this.persistent = persistent;
  	}
  
  	/**
+ 	 * This locks the RrdOpener in the FetchSourceList.  Subsequent call so
+ 	 * setRrdOpener() will be ignored until it is unlocked.
+ 	 */
+ 	public void lockOpener() {
+ 		openerLocked = true;
+ 	}
+ 
+ 	/**
+ 	 * Unlocks the RrdOpener object, means calls to setRrdOpener() can change
+ 	 * the internal rrdOpener object.
+ 	 */
+ 	public void unlockOpener() {
+ 		openerLocked = false;
+ 	}
+ 
+ 	/**
  	 * Returns the number of FetchSources hold in the list.
  	 * @return Number of different FetchSources.