Merge branch 'master' of git@abyss:12PDF-OVER-4.0.git

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@221 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

1 files changed, 17 insertions, 6 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 c7e1b7b7..e00c9253 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
@@ -101,14 +101,14 @@ public class PositioningComposite extends StateComposite {
 		bottomBar.setLayoutData(fd_bottomBar);
 		bottomBar.setLayout(new FormLayout());
 
-		Button btnSign = new Button(bottomBar, SWT.PUSH);
-		btnSign.setText(Messages.getString("positioning.sign")); //$NON-NLS-1$
+		this.btnSign = new Button(bottomBar, SWT.PUSH);
+		this.btnSign.setText(Messages.getString("positioning.sign")); //$NON-NLS-1$
 		FormData fd_btnSign = new FormData();
 		fd_btnSign.right = new FormAttachment(100);
 		fd_btnSign.top = new FormAttachment(0);
-		btnSign.setLayoutData(fd_btnSign);
-		this.getShell().setDefaultButton(btnSign);
-		btnSign.addSelectionListener(new SelectionAdapter() {
+		this.btnSign.setLayoutData(fd_btnSign);
+		this.getShell().setDefaultButton(this.btnSign);
+		this.btnSign.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				PositioningComposite.this.setFinalPosition();
@@ -118,7 +118,7 @@ public class PositioningComposite extends StateComposite {
 		this.btnNewPage = new Button(bottomBar, SWT.TOGGLE);
 		this.btnNewPage.setText(Messages.getString("positioning.newPage")); //$NON-NLS-1$
 		FormData fd_btnNewPage = new FormData();
-		fd_btnNewPage.right = new FormAttachment(btnSign);
+		fd_btnNewPage.right = new FormAttachment(this.btnSign);
 		fd_btnNewPage.top = new FormAttachment(0);
 		this.btnNewPage.setLayoutData(fd_btnNewPage);
 		this.btnNewPage.addSelectionListener(new SelectionAdapter() {
@@ -316,6 +316,8 @@ public class PositioningComposite extends StateComposite {
 		}
 	};
 
+	private Button btnSign;
+
 	void showPage(int page) {
 		final int previousPage = this.currentPage;
 		this.currentPage = page;
@@ -410,4 +412,13 @@ public class PositioningComposite extends StateComposite {
 	public SignaturePosition getPosition() {
 		return this.position;
 	}
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.composites.StateComposite#reloadResources()
+	 */
+	@Override
+	public void reloadResources() {
+		this.btnNewPage.setText(Messages.getString("positioning.newPage")); //$NON-NLS-1$
+		this.btnSign.setText(Messages.getString("positioning.sign")); //$NON-NLS-1$
+	}
 }