You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/05/10 09:49:42 UTC
[isis] branch master updated: ISIS-3040: encapsulate PdfJsPanel's config
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new ad68697d03 ISIS-3040: encapsulate PdfJsPanel's config
ad68697d03 is described below
commit ad68697d03d2a326d76d4c3e4712dd951eed5bb9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue May 10 11:49:37 2022 +0200
ISIS-3040: encapsulate PdfJsPanel's config
---
.../apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.java | 7 ++++---
.../isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.java
index aa77afe05b..cdfbeabd93 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.java
@@ -27,10 +27,8 @@ import org.apache.isis.extensions.pdfjs.wkt.integration.res.PdfJsIntegrationRefe
import org.apache.isis.extensions.pdfjs.wkt.integration.res.PdfJsReference;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
-import lombok.Getter;
import lombok.NonNull;
import lombok.val;
-import lombok.experimental.Accessors;
/**
* A panel for rendering PDF documents inline in the page
@@ -41,7 +39,6 @@ public class PdfJsPanel extends Panel {
private final static String ID_PDFJSCANVAS = "pdfJsCanvas";
- @Getter @Accessors(makeFinal = true)
private PdfJsConfig config;
/**
@@ -67,4 +64,8 @@ public class PdfJsPanel extends Panel {
response.render(PdfJsIntegrationReference.domReadyScript(config));
}
+ public CharSequence getCanvasId() {
+ return config.getCanvasId();
+ }
+
}
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
index bf64aa4df1..a53f3a3ec4 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
@@ -278,7 +278,7 @@ implements IRequestListener {
@Override
protected void onComponentTag(final ComponentTag tag) {
super.onComponentTag(tag);
- tag.put("data-canvas-id", pdfJsPanel.getConfig().getCanvasId());
+ tag.put("data-canvas-id", pdfJsPanel.getCanvasId());
}
};
}