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 2020/10/24 18:20:04 UTC
[isis] branch master updated: ISIS-2297: minor cleanup
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 042bda5 ISIS-2297: minor cleanup
042bda5 is described below
commit 042bda5ff2dc96b6629999d15372b81eacc3350d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Oct 24 20:19:46 2020 +0200
ISIS-2297: minor cleanup
---
.../main/java/org/apache/isis/commons/internal/image/_Images.java | 3 +++
.../facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/image/_Images.java b/commons/src/main/java/org/apache/isis/commons/internal/image/_Images.java
index 85e7a10..7d3c9e3 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/image/_Images.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/image/_Images.java
@@ -110,10 +110,13 @@ public class _Images {
@Nullable
public static BufferedImage fromPixels(final @Nullable int[][] pixels){
+ /*sonar-ignore-on*/
final int height = _NullSafe.size(pixels);
final int width = height>0
? _NullSafe.size(pixels[0])
: 0;
+ /*sonar-ignore-off*/
+
final int pixelCount = width * height;
if(pixelCount>0) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
index 6b3dffa..d569efc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
@@ -66,7 +66,9 @@ extends ImageValueSemanticsProviderAbstract<BufferedImage> {
if(_Strings.isNullOrEmpty(base64ImageData)) {
return null;
}
+ /*sonar-ignore-on*/
return _Images.fromBase64(base64ImageData);
+ /*sonar-ignore-off*/
}
@Override
@@ -81,12 +83,13 @@ extends ImageValueSemanticsProviderAbstract<BufferedImage> {
// -- HELPER
- @Nullable
private Optional<BufferedImage> unwrap(final @Nullable ManagedObject adapter) {
if(ManagedObjects.isNullOrUnspecifiedOrEmpty(adapter)) {
return Optional.empty();
}
+ /*sonar-ignore-on*/
return Optional.ofNullable((BufferedImage) adapter.getPojo());
+ /*sonar-ignore-off*/
}