Menu
▾
▴
jrobin-commits — Mailing list for CVS commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(11) |
Oct
(60) |
Nov
(68) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(10) |
Feb
(15) |
Mar
(30) |
Apr
(20) |
May
(32) |
Jun
(30) |
Jul
(61) |
Aug
(13) |
Sep
(14) |
Oct
(13) |
Nov
(28) |
Dec
(10) |
| 2005 |
Jan
(7) |
Feb
(5) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(15) |
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(20) |
Aug
(35) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(14) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sa...@us...> - 2003-11-07 08:23:22
|
Update of /cvsroot/jrobin/src/org/jrobin/mrtg In directory sc8-pr-cvs1:/tmp/cvs-serv14464/org/jrobin/mrtg Added Files: Debug.java MrtgConstants.java MrtgException.java Log Message: packages org.jrobin.* created (old jrobin.* packages still exist, will be removed later) --- NEW FILE: Debug.java --- /* ============================================================ * JRobin : Pure java implementation of RRDTool's functionality * ============================================================ * * Project Info: http://www.sourceforge.net/projects/jrobin * Project Lead: Sasa Markovic (sa...@eu...); * * (C) Copyright 2003, by Sasa Markovic. * * Developers: Sasa Markovic (sa...@jr...) * Arne Vandamme (cob...@jr...) * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; * either version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License along with this * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ package org.jrobin.mrtg; /** * Created by IntelliJ IDEA. * User: Administrator * Date: Jul 30, 2003 * Time: 11:25:12 AM * To change this template use Options | File Templates. */ public class Debug { static final boolean DEBUG = false; public static void print(String msg) { if(DEBUG) { System.out.println(msg); } } } --- NEW FILE: MrtgConstants.java --- /* ============================================================ * JRobin : Pure java implementation of RRDTool's functionality * ============================================================ * * Project Info: http://www.sourceforge.net/projects/jrobin * Project Lead: Sasa Markovic (sa...@eu...); * * (C) Copyright 2003, by Sasa Markovic. * * Developers: Sasa Markovic (sa...@jr...) * Arne Vandamme (cob...@jr...) * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; * either version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License along with this * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ package org.jrobin.mrtg; public interface MrtgConstants { int SERVER_PORT = 35353; } --- NEW FILE: MrtgException.java --- /* ============================================================ * JRobin : Pure java implementation of RRDTool's functionality * ============================================================ * * Project Info: http://www.sourceforge.net/projects/jrobin * Project Lead: Sasa Markovic (sa...@eu...); * * (C) Copyright 2003, by Sasa Markovic. * * Developers: Sasa Markovic (sa...@jr...) * Arne Vandamme (cob...@jr...) * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; * either version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License along with this * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ package org.jrobin.mrtg; public class MrtgException extends Exception { public MrtgException(String cause) { super(cause); } public MrtgException(Exception e) { super(e); } } |
|
From: <sa...@us...> - 2003-11-07 08:23:21
|
Update of /cvsroot/jrobin/src In directory sc8-pr-cvs1:/tmp/cvs-serv14464 Modified Files: ComplexDemo.java Demo.java Log Message: packages org.jrobin.* created (old jrobin.* packages still exist, will be removed later) Index: ComplexDemo.java =================================================================== RCS file: /cvsroot/jrobin/src/ComplexDemo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ComplexDemo.java 6 Nov 2003 15:52:52 -0000 1.1 --- ComplexDemo.java 7 Nov 2003 08:23:18 -0000 1.2 *************** *** 30,35 **** import java.io.IOException; ! import jrobin.core.*; ! import jrobin.graph.*; /** --- 30,35 ---- import java.io.IOException; ! import org.jrobin.core.*; ! import org.jrobin.graph.*; /** Index: Demo.java =================================================================== RCS file: /cvsroot/jrobin/src/Demo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Demo.java 6 Nov 2003 15:52:52 -0000 1.1 --- Demo.java 7 Nov 2003 08:23:18 -0000 1.2 *************** *** 24,30 **** */ ! import jrobin.core.*; ! import jrobin.graph.RrdGraph; ! import jrobin.graph.RrdGraphDef; import java.awt.*; --- 24,30 ---- */ ! import org.jrobin.core.*; ! import org.jrobin.graph.RrdGraph; ! import org.jrobin.graph.RrdGraphDef; import java.awt.*; |
|
From: <sa...@us...> - 2003-11-07 08:17:51
|
Update of /cvsroot/jrobin/src/org/jrobin/mrtg/client In directory sc8-pr-cvs1:/tmp/cvs-serv13696/client Log Message: Directory /cvsroot/jrobin/src/org/jrobin/mrtg/client added to the repository |
|
From: <sa...@us...> - 2003-11-07 08:17:51
|
Update of /cvsroot/jrobin/src/org/jrobin/mrtg/server In directory sc8-pr-cvs1:/tmp/cvs-serv13696/server Log Message: Directory /cvsroot/jrobin/src/org/jrobin/mrtg/server added to the repository |
|
From: <sa...@us...> - 2003-11-07 08:16:19
|
Update of /cvsroot/jrobin/src/org/jrobin/mrtg In directory sc8-pr-cvs1:/tmp/cvs-serv13504/mrtg Log Message: Directory /cvsroot/jrobin/src/org/jrobin/mrtg added to the repository |
|
From: <sa...@us...> - 2003-11-07 08:16:19
|
Update of /cvsroot/jrobin/src/org/jrobin/inspector In directory sc8-pr-cvs1:/tmp/cvs-serv13504/inspector Log Message: Directory /cvsroot/jrobin/src/org/jrobin/inspector added to the repository |
|
From: <sa...@us...> - 2003-11-07 08:16:19
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs1:/tmp/cvs-serv13504/graph Log Message: Directory /cvsroot/jrobin/src/org/jrobin/graph added to the repository |
|
From: <sa...@us...> - 2003-11-07 08:14:01
|
Update of /cvsroot/jrobin/src/org/jrobin/core In directory sc8-pr-cvs1:/tmp/cvs-serv13100/core Log Message: Directory /cvsroot/jrobin/src/org/jrobin/core added to the repository |
|
From: <sa...@us...> - 2003-11-07 08:13:27
|
Update of /cvsroot/jrobin/src/org/jrobin In directory sc8-pr-cvs1:/tmp/cvs-serv13036/jrobin Log Message: Directory /cvsroot/jrobin/src/org/jrobin added to the repository |
|
From: <sa...@us...> - 2003-11-07 08:12:47
|
Update of /cvsroot/jrobin/src/org In directory sc8-pr-cvs1:/tmp/cvs-serv12879/org Log Message: Directory /cvsroot/jrobin/src/org added to the repository |
|
From: <sa...@us...> - 2003-11-06 15:58:45
|
Update of /cvsroot/jrobin/src In directory sc8-pr-cvs1:/tmp/cvs-serv5717 Removed Files: Test.java Log Message: --- Test.java DELETED --- |
|
From: <sa...@us...> - 2003-11-06 15:55:50
|
Update of /cvsroot/jrobin/src/jrobin/demo In directory sc8-pr-cvs1:/tmp/cvs-serv5027/jrobin/demo Removed Files: JRobinComplexDemo.java JRobinGallery.java Log Message: Removed jrobin.demo package --- JRobinComplexDemo.java DELETED --- --- JRobinGallery.java DELETED --- |
Update of /cvsroot/jrobin/src/jrobin/core
In directory sc8-pr-cvs1:/tmp/cvs-serv4316/jrobin/core
Modified Files:
ArcDef.java ArcState.java Archive.java Datasource.java
DsDef.java FetchData.java FetchPoint.java FetchRequest.java
Header.java Robin.java RpnCalculator.java RrdDb.java
RrdDbPool.java RrdDef.java RrdDouble.java RrdException.java
RrdFile.java RrdInt.java RrdLong.java RrdString.java
RrdUpdater.java Sample.java Util.java XmlReader.java
XmlWriter.java
Log Message:
Uniform source code headers provided. Minor changes to Demo classes
Index: ArcDef.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/ArcDef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArcDef.java 4 Sep 2003 13:26:41 -0000 1.1
--- ArcDef.java 6 Nov 2003 15:52:52 -0000 1.2
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: ArcState.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/ArcState.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ArcState.java 6 Oct 2003 10:45:04 -0000 1.4
--- ArcState.java 6 Nov 2003 15:52:52 -0000 1.5
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: Archive.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/Archive.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Archive.java 22 Oct 2003 08:55:10 -0000 1.7
--- Archive.java 6 Nov 2003 15:52:52 -0000 1.8
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: Datasource.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/Datasource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Datasource.java 6 Oct 2003 10:45:04 -0000 1.5
--- Datasource.java 6 Nov 2003 15:52:52 -0000 1.6
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: DsDef.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/DsDef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DsDef.java 16 Oct 2003 09:26:30 -0000 1.2
--- DsDef.java 6 Nov 2003 15:52:52 -0000 1.3
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: FetchData.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/FetchData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FetchData.java 23 Oct 2003 23:16:36 -0000 1.4
--- FetchData.java 6 Nov 2003 15:52:52 -0000 1.5
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: FetchPoint.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/FetchPoint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FetchPoint.java 21 Oct 2003 12:53:05 -0000 1.2
--- FetchPoint.java 6 Nov 2003 15:52:52 -0000 1.3
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: FetchRequest.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/FetchRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FetchRequest.java 23 Oct 2003 14:55:34 -0000 1.4
--- FetchRequest.java 6 Nov 2003 15:52:52 -0000 1.5
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: Header.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/Header.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Header.java 6 Oct 2003 10:45:04 -0000 1.4
--- Header.java 6 Nov 2003 15:52:52 -0000 1.5
***************
*** 12,15 ****
--- 12,18 ----
* either version 2.1 of the License, or (at your option) any later version.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Index: Robin.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/Robin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Robin.java 21 Oct 2003 12:53:05 -0000 1.4
--- Robin.java 6 Nov 2003 15:52:52 -0000 1.5
***************
*** 12,15 ****
--- 12,18 ----
* either version 2.1 of the License, or (at your option) any later version.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Index: RpnCalculator.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RpnCalculator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RpnCalculator.java 23 Oct 2003 14:55:34 -0000 1.2
--- RpnCalculator.java 6 Nov 2003 15:52:52 -0000 1.3
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: RrdDb.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdDb.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RrdDb.java 23 Oct 2003 14:55:34 -0000 1.12
--- RrdDb.java 6 Nov 2003 15:52:52 -0000 1.13
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: RrdDbPool.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdDbPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RrdDbPool.java 23 Oct 2003 14:55:34 -0000 1.1
--- RrdDbPool.java 6 Nov 2003 15:52:52 -0000 1.2
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: RrdDef.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdDef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RrdDef.java 4 Sep 2003 13:26:41 -0000 1.1
--- RrdDef.java 6 Nov 2003 15:52:52 -0000 1.2
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: RrdDouble.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdDouble.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RrdDouble.java 4 Sep 2003 13:26:41 -0000 1.1
--- RrdDouble.java 6 Nov 2003 15:52:52 -0000 1.2
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: RrdException.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RrdException.java 6 Oct 2003 08:50:59 -0000 1.2
--- RrdException.java 6 Nov 2003 15:52:52 -0000 1.3
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: RrdFile.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdFile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RrdFile.java 23 Oct 2003 14:55:34 -0000 1.3
--- RrdFile.java 6 Nov 2003 15:52:52 -0000 1.4
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: RrdInt.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdInt.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RrdInt.java 4 Sep 2003 13:26:41 -0000 1.1
--- RrdInt.java 6 Nov 2003 15:52:52 -0000 1.2
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: RrdLong.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdLong.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RrdLong.java 4 Sep 2003 13:26:41 -0000 1.1
--- RrdLong.java 6 Nov 2003 15:52:52 -0000 1.2
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: RrdString.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdString.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RrdString.java 4 Sep 2003 13:26:41 -0000 1.1
--- RrdString.java 6 Nov 2003 15:52:52 -0000 1.2
***************
*** 12,15 ****
--- 12,18 ----
* either version 2.1 of the License, or (at your option) any later version.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Index: RrdUpdater.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/RrdUpdater.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RrdUpdater.java 4 Sep 2003 13:26:41 -0000 1.1
--- RrdUpdater.java 6 Nov 2003 15:52:52 -0000 1.2
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: Sample.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/Sample.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Sample.java 23 Oct 2003 14:55:34 -0000 1.4
--- Sample.java 6 Nov 2003 15:52:52 -0000 1.5
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: Util.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/Util.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Util.java 30 Oct 2003 16:21:13 -0000 1.9
--- Util.java 6 Nov 2003 15:52:52 -0000 1.10
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
***************
*** 28,31 ****
--- 31,35 ----
import java.util.Locale;
import java.util.GregorianCalendar;
+ import java.io.File;
/**
***************
*** 38,41 ****
--- 42,48 ----
// pattern RRDTool uses to format doubles in XML files
static final String PATTERN = "0.0000000000E00";
+ // directory under $USER_HOME used for demo graphs storing
+ static final String JROBIN_DIR = "jrobin-demo";
+
static final DecimalFormat df;
static {
***************
*** 166,169 ****
--- 173,195 ----
}
return value;
+ }
+
+ private static final File homeDirFile;
+ private static final String homeDirPath;
+
+ static {
+ String delim = System.getProperty("file.separator");
+ homeDirPath = System.getProperty("user.home") + delim + JROBIN_DIR + delim;
+ homeDirFile = new File(homeDirPath);
+ }
+
+ /**
+ * Returns path to directory used for placement of JRobin demo graphs. and creates it
+ * if necessary.
+ * @return Path to demo directory (defaults to $HOME/jrobin/) if directory exists or
+ * was successfully created. Null if such directory could not be created.
+ */
+ public static String getJRobinDemoDirectory() {
+ return (homeDirFile.exists() || homeDirFile.mkdirs())? homeDirPath: null;
}
Index: XmlReader.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/XmlReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XmlReader.java 29 Sep 2003 13:27:53 -0000 1.3
--- XmlReader.java 6 Nov 2003 15:52:52 -0000 1.4
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
Index: XmlWriter.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/core/XmlWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XmlWriter.java 16 Oct 2003 09:26:30 -0000 1.4
--- XmlWriter.java 6 Nov 2003 15:52:52 -0000 1.5
***************
*** 8,11 ****
--- 8,14 ----
* (C) Copyright 2003, by Sasa Markovic.
*
+ * Developers: Sasa Markovic (sa...@jr...)
+ * Arne Vandamme (cob...@jr...)
+ *
* This library is free software; you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation;
|
Update of /cvsroot/jrobin/src/jrobin/mrtg/client In directory sc8-pr-cvs1:/tmp/cvs-serv4316/jrobin/mrtg/client Modified Files: AboutDialog.java Client.java EditLinkDialog.java EditRouterDialog.java GraphFrame.java HelpDialog.java HostDialog.java LinkInfo.java MrtgData.java Resources.java RouterInfo.java RpcClient.java ServerInfo.java SplashWindow.java TreeElementInfo.java TreeRenderer.java Util.java Log Message: Uniform source code headers provided. Minor changes to Demo classes Index: AboutDialog.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/AboutDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AboutDialog.java 4 Sep 2003 13:28:18 -0000 1.1 --- AboutDialog.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Client.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/Client.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Client.java 1 Oct 2003 14:38:56 -0000 1.2 --- Client.java 6 Nov 2003 15:52:52 -0000 1.3 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: EditLinkDialog.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/EditLinkDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EditLinkDialog.java 4 Sep 2003 13:28:18 -0000 1.1 --- EditLinkDialog.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: EditRouterDialog.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/EditRouterDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EditRouterDialog.java 4 Sep 2003 13:28:18 -0000 1.1 --- EditRouterDialog.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: GraphFrame.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/GraphFrame.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GraphFrame.java 2 Oct 2003 09:30:40 -0000 1.2 --- GraphFrame.java 6 Nov 2003 15:52:52 -0000 1.3 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: HelpDialog.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/HelpDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HelpDialog.java 4 Sep 2003 13:28:18 -0000 1.1 --- HelpDialog.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: HostDialog.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/HostDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HostDialog.java 4 Sep 2003 13:28:18 -0000 1.1 --- HostDialog.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: LinkInfo.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/LinkInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LinkInfo.java 4 Sep 2003 13:28:18 -0000 1.1 --- LinkInfo.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: MrtgData.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/MrtgData.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MrtgData.java 4 Sep 2003 13:28:18 -0000 1.1 --- MrtgData.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Resources.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/Resources.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Resources.java 4 Sep 2003 13:28:18 -0000 1.1 --- Resources.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: RouterInfo.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/RouterInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RouterInfo.java 4 Sep 2003 13:28:18 -0000 1.1 --- RouterInfo.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: RpcClient.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/RpcClient.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RpcClient.java 4 Sep 2003 13:28:18 -0000 1.1 --- RpcClient.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: ServerInfo.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/ServerInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ServerInfo.java 4 Sep 2003 13:28:18 -0000 1.1 --- ServerInfo.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: SplashWindow.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/SplashWindow.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SplashWindow.java 4 Sep 2003 13:28:18 -0000 1.1 --- SplashWindow.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 1,2 **** --- 1,26 ---- + /* ============================================================ + * JRobin : Pure java implementation of RRDTool's functionality + * ============================================================ + * + * Project Info: http://www.sourceforge.net/projects/jrobin + * Project Lead: Sasa Markovic (sa...@eu...); + * + * (C) Copyright 2003, by Sasa Markovic. + * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * + * This library is free software; you can redistribute it and/or modify it under the terms + * of the GNU Lesser General Public License as published by the Free Software Foundation; + * either version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License along with this + * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ package jrobin.mrtg.client; Index: TreeElementInfo.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/TreeElementInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TreeElementInfo.java 4 Sep 2003 13:28:18 -0000 1.1 --- TreeElementInfo.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: TreeRenderer.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/TreeRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TreeRenderer.java 4 Sep 2003 13:28:18 -0000 1.1 --- TreeRenderer.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Util.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/client/Util.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Util.java 4 Sep 2003 13:28:18 -0000 1.1 --- Util.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; |
|
From: <sa...@us...> - 2003-11-06 15:52:59
|
Update of /cvsroot/jrobin/src In directory sc8-pr-cvs1:/tmp/cvs-serv4316 Added Files: ComplexDemo.java Demo.java Log Message: Uniform source code headers provided. Minor changes to Demo classes --- NEW FILE: ComplexDemo.java --- /* ============================================================ * JRobin : Pure java implementation of RRDTool's functionality * ============================================================ * * Project Info: http://www.sourceforge.net/projects/jrobin * Project Lead: Sasa Markovic (sa...@eu...); * * (C) Copyright 2003, by Sasa Markovic. * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; * either version 2.1 of the License, or (at your option) any later version. * * Developers: Sasa Markovic (sa...@jr...) * Arne Vandamme (cob...@jr...) * * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License along with this * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ import java.awt.Color; import java.util.Date; import java.util.GregorianCalendar; import java.text.SimpleDateFormat; import java.io.IOException; import jrobin.core.*; import jrobin.graph.*; /** * <p>Extended graphing demo for JRobin.</p> * * @author Arne Vandamme (cob...@jr...) */ class ComplexDemo { private static final String filename = "complexdemo"; 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; } private static void println(String msg) { System.out.println(msg); } private static void createDatabase(String xmlPath) throws IOException, RrdException { // Import database from XML String rrdPath = getPath("rrd"); println("-- Importing XML file: " + xmlPath); println("-- to RRD file: " + rrdPath); RrdDbPool pool = RrdDbPool.getInstance(); RrdDb rrd = pool.requestRrdDb(rrdPath, xmlPath); println("-- RRD file created"); pool.release(rrd); } private static void createGraphs() throws RrdException, IOException { GregorianCalendar start, stop; RrdGraph graph = new RrdGraph(true); String rrdPath = getPath("rrd"); // Create traffic overview of a week println("-- Creating graph 1"); start = new GregorianCalendar(2003, 7, 20); stop = new GregorianCalendar(2003, 7, 27); RrdGraphDef def = new RrdGraphDef(start, stop); def.setImageBorder(Color.GRAY, 1); def.setTitle("JRobinComplexDemo@Ldemo graph 1@r\nNetwork traffic overview"); def.setVerticalLabel("bits per second"); def.datasource("ifInOctets", rrdPath, "ifInOctets", "AVERAGE"); def.datasource("ifOutOctets", rrdPath, "ifOutOctets", "AVERAGE"); def.datasource("bitIn", "ifInOctets,8,*"); def.datasource("bitOut", "ifOutOctets,8,*"); def.comment(" "); def.area("bitIn", new Color(0x00, 0xFF, 0x00), "Incoming traffic "); def.line("bitOut", new Color(0x00, 0x00, 0x33), "Outgoing traffic\n\n"); def.gprint("bitIn", "MAX", "Max: @6.1 @sbit/s"); def.gprint("bitOut", "MAX", " @6.1 @sbit/s\n"); def.gprint("bitIn", "MIN", "Min: @6.1 @sbit/s"); def.gprint("bitOut", "MIN", " @6.1 @sbit/s"); def.comment(" Connection: 100 Mbit/s\n"); def.gprint("bitIn", "AVG", "Avg: @6.1 @sbit/s"); def.gprint("bitOut", "AVG", " @6.1 @sbit/s"); def.comment(" Duplex mode: FD - fixed\n\n"); def.gprint("bitIn", "LAST", "Cur: @6.1 @sbit/s"); def.gprint("bitOut", "LAST", " @6.1 @sbit/s\n\n"); def.comment("[ courtesy of www.cherrymon.org ]@L"); def.comment("Generated: " + timestamp() + " @r"); graph.setGraphDef(def); String pngFile = getPath(1, "png"); graph.saveAsPNG(pngFile); String gifFile = getPath(1, "gif"); graph.saveAsGIF(gifFile); String jpgFile = getPath(1, "jpg"); graph.saveAsJPEG(jpgFile, 0.6F); // Create server load and cpu usage of a day println("-- Creating graph 2"); start = new GregorianCalendar(2003, 7, 19); stop = new GregorianCalendar(2003, 7, 20); def = new RrdGraphDef(start, stop); def.setImageBorder(Color.GRAY, 1); def.setTitle("JRobinComplexDemo@Ldemo graph 2@r\nServer load and CPU utilization"); def.datasource("load", rrdPath, "serverLoad", "AVERAGE"); def.datasource("user", rrdPath, "serverCPUUser", "AVERAGE"); def.datasource("nice", rrdPath, "serverCPUNice", "AVERAGE"); def.datasource("system", rrdPath, "serverCPUSystem", "AVERAGE"); def.datasource("idle", rrdPath, "serverCPUIdle", "AVERAGE"); def.datasource("total", "user,nice,+,system,+,idle,+"); def.datasource("busy", "user,nice,+,system,+,total,/,100,*"); def.datasource("p25t50", "busy,25,GT,busy,50,LE,load,0,IF,0,IF"); def.datasource("p50t75", "busy,50,GT,busy,75,LE,load,0,IF,0,IF"); def.datasource("p75t90", "busy,75,GT,busy,90,LE,load,0,IF,0,IF"); def.datasource("p90t100", "busy,90,GT,load,0,IF"); def.comment("CPU utilization (%)\n "); def.area("load", new Color(0x66, 0x99, 0xcc), " 0 - 25%"); def.area("p25t50", new Color(0x00, 0x66, 0x99), "25 - 50%@L"); def.gprint("busy", "MIN", "Minimum:@5.1@s%"); def.gprint("busy", "MAX", "Maximum:@5.1@s% @r "); def.area("p50t75", new Color(0x66, 0x66, 0x00), "50 - 75%"); def.area("p75t90", new Color(0xff, 0x66, 0x00), "75 - 90%"); def.area("p90t100", new Color(0xcc, 0x33, 0x00), "90 - 100%@L"); def.gprint("busy", "AVG", " Average:@5.1@s%"); def.gprint("busy", "LAST", "Current:@5.1@s% @r "); def.comment("\nServer load\n "); def.line("load", new Color(0x00, 0x00, 0x00), "Load average (5 min)@L"); def.gprint("load", "MIN", "Minimum:@5.2@s%"); def.gprint("load", "MAX", "Maximum:@5.2@s% @r "); def.gprint("load", "AVG", "Average:@5.2@s%"); def.gprint("load", "LAST", "Current:@5.2@s% @r"); def.comment("\n\n[ courtesy of www.cherrymon.org ]@L"); def.comment("Generated: " + timestamp() + " @r"); graph.setGraphDef(def); pngFile = getPath(2, "png"); graph.saveAsPNG(pngFile); gifFile = getPath(2, "gif"); graph.saveAsGIF(gifFile); jpgFile = getPath(2, "jpg"); graph.saveAsJPEG(jpgFile, 0.6F); // Create ftp graph for a month println("-- Creating graph 3: complexdemo3.png"); start = new GregorianCalendar(2003, 7, 19, 12, 00); stop = new GregorianCalendar(2003, 7, 20, 12, 00); def = new RrdGraphDef(start, stop); def.setImageBorder(Color.GRAY, 1); def.setFrontGrid(false); def.setTitle("JRobinComplexDemo@Ldemo graph 3@r\nFTP Usage"); def.datasource("ftp", rrdPath, "ftpUsers", "AVERAGE"); def.line("ftp", new Color(0x00, 0x00, 0x33), "FTP connections"); def.gprint("ftp", "AVG", "( average: @0,"); def.gprint("ftp", "MIN", "never below: @0 )\n\n"); def.comment(" Usage spread:"); def.area(new GregorianCalendar(2003, 7, 19, 17, 00), Double.MIN_VALUE, new GregorianCalendar(2003, 7, 19, 23, 00), Double.MAX_VALUE, Color.RED, "peak period"); def.area(new GregorianCalendar(2003, 7, 20, 5, 00), Double.MIN_VALUE, new GregorianCalendar(2003, 7, 20, 8, 30), Double.MAX_VALUE, Color.LIGHT_GRAY, "quiet period\n"); def.comment(" Rise/descend:"); def.area("ftp", new Color(0x00, 0x00, 0x33), null); def.line(new GregorianCalendar(2003, 7, 19, 12, 00), 110, new GregorianCalendar(2003, 7, 19, 20, 30), 160, Color.PINK, "climb slope", 2); def.line(new GregorianCalendar(2003, 7, 19, 20, 30), 160, new GregorianCalendar(2003, 7, 20, 8, 00), 45, Color.CYAN, "fall-back slope\n", 2); def.vrule(new GregorianCalendar(2003, 7, 20), Color.YELLOW, null); def.comment("\n\n[ courtesy of www.cherrymon.org ]@L"); def.comment("Generated: " + timestamp() + " @r"); graph.setGraphDef(def); pngFile = getPath(3, "png"); graph.saveAsPNG(pngFile, 500, 300); gifFile = getPath(3, "gif"); graph.saveAsGIF(gifFile, 500, 300); jpgFile = getPath(3, "jpg"); graph.saveAsJPEG(jpgFile, 500, 300, 0.6F); println("-- Finished"); println("**************************************"); println("Check your " + Util.getJRobinDemoDirectory() + " directory."); println("You should see nine nice looking graphs starting with [" + filename + "],"); println("three different graphs, each in three different image formats"); println("**************************************"); } private static String timestamp() { SimpleDateFormat df = new SimpleDateFormat("dd/MM/yyyy HH:mm"); return df.format(new Date()); } public static void main(String[] args) throws IOException, RrdException { if(args.length == 0) { println("Usage: ComplexDemo [path to rrdtool_dump.xml file]"); println("You can download separate rrdtool_dump.xml file from:"); println("http://www.sourceforge.net/projects/jrobin"); System.exit(-1); } long start = System.currentTimeMillis(); println("********************************************************************"); println("* JRobinComplexDemo *"); println("* *"); println("* This demo creates 3 separate graphs and stores them under *"); println("* several formats in 9 files. Values are selected from a large *"); println("* RRD file that will be created by importing an XML dump *"); println("* of approx. 7 MB. *"); println("* *"); println("* Graphs are created using real-life values, original RRD file *"); println("* provided by www.cherrymon.org. See the ComplexDemo *"); println("* sourcecode on how to create the graphs generated by this demo. *"); println("********************************************************************"); createDatabase(args[0]); createGraphs(); long stop = System.currentTimeMillis(); println("-- Demo finished in " + ((stop - start) / 1000.0) + " seconds."); } } --- NEW FILE: Demo.java --- /* ============================================================ * JRobin : Pure java implementation of RRDTool's functionality * ============================================================ * * Project Info: http://www.sourceforge.net/projects/jrobin * Project Lead: Sasa Markovic (sa...@eu...); * * (C) Copyright 2003, by Sasa Markovic. * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; * either version 2.1 of the License, or (at your option) any later version. * * Developers: Sasa Markovic (sa...@jr...) * Arne Vandamme (cob...@jr...) * * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License along with this * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ import jrobin.core.*; import jrobin.graph.RrdGraph; import jrobin.graph.RrdGraphDef; import java.awt.*; import java.io.BufferedOutputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.util.GregorianCalendar; class Demo { static final String HOME = Util.getJRobinDemoDirectory(); static final String FILE = "demo"; static final GregorianCalendar START = new GregorianCalendar(2003, 4, 1); static final GregorianCalendar END = new GregorianCalendar(2003, 5, 1); static final int MAX_STEP = 240; // increase this to get better flaming graph... static final int GRADIENT_COLOR_STEPS = 20; public static void main(String[] args) throws RrdException, IOException { // setup println("==Starting demo"); RrdDb.setLockMode(RrdDb.NO_LOCKS); long startMillis = System.currentTimeMillis(); long start = START.getTime().getTime() / 1000L; long end = END.getTime().getTime() / 1000L; 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 pw = new PrintWriter( new BufferedOutputStream(new FileOutputStream(logPath, false)) ); // creation println("==Creating RRD file " + rrdPath); RrdDef rrdDef = new RrdDef(rrdPath, start - 1, 300); rrdDef.addDatasource("sun", "GAUGE", 600, 0, Double.NaN); rrdDef.addDatasource("shade", "GAUGE", 600, 0, Double.NaN); rrdDef.addArchive("AVERAGE", 0.5, 1, 600); rrdDef.addArchive("AVERAGE", 0.5, 6, 700); rrdDef.addArchive("AVERAGE", 0.5, 24, 797); rrdDef.addArchive("AVERAGE", 0.5, 288, 775); rrdDef.addArchive("MAX", 0.5, 1, 600); rrdDef.addArchive("MAX", 0.5, 6, 700); rrdDef.addArchive("MAX", 0.5, 24, 797); rrdDef.addArchive("MAX", 0.5, 288, 775); println(rrdDef.dump()); pw.println(rrdDef.dump()); RrdDb rrdDb = new RrdDb(rrdDef); println("==RRD file created."); // update database GaugeSource sunSource = new GaugeSource(1200, 20); GaugeSource shadeSource = new GaugeSource(300, 10); println("==Simulating one month of RRD file updates with step not larger than " + MAX_STEP + " seconds (* denotes 1000 updates)"); long t = start; int n = 0; Sample sample = rrdDb.createSample(); while(t <= end) { sample.setTime(t); sample.setValue("sun", sunSource.getValue()); sample.setValue("shade", shadeSource.getValue()); pw.println(sample.dump()); sample.update(); t += Math.random() * MAX_STEP + 1; if(((++n) % 1000) == 0) { System.out.print("*"); }; } System.out.println(""); println("==Finished. RRD file updated " + n + " times"); println("==Last update time was: " + rrdDb.getLastUpdateTime()); // fetch data println("==Fetching data for the whole month"); FetchRequest request = rrdDb.createFetchRequest("AVERAGE", start, end); println(request.dump()); pw.println(request.dump()); FetchData fetchData = request.fetchData(); println("==Data fetched. " + fetchData.getRowCount() + " points obtained"); for(int i = 0; i < fetchData.getRowCount(); i++) { println(fetchData.getRow(i).dump()); } println("==Fetch completed"); println("==Dumping RRD file to XML file " + xmlPath + " (can be restored with RRDTool)"); rrdDb.dumpXml(xmlPath); println("==Creating RRD file " + rrdRestoredPath + " from XML file " + xmlPath); RrdDb rrdRestoredDb = new RrdDb(rrdRestoredPath, xmlPath); // close files println("==Closing both RRD files"); rrdDb.close(); rrdRestoredDb.close(); // creating graph println("==Creating graph from the second file"); RrdGraphDef gDef = new RrdGraphDef(); gDef.setTimePeriod(start, end); gDef.setTitle("Temperatures in May 2003"); gDef.setVerticalLabel("temperature"); gDef.datasource("sun", rrdRestoredPath, "sun", "AVERAGE"); gDef.datasource("shade", rrdRestoredPath, "shade", "AVERAGE"); gDef.datasource("median", "sun,shade,+,2,/"); gDef.datasource("diff", "sun,shade,-,ABS,-1,*"); // gradient color datasources for(int i = 1; i < GRADIENT_COLOR_STEPS; i++) { double factor = i / (double) GRADIENT_COLOR_STEPS; gDef.datasource("diff" + i, "diff," + factor + ",*"); } gDef.datasource("sine", "TIME," + start + ",-," + (end - start) + ",/,2,PI,*,*,SIN,1000,*"); gDef.line("sun", Color.GREEN, "sun temp"); gDef.line("shade", Color.BLUE, "shade temp"); gDef.line("median", Color.MAGENTA, "median value@L"); gDef.area("diff", Color.RED, "difference@r"); // gradient color areas for(int i = GRADIENT_COLOR_STEPS - 1; i >= 1; i--) { gDef.area("diff" + i, new Color(255, 255 - 255 * i / GRADIENT_COLOR_STEPS, 0), null); } gDef.line("sine", Color.CYAN, "sine function demo@L"); gDef.gprint("sun", "MAX", "maxSun = @3@s"); gDef.gprint("sun", "AVERAGE", "avgSun = @3@S@r"); gDef.gprint("shade", "MAX", "maxShade = @3@S"); gDef.gprint("shade", "AVERAGE", "avgShade = @3@S@r"); // create graph finally RrdGraph graph = new RrdGraph(gDef); println("==Graph created"); println("==Saving graph as PNG file " + pngPath); graph.saveAsPNG(pngPath, 400, 250); println("==Saving graph as JPEG file " + jpegPath); graph.saveAsJPEG(jpegPath, 400, 250, 0.5F); println("==Saving graph as GIF file " + gifPath); graph.saveAsGIF(gifPath, 400, 250); // demo ends pw.close(); println("Demo completed in " + ((System.currentTimeMillis() - startMillis) / 1000.0) + " sec"); } static void println(String msg) { System.out.println(msg); } static String getFullPath(String path) { return HOME + path; } } class GaugeSource { private double value; private double step; GaugeSource(double value, double step) { this.value = value; this.step = step; } double getValue() { double oldValue = value; double increment = Math.random() * step; if(Math.random() > 0.5) { increment *= -1; } value += increment; if(value <= 0) { value = 0; } return oldValue; } } |
|
From: <sa...@us...> - 2003-11-06 15:52:59
|
Update of /cvsroot/jrobin/src/jrobin/mrtg/server In directory sc8-pr-cvs1:/tmp/cvs-serv4316/jrobin/mrtg/server Modified Files: Archiver.java Collector.java Config.java Grapher.java Hardware.java Link.java RawSample.java Router.java RpcServer.java Scheduler.java Server.java SnmpCommunicator.java Log Message: Uniform source code headers provided. Minor changes to Demo classes Index: Archiver.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/Archiver.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Archiver.java 4 Sep 2003 13:28:38 -0000 1.1 --- Archiver.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Collector.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/Collector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Collector.java 4 Sep 2003 13:28:38 -0000 1.1 --- Collector.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Config.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/Config.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Config.java 4 Sep 2003 13:28:38 -0000 1.1 --- Config.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Grapher.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/Grapher.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Grapher.java 30 Oct 2003 16:21:13 -0000 1.4 --- Grapher.java 6 Nov 2003 15:52:52 -0000 1.5 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Hardware.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/Hardware.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Hardware.java 4 Sep 2003 13:28:38 -0000 1.1 --- Hardware.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Link.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/Link.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Link.java 4 Sep 2003 13:28:38 -0000 1.1 --- Link.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: RawSample.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/RawSample.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RawSample.java 4 Sep 2003 13:28:38 -0000 1.1 --- RawSample.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Router.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/Router.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Router.java 4 Sep 2003 13:28:38 -0000 1.1 --- Router.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: RpcServer.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/RpcServer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RpcServer.java 4 Sep 2003 13:28:38 -0000 1.1 --- RpcServer.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Scheduler.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/Scheduler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Scheduler.java 4 Sep 2003 13:28:38 -0000 1.1 --- Scheduler.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: Server.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/Server.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Server.java 4 Sep 2003 13:28:38 -0000 1.1 --- Server.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: SnmpCommunicator.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/server/SnmpCommunicator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SnmpCommunicator.java 4 Sep 2003 13:28:38 -0000 1.1 --- SnmpCommunicator.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; |
|
From: <sa...@us...> - 2003-11-06 15:52:58
|
Update of /cvsroot/jrobin/src/jrobin/inspector In directory sc8-pr-cvs1:/tmp/cvs-serv4316/jrobin/inspector Modified Files: ArchiveTableModel.java DataTableModel.java DatasourceTableModel.java HeaderTableModel.java InspectorModel.java MainTreeModel.java RrdInspector.java RrdNode.java Log Message: Uniform source code headers provided. Minor changes to Demo classes Index: ArchiveTableModel.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/inspector/ArchiveTableModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ArchiveTableModel.java 6 Oct 2003 08:58:08 -0000 1.1 --- ArchiveTableModel.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: DataTableModel.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/inspector/DataTableModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DataTableModel.java 6 Oct 2003 08:58:08 -0000 1.1 --- DataTableModel.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: DatasourceTableModel.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/inspector/DatasourceTableModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DatasourceTableModel.java 6 Oct 2003 08:58:08 -0000 1.1 --- DatasourceTableModel.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: HeaderTableModel.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/inspector/HeaderTableModel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HeaderTableModel.java 21 Oct 2003 12:53:05 -0000 1.2 --- HeaderTableModel.java 6 Nov 2003 15:52:52 -0000 1.3 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: InspectorModel.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/inspector/InspectorModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InspectorModel.java 6 Oct 2003 08:58:08 -0000 1.1 --- InspectorModel.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: MainTreeModel.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/inspector/MainTreeModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MainTreeModel.java 6 Oct 2003 08:58:08 -0000 1.1 --- MainTreeModel.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: RrdInspector.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/inspector/RrdInspector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RrdInspector.java 6 Oct 2003 08:58:08 -0000 1.1 --- RrdInspector.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: RrdNode.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/inspector/RrdNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RrdNode.java 6 Oct 2003 08:58:08 -0000 1.1 --- RrdNode.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; |
|
From: <sa...@us...> - 2003-11-06 15:52:58
|
Update of /cvsroot/jrobin/src/jrobin/mrtg In directory sc8-pr-cvs1:/tmp/cvs-serv4316/jrobin/mrtg Modified Files: Debug.java MrtgConstants.java MrtgException.java Log Message: Uniform source code headers provided. Minor changes to Demo classes Index: Debug.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/Debug.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Debug.java 4 Sep 2003 13:27:38 -0000 1.1 --- Debug.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 1,2 **** --- 1,27 ---- + /* ============================================================ + * JRobin : Pure java implementation of RRDTool's functionality + * ============================================================ + * + * Project Info: http://www.sourceforge.net/projects/jrobin + * Project Lead: Sasa Markovic (sa...@eu...); + * + * (C) Copyright 2003, by Sasa Markovic. + * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * + * This library is free software; you can redistribute it and/or modify it under the terms + * of the GNU Lesser General Public License as published by the Free Software Foundation; + * either version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License along with this + * library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + package jrobin.mrtg; Index: MrtgConstants.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/MrtgConstants.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MrtgConstants.java 4 Sep 2003 13:27:38 -0000 1.1 --- MrtgConstants.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; Index: MrtgException.java =================================================================== RCS file: /cvsroot/jrobin/src/jrobin/mrtg/MrtgException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MrtgException.java 4 Sep 2003 13:27:38 -0000 1.1 --- MrtgException.java 6 Nov 2003 15:52:52 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * (C) Copyright 2003, by Sasa Markovic. * + * Developers: Sasa Markovic (sa...@jr...) + * Arne Vandamme (cob...@jr...) + * * This library is free software; you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Foundation; |
|
From: <cob...@us...> - 2003-11-04 22:27:32
|
Update of /cvsroot/jrobin/src In directory sc8-pr-cvs1:/tmp/cvs-serv5130/src Modified Files: Test.java Log Message: Bug fix: JRobinComplexDemo crash Index: Test.java =================================================================== RCS file: /cvsroot/jrobin/src/Test.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Test.java 31 Oct 2003 15:12:57 -0000 1.1 --- Test.java 4 Nov 2003 22:27:28 -0000 1.2 *************** *** 1,6 **** ! import jrobin.graph2.RrdGraphDef; ! import jrobin.graph2.RrdGraph; import jrobin.core.Util; import jrobin.core.RrdException; --- 1,6 ---- ! import jrobin.graph.RrdGraphDef; ! import jrobin.graph.RrdGraph; import jrobin.core.Util; import jrobin.core.RrdException; |
Update of /cvsroot/jrobin/src/jrobin/graph
In directory sc8-pr-cvs1:/tmp/cvs-serv5130/src/jrobin/graph
Modified Files:
ValueGrid.java RrdGraph.java Source.java Grapher.java
ValueFormatter.java CustomLine.java
Log Message:
Bug fix:
JRobinComplexDemo crash
Index: ValueGrid.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/ValueGrid.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ValueGrid.java 30 Oct 2003 16:21:12 -0000 1.1
--- ValueGrid.java 4 Nov 2003 22:27:28 -0000 1.2
***************
*** 55,59 ****
* ValueAxisUnit is null, one will be automatically determined.
*/
! ValueGrid( GridRange gr, double lower, double upper, ValueAxisUnit vAxis )
{
double grLower = Double.MAX_VALUE;
--- 55,59 ----
* ValueAxisUnit is null, one will be automatically determined.
*/
! ValueGrid( GridRange gr, double low, double up, ValueAxisUnit vAxis )
{
double grLower = Double.MAX_VALUE;
***************
*** 67,72 ****
}
! this.lower = lower;
! this.upper = upper;
this.vAxis = vAxis;
--- 67,72 ----
}
! this.lower = low;
! this.upper = up;
this.vAxis = vAxis;
***************
*** 77,81 ****
this.lower = ( lower == grLower ? grLower : this.vAxis.getNiceLower( lower ) );
this.upper = ( upper == grUpper ? grUpper : this.vAxis.getNiceHigher( upper ) );
! }
}
--- 77,81 ----
this.lower = ( lower == grLower ? grLower : this.vAxis.getNiceLower( lower ) );
this.upper = ( upper == grUpper ? grUpper : this.vAxis.getNiceHigher( upper ) );
! }
}
***************
*** 108,111 ****
--- 108,116 ----
if ( vAxis != null )
return;
+
+ if ( upper == Double.NaN || upper == Double.MIN_VALUE || upper == Double.MAX_VALUE )
+ upper = 0.9;
+ if ( lower == Double.NaN || lower == Double.MAX_VALUE || lower == Double.MIN_VALUE )
+ lower = 0;
if ( !rigid && upper == 0 && upper == lower )
Index: RrdGraph.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/RrdGraph.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RrdGraph.java 30 Oct 2003 16:21:12 -0000 1.10
--- RrdGraph.java 4 Nov 2003 22:27:28 -0000 1.11
***************
*** 80,88 ****
/**
* Constructs a new JRobin graph object.
! * @param poolSize Maximum number of concurrent open rrd files in the RrdGraph object.
*/
! public RrdGraph( RrdDbPool pool )
{
! this.pool = pool;
}
--- 80,89 ----
/**
* Constructs a new JRobin graph object.
! * @param usePool True if this should object should use RrdDbPool
*/
! public RrdGraph( boolean usePool )
{
! if ( usePool )
! this.pool = RrdDbPool.getInstance();
}
***************
*** 95,99 ****
public RrdGraph( RrdGraphDef graphDef ) throws IOException, RrdException
{
! this( graphDef, null );
}
--- 96,100 ----
public RrdGraph( RrdGraphDef graphDef ) throws IOException, RrdException
{
! this( graphDef, false );
}
***************
*** 101,111 ****
* Constructs a new JRobin graph from the supplied definition.
* @param graphDef Graph definition.
! * @param poolSize Maximum number of concurrent open rrd files in the RrdGraph object.
* @throws IOException Thrown in case of I/O error.
* @throws RrdException Thrown in case of JRobin specific error.
*/
! public RrdGraph( RrdGraphDef graphDef, RrdDbPool pool ) throws IOException, RrdException
{
! this.pool = pool;
grapher = new Grapher( graphDef, this );
}
--- 102,113 ----
* Constructs a new JRobin graph from the supplied definition.
* @param graphDef Graph definition.
! * @param usePool True if this should object should use RrdDbPool
* @throws IOException Thrown in case of I/O error.
* @throws RrdException Thrown in case of JRobin specific error.
*/
! public RrdGraph( RrdGraphDef graphDef, boolean usePool ) throws IOException, RrdException
{
! if ( usePool )
! this.pool = RrdDbPool.getInstance();
grapher = new Grapher( graphDef, this );
}
Index: Source.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/Source.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Source.java 30 Oct 2003 16:21:12 -0000 1.4
--- Source.java 4 Nov 2003 22:27:28 -0000 1.5
***************
*** 106,113 ****
{
case AGG_MINIMUM:
! return min;
case AGG_MAXIMUM:
! return max;
case AGG_AVERAGE:
--- 106,113 ----
{
case AGG_MINIMUM:
! return ( min != Double.MIN_VALUE && min != Double.MAX_VALUE ? min : Double.NaN );
case AGG_MAXIMUM:
! return ( max != Double.MIN_VALUE && max != Double.MAX_VALUE ? max : Double.NaN );
case AGG_AVERAGE:
Index: Grapher.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/Grapher.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Grapher.java 30 Oct 2003 16:21:12 -0000 1.12
--- Grapher.java 4 Nov 2003 22:27:28 -0000 1.13
***************
*** 466,470 ****
lastPlotType = plotDefs[i].plotType;
}
!
// Reset clipping area, origin and AA settings
graphics.translate( -graphOriginX, -graphOriginY );
--- 466,470 ----
lastPlotType = plotDefs[i].plotType;
}
!
// Reset clipping area, origin and AA settings
graphics.translate( -graphOriginX, -graphOriginY );
Index: ValueFormatter.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/ValueFormatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ValueFormatter.java 30 Oct 2003 16:21:12 -0000 1.1
--- ValueFormatter.java 4 Nov 2003 22:27:28 -0000 1.2
***************
*** 128,138 ****
{
String valueStr = "" + value;
!
! if ( scale ) {
! scaleValue( scaleIndex );
! valueStr = decFormat.format(scaledValue);
}
- else
- valueStr = decFormat.format(value);
// Fix the formatted string to the correct length
--- 128,140 ----
{
String valueStr = "" + value;
!
! if ( !Double.isNaN(value) ) {
! if ( scale ) {
! scaleValue( scaleIndex );
! valueStr = decFormat.format(scaledValue);
! }
! else
! valueStr = decFormat.format(value);
}
// Fix the formatted string to the correct length
Index: CustomLine.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/CustomLine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CustomLine.java 30 Oct 2003 16:21:12 -0000 1.1
--- CustomLine.java 4 Nov 2003 22:27:28 -0000 1.2
***************
*** 150,154 ****
// Draw the line
! if ( visible )
g.drawLine( ax, ay, nx, ny );
--- 150,154 ----
// Draw the line
! if ( visible )
g.drawLine( ax, ay, nx, ny );
|
|
From: <cob...@us...> - 2003-11-04 22:27:31
|
Update of /cvsroot/jrobin/src/jrobin/demo
In directory sc8-pr-cvs1:/tmp/cvs-serv5130/src/jrobin/demo
Modified Files:
JRobinComplexDemo.java
Log Message:
Bug fix:
JRobinComplexDemo crash
Index: JRobinComplexDemo.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/demo/JRobinComplexDemo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JRobinComplexDemo.java 30 Oct 2003 16:21:13 -0000 1.2
--- JRobinComplexDemo.java 4 Nov 2003 22:27:28 -0000 1.3
***************
*** 69,73 ****
RrdDbPool pool = RrdDbPool.getInstance();
! RrdGraph graph = new RrdGraph( pool );
try
--- 69,73 ----
RrdDbPool pool = RrdDbPool.getInstance();
! RrdGraph graph = new RrdGraph( true );
try
***************
*** 141,145 ****
def.gprint("load", "MIN", "Minimum:@5.2@s%");
def.gprint("load", "MAX", "Maximum:@5.2@s% @r ");
! def.hrule( 0.7, new Color( 0xFF, 0xCC, 0x00), "Average load@L" );
def.gprint("load", "AVG", "Average:@5.2@s%");
def.gprint("load", "LAST", "Current:@5.2@s% @r");
--- 141,145 ----
def.gprint("load", "MIN", "Minimum:@5.2@s%");
def.gprint("load", "MAX", "Maximum:@5.2@s% @r ");
! //def.hrule( 0.7, new Color( 0xFF, 0xCC, 0x00), "Average load@L" );
def.gprint("load", "AVG", "Average:@5.2@s%");
def.gprint("load", "LAST", "Current:@5.2@s% @r");
***************
*** 156,160 ****
graph.saveAsGIF( "/complexdemo2.gif" );
// ---------------------------------------------------------------
-
// Create ftp graph for a month
--- 156,159 ----
|
|
From: <sa...@us...> - 2003-10-31 15:13:00
|
Update of /cvsroot/jrobin/src/jrobin/demo In directory sc8-pr-cvs1:/tmp/cvs-serv30732/jrobin/demo Removed Files: JRobinDemo.java Log Message: Removed JRobinDemo from demo.* package, moved to root of the hierarchy as Test.java --- JRobinDemo.java DELETED --- |
|
From: <sa...@us...> - 2003-10-31 15:13:00
|
Update of /cvsroot/jrobin/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30732
Added Files:
Test.java
Log Message:
Removed JRobinDemo from demo.* package, moved to root of the hierarchy as Test.java
--- NEW FILE: Test.java ---
import jrobin.graph2.RrdGraphDef;
import jrobin.graph2.RrdGraph;
import jrobin.core.Util;
import jrobin.core.RrdException;
import java.io.IOException;
import java.awt.*;
class Test {
static final String RRD_FILE = "S:/traffic_jrobin.rrd";
static final String PNG = "S:/traffic_jrobin.png";
public static void main(String[] args) throws RrdException, IOException {
RrdGraphDef def = new RrdGraphDef();
def.setTimePeriod(Util.getTimestamp(2003, 9, 28), Util.getTimestamp(2003, 9, 29));
def.setVerticalLabel("link speed [bits/sec]");
def.setTitle("Leased Line Daily Traffic");
def.datasource("in", RRD_FILE, "input", "AVERAGE");
def.datasource("out", RRD_FILE, "output", "AVERAGE");
def.datasource("in8", "in,8,*");
def.datasource("out8", "out,8,*");
def.datasource("total", "in8,out8,+");
def.datasource("totalneg", "total,-1,*");
def.area("out8", Color.GREEN, "output traffic");
def.line("in8", Color.BLUE, "input traffic");
def.line("totalneg", Color.RED, "total traffic@r");
def.gprint("in8", "AVERAGE", "avgIn=@2 @sbits/sec");
def.gprint("in8", "MAX", "maxIn=@2 @sbits/sec@r");
def.gprint("out8", "AVERAGE", "avgOut=@2 @sbits/sec");
def.gprint("out8", "MAX", "maxOut=@2 @sbits/sec@r");
def.gprint("total", "AVERAGE", "avgTotal=@2 @sbits/sec");
def.gprint("total", "MAX", "maxTotal=@2 @sbits/sec@r");
def.setAntiAliasing(false);
RrdGraph g = new RrdGraph(def);
g.saveAsPNG(PNG, 400, 200);
}
}
|
|
From: <cob...@us...> - 2003-10-30 17:21:22
|
Update of /cvsroot/jrobin/src/jrobin/graph
In directory sc8-pr-cvs1:/tmp/cvs-serv1646/src/jrobin/graph
Modified Files:
RpnCalculator.java ChartGraphics.java JpegImageWriteParam.java
Cdef.java ChartPanel.java
Log Message:
Graph lib 1.2.0
Updated some class visibilities for "public" Javadoc generation
Index: RpnCalculator.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/RpnCalculator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RpnCalculator.java 30 Oct 2003 16:21:12 -0000 1.3
--- RpnCalculator.java 30 Oct 2003 17:21:15 -0000 1.4
***************
*** 36,40 ****
* @author Sasa Markovic (sa...@jr...)
*/
! public class RpnCalculator
{
// ================================================================
--- 36,40 ----
* @author Sasa Markovic (sa...@jr...)
*/
! class RpnCalculator
{
// ================================================================
Index: ChartGraphics.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/ChartGraphics.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChartGraphics.java 30 Oct 2003 16:21:12 -0000 1.6
--- ChartGraphics.java 30 Oct 2003 17:21:15 -0000 1.7
***************
*** 36,40 ****
* @author Arne Vandamme (cob...@jr...)
*/
! public class ChartGraphics
{
// ================================================================
--- 36,40 ----
* @author Arne Vandamme (cob...@jr...)
*/
! class ChartGraphics
{
// ================================================================
Index: JpegImageWriteParam.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/JpegImageWriteParam.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JpegImageWriteParam.java 30 Oct 2003 16:21:12 -0000 1.2
--- JpegImageWriteParam.java 30 Oct 2003 17:21:15 -0000 1.3
***************
*** 33,37 ****
import javax.imageio.plugins.jpeg.JPEGImageWriteParam;;
! public class JpegImageWriteParam extends JPEGImageWriteParam
{
public JpegImageWriteParam() {
--- 33,37 ----
import javax.imageio.plugins.jpeg.JPEGImageWriteParam;;
! class JpegImageWriteParam extends JPEGImageWriteParam
{
public JpegImageWriteParam() {
Index: Cdef.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/Cdef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Cdef.java 30 Oct 2003 16:21:12 -0000 1.3
--- Cdef.java 30 Oct 2003 17:21:15 -0000 1.4
***************
*** 36,40 ****
* @author Arne Vandamme (cob...@jr...)
*/
! public class Cdef extends Source
{
// ================================================================
--- 36,40 ----
* @author Arne Vandamme (cob...@jr...)
*/
! class Cdef extends Source
{
// ================================================================
Index: ChartPanel.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/graph/ChartPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChartPanel.java 30 Oct 2003 16:21:12 -0000 1.2
--- ChartPanel.java 30 Oct 2003 17:21:15 -0000 1.3
***************
*** 30,34 ****
/**
! * <p>JPanel containing the graph.</p>
*
* @author Arne Vandamme (cob...@jr...)
--- 30,34 ----
/**
! * <p>JPanel containing a generated JRobin graph.</p>
*
* @author Arne Vandamme (cob...@jr...)
|
|
From: <cob...@us...> - 2003-10-30 16:21:17
|
Update of /cvsroot/jrobin/src/jrobin/demo
In directory sc8-pr-cvs1:/tmp/cvs-serv20325/src/jrobin/demo
Modified Files:
JRobinGallery.java JRobinDemo.java JRobinComplexDemo.java
Removed Files:
JRobinTimeProfiler.java TimeProfile.java
JRobinComplexGraph.java ProfileGraphsOld.java
ProfileGraphsNew.java
Log Message:
Graph lib 1.2.0
Almost final to final...
Minor fixes, minor tweaking
Added option to disable spacer between comments
Index: JRobinGallery.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/demo/JRobinGallery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JRobinGallery.java 27 Oct 2003 21:03:33 -0000 1.5
--- JRobinGallery.java 30 Oct 2003 16:21:13 -0000 1.6
***************
*** 1,6 ****
package jrobin.demo;
! import jrobin.graph2.RrdGraphDef;
! import jrobin.graph2.RrdGraph;
import jrobin.core.RrdException;
--- 1,6 ----
package jrobin.demo;
! import jrobin.graph.RrdGraphDef;
! import jrobin.graph.RrdGraph;
import jrobin.core.RrdException;
***************
*** 22,25 ****
--- 22,27 ----
GregorianCalendar start = new GregorianCalendar(2003, 3, 25);
GregorianCalendar end = new GregorianCalendar(2003, 5, 5);
+ //GregorianCalendar start = new GregorianCalendar(2003, 4, 1, 13, 00);
+ //GregorianCalendar end = new GregorianCalendar(2003, 4, 1, 13, 50);
def.setTimePeriod(start, end);
long t0 = start.getTime().getTime() / 1000L;
Index: JRobinDemo.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/demo/JRobinDemo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JRobinDemo.java 28 Oct 2003 14:51:39 -0000 1.9
--- JRobinDemo.java 30 Oct 2003 16:21:13 -0000 1.10
***************
*** 175,181 ****
RrdGraphDef gDef = new RrdGraphDef();
gDef.setTimePeriod(start, end);
- gDef.setTimeAxisLabel("day in month");
gDef.setTitle("Temperatures in May 2003");
! gDef.setValueAxisLabel("temperature");
gDef.datasource("sun", rrdRestoredPath, "sun", "AVERAGE");
gDef.datasource("shade", rrdRestoredPath, "shade", "AVERAGE");
--- 175,180 ----
RrdGraphDef gDef = new RrdGraphDef();
gDef.setTimePeriod(start, end);
gDef.setTitle("Temperatures in May 2003");
! gDef.setVerticalLabel("temperature");
gDef.datasource("sun", rrdRestoredPath, "sun", "AVERAGE");
gDef.datasource("shade", rrdRestoredPath, "shade", "AVERAGE");
Index: JRobinComplexDemo.java
===================================================================
RCS file: /cvsroot/jrobin/src/jrobin/demo/JRobinComplexDemo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JRobinComplexDemo.java 27 Oct 2003 21:03:33 -0000 1.1
--- JRobinComplexDemo.java 30 Oct 2003 16:21:13 -0000 1.2
***************
*** 31,35 ****
import jrobin.core.*;
! import jrobin.graph2.*;
/**
--- 31,35 ----
import jrobin.core.*;
! import jrobin.graph.*;
/**
***************
*** 101,105 ****
def.comment( "[ courtesy of www.cherrymon.org ]@L" );
def.comment( "Generated: " + timestamp() + " @r" );
!
graph.setGraphDef( def );
graph.saveAsPNG( "/complexdemo1.png" );
--- 101,105 ----
def.comment( "[ courtesy of www.cherrymon.org ]@L" );
def.comment( "Generated: " + timestamp() + " @r" );
!
graph.setGraphDef( def );
graph.saveAsPNG( "/complexdemo1.png" );
***************
*** 114,117 ****
--- 114,118 ----
def = new RrdGraphDef( start, stop );
def.setImageBorder( Color.GRAY, 1 );
+ //def.setGridRange( -4.5, 0.5, false );
def.setTitle( "JRobinComplexDemo@Ldemo graph 2@r\nServer load and CPU utilization" );
def.datasource("load", demofile, "serverLoad", "AVERAGE");
***************
*** 128,140 ****
def.comment( "CPU utilization (%)\n " );
def.area("load", new Color(0x66,0x99,0xcc), " 0 - 25%");
! def.area("p25t50", new Color(0x00,0x66,0x99), "25 - 50%");
! def.comment(" ");
def.gprint("busy", "MIN", "Minimum:@5.1@s%");
! def.gprint("busy", "MAX", "Maximum:@5.1@s%\n ");
def.area("p50t75", new Color(0x66,0x66,0x00), "50 - 75%");
def.area("p75t90", new Color(0xff,0x66,0x00), "75 - 90%");
! def.area("p90t100", new Color(0xcc,0x33,0x00), "90 - 100%");
def.gprint("busy", "AVG", " Average:@5.1@s%");
! def.gprint("busy", "LAST", "Current:@5.1@s%\n ");
def.comment( "\nServer load\n " );
def.line("load", new Color(0x00,0x00,0x00), "Load average (5 min)@L" );
--- 129,140 ----
def.comment( "CPU utilization (%)\n " );
def.area("load", new Color(0x66,0x99,0xcc), " 0 - 25%");
! def.area("p25t50", new Color(0x00,0x66,0x99), "25 - 50%@L");
def.gprint("busy", "MIN", "Minimum:@5.1@s%");
! def.gprint("busy", "MAX", "Maximum:@5.1@s% @r ");
def.area("p50t75", new Color(0x66,0x66,0x00), "50 - 75%");
def.area("p75t90", new Color(0xff,0x66,0x00), "75 - 90%");
! def.area("p90t100", new Color(0xcc,0x33,0x00), "90 - 100%@L");
def.gprint("busy", "AVG", " Average:@5.1@s%");
! def.gprint("busy", "LAST", "Current:@5.1@s% @r ");
def.comment( "\nServer load\n " );
def.line("load", new Color(0x00,0x00,0x00), "Load average (5 min)@L" );
***************
*** 152,155 ****
--- 152,158 ----
println( "- Creating graph 2: complexdemo2.jpg" );
graph.saveAsJPEG( "/complexdemo2.jpg", 640, 480, 1.0f );
+
+ println( "- Creating graph 2: complexdemo2.gif" );
+ graph.saveAsGIF( "/complexdemo2.gif" );
// ---------------------------------------------------------------
***************
*** 210,218 ****
public static void main(String[] args)
{
createDatabase();
createGraphs();
! println( "- Demo finished." );
}
}
--- 213,236 ----
public static void main(String[] args)
{
+ long start = System.currentTimeMillis();
+
+ println( "********************************************************************" );
+ println( "* JRobinComplexDemo *" );
+ println( "* This demo creates 3 separate graphs and stores them under *" );
+ println( "* several formats in 6 files. Values are selected from a large *" );
+ println( "* RRD file that will be created by importing an XML dump of +7 MB. *" );
+ println( "* *" );
+ println( "* Graphs are created using real-life values, original RRD file *" );
+ println( "* provided by www.cherrymon.org. See the JRobinComplexDemo *" );
+ println( "* sourcecode on how to create the graphs generated by this demo. *" );
+ println( "********************************************************************" );
+
createDatabase();
createGraphs();
! long stop = System.currentTimeMillis();
!
! println( "- Demo finished in " + (stop - start) + " milliseconds." );
}
}
--- JRobinTimeProfiler.java DELETED ---
--- TimeProfile.java DELETED ---
--- JRobinComplexGraph.java DELETED ---
--- ProfileGraphsOld.java DELETED ---
--- ProfileGraphsNew.java DELETED ---
|
