summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:04:14 +0000
committertkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:04:14 +0000
commitfb4cffd6fed59e5800f8e5803cfaf4fb45de35ec (patch)
tree19bb1c23f76f15d90453736911960020726359ec
parentef62ac462765cbb921e3f52ec468356f36162af7 (diff)
downloadmocca-fb4cffd6fed59e5800f8e5803cfaf4fb45de35ec.tar.gz
mocca-fb4cffd6fed59e5800f8e5803cfaf4fb45de35ec.tar.bz2
mocca-fb4cffd6fed59e5800f8e5803cfaf4fb45de35ec.zip
SignaturePanel doesn't need to track PageNr
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@111 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java2
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java11
2 files changed, 1 insertions, 12 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java
index 71e4149a..7d461772 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java
@@ -182,7 +182,7 @@ public class PositioningComposite extends StateComposite {
*/
void setFinalPosition() {
// TODO: check if this is the real position
- this.position = new SignaturePosition(this.viewer.getSignaturePositionX(), this.viewer.getSignaturePositionY(), this.viewer.getCurrentPage());
+ this.position = new SignaturePosition(this.viewer.getSignaturePositionX(), this.viewer.getSignaturePositionY(), this.currentPage);
PositioningComposite.this.state.updateStateMachine();
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java
index 4d3ba584..6d88460b 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java
@@ -56,8 +56,6 @@ public class SignaturePanel extends JPanel {
private PDFPage currentPage;
/** The current transform from screen to page space */
AffineTransform currentXform;
- /** The current page number */
- private int currentPageNr;
/** The horizontal offset of the image from the left edge of the panel */
int offx;
/** The vertical offset of the image from the top of the panel */
@@ -100,7 +98,6 @@ public class SignaturePanel extends JPanel {
*/
public void showPage(int page) {
//sigPagePos = null;
- this.currentPageNr = page;
showPage(this.pdf.getPage(page));
}
@@ -121,14 +118,6 @@ public class SignaturePanel extends JPanel {
}
/**
- * return the currently displayed page
- * @return current page number
- */
- public int getCurrentPage() {
- return this.currentPageNr;
- }
-
- /**
* Stop the generation of any previous page, and draw the new one.
*
* @param page the PDFPage to draw.