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:46:58 UTC
[isis] branch master updated: ISIS-3040: purge PdfJsConfigWkt
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 238edbf624 ISIS-3040: purge PdfJsConfigWkt
238edbf624 is described below
commit 238edbf624dd38b807de44765d713f3105aa491a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue May 10 11:46:52 2022 +0200
ISIS-3040: purge PdfJsConfigWkt
---
.../pdfjs/wkt/integration/PdfJsConfigWkt.java | 123 ---------------------
.../pdfjs/wkt/integration/PdfJsPanel.java | 5 +-
.../integration/res/PdfJsIntegrationReference.java | 4 +-
.../pdfjs/wkt/integration/res/PdfJsReference.java | 4 +-
.../pdfjs/wkt/ui/components/PdfJsViewerPanel.java | 23 ++--
5 files changed, 18 insertions(+), 141 deletions(-)
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsConfigWkt.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsConfigWkt.java
deleted file mode 100644
index 0576986ddd..0000000000
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsConfigWkt.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.extensions.pdfjs.wkt.integration;
-
-import org.apache.wicket.util.lang.Args;
-
-import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
-import org.apache.isis.extensions.pdfjs.applib.config.Scale;
-
-import de.agilecoders.wicket.jquery.AbstractConfig;
-import de.agilecoders.wicket.jquery.IKey;
-import de.agilecoders.wicket.jquery.Key;
-
-public class PdfJsConfigWkt extends AbstractConfig {
-
- private static final long serialVersionUID = 1L;
-
- private static final IKey<Integer> INITIAL_PAGE = new Key<>("initialPage", 1);
- private static final IKey<String> INITIAL_SCALE = new Key<>("initialScale", Scale._1_00.getValue());
- private static final IKey<Integer> INITIAL_HEIGHT = new Key<>("initialHeight", 800);
- private static final IKey<Boolean> WORKER_DISABLED = new Key<>("workerDisabled", false);
- private static final IKey<CharSequence> PDF_DOCUMENT_URL = new Key<>("documentUrl", null);
- private static final IKey<CharSequence> WORKER_URL = new Key<>("workerUrl", null);
- private static final IKey<CharSequence> CANVAS_ID = new Key<>("canvasId", null);
-
- public static PdfJsConfigWkt from(final PdfJsConfig config) {
- return new PdfJsConfigWkt()
- .withCanvasId(config.getCanvasId())
- .withDocumentUrl(config.getDocumentUrl())
- .withInitialHeight(config.getInitialHeight())
- .withInitialScale(config.getInitialScale())
- .withInitialHeight(config.getInitialHeight())
- .withWorkerUrl(config.getWorkerUrl())
- .disableWorker(config.isWorkerDisabled())
- ;
- }
-
- public PdfJsConfigWkt withInitialPage(int initialPage) {
- if (initialPage < 1) {
- initialPage = 1;
- }
- put(INITIAL_PAGE, initialPage);
- return this;
- }
-
- public int getInitialPage() {
- return get(INITIAL_PAGE);
- }
-
- public PdfJsConfigWkt withInitialHeight(final int initialHeight) {
- Args.isTrue(initialHeight >= 400 && initialHeight <= 2000,
- "'initialHeight' must be between 400 and 2000");
- put(INITIAL_HEIGHT, initialHeight);
- return this;
- }
-
- public int getInitialHeight() {
- return get(INITIAL_HEIGHT);
- }
-
- public PdfJsConfigWkt withInitialScale(final Scale initialScale) {
- put(INITIAL_SCALE, initialScale.getValue());
- return this;
- }
-
- public String getInitialScale() {
- return get(INITIAL_SCALE);
- }
-
- public PdfJsConfigWkt disableWorker(final boolean disable) {
- put(WORKER_DISABLED, disable);
- return this;
- }
-
- public boolean isWorkerDisabled() {
- return get(WORKER_DISABLED);
- }
-
- public PdfJsConfigWkt withDocumentUrl(final CharSequence url) {
- put(PDF_DOCUMENT_URL, url);
- return this;
- }
-
- public CharSequence getDocumentUrl() {
- return get(PDF_DOCUMENT_URL);
- }
-
- public PdfJsConfigWkt withWorkerUrl(final CharSequence url) {
- put(WORKER_URL, url);
- return this;
- }
-
- public CharSequence getWorkerUrl() {
- return get(WORKER_URL);
- }
-
- public PdfJsConfigWkt withCanvasId(final CharSequence url) {
- put(CANVAS_ID, url);
- return this;
- }
-
- public CharSequence getCanvasId() {
- return get(CANVAS_ID);
- }
-
-}
-
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 904eef8eb4..aa77afe05b 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
@@ -22,6 +22,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
import org.apache.isis.extensions.pdfjs.wkt.integration.res.PdfJsIntegrationReference;
import org.apache.isis.extensions.pdfjs.wkt.integration.res.PdfJsReference;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -41,14 +42,14 @@ public class PdfJsPanel extends Panel {
private final static String ID_PDFJSCANVAS = "pdfJsCanvas";
@Getter @Accessors(makeFinal = true)
- private PdfJsConfigWkt config;
+ private PdfJsConfig config;
/**
* Constructor.
*
* @param id The component id
*/
- public PdfJsPanel(final String id, final @NonNull PdfJsConfigWkt config) {
+ public PdfJsPanel(final String id, final @NonNull PdfJsConfig config) {
super(id);
val pdfJsCanvas = Wkt.add(this, Wkt.ajaxEnable(new WebComponent(ID_PDFJSCANVAS)));
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
index aeefab4b34..6e49315ced 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
@@ -23,7 +23,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.isis.extensions.pdfjs.wkt.integration.PdfJsConfigWkt;
+import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
import lombok.Getter;
import lombok.experimental.Accessors;
@@ -49,7 +49,7 @@ extends JavaScriptResourceReference {
}
public static OnDomReadyHeaderItem domReadyScript(
- final PdfJsConfigWkt config) {
+ final PdfJsConfig config) {
return OnDomReadyHeaderItem.forScript(
String.format("WicketStuff.PDFJS.init(%s)", config.toJsonString()));
}
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsReference.java
index 5e6cc3e871..b1507b47df 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsReference.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsReference.java
@@ -24,7 +24,7 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.isis.extensions.pdfjs.wkt.integration.PdfJsConfigWkt;
+import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
import lombok.Getter;
import lombok.experimental.Accessors;
@@ -49,7 +49,7 @@ extends JavaScriptResourceReference {
return JavaScriptHeaderItem.forReference(instance());
}
- public static PdfJsConfigWkt configureWorkerUrl(final PdfJsConfigWkt config) {
+ public static PdfJsConfig configureWorkerUrl(final PdfJsConfig config) {
return config.withWorkerUrl(createPdfJsWorkerUrl());
}
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 594a355de8..bf64aa4df1 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
@@ -48,7 +48,6 @@ import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
import org.apache.isis.extensions.pdfjs.applib.config.Scale;
import org.apache.isis.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
import org.apache.isis.extensions.pdfjs.metamodel.facet.PdfJsViewerFacet;
-import org.apache.isis.extensions.pdfjs.wkt.integration.PdfJsConfigWkt;
import org.apache.isis.extensions.pdfjs.wkt.integration.PdfJsPanel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -212,24 +211,24 @@ implements IRequestListener {
if (adapter != null
&& blob != null) {
- val pdfJsConfig = PdfJsConfigWkt.from(
+ val pdfJsConfig =
scalarModel.lookupFacet(PdfJsViewerFacet.class)
.map(pdfJsViewerFacet->pdfJsViewerFacet.configFor(buildKey()))
.orElseGet(PdfJsConfig::new)
.withDocumentUrl(urlFor(
new ListenerRequestHandler(
- new PageAndComponentProvider(getPage(), this)))));
+ new PageAndComponentProvider(getPage(), this))));
val pdfJsPanel = new PdfJsPanel(ID_SCALAR_VALUE, pdfJsConfig);
- val prevPageButton = createComponent("prevPage", pdfJsConfig);
- val nextPageButton = createComponent("nextPage", pdfJsConfig);
- val currentZoomSelect = createComponent("currentZoom", pdfJsConfig);
- val currentPageLabel = createComponent("currentPage", pdfJsConfig);
- val totalPagesLabel = createComponent("totalPages", pdfJsConfig);
+ val prevPageButton = createComponent("prevPage", pdfJsPanel);
+ val nextPageButton = createComponent("nextPage", pdfJsPanel);
+ val currentZoomSelect = createComponent("currentZoom", pdfJsPanel);
+ val currentPageLabel = createComponent("currentPage", pdfJsPanel);
+ val totalPagesLabel = createComponent("totalPages", pdfJsPanel);
- val currentHeightSelect = createComponent("currentHeight", pdfJsConfig);
- val printButton = createComponent("print", pdfJsConfig);
+ val currentHeightSelect = createComponent("currentHeight", pdfJsPanel);
+ val printButton = createComponent("print", pdfJsPanel);
//MarkupContainer downloadButton = createComponent("download", config);
@@ -272,14 +271,14 @@ implements IRequestListener {
return containerIfCompact;
}
- private MarkupContainer createComponent(final String id, final PdfJsConfigWkt config) {
+ private MarkupContainer createComponent(final String id, final PdfJsPanel pdfJsPanel) {
return new WebMarkupContainer(id) {
private static final long serialVersionUID = 1L;
@Override
protected void onComponentTag(final ComponentTag tag) {
super.onComponentTag(tag);
- tag.put("data-canvas-id", config.getCanvasId());
+ tag.put("data-canvas-id", pdfJsPanel.getConfig().getCanvasId());
}
};
}