You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/12 12:41:19 UTC
[isis] branch master updated: ISIS-2260: fixes NPE for pdf.js
This is an automated email from the ASF dual-hosted git repository.
danhaywood 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 3997c7d ISIS-2260: fixes NPE for pdf.js
3997c7d is described below
commit 3997c7d52152cac0d942ec27becbbec5adee11c8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jan 12 12:40:45 2020 +0000
ISIS-2260: fixes NPE for pdf.js
also removes duplicate dependency definitions, fixed minor issue with download layout schema namespaces
---
.../isis/core/metamodel/services/grid/GridServiceDefault.java | 2 +-
extensions/security/secman/pom.xml | 5 -----
.../viewer/wicket/pdfjs/ui/components/PdfJsViewerPanel.java | 7 ++-----
.../pdfjs/ui/components/PdfJsViewerPanelComponentFactory.java | 3 +++
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
index 1257557..5054615 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
@@ -159,7 +159,7 @@ public class GridServiceDefault implements GridService {
}
}
return parts.stream()
- .collect(Collectors.joining(""));
+ .collect(Collectors.joining(" "));
}
////////////////////////////////////////////////////////
diff --git a/extensions/security/secman/pom.xml b/extensions/security/secman/pom.xml
index 81faae3..86ce7e8 100644
--- a/extensions/security/secman/pom.xml
+++ b/extensions/security/secman/pom.xml
@@ -52,11 +52,6 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-secman-persistence-jdo</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerPanel.java b/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerPanel.java
index 1d03d2a..bcf7450 100644
--- a/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerPanel.java
+++ b/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerPanel.java
@@ -64,9 +64,6 @@ class PdfJsViewerPanel extends ScalarPanelAbstract implements IRequestListener {
String pdfJsViewerPanelCallbacksTemplateJs;
- private ServiceInjector serviceInjector;
- private ServiceRegistry serviceRegistry;
-
PdfJsViewerPanel(String id, ScalarModel scalarModel) {
super(id, scalarModel);
@@ -175,12 +172,12 @@ class PdfJsViewerPanel extends ScalarPanelAbstract implements IRequestListener {
private void updateAdvisors(final Updater updater) {
val instanceKey = buildKey();
- serviceRegistry.select(PdfJsViewerAdvisor.class)
+ getServiceRegistry().select(PdfJsViewerAdvisor.class)
.forEach(advisor -> updater.update(advisor, instanceKey));
}
private PdfJsViewerAdvisor.InstanceKey buildKey() {
- return serviceRegistry.lookupService(UserService.class)
+ return getServiceRegistry().lookupService(UserService.class)
.map(this::toInstanceKey)
.orElseThrow(() -> new IllegalStateException(
"Could not locate UserService"));
diff --git a/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerPanelComponentFactory.java b/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerPanelComponentFactory.java
index 6936c59..da8e90e 100644
--- a/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerPanelComponentFactory.java
+++ b/extensions/vw/pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerPanelComponentFactory.java
@@ -3,10 +3,12 @@ package org.apache.isis.extensions.viewer.wicket.pdfjs.ui.components;
import java.util.Objects;
import javax.activation.MimeType;
+import javax.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -22,6 +24,7 @@ public class PdfJsViewerPanelComponentFactory extends ComponentFactoryAbstract {
private static final long serialVersionUID = 1L;
+ @Inject
public PdfJsViewerPanelComponentFactory() {
super(ComponentType.SCALAR_NAME_AND_VALUE, PdfJsViewerPanel.class);
}