You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@poi.apache.org by gl...@apache.org on 2004/04/09 14:19:08 UTC
cvs commit: jakarta-poi build.xml
glens 2004/04/09 05:19:08
Modified: src/java/org/apache/poi/hssf/usermodel EscherGraphics.java
TestEscherGraphics.java TestEscherGraphics2d.java
. build.xml
Log:
Some of the later tweaks ported to the head.
Revision Changes Path
1.3 +3 -3 jakarta-poi/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
Index: EscherGraphics.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EscherGraphics.java 9 Apr 2004 11:45:37 -0000 1.2
+++ EscherGraphics.java 9 Apr 2004 12:19:08 -0000 1.3
@@ -253,9 +253,9 @@
excelFont = new Font( font.getName(), font.getStyle(), (int) ( font.getSize() / verticalPixelsPerPoint ));
}
FontDetails d = StaticFontMetrics.getFontDetails( excelFont );
- int width = (int) ( (d.getStringWidth( str ) * 2.5) + 12 );
- int height = (int) ( ( font.getSize() * 2.0 * verticalPixelsPerPoint ) + 6 );
- y -= ( font.getSize() * verticalPixelsPerPoint ); // we want to draw the shape from the top-left
+ int width = (int) ( (d.getStringWidth( str ) * 8) + 12 );
+ int height = (int) ( ( font.getSize() / verticalPixelsPerPoint ) + 6 ) * 2;
+ y -= ( font.getSize() / verticalPixelsPerPoint ) + 2 * verticalPixelsPerPoint; // we want to draw the shape from the top-left
HSSFTextbox textbox = escherGroup.createTextbox( new HSSFChildAnchor( x, y, x + width, y + height ) );
textbox.setNoFill( true );
textbox.setLineStyle( HSSFShape.LINESTYLE_NONE );
1.2 +5 -1 jakarta-poi/src/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
Index: TestEscherGraphics.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestEscherGraphics.java 9 Apr 2004 11:45:37 -0000 1.1
+++ TestEscherGraphics.java 9 Apr 2004 12:19:08 -0000 1.2
@@ -27,11 +27,15 @@
public void testGetFont() throws Exception
{
Font f = graphics.getFont();
- assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", f.toString());
+ if (f.toString().indexOf("dialog") == -1)
+ assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", f.toString());
}
public void testGetFontMetrics() throws Exception
{
+ Font f = graphics.getFont();
+ if (f.toString().indexOf("dialog") != -1)
+ return;
FontMetrics fontMetrics = graphics.getFontMetrics(graphics.getFont());
assertEquals(7, fontMetrics.charWidth('X'));
assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", fontMetrics.getFont().toString());
1.2 +5 -0 jakarta-poi/src/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
Index: TestEscherGraphics2d.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestEscherGraphics2d.java 9 Apr 2004 11:45:37 -0000 1.1
+++ TestEscherGraphics2d.java 9 Apr 2004 12:19:08 -0000 1.2
@@ -49,6 +49,8 @@
public void testGetFontMetrics() throws Exception
{
FontMetrics fontMetrics = graphics.getFontMetrics(graphics.getFont());
+ if (graphics.getFont().toString().indexOf("dialog") != -1) // if dialog is returned we can't run the test properly.
+ return;
assertEquals(7, fontMetrics.charWidth('X'));
assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", fontMetrics.getFont().toString());
}
@@ -69,6 +71,9 @@
public void testGetFont() throws Exception
{
Font f = graphics.getFont();
+ if (graphics.getFont().toString().indexOf("dialog") != -1) // if dialog is returned we can't run the test properly.
+ return;
+
assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", f.toString());
}
}
1.55 +5 -0 jakarta-poi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-poi/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- build.xml 9 Apr 2004 11:45:38 -0000 1.54
+++ build.xml 9 Apr 2004 12:19:08 -0000 1.55
@@ -275,6 +275,7 @@
<classpath refid="test.classpath"/>
<sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
<sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/>
+ <sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain"/>
<formatter type="xml"/>
<batchtest todir="${main.reports.test}">
@@ -293,6 +294,7 @@
<classpath refid="test.classpath"/>
<sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
<sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/>
+ <sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain" usefile="no"/>
<formatter type="xml"/>
<test name="${testcase}"/>
@@ -307,6 +309,7 @@
<classpath refid="test.classpath"/>
<sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
<sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/>
+ <sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain" usefile="no"/>
<test name="${testcase}"/>
</junit>
@@ -341,6 +344,7 @@
<sysproperty key="HPSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
<sysproperty key="HDF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdf/data"/>
<sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
+ <sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain"/>
<formatter type="xml"/>
<batchtest todir="${scratchpad.reports.test}">
@@ -376,6 +380,7 @@
</classpath>
<sysproperty key="HSSF.testdata.path" file="${contrib.src.test}/org/apache/poi/hssf/data"/>
<sysproperty key="HPSF.testdata.path" file="${contrib.src.test}/org/apache/poi/hpsf/data"/>
+ <sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain"/>
<formatter type="xml"/>
<batchtest todir="${contrib.reports.test}">
---------------------------------------------------------------------
To unsubscribe, e-mail: poi-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: poi-dev-help@jakarta.apache.org