From 1c8937d712617f2ea13c2bfe1e38b6a616e17c8f Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky@redhat.com> Date: Mon, 9 Jan 2012 10:13:16 +0100 Subject: [PATCH 4/4] Fix itext dependency --- .../apache/maven/doxia/module/itext/ITextFont.java | 6 +++--- .../apache/maven/doxia/module/itext/ITextSink.java | 6 +++--- .../apache/maven/doxia/module/itext/ITextUtil.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java index 8882f98..019f3a8 100644 --- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java +++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java @@ -262,7 +262,7 @@ public class ITextFont { Font font = getCurrentFont(); - return String.valueOf( font.color().getBlue() ); + return String.valueOf( font.getColor().getBlue() ); } /** @@ -274,7 +274,7 @@ public class ITextFont { Font font = getCurrentFont(); - return String.valueOf( font.color().getGreen() ); + return String.valueOf( font.getColor().getGreen() ); } /** @@ -286,7 +286,7 @@ public class ITextFont { Font font = getCurrentFont(); - return String.valueOf( font.color().getRed() ); + return String.valueOf( font.getColor().getRed() ); } /** diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java index d87f149..9c576cc 100644 --- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java +++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java @@ -1231,9 +1231,9 @@ public class ITextSink try { Image image = Image.getInstance( new URL( urlName ) ); - image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 ); - width = image.plainWidth(); - height = image.plainHeight(); + image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 ); + width = image.getPlainWidth(); + height = image.getPlainHeight(); } catch ( BadElementException e ) { diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java index 76770e4..d6b8d8a 100644 --- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java +++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java @@ -77,7 +77,7 @@ public class ITextUtil if ( currentField.getType().equals( Rectangle.class ) ) { Rectangle fPageSize = (Rectangle) currentField.get( null ); - if ( ( rect.width() == fPageSize.width() ) && ( rect.height() == fPageSize.height() ) ) + if ( ( rect.getWidth() == fPageSize.getWidth() ) && ( rect.getHeight() == fPageSize.getHeight() ) ) { return currentField.getName(); } -- 1.7.7.4