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 2021/11/15 10:43:39 UTC
[isis] branch master updated: ISIS-2882: ScalarRepresentation: cleaning up and java-doc fixes
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 092b5ef ISIS-2882: ScalarRepresentation: cleaning up and java-doc fixes
092b5ef is described below
commit 092b5efe988777f36c557307dc214b165a71482e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Nov 15 11:43:05 2021 +0100
ISIS-2882: ScalarRepresentation: cleaning up and java-doc fixes
---
.../apache/isis/core/metamodel/commons/ScalarRepresentation.java | 8 ++++----
.../org/apache/isis/viewer/common/model/object/ObjectUiModel.java | 4 ----
.../wicket/model/converter/ConverterBasedOnValueSemantics.java | 2 +-
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ScalarRepresentation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ScalarRepresentation.java
index b820864..d24fa3b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ScalarRepresentation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/ScalarRepresentation.java
@@ -22,12 +22,12 @@ import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.adapters.Renderer;
/**
- * Introduced specifically for value-types.
+ * Mode of representation for a Scalar within the UI.
*/
public enum ScalarRepresentation {
/**
- * Editing (parsing) mode, corresponds to 'regular' UI components.
+ * Editing (text-parsing) mode, corresponds to 'regular' UI components.
* <p>
* In case of value-types, indicates that for value-type to {@link String} conversion,
* a {@link Parser} is required.
@@ -35,7 +35,7 @@ public enum ScalarRepresentation {
EDITING,
/**
- * Viewing (rendering) mode, corresponds to 'compact' UI components.
+ * Viewing (HTML-rendering) mode, corresponds to 'compact' UI components.
* <p>
* In case of value-types, indicates that for value-type to {@link String} conversion,
* a {@link Renderer} is required.
@@ -46,7 +46,7 @@ public enum ScalarRepresentation {
return this == EDITING;
}
- public boolean isRendering() {
+ public boolean isViewing() {
return this == VIEWING;
}
}
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
index 5c72bc3..1235908 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
@@ -35,10 +35,6 @@ public interface ObjectUiModel {
.isVisible(getManagedObject(), InteractionInitiatedBy.USER);
}
-// public enum ScalarRepresentation {
-// VIEW, EDIT
-// }
-
@RequiredArgsConstructor
public enum RenderingHint {
// normal form
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ConverterBasedOnValueSemantics.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ConverterBasedOnValueSemantics.java
index ce9eb16..f40024e 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ConverterBasedOnValueSemantics.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ConverterBasedOnValueSemantics.java
@@ -69,7 +69,7 @@ implements
public final T convertToObject(final String text, final Locale locale) throws ConversionException {
// guard against framework bugs
- if(scalarRepresentation.isRendering()) {
+ if(scalarRepresentation.isViewing()) {
throw _Exceptions.illegalArgument("Internal Error: "
+ "cannot convert a rendering representation back to its value-type '%s' -> %s",
text,