Author: kmorin Date: 2015-01-19 12:27:39 +0000 (Mon, 19 Jan 2015) New Revision: 752 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/752 Log: make it build Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/pom.xml Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2015-01-19 10:15:03 UTC (rev 751) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2015-01-19 12:27:39 UTC (rev 752) @@ -177,10 +177,11 @@ if (FaxToMailUIUtil.isFileAPDF(attachmentFile)) { try { - pdDocument = PDDocument.loadLegacy(file); - if (pdDocument.isEncrypted()) { - pdDocument.decrypt(""); - } +// pdDocument = PDDocument.loadLegacy(file); +// if (pdDocument.isEncrypted()) { +// pdDocument.decrypt(""); +// } + pdDocument = PDDocument.load(file); model.setPageNumber(pdDocument.getNumberOfPages()); model.setCurrentPageIndex(1); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2015-01-19 10:15:03 UTC (rev 751) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2015-01-19 12:27:39 UTC (rev 752) @@ -531,10 +531,11 @@ result = defaultPrinter || printJob.printDialog(attributes); if (result) { - pdDocument = PDDocument.loadLegacy(fis); - if (pdDocument.isEncrypted()) { - pdDocument.decrypt(""); - } +// pdDocument = PDDocument.loadLegacy(fis); +// if (pdDocument.isEncrypted()) { +// pdDocument.decrypt(""); +// } + pdDocument = PDDocument.load(fis); final PDFRenderer renderer = new PDFRenderer(pdDocument); final int numOfPages = pdDocument.getNumberOfPages(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-01-19 10:15:03 UTC (rev 751) +++ trunk/pom.xml 2015-01-19 12:27:39 UTC (rev 752) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.1</version> + <version>6</version> </parent> <groupId>com.franciaflex</groupId> @@ -121,8 +121,15 @@ <slf4jVersion>1.7.7</slf4jVersion> <log4jVersion>2.1</log4jVersion> <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> + + <commonsIoVersion>2.4</commonsIoVersion> <commonsEmailVersion>1.3.3</commonsEmailVersion> + <commonsCollections4Version>4.0</commonsCollections4Version> + <commonsLang3Version>3.3.2</commonsLang3Version> + <commonsLoggingVersion>1.2</commonsLoggingVersion> + <junitVersion>4.11</junitVersion> + <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -135,6 +142,10 @@ <maven.compiler.target>1.7</maven.compiler.target> <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> + + <!-- issues status to include in changelog --> + <redmine.statusIds>18,19,3,10,11</redmine.statusIds> + </properties> <repositories> @@ -428,6 +439,24 @@ <version>${commonsIoVersion}</version> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commonsLoggingVersion}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>${commonsCollections4Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commonsLang3Version}</version> + </dependency> + <!-- web module --> <dependency> <groupId>javax.servlet</groupId> @@ -698,6 +727,13 @@ <version>1.51</version> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junitVersion}</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement>