moparisthebest
/
poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Some of the later tweaks ported to the head. 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353543 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Glen Stampoultzis 2004-04-09 12:19:08 +00:00
parent d335e740b6
commit 0f924813a5
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.xml
View File

@ -275,6 +275,7 @@ Main targets:
<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 @@ Main targets:
<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 @@ Main targets:
<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 @@ Main targets:
<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 @@ Main targets:
</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}">

6
src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
View File

@ -253,9 +253,9 @@ public class EscherGraphics
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 );

6
src/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
View File

@ -27,11 +27,15 @@ public class TestEscherGraphics extends TestCase
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());

5
src/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
View File

@ -49,6 +49,8 @@ public class TestEscherGraphics2d extends TestCase
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 class TestEscherGraphics2d extends TestCase
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());
}
}