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: Benjamin R. <ran...@us...> - 2007-08-03 19:48:27
|
Update of /cvsroot/jrobin/maven In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14447 Modified Files: pom.xml Log Message: tagging 1.5.7 Index: pom.xml =================================================================== RCS file: /cvsroot/jrobin/maven/pom.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pom.xml 2 Aug 2007 18:05:41 -0000 1.10 --- pom.xml 3 Aug 2007 19:48:01 -0000 1.11 *************** *** 5,9 **** <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.7-SNAPSHOT</version> <packaging>jar</packaging> <url>http://www.jrobin.org</url> --- 5,9 ---- <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.7</version> <packaging>jar</packaging> <url>http://www.jrobin.org</url> |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 21:09:09
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18468/src/org/jrobin/graph Modified Files: RrdGraph.java RrdGraphDef.java Log Message: clean up warnings Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** RrdGraphDef.java 2 Aug 2007 21:02:14 -0000 1.31 --- RrdGraphDef.java 2 Aug 2007 21:09:04 -0000 1.32 *************** *** 25,36 **** package org.jrobin.graph; ! import org.jrobin.core.RrdException; ! import org.jrobin.core.Util; ! import org.jrobin.data.Plottable; ! ! import java.awt.*; import java.io.File; - import java.io.FileInputStream; - import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; --- 25,31 ---- package org.jrobin.graph; ! import java.awt.Font; ! import java.awt.Paint; import java.io.File; import java.io.InputStream; import java.net.MalformedURLException; *************** *** 39,42 **** --- 34,41 ---- import java.util.List; + import org.jrobin.core.RrdException; + import org.jrobin.core.Util; + import org.jrobin.data.Plottable; + /** * Class which should be used to define new JRobin graph. Once constructed and populated with data Index: RrdGraph.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraph.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RrdGraph.java 2 Aug 2007 21:02:14 -0000 1.14 --- RrdGraph.java 2 Aug 2007 21:09:04 -0000 1.15 *************** *** 32,36 **** import java.awt.*; import java.io.IOException; - import java.io.InputStream; /** --- 32,35 ---- |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 21:09:08
|
Update of /cvsroot/jrobin/src/org/jrobin/inspector In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18468/src/org/jrobin/inspector Modified Files: ArchiveTableModel.java DataTableModel.java DatasourceTableModel.java EditArchiveDialog.java EditDatasourceDialog.java GraphFrame.java HeaderTableModel.java MainTreeModel.java RrdInspector.java Log Message: clean up warnings Index: DataTableModel.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/DataTableModel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DataTableModel.java 21 Dec 2006 18:02:44 -0000 1.8 --- DataTableModel.java 2 Aug 2007 21:09:04 -0000 1.9 *************** *** 34,37 **** --- 34,38 ---- class DataTableModel extends AbstractTableModel { + private static final long serialVersionUID = 1L; private static final String[] COLUMN_NAMES = {"timestamp", "date", "value"}; Index: MainTreeModel.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/MainTreeModel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MainTreeModel.java 21 Dec 2006 18:02:45 -0000 1.8 --- MainTreeModel.java 2 Aug 2007 21:09:04 -0000 1.9 *************** *** 35,38 **** --- 35,39 ---- class MainTreeModel extends DefaultTreeModel { + private static final long serialVersionUID = 1L; private static final DefaultMutableTreeNode INVALID_NODE = new DefaultMutableTreeNode("No valid RRD file specified"); Index: DatasourceTableModel.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/DatasourceTableModel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DatasourceTableModel.java 21 Dec 2006 18:02:44 -0000 1.8 --- DatasourceTableModel.java 2 Aug 2007 21:09:04 -0000 1.9 *************** *** 34,37 **** --- 34,38 ---- class DatasourceTableModel extends AbstractTableModel { + private static final long serialVersionUID = 1L; private static final Object[] DESCRIPTIONS = { "name", "type", "heartbeat", "min value", Index: HeaderTableModel.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/HeaderTableModel.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** HeaderTableModel.java 21 Dec 2006 18:02:45 -0000 1.9 --- HeaderTableModel.java 2 Aug 2007 21:09:04 -0000 1.10 *************** *** 36,39 **** --- 36,40 ---- class HeaderTableModel extends AbstractTableModel { + private static final long serialVersionUID = 1L; private static final Object[] DESCRIPTIONS = { "path", "signature", "step", "last timestamp", Index: GraphFrame.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/GraphFrame.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GraphFrame.java 21 Dec 2006 18:02:44 -0000 1.3 --- GraphFrame.java 2 Aug 2007 21:09:04 -0000 1.4 *************** *** 41,44 **** --- 41,45 ---- class GraphFrame extends JFrame { + private static final long serialVersionUID = 1L; private static final Color COLOR = Color.RED; private static final int WIDTH = 400, HEIGHT = 240; *************** *** 273,276 **** --- 274,278 ---- class GraphPanel extends JPanel { + private static final long serialVersionUID = 1L; public void paintComponent(Graphics g) { rrdGraph.render(g); Index: EditDatasourceDialog.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/EditDatasourceDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EditDatasourceDialog.java 21 Dec 2006 18:02:44 -0000 1.3 --- EditDatasourceDialog.java 2 Aug 2007 21:09:04 -0000 1.4 *************** *** 35,38 **** --- 35,39 ---- class EditDatasourceDialog extends JDialog { + private static final long serialVersionUID = 1L; private static final int FIELD_SIZE = 20; private static final String TITLE_NEW = "New datasource"; Index: EditArchiveDialog.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/EditArchiveDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EditArchiveDialog.java 21 Dec 2006 18:02:44 -0000 1.3 --- EditArchiveDialog.java 2 Aug 2007 21:09:04 -0000 1.4 *************** *** 36,39 **** --- 36,40 ---- class EditArchiveDialog extends JDialog { + private static final long serialVersionUID = 1L; private static final int FIELD_SIZE = 20; private static final String TITLE_NEW = "New archive"; Index: ArchiveTableModel.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/ArchiveTableModel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ArchiveTableModel.java 21 Dec 2006 18:02:44 -0000 1.8 --- ArchiveTableModel.java 2 Aug 2007 21:09:04 -0000 1.9 *************** *** 34,37 **** --- 34,38 ---- class ArchiveTableModel extends AbstractTableModel { + private static final long serialVersionUID = 1L; private static final Object[] DESCRIPTIONS = { "consolidation", "xff", "steps", "rows", "accum. value", "NaN steps", "start", "end" Index: RrdInspector.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/RrdInspector.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RrdInspector.java 21 Dec 2006 18:02:45 -0000 1.9 --- RrdInspector.java 2 Aug 2007 21:09:04 -0000 1.10 *************** *** 45,48 **** --- 45,49 ---- */ public class RrdInspector extends JFrame { + private static final long serialVersionUID = 1L; static final boolean SHOULD_CREATE_BACKUPS = true; static final String TITLE = "RRD File Inspector"; *************** *** 132,135 **** --- 133,137 ---- dataTable.getColumnModel().getColumn(1).setPreferredWidth(150); dataTable.getColumnModel().getColumn(2).setCellRenderer(new DefaultTableCellRenderer() { + private static final long serialVersionUID = 1L; { setBackground(Color.YELLOW); |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 21:09:07
|
Update of /cvsroot/jrobin/src/org/jrobin/core/jrrd In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18468/src/org/jrobin/core/jrrd Modified Files: RRDException.java Log Message: clean up warnings Index: RRDException.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/core/jrrd/RRDException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RRDException.java 21 Dec 2006 18:02:42 -0000 1.2 --- RRDException.java 2 Aug 2007 21:09:04 -0000 1.3 *************** *** 17,20 **** --- 17,21 ---- */ public class RRDException extends Exception { + private static final long serialVersionUID = 1L; /** |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 21:09:07
|
Update of /cvsroot/jrobin/src/org/jrobin/core In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18468/src/org/jrobin/core Modified Files: RrdException.java Log Message: clean up warnings Index: RrdException.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/core/RrdException.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RrdException.java 21 Dec 2006 18:02:41 -0000 1.4 --- RrdException.java 2 Aug 2007 21:09:04 -0000 1.5 *************** *** 35,38 **** --- 35,40 ---- */ public class RrdException extends Exception { + private static final long serialVersionUID = 1L; + /** * Creates new RrdException with the supplied message in it. |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 21:09:07
|
Update of /cvsroot/jrobin/src/org/jrobin/core/timespec In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18468/src/org/jrobin/core/timespec Modified Files: Epoch.java Log Message: clean up warnings Index: Epoch.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/core/timespec/Epoch.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Epoch.java 21 Dec 2006 18:02:42 -0000 1.2 --- Epoch.java 2 Aug 2007 21:09:04 -0000 1.3 *************** *** 36,39 **** --- 36,40 ---- */ public class Epoch extends JFrame { + private static final long serialVersionUID = 1L; private static final String[] supportedFormats = { "MM/dd/yy HH:mm:ss", "dd.MM.yy HH:mm:ss", "yy-MM-dd HH:mm:ss", "MM/dd/yy HH:mm", |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 21:02:20
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15896/src/org/jrobin/graph Modified Files: RrdGraph.java RrdGraphConstants.java RrdGraphDef.java Log Message: disable this stuff for now, it still acts funny Index: RrdGraphConstants.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphConstants.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RrdGraphConstants.java 31 Jul 2007 21:04:02 -0000 1.5 --- RrdGraphConstants.java 2 Aug 2007 21:02:14 -0000 1.6 *************** *** 263,272 **** * Default graph small font */ ! String DEFAULT_SMALL_FONT_FILE = "DejaVuSansMono.ttf"; /** * Default graph large font */ ! String DEFAULT_LARGE_FONT_FILE = "DejaVuSans-Bold.ttf"; /** --- 263,272 ---- * Default graph small font */ ! String DEFAULT_MONOSPACE_FONT_FILE = "DejaVuSansMono.ttf"; /** * Default graph large font */ ! String DEFAULT_PROPORTIONAL_FONT_FILE = "DejaVuSans-Bold.ttf"; /** Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** RrdGraphDef.java 2 Aug 2007 18:05:41 -0000 1.30 --- RrdGraphDef.java 2 Aug 2007 21:02:14 -0000 1.31 *************** *** 114,119 **** String title = null; // ok long step = 0; // ok ! Font smallFont; ! Font largeFont; boolean drawXGrid = true; // ok boolean drawYGrid = true; // ok --- 114,119 ---- String title = null; // ok long step = 0; // ok ! protected Font smallFont; ! protected Font largeFont; boolean drawXGrid = true; // ok boolean drawYGrid = true; // ok *************** *** 142,147 **** } ! smallFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_SMALL_FONT_FILE).deriveFont(Font.PLAIN, 10); ! largeFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_LARGE_FONT_FILE).deriveFont(Font.BOLD, 12); } --- 142,149 ---- } ! // smallFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_MONOSPACE_FONT_FILE).deriveFont(10); ! // largeFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_MONOSPACE_FONT_FILE).deriveFont(12); ! smallFont = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); ! largeFont = new Font(DEFAULT_FONT_NAME, Font.BOLD, 12); } *************** *** 187,198 **** } - protected Font getSmallFont() { - return this.smallFont; - } - - protected Font getLargeFont() { - return this.largeFont; - } - /** * Sets the signature string that runs along the right-side of the graph. --- 189,192 ---- *************** *** 706,709 **** --- 700,720 ---- /** + * Get the default small font for graphing. + * @return the font + */ + public Font getSmallFont() { + return this.smallFont; + } + + /** + * Get the default large font for graphing. + * @return the font + */ + public Font getLargeFont() { + return this.largeFont; + } + + + /** * Sets default font for graphing. Note that JRobin will behave unpredictably if proportional * font is selected. Index: RrdGraph.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraph.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** RrdGraph.java 29 Jul 2007 16:46:36 -0000 1.13 --- RrdGraph.java 2 Aug 2007 21:02:14 -0000 1.14 *************** *** 139,151 **** private void gator() { if (!gdef.onlyGraph && gdef.showSignature) { ! Font font; ! try { ! InputStream fontStream = ClassLoader.getSystemClassLoader().getResourceAsStream("DejaVuSansMono.ttf"); ! font = Font.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(9).deriveFont(Font.PLAIN); ! fontStream.close(); ! } catch (Exception e) { ! // fall back to the default font ! font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 9); ! } int x = (int) (im.xgif - 2 - worker.getFontAscent(font)); int y = 4; --- 139,143 ---- private void gator() { if (!gdef.onlyGraph && gdef.showSignature) { ! Font font = gdef.getSmallFont().deriveFont(Font.PLAIN, 9); int x = (int) (im.xgif - 2 - worker.getFontAscent(font)); int y = 4; *************** *** 186,190 **** if (gdef.verticalLabel != null) { int x = PADDING_LEFT; ! int y = im.yorigin - im.ysize / 2 + (int) worker.getStringWidth(gdef.verticalLabel, gdef.smallFont) / 2; int ascent = (int) worker.getFontAscent(gdef.smallFont); worker.transform(x, y, -Math.PI / 2); --- 178,182 ---- if (gdef.verticalLabel != null) { int x = PADDING_LEFT; ! int y = im.yorigin - im.ysize / 2 + (int) worker.getStringWidth(gdef.verticalLabel, gdef.getSmallFont()) / 2; int ascent = (int) worker.getFontAscent(gdef.smallFont); worker.transform(x, y, -Math.PI / 2); |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 18:05:44
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8429/src/org/jrobin/graph Modified Files: RrdGraphDef.java Log Message: 1.5.7-snapshot now Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** RrdGraphDef.java 2 Aug 2007 16:23:58 -0000 1.29 --- RrdGraphDef.java 2 Aug 2007 18:05:41 -0000 1.30 *************** *** 143,147 **** smallFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_SMALL_FONT_FILE).deriveFont(Font.PLAIN, 10); ! largeFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_SMALL_FONT_FILE).deriveFont(Font.BOLD, 12); } --- 143,147 ---- smallFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_SMALL_FONT_FILE).deriveFont(Font.PLAIN, 10); ! largeFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_LARGE_FONT_FILE).deriveFont(Font.BOLD, 12); } *************** *** 180,184 **** font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); } ! return font; } --- 180,187 ---- font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); } ! ! if (font == null) { ! font = new Font(null, Font.PLAIN, 10); ! } return font; } |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 18:05:44
|
Update of /cvsroot/jrobin/maven In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8429 Modified Files: pom.xml Log Message: 1.5.7-snapshot now Index: pom.xml =================================================================== RCS file: /cvsroot/jrobin/maven/pom.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pom.xml 2 Aug 2007 17:05:05 -0000 1.9 --- pom.xml 2 Aug 2007 18:05:41 -0000 1.10 *************** *** 5,9 **** <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.6</version> <packaging>jar</packaging> <url>http://www.jrobin.org</url> --- 5,9 ---- <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.7-SNAPSHOT</version> <packaging>jar</packaging> <url>http://www.jrobin.org</url> |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 17:05:10
|
Update of /cvsroot/jrobin/maven In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11836 Modified Files: pom.xml Log Message: tagging 1.5.6 Index: pom.xml =================================================================== RCS file: /cvsroot/jrobin/maven/pom.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pom.xml 2 Aug 2007 16:22:20 -0000 1.8 --- pom.xml 2 Aug 2007 17:05:05 -0000 1.9 *************** *** 5,9 **** <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.6-SNAPSHOT</version> <packaging>jar</packaging> <url>http://www.jrobin.org</url> --- 5,9 ---- <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.6</version> <packaging>jar</packaging> <url>http://www.jrobin.org</url> |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 16:24:02
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27245/src/org/jrobin/graph Modified Files: RrdGraphDef.java Log Message: might as well commit this ;) Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** RrdGraphDef.java 2 Aug 2007 16:22:20 -0000 1.28 --- RrdGraphDef.java 2 Aug 2007 16:23:58 -0000 1.29 *************** *** 164,167 **** --- 164,168 ---- if (file != null) { + // System.err.println("Found a font URL: " + file.toExternalForm()); try { InputStream fontStream = file.openStream(); |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 16:22:25
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26770/src/org/jrobin/graph Modified Files: RrdGraphDef.java Log Message: yay, it works! Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** RrdGraphDef.java 2 Aug 2007 05:21:11 -0000 1.27 --- RrdGraphDef.java 2 Aug 2007 16:22:20 -0000 1.28 *************** *** 30,35 **** --- 30,39 ---- import java.awt.*; + import java.io.File; + import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; + import java.net.MalformedURLException; + import java.net.URL; import java.util.ArrayList; import java.util.List; *************** *** 116,120 **** int firstDayOfWeek = FIRST_DAY_OF_WEEK; // ok boolean showSignature = true; ! List<Source> sources = new ArrayList<Source>(); List<CommentText> comments = new ArrayList<CommentText>(); --- 120,125 ---- int firstDayOfWeek = FIRST_DAY_OF_WEEK; // ok boolean showSignature = true; ! File fontDir = null; ! List<Source> sources = new ArrayList<Source>(); List<CommentText> comments = new ArrayList<CommentText>(); *************** *** 131,159 **** throw new RuntimeException(e); } ! smallFont = this.getSmallFont(); ! largeFont = this.getLargeFont(); } protected Font getFontFromResourceName(String name) { ! Font font; ! try { ! InputStream fontStream = this.getClass().getResourceAsStream(name); ! font = Font.createFont(Font.TRUETYPE_FONT, fontStream); ! fontStream.close(); ! } catch (Exception e) { ! System.err.println("An error occurred loading the font '" + name + "'. Falling back to the default."); ! // e.printStackTrace(); font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); } return font; } protected Font getSmallFont() { ! return this.getFontFromResourceName(RrdGraphConstants.DEFAULT_SMALL_FONT_FILE).deriveFont(Font.PLAIN).deriveFont(10); } protected Font getLargeFont() { ! return this.getFontFromResourceName(RrdGraphConstants.DEFAULT_LARGE_FONT_FILE).deriveFont(Font.BOLD).deriveFont(12); } --- 136,192 ---- throw new RuntimeException(e); } ! ! String fontdirProperty = System.getProperty("jrobin.fontdir"); ! if (fontdirProperty != null && fontdirProperty.length() != 0) { ! fontDir = new File(fontdirProperty); ! } ! ! smallFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_SMALL_FONT_FILE).deriveFont(Font.PLAIN, 10); ! largeFont = this.getFontFromResourceName(RrdGraphConstants.DEFAULT_SMALL_FONT_FILE).deriveFont(Font.BOLD, 12); } protected Font getFontFromResourceName(String name) { ! Font font = null; ! Exception exception = null; ! URL file = null; ! if (fontDir != null) { ! try { ! file = new URL("file://" + new File(fontDir, name).getAbsolutePath()); ! } catch (MalformedURLException e) { ! // fall through to the jar ! exception = e; ! } ! } ! if (file == null) { ! file = this.getClass().getResource(name); ! } ! ! if (file != null) { ! try { ! InputStream fontStream = file.openStream(); ! font = Font.createFont(Font.TRUETYPE_FONT, fontStream); ! fontStream.close(); ! } catch (Exception e) { ! exception = e; ! } ! } else { ! // we can't find our fonts, fall back to the system font ! System.err.println("An error occurred loading the font '" + name + "'. Falling back to the default."); ! if (exception != null) { ! System.err.println(exception.getLocalizedMessage()); ! } font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); } + return font; } protected Font getSmallFont() { ! return this.smallFont; } protected Font getLargeFont() { ! return this.largeFont; } *************** *** 672,676 **** * font is selected. * ! * @param smallFont Default font for graphing. Use only monospaced fonths. */ public void setSmallFont(Font smallFont) { --- 705,709 ---- * font is selected. * ! * @param smallFont Default font for graphing. Use only monospaced fonts. */ public void setSmallFont(Font smallFont) { |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 16:22:24
|
Update of /cvsroot/jrobin/maven In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26770 Modified Files: pom.xml Log Message: yay, it works! Index: pom.xml =================================================================== RCS file: /cvsroot/jrobin/maven/pom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pom.xml 29 Jul 2007 17:33:20 -0000 1.7 --- pom.xml 2 Aug 2007 16:22:20 -0000 1.8 *************** *** 17,20 **** --- 17,27 ---- <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> <artifactId>maven-deploy-plugin</artifactId> <configuration> |
|
From: Benjamin R. <ran...@us...> - 2007-08-02 05:21:15
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13308/src/org/jrobin/graph Modified Files: RrdGraphDef.java Log Message: fix verboseness, and do not use the system class loader Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** RrdGraphDef.java 31 Jul 2007 21:04:02 -0000 1.26 --- RrdGraphDef.java 2 Aug 2007 05:21:11 -0000 1.27 *************** *** 139,148 **** try { ! InputStream fontStream = ClassLoader.getSystemClassLoader().getResourceAsStream(name); font = Font.createFont(Font.TRUETYPE_FONT, fontStream); fontStream.close(); } catch (Exception e) { System.err.println("An error occurred loading the font '" + name + "'. Falling back to the default."); ! e.printStackTrace(); font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); } --- 139,148 ---- try { ! InputStream fontStream = this.getClass().getResourceAsStream(name); font = Font.createFont(Font.TRUETYPE_FONT, fontStream); fontStream.close(); } catch (Exception e) { System.err.println("An error occurred loading the font '" + name + "'. Falling back to the default."); ! // e.printStackTrace(); font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); } |
|
From: Benjamin R. <ran...@us...> - 2007-07-31 21:04:06
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv329/src/org/jrobin/graph Modified Files: RrdGraphConstants.java RrdGraphDef.java Log Message: rearranged font stuff Index: RrdGraphConstants.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphConstants.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RrdGraphConstants.java 29 Jul 2007 16:46:36 -0000 1.4 --- RrdGraphConstants.java 31 Jul 2007 21:04:02 -0000 1.5 *************** *** 263,272 **** * Default graph small font */ ! Font DEFAULT_SMALL_FONT = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); ! /** * Default graph large font */ ! Font DEFAULT_LARGE_FONT = new Font(DEFAULT_FONT_NAME, Font.BOLD, 12); /** --- 263,272 ---- * Default graph small font */ ! String DEFAULT_SMALL_FONT_FILE = "DejaVuSansMono.ttf"; ! /** * Default graph large font */ ! String DEFAULT_LARGE_FONT_FILE = "DejaVuSans-Bold.ttf"; /** Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** RrdGraphDef.java 29 Jul 2007 17:39:21 -0000 1.25 --- RrdGraphDef.java 31 Jul 2007 21:04:02 -0000 1.26 *************** *** 110,115 **** String title = null; // ok long step = 0; // ok ! Font smallFont = RrdGraphConstants.DEFAULT_SMALL_FONT; // ok ! Font largeFont = RrdGraphConstants.DEFAULT_LARGE_FONT; // ok boolean drawXGrid = true; // ok boolean drawYGrid = true; // ok --- 110,115 ---- String title = null; // ok long step = 0; // ok ! Font smallFont; ! Font largeFont; boolean drawXGrid = true; // ok boolean drawYGrid = true; // ok *************** *** 131,150 **** throw new RuntimeException(e); } try { ! InputStream fontStream = ClassLoader.getSystemClassLoader() ! .getResourceAsStream("DejaVuSansMono.ttf"); ! smallFont = Font.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(11).deriveFont(Font.PLAIN); ! fontStream.close(); ! fontStream = ClassLoader.getSystemClassLoader() ! .getResourceAsStream("DejaVuSans-Bold.ttf"); ! largeFont = Font.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(12).deriveFont(Font.BOLD); fontStream.close(); ! } catch (Exception ioe) { ! // if we can't load custom fonts, fall back to the normal defaults ! System.err.println("An error occurred loading fonts."); ! ioe.printStackTrace(); } } ! /** * Sets the signature string that runs along the right-side of the graph. --- 131,161 ---- throw new RuntimeException(e); } + smallFont = this.getSmallFont(); + largeFont = this.getLargeFont(); + } + + protected Font getFontFromResourceName(String name) { + Font font; + try { ! InputStream fontStream = ClassLoader.getSystemClassLoader().getResourceAsStream(name); ! font = Font.createFont(Font.TRUETYPE_FONT, fontStream); fontStream.close(); ! } catch (Exception e) { ! System.err.println("An error occurred loading the font '" + name + "'. Falling back to the default."); ! e.printStackTrace(); ! font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); } + return font; } ! ! protected Font getSmallFont() { ! return this.getFontFromResourceName(RrdGraphConstants.DEFAULT_SMALL_FONT_FILE).deriveFont(Font.PLAIN).deriveFont(10); ! } ! ! protected Font getLargeFont() { ! return this.getFontFromResourceName(RrdGraphConstants.DEFAULT_LARGE_FONT_FILE).deriveFont(Font.BOLD).deriveFont(12); ! } ! /** * Sets the signature string that runs along the right-side of the graph. |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 17:39:25
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1908/src/org/jrobin/graph Modified Files: RrdGraphDef.java Log Message: removing debug stuff Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** RrdGraphDef.java 29 Jul 2007 16:46:36 -0000 1.24 --- RrdGraphDef.java 29 Jul 2007 17:39:21 -0000 1.25 *************** *** 135,144 **** .getResourceAsStream("DejaVuSansMono.ttf"); smallFont = Font.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(11).deriveFont(Font.PLAIN); - System.err.println("Created font " + smallFont.toString()); fontStream.close(); fontStream = ClassLoader.getSystemClassLoader() .getResourceAsStream("DejaVuSans-Bold.ttf"); largeFont = Font.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(12).deriveFont(Font.BOLD); - System.err.println("Created font " + largeFont.toString()); fontStream.close(); } catch (Exception ioe) { --- 135,142 ---- |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 17:33:23
|
Update of /cvsroot/jrobin/maven In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31577 Modified Files: pom.xml Log Message: set to snapshot now that 1.5.5 has been tagged Index: pom.xml =================================================================== RCS file: /cvsroot/jrobin/maven/pom.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pom.xml 29 Jul 2007 17:24:53 -0000 1.6 --- pom.xml 29 Jul 2007 17:33:20 -0000 1.7 *************** *** 5,9 **** <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.5</version> <packaging>jar</packaging> <url>http://www.jrobin.org</url> --- 5,9 ---- <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.6-SNAPSHOT</version> <packaging>jar</packaging> <url>http://www.jrobin.org</url> |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 17:24:57
|
Update of /cvsroot/jrobin/maven In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27403 Modified Files: pom.xml Log Message: 1.5.5 released Index: pom.xml =================================================================== RCS file: /cvsroot/jrobin/maven/pom.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pom.xml 29 Jul 2007 04:19:30 -0000 1.5 --- pom.xml 29 Jul 2007 17:24:53 -0000 1.6 *************** *** 1,12 **** ! <?xml version="1.0" encoding="UTF-8"?> ! <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> ! <modelVersion>4.0.0</modelVersion> ! <groupId>org.jrobin</groupId> ! <artifactId>jrobin</artifactId> ! <name>jrobin</name> ! <version>1.5.5-SNAPSHOT</version> ! <packaging>jar</packaging> ! <url>http://www.jrobin.org</url> ! <build> <sourceDirectory>src</sourceDirectory> <resources> --- 1,12 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> ! <modelVersion>4.0.0</modelVersion> ! <groupId>org.jrobin</groupId> ! <artifactId>jrobin</artifactId> ! <name>jrobin</name> ! <version>1.5.5</version> ! <packaging>jar</packaging> ! <url>http://www.jrobin.org</url> ! <build> <sourceDirectory>src</sourceDirectory> <resources> *************** *** 19,36 **** <artifactId>maven-deploy-plugin</artifactId> <configuration> ! <repositoryId>opennms-snapshot-repo</repositoryId> ! <!-- <url>scpexe://repo.opennms.org/var/www/sites/opennms.org/site/repo/maven2</url> --> <file>jrobin.jar</file> </configuration> </plugin> ! </plugins> ! </build> ! <dependencies> ! <dependency> ! <groupId>junit</groupId> ! <artifactId>junit</artifactId> ! <version>3.8.1</version> ! <scope>test</scope> ! </dependency> </dependencies> <distributionManagement> --- 19,65 ---- <artifactId>maven-deploy-plugin</artifactId> <configuration> ! <repositoryId>opennms-repo</repositoryId> ! <!-- <repositoryId>opennms-snapshot-repo</repositoryId> --> <file>jrobin.jar</file> </configuration> </plugin> ! <plugin> ! <groupId>org.apache.maven.plugins</groupId> ! <artifactId>maven-javadoc-plugin</artifactId> ! <executions> ! <execution> ! <goals> ! <goal>jar</goal> ! </goals> ! </execution> ! </executions> ! </plugin> ! <plugin> ! <artifactId>maven-source-plugin</artifactId> ! <executions> ! <execution> ! <goals> ! <goal>jar</goal> ! </goals> ! </execution> ! </executions> ! </plugin> ! </plugins> ! </build> ! <reporting> ! <plugins> ! <plugin> ! <groupId>org.apache.maven.plugins</groupId> ! <artifactId>maven-javadoc-plugin</artifactId> ! </plugin> ! </plugins> ! </reporting> ! <dependencies> ! <dependency> ! <groupId>junit</groupId> ! <artifactId>junit</artifactId> ! <version>3.8.1</version> ! <scope>test</scope> ! </dependency> </dependencies> <distributionManagement> *************** *** 48,51 **** </snapshotRepository> </distributionManagement> ! </project> ! --- 77,79 ---- </snapshotRepository> </distributionManagement> ! </project> |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 16:46:39
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12417/src/org/jrobin/graph Modified Files: RrdGraph.java RrdGraphConstants.java RrdGraphDef.java Log Message: add the ability to change the signature Index: RrdGraphConstants.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphConstants.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RrdGraphConstants.java 29 Jul 2007 04:19:29 -0000 1.3 --- RrdGraphConstants.java 29 Jul 2007 16:46:36 -0000 1.4 *************** *** 259,266 **** --- 259,268 ---- String DEFAULT_FONT_NAME = System.getProperty("os.name").toLowerCase().contains("windows") ? "Lucida Sans Typewriter" : "Monospaced"; + /** * Default graph small font */ Font DEFAULT_SMALL_FONT = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10); + /** * Default graph large font Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** RrdGraphDef.java 29 Jul 2007 04:19:29 -0000 1.23 --- RrdGraphDef.java 29 Jul 2007 16:46:36 -0000 1.24 *************** *** 86,89 **** --- 86,90 ---- String overlayImage = null; // ok String unit = null; // ok + String signature = "Created with JRobin"; // ok boolean lazy = false; // ok double minValue = Double.NaN; // ok *************** *** 133,147 **** InputStream fontStream = ClassLoader.getSystemClassLoader() .getResourceAsStream("DejaVuSansMono.ttf"); ! smallFont = Font.createFont(Font.TRUETYPE_FONT, fontStream); fontStream.close(); fontStream = ClassLoader.getSystemClassLoader() .getResourceAsStream("DejaVuSans-Bold.ttf"); ! largeFont = Font.createFont(Font.TRUETYPE_FONT, fontStream); fontStream.close(); } catch (Exception ioe) { // if we can't load custom fonts, fall back to the normal defaults } } /** --- 134,169 ---- InputStream fontStream = ClassLoader.getSystemClassLoader() .getResourceAsStream("DejaVuSansMono.ttf"); ! smallFont = Font.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(11).deriveFont(Font.PLAIN); ! System.err.println("Created font " + smallFont.toString()); fontStream.close(); fontStream = ClassLoader.getSystemClassLoader() .getResourceAsStream("DejaVuSans-Bold.ttf"); ! largeFont = Font.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(12).deriveFont(Font.BOLD); ! System.err.println("Created font " + largeFont.toString()); fontStream.close(); } catch (Exception ioe) { // if we can't load custom fonts, fall back to the normal defaults + System.err.println("An error occurred loading fonts."); + ioe.printStackTrace(); } } + /** + * Sets the signature string that runs along the right-side of the graph. + * Defaults to "Created with JRobin". + * + * @param signature the string to print + */ + public void setSignature(String signature) { + this.signature = signature; + } + + /** + * Gets the signature string that runs along the right-side of the graph. + * @return the signature string + */ + public String getSignature() { + return this.signature; + } /** Index: RrdGraph.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraph.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RrdGraph.java 21 Dec 2006 18:02:44 -0000 1.12 --- RrdGraph.java 29 Jul 2007 16:46:36 -0000 1.13 *************** *** 32,35 **** --- 32,36 ---- import java.awt.*; import java.io.IOException; + import java.io.InputStream; /** *************** *** 43,46 **** --- 44,48 ---- Mapper mapper; RrdGraphInfo info = new RrdGraphInfo(); + private String signature; /** *************** *** 53,56 **** --- 55,59 ---- public RrdGraph(RrdGraphDef gdef) throws IOException, RrdException { this.gdef = gdef; + signature = gdef.getSignature(); worker = new ImageWorker(100, 100); // Dummy worker, just to start with something try { *************** *** 136,144 **** private void gator() { if (!gdef.onlyGraph && gdef.showSignature) { ! Font font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 9); int x = (int) (im.xgif - 2 - worker.getFontAscent(font)); int y = 4; worker.transform(x, y, Math.PI / 2); ! worker.drawString("Created with JRobin", 0, 0, font, Color.LIGHT_GRAY); worker.reset(); } --- 139,155 ---- private void gator() { if (!gdef.onlyGraph && gdef.showSignature) { ! Font font; ! try { ! InputStream fontStream = ClassLoader.getSystemClassLoader().getResourceAsStream("DejaVuSansMono.ttf"); ! font = Font.createFont(Font.TRUETYPE_FONT, fontStream).deriveFont(9).deriveFont(Font.PLAIN); ! fontStream.close(); ! } catch (Exception e) { ! // fall back to the default font ! font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 9); ! } int x = (int) (im.xgif - 2 - worker.getFontAscent(font)); int y = 4; worker.transform(x, y, Math.PI / 2); ! worker.drawString(signature, 0, 0, font, Color.LIGHT_GRAY); worker.reset(); } |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 04:19:35
|
Update of /cvsroot/jrobin/maven In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13824 Modified Files: pom.xml Log Message: Incorporate Will Fraley's jrobin graph cleanups Index: pom.xml =================================================================== RCS file: /cvsroot/jrobin/maven/pom.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pom.xml 29 Jul 2007 01:41:46 -0000 1.4 --- pom.xml 29 Jul 2007 04:19:30 -0000 1.5 *************** *** 5,12 **** <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.5-SNAPSHOT</version> <url>http://www.jrobin.org</url> <build> ! <sourceDirectory>src</sourceDirectory> </build> <dependencies> --- 5,28 ---- <artifactId>jrobin</artifactId> <name>jrobin</name> ! <version>1.5.5-SNAPSHOT</version> ! <packaging>jar</packaging> <url>http://www.jrobin.org</url> <build> ! <sourceDirectory>src</sourceDirectory> ! <resources> ! <resource> ! <directory>fonts</directory> ! </resource> ! </resources> ! <plugins> ! <plugin> ! <artifactId>maven-deploy-plugin</artifactId> ! <configuration> ! <repositoryId>opennms-snapshot-repo</repositoryId> ! <!-- <url>scpexe://repo.opennms.org/var/www/sites/opennms.org/site/repo/maven2</url> --> ! <file>jrobin.jar</file> ! </configuration> ! </plugin> ! </plugins> </build> <dependencies> *************** *** 17,21 **** <scope>test</scope> </dependency> ! </dependencies> </project> --- 33,51 ---- <scope>test</scope> </dependency> ! </dependencies> ! <distributionManagement> ! <!-- use the following if you're not using a snapshot version. --> ! <repository> ! <id>opennms-repo</id> ! <name>OpenNMS Release Repository</name> ! <url>scpexe://repo.opennms.org/var/www/sites/opennms.org/site/repo/maven2</url> ! </repository> ! <!-- use the following if you ARE using a snapshot version. --> ! <snapshotRepository> ! <id>opennms-snapshot-repo</id> ! <name>OpenNMS Snapshot Repository</name> ! <url>scpexe://repo.opennms.org/var/www/sites/opennms.org/site/repo/snapshots</url> ! </snapshotRepository> ! </distributionManagement> </project> |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 04:19:35
|
Update of /cvsroot/jrobin/src/org/jrobin/graph In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13824/src/org/jrobin/graph Modified Files: RrdGraphConstants.java RrdGraphDef.java ImageWorker.java Log Message: Incorporate Will Fraley's jrobin graph cleanups Index: RrdGraphConstants.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphConstants.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RrdGraphConstants.java 21 Dec 2006 18:02:44 -0000 1.2 --- RrdGraphConstants.java 29 Jul 2007 04:19:29 -0000 1.3 *************** *** 168,176 **** * Default minor grid color */ ! Color DEFAULT_GRID_COLOR = new Color(140, 140, 140); /** * Default major grid color */ ! Color DEFAULT_MGRID_COLOR = new Color(130, 30, 30); /** * Default font color --- 168,178 ---- * Default minor grid color */ ! Color DEFAULT_GRID_COLOR = new Color(171, 171, 171, 95); ! // Color DEFAULT_GRID_COLOR = new Color(140, 140, 140); /** * Default major grid color */ ! Color DEFAULT_MGRID_COLOR = new Color(255, 91, 91, 95); ! // Color DEFAULT_MGRID_COLOR = new Color(130, 30, 30); /** * Default font color *************** *** 322,327 **** * Stroke used to draw grid */ ! Stroke GRID_STROKE = ! new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1, new float[] {1, 1}, 0); /** * Stroke used to draw ticks --- 324,332 ---- * Stroke used to draw grid */ ! // solid line ! Stroke GRID_STROKE = new BasicStroke(1); ! ! // dotted line ! // Stroke GRID_STROKE = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1, new float[] {1, 1}, 0); /** * Stroke used to draw ticks Index: RrdGraphDef.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdGraphDef.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** RrdGraphDef.java 21 Dec 2006 18:02:44 -0000 1.22 --- RrdGraphDef.java 29 Jul 2007 04:19:29 -0000 1.23 *************** *** 30,33 **** --- 30,35 ---- import java.awt.*; + import java.io.IOException; + import java.io.InputStream; import java.util.ArrayList; import java.util.List; *************** *** 125,132 **** try { setTimeSpan(Util.getTimestamps(DEFAULT_START, DEFAULT_END)); ! } ! catch (RrdException e) { throw new RuntimeException(e); } } --- 127,145 ---- try { setTimeSpan(Util.getTimestamps(DEFAULT_START, DEFAULT_END)); ! } catch (RrdException e) { throw new RuntimeException(e); } + try { + InputStream fontStream = ClassLoader.getSystemClassLoader() + .getResourceAsStream("DejaVuSansMono.ttf"); + smallFont = Font.createFont(Font.TRUETYPE_FONT, fontStream); + fontStream.close(); + fontStream = ClassLoader.getSystemClassLoader() + .getResourceAsStream("DejaVuSans-Bold.ttf"); + largeFont = Font.createFont(Font.TRUETYPE_FONT, fontStream); + fontStream.close(); + } catch (Exception ioe) { + // if we can't load custom fonts, fall back to the normal defaults + } } Index: ImageWorker.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/graph/ImageWorker.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ImageWorker.java 21 Dec 2006 18:02:43 -0000 1.2 --- ImageWorker.java 29 Jul 2007 04:19:29 -0000 1.3 *************** *** 170,173 **** --- 170,175 ---- gd.setRenderingHint(RenderingHints.KEY_ANTIALIASING, enable ? RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF); + gd.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,RenderingHints.VALUE_TEXT_ANTIALIAS_ON); + gd.setRenderingHint(RenderingHints.KEY_RENDERING,RenderingHints.VALUE_RENDER_QUALITY); } |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 04:19:35
|
Update of /cvsroot/jrobin/maven/fonts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13824/fonts Added Files: DejaVuSans-Bold.ttf DejaVuSansMono.ttf Log Message: Incorporate Will Fraley's jrobin graph cleanups --- NEW FILE: DejaVuSans-Bold.ttf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: DejaVuSansMono.ttf --- (This appears to be a binary file; contents omitted.) |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 01:53:09
|
Update of /cvsroot/jrobin/maven/fonts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20710/fonts Log Message: Directory /cvsroot/jrobin/maven/fonts added to the repository |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 01:41:50
|
Update of /cvsroot/jrobin/maven/.settings In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17479/.settings Added Files: org.eclipse.jdt.core.prefs Log Message: this stuff is all broken, and it was not in the jrobinlite tarball, which is what was used to make the 1.5.4 jar --- NEW FILE: org.eclipse.jdt.core.prefs --- #Sat Jul 28 20:10:02 CDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.5 |
|
From: Benjamin R. <ran...@us...> - 2007-07-29 01:41:50
|
Update of /cvsroot/jrobin/src/org/jrobin/demo In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17479/src/org/jrobin/demo Removed Files: AppletDemo.java HeartbeatFix.java MinMax.java Test.java ComplexDemo.java Demo.java TemplatesDemo.java PlottableDemo.java StressTest.java Log Message: this stuff is all broken, and it was not in the jrobinlite tarball, which is what was used to make the 1.5.4 jar --- HeartbeatFix.java DELETED --- --- Demo.java DELETED --- --- TemplatesDemo.java DELETED --- --- ComplexDemo.java DELETED --- --- AppletDemo.java DELETED --- --- PlottableDemo.java DELETED --- --- MinMax.java DELETED --- --- StressTest.java DELETED --- --- Test.java DELETED --- |
