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/10/10 06:58:31 UTC
[isis] branch master updated: ISIS-3240: remove unused FormatModifiers
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 30f94df14e ISIS-3240: remove unused FormatModifiers
30f94df14e is described below
commit 30f94df14ea47cea3d10d468a1230fb96a749743
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Oct 10 08:58:25 2022 +0200
ISIS-3240: remove unused FormatModifiers
---
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java | 3 ---
.../components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java | 6 ------
.../viewer/wicket/ui/components/scalars/bool/BooleanPanel.java | 8 --------
.../ui/components/scalars/composite/CompositeValuePanel.java | 6 ------
4 files changed, 23 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index fb5690e638..c9769fa8e2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -90,9 +90,6 @@ implements ScalarModelChangeListener {
public enum FormatModifier {
MARKUP,
MULITLINE,
- COMPOSITE,
- TRISTATE,
- BLOB,
BADGE,
/** render output un-escaped; careful not to allow XSS vulnerabilities*/
NO_OUTPUT_ESCAPE
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
index e92504342d..10a1cefc62 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.blobclob;
-import java.util.EnumSet;
import java.util.List;
import java.util.Optional;
@@ -60,11 +59,6 @@ extends ScalarPanelFormFieldAbstract<T> {
protected abstract IResource newResource(final T namedWithMimeType);
- @Override
- protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {
- modifiers.add(FormatModifier.BLOB);
- }
-
// -- INPUT FORMAT
@Override
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bool/BooleanPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bool/BooleanPanel.java
index 3f549fa8c8..13a4854bcb 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bool/BooleanPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bool/BooleanPanel.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.bool;
-import java.util.EnumSet;
import java.util.Optional;
import org.apache.wicket.Component;
@@ -52,13 +51,6 @@ extends ScalarPanelFormFieldAbstract<Boolean> {
super(id, scalarModel, Boolean.class);
}
- @Override
- protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {
- if(!scalarModel().isRequired()) {
- modifiers.add(FormatModifier.TRISTATE);
- }
- }
-
@Override
protected Optional<InputFragment> getInputFragmentType() {
return Optional.of(InputFragment.CHECKBOX);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
index d814dc5c5f..7b7befee5d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/composite/CompositeValuePanel.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.composite;
-import java.util.EnumSet;
import java.util.Optional;
import org.apache.wicket.Component;
@@ -44,11 +43,6 @@ extends ScalarPanelFormFieldAbstract<T> {
super(id, scalarModel, valueType);
}
- @Override
- protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {
- modifiers.add(FormatModifier.COMPOSITE);
- }
-
@Override
protected Component createComponentForOutput(final String id) {
return new MarkupComponent(id, scalarModel());