midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FR - 2800686 

https://sourceforge.net/tracker/index.php?func=detail&aid=2800686&group_id=176962&atid=879335

Updated iText library (new version 2.1.7). Needed for new jasperreports library.
This commit is contained in:
usrdno 2009-10-09 18:44:12 +00:00
parent b756a460a0
commit 59607d6ab1
11 changed files with 159 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.classpath
View File

@ -48,7 +48,6 @@
<classpathentry exported="true" kind="lib" path="tools/lib/xercesImpl.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/xercesImpl.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/xjavadoc-1.1.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/xjavadoc-1.1.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/xml-apis.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/xml-apis.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/itext-1.4.8.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/jpedal.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/jpedal.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/swingx-0.9.0.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/swingx-0.9.0.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/bsh-2.0b5.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/bsh-2.0b5.jar"/>
@ -130,12 +129,12 @@
<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/commons-fileupload.jar"/> <classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/commons-fileupload.jar"/>
<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus-sources.jar"/> <classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus-sources.jar"/>
<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/displaytag-export-poi-1.1.1.jar"/> <classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/displaytag-export-poi-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/itext-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/log4j-1.2.13.jar"/> <classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/log4j-1.2.13.jar"/>
<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/poi-3.0-FINAL.jar"/> <classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/poi-3.0-FINAL.jar"/>
<classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/servlet.jar"/> <classpathentry exported="true" kind="lib" path="posterita/posterita/web/WEB-INF/lib/servlet.jar"/>
<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/jasperreports-3.5.3.jar"/> <classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/jasperreports-3.5.3.jar"/>
<classpathentry exported="true" kind="lib" path="packages/liberoHR.jar"/> <classpathentry exported="true" kind="lib" path="packages/liberoHR.jar"/>
<classpathentry exported="true" kind="lib" path="packages/liberoMFG.jar"/> <classpathentry exported="true" kind="lib" path="packages/liberoMFG.jar"/>
<classpathentry kind="lib" path="tools/lib/iText-2.1.7.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

2
JasperReports/build.xml
View File

@ -70,7 +70,7 @@
<pathelement path="../tools/lib/xercesImpl.jar"/> <pathelement path="../tools/lib/xercesImpl.jar"/>
<pathelement path="../tools/lib/xml-apis.jar"/> <pathelement path="../tools/lib/xml-apis.jar"/>
<pathelement path="../tools/lib/postgresql.jar"/> <pathelement path="../tools/lib/postgresql.jar"/>
<pathelement path="../tools/lib/itext-1.4.8.jar"/> <pathelement path="../tools/lib/iText-2.1.7.jar"/>
<fileset dir="../jboss/client" includes="*.jar"/> <fileset dir="../jboss/client" includes="*.jar"/>
</classpath> </classpath>
</javac> </javac>

2
JasperReportsTools/.classpath
View File

@ -4,7 +4,7 @@
<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-digester-1.7.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-digester-1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/iReport.jar"/> <classpathentry exported="true" kind="lib" path="lib/iReport.jar"/>
<classpathentry exported="true" kind="lib" path="/tools/lib/itext-1.4.8.jar"/> <classpathentry exported="true" kind="lib" path="/tools/lib/iText-2.1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jasperreports-3.5.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/jasperreports-3.5.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.3.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/tools"/> <classpathentry combineaccessrules="false" kind="src" path="/tools"/>

2
posterita/.classpath
View File

@ -7,7 +7,7 @@
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/commons-validator.jar"/> <classpathentry kind="lib" path="posterita/web/WEB-INF/lib/commons-validator.jar"/>
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/displaytag-1.1.1.jar"/> <classpathentry kind="lib" path="posterita/web/WEB-INF/lib/displaytag-1.1.1.jar"/>
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/displaytag-export-poi-1.1.1.jar"/> <classpathentry kind="lib" path="posterita/web/WEB-INF/lib/displaytag-export-poi-1.1.1.jar"/>
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/itext-1.3.jar"/> <classpathentry kind="lib" path="posterita/web/WEB-INF/lib/iText-2.1.7.jar"/>
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/jcommon-1.0.10.jar"/> <classpathentry kind="lib" path="posterita/web/WEB-INF/lib/jcommon-1.0.10.jar"/>
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/jfreechart-1.0.2.jar"/> <classpathentry kind="lib" path="posterita/web/WEB-INF/lib/jfreechart-1.0.2.jar"/>
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/poi-3.0-FINAL.jar"/> <classpathentry kind="lib" path="posterita/web/WEB-INF/lib/poi-3.0-FINAL.jar"/>

8
posterita/posterita/src/main/org/posterita/businesslogic/performanceanalysis/POSReportManager.java
View File

@ -1025,7 +1025,7 @@ public class POSReportManager {
} }
logo.setAbsolutePosition(document.left(), document.top() logo.setAbsolutePosition(document.left(), document.top()
- logo.height()); - logo.getHeight());
document.add(logo); document.add(logo);
PdfPTable table = new PdfPTable(2); PdfPTable table = new PdfPTable(2);
@ -1048,7 +1048,7 @@ public class POSReportManager {
cell.setColspan(2); cell.setColspan(2);
cell.setHorizontalAlignment(PdfPCell.ALIGN_RIGHT); cell.setHorizontalAlignment(PdfPCell.ALIGN_RIGHT);
cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE); cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE);
cell.setFixedHeight(logo.height()); cell.setFixedHeight(logo.getHeight());
cell.setBorderWidth(cellBorderWidth); cell.setBorderWidth(cellBorderWidth);
table.addCell(cell); table.addCell(cell);
@ -1915,7 +1915,7 @@ public class POSReportManager {
} }
logo.setAbsolutePosition(document.left(), document.top() logo.setAbsolutePosition(document.left(), document.top()
- logo.height()); - logo.getHeight());
document.add(logo); document.add(logo);
PdfPTable table = new PdfPTable(2); PdfPTable table = new PdfPTable(2);
@ -1942,7 +1942,7 @@ public class POSReportManager {
cell.setColspan(2); cell.setColspan(2);
cell.setHorizontalAlignment(PdfPCell.ALIGN_RIGHT); cell.setHorizontalAlignment(PdfPCell.ALIGN_RIGHT);
cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE); cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE);
cell.setFixedHeight(logo.height()); cell.setFixedHeight(logo.getHeight());
cell.setBorderWidth(cellBorderWidth); cell.setBorderWidth(cellBorderWidth);
table.addCell(cell); table.addCell(cell);

8
posterita/posterita/src/main/org/posterita/core/CrossTabReportGenerator.java
View File

@ -164,7 +164,7 @@ public class CrossTabReportGenerator extends PDFReportGenerator
float headerChkLength = headerChk.getWidthPoint() + 2*CELLPADDING; float headerChkLength = headerChk.getWidthPoint() + 2*CELLPADDING;
float tableWidth = headerChkLength + dataChkLength*columnCount; float tableWidth = headerChkLength + dataChkLength*columnCount;
float actualTableWidth = document.getPageSize().width() - 2*MARGIN; float actualTableWidth = document.getPageSize().getWidth() - 2*MARGIN;
float columnWidth = dataChkLength; float columnWidth = dataChkLength;
@ -231,7 +231,7 @@ public class CrossTabReportGenerator extends PDFReportGenerator
float tableWidth = headerChkLength + dataChkLength*columnCount; float tableWidth = headerChkLength + dataChkLength*columnCount;
float actualTableWidth = document.getPageSize().width() - 2*MARGIN; float actualTableWidth = document.getPageSize().getWidth() - 2*MARGIN;
//float actualTableHeight = document.getPageSize().height() - 2*MARGIN; //float actualTableHeight = document.getPageSize().height() - 2*MARGIN;
//if the table size is greater than that of the page we should //if the table size is greater than that of the page we should
@ -239,8 +239,8 @@ public class CrossTabReportGenerator extends PDFReportGenerator
if(tableWidth > actualTableWidth) if(tableWidth > actualTableWidth)
{ {
float documentWidth = document.getPageSize().width(); float documentWidth = document.getPageSize().getWidth();
float documentHeight = document.getPageSize().height(); float documentHeight = document.getPageSize().getHeight();
float newDocumentWidth = tableWidth + 2*MARGIN; float newDocumentWidth = tableWidth + 2*MARGIN;
float newDocumentHeight = (documentHeight * newDocumentWidth)/documentWidth; float newDocumentHeight = (documentHeight * newDocumentWidth)/documentWidth;

2
posterita/posterita/src/main/org/posterita/core/PDFReportPageEventHelper.java
View File

@ -64,7 +64,7 @@ public class PDFReportPageEventHelper extends PdfPageEventHelper
cb.saveState(); cb.saveState();
// write the headertable // write the headertable
table.setTotalWidth(document.right() - document.left()); table.setTotalWidth(document.right() - document.left());
table.writeSelectedRows(0, -1, document.left(), document.getPageSize().height() - 50, cb); table.writeSelectedRows(0, -1, document.left(), document.getPageSize().getHeight() - 50, cb);
// compose the footer // compose the footer
String text = "Page " + writer.getPageNumber() + " of "; String text = "Page " + writer.getPageNumber() + " of ";
float textSize = PAGE_FOOTER_FONT.getBaseFont().getWidthPoint(text, 10); float textSize = PAGE_FOOTER_FONT.getBaseFont().getWidthPoint(text, 10);

6
posterita/posterita/src/main/org/posterita/core/SimpleReportGenerator.java
View File

@ -145,7 +145,7 @@ public class SimpleReportGenerator extends PDFReportGenerator
tableWidth += (columnWidth[j] + 2*CELLPADDING); tableWidth += (columnWidth[j] + 2*CELLPADDING);
} }
float actualTableWidth = PAGE_SIZE.width() - 2*MARGIN; float actualTableWidth = PAGE_SIZE.getWidth() - 2*MARGIN;
//float actualTableHeight = PAGE_SIZE.height() - 2*MARGIN; //float actualTableHeight = PAGE_SIZE.height() - 2*MARGIN;
//if the table size is greater than that of the page we should //if the table size is greater than that of the page we should
@ -153,8 +153,8 @@ public class SimpleReportGenerator extends PDFReportGenerator
if(tableWidth > actualTableWidth) if(tableWidth > actualTableWidth)
{ {
float documentWidth = PAGE_SIZE.width(); float documentWidth = PAGE_SIZE.getWidth();
float documentHeight = PAGE_SIZE.height(); float documentHeight = PAGE_SIZE.getHeight();
float newDocumentWidth = tableWidth + 2*MARGIN; float newDocumentWidth = tableWidth + 2*MARGIN;
float newDocumentHeight = (documentHeight * newDocumentWidth)/documentWidth; float newDocumentHeight = (documentHeight * newDocumentWidth)/documentWidth;

2
serverRoot/Remote Debug Adempiere - serverRoot.launch
View File

File diff suppressed because one or more lines are too long

4
tools/build.xml
View File

@ -257,7 +257,7 @@
<zipfileset src="lib/jpedal.jar"> <zipfileset src="lib/jpedal.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<zipfileset src="lib/itext-1.4.8.jar"> <zipfileset src="lib/iText-2.1.7.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<!-- JFreeChart --> <!-- JFreeChart -->
@ -417,7 +417,7 @@
<zipfileset src="lib/jpedal.jar"> <zipfileset src="lib/jpedal.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<zipfileset src="lib/itext-1.4.8.jar"> <zipfileset src="lib/iText-2.1.7.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<zipfileset src="lib/swingx-0.9.0.jar"> <zipfileset src="lib/swingx-0.9.0.jar">

2
zkwebui/.tomcatplugin
View File

@ -32,7 +32,7 @@
<webClassPathEntry>/tools/lib/commons-net-1.4.0.jar</webClassPathEntry> <webClassPathEntry>/tools/lib/commons-net-1.4.0.jar</webClassPathEntry>
<webClassPathEntry>/tools/lib/groovy-all-1.5.1.jar</webClassPathEntry> <webClassPathEntry>/tools/lib/groovy-all-1.5.1.jar</webClassPathEntry>
<webClassPathEntry>/tools/lib/groovy-engine.jar</webClassPathEntry> <webClassPathEntry>/tools/lib/groovy-engine.jar</webClassPathEntry>
<webClassPathEntry>/tools/lib/itext-1.4.8.jar</webClassPathEntry> <webClassPathEntry>/tools/lib/iText-2.1.7.jar</webClassPathEntry>
<webClassPathEntry>/tools/lib/jcommon-1.0.5.jar</webClassPathEntry> <webClassPathEntry>/tools/lib/jcommon-1.0.5.jar</webClassPathEntry>
<webClassPathEntry>/tools/lib/jfreechart-1.0.2.jar</webClassPathEntry> <webClassPathEntry>/tools/lib/jfreechart-1.0.2.jar</webClassPathEntry>
<webClassPathEntry>/tools/lib/jnlp.jar</webClassPathEntry> <webClassPathEntry>/tools/lib/jnlp.jar</webClassPathEntry>