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/04/11 17:10:07 UTC
[isis] branch master updated: ISIS-2340: minor cleanup,
also supposed fix for javac issue
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 ee2cac2 ISIS-2340: minor cleanup, also supposed fix for javac issue
ee2cac2 is described below
commit ee2cac203cb5d2218b08669b573c2401bc9664e9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Apr 11 19:09:53 2020 +0200
ISIS-2340: minor cleanup, also supposed fix for javac issue
---
.../vaadin/model/action/ActionFactoryVaa.java | 48 +-------------
.../Decorators.java} | 74 +++++++++-------------
.../components/actionmenu/CssClassFaBehavior.java | 5 --
.../isis/viewer/wicket/ui/util/Decorators.java | 2 -
4 files changed, 32 insertions(+), 97 deletions(-)
diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionFactoryVaa.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionFactoryVaa.java
index 4c0ada8..a0246a0 100644
--- a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionFactoryVaa.java
+++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionFactoryVaa.java
@@ -18,23 +18,16 @@
*/
package org.apache.isis.incubator.viewer.vaadin.model.action;
-import java.util.Optional;
-
import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.html.Label;
-import com.vaadin.flow.component.html.Span;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import org.apache.isis.applib.layout.component.CssClassFaPosition;
-import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.incubator.viewer.vaadin.model.decorator.Decorators;
import org.apache.isis.incubator.viewer.vaadin.model.entity.ObjectVaa;
import org.apache.isis.viewer.common.model.action.ActionUiModel;
import org.apache.isis.viewer.common.model.action.ActionUiModelFactory;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeDecorator;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeUiModel;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -42,43 +35,6 @@ import lombok.val;
@RequiredArgsConstructor
public class ActionFactoryVaa implements ActionUiModelFactory<Component> {
- private static class IconDecorator implements FontAwesomeDecorator<Component, Label> {
-
- @Override
- public Component decorate(
- final Label uiComponent,
- final Optional<FontAwesomeUiModel> fontAwesomeUiModel) {
-
- val decoratedUiComponent = fontAwesomeUiModel
- .map(fontAwesome->{
-
- val faIcon = new Span();
-
- _Strings.splitThenStreamTrimmed(fontAwesome.getCssClass(), " ")
- .forEach(faIcon::addClassName);
-
- return CssClassFaPosition.isLeftOrUnspecified(fontAwesome.getPosition())
- ? new HorizontalLayout(faIcon, uiComponent)
- : new HorizontalLayout(uiComponent, faIcon);
-
- })
- .orElseGet(()->{
-
- // TODO add spacer, to account for missing fa icon?
- // but then where to add, left or right?
-
- return new HorizontalLayout(uiComponent);
- });
-
- return decoratedUiComponent;
-
- }
-
- }
-
- private final IconDecorator iconDecorator = new IconDecorator();
-
-
@Override
public ActionUiModel<Component> newAction(
IsisWebAppCommonContext commonContext,
@@ -103,7 +59,7 @@ public class ActionFactoryVaa implements ActionUiModelFactory<Component> {
val actionMeta = model.getActionUiMetaModel();
val uiLabel = new Label(actionMeta.getLabel());
- return iconDecorator.decorate(uiLabel, actionMeta.getFontAwesomeUiModel());
+ return Decorators.getIconDecorator().decorate(uiLabel, actionMeta.getFontAwesomeUiModel());
}
diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionFactoryVaa.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java
similarity index 62%
copy from incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionFactoryVaa.java
copy to incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java
index 4c0ada8..fa889ca 100644
--- a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionFactoryVaa.java
+++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.incubator.viewer.vaadin.model.action;
+package org.apache.isis.incubator.viewer.vaadin.model.decorator;
import java.util.Optional;
@@ -27,22 +27,38 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.incubator.viewer.vaadin.model.entity.ObjectVaa;
-import org.apache.isis.viewer.common.model.action.ActionUiModel;
-import org.apache.isis.viewer.common.model.action.ActionUiModelFactory;
import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeDecorator;
import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeUiModel;
+import org.apache.isis.viewer.common.model.decorator.tooltip.TooltipDecorator;
+import org.apache.isis.viewer.common.model.decorator.tooltip.TooltipUiModel;
-import lombok.RequiredArgsConstructor;
+import lombok.Getter;
import lombok.val;
+import lombok.experimental.UtilityClass;
+import lombok.extern.log4j.Log4j2;
-@RequiredArgsConstructor
-public class ActionFactoryVaa implements ActionUiModelFactory<Component> {
+/**
+ *
+ */
+@UtilityClass
+@Log4j2
+public class Decorators {
- private static class IconDecorator implements FontAwesomeDecorator<Component, Label> {
+ @Getter(lazy = true) private final static Tooltip tooltip = new Tooltip();
+ @Getter(lazy = true) private final static IconDecoratorForLabels iconDecorator = new IconDecoratorForLabels();
+
+ // -- DECORATOR CLASSES
+
+ public final static class Tooltip implements TooltipDecorator<Component> {
+
+ @Override
+ public void addTooltip(Component uiComponent, TooltipUiModel tooltipUiModel) {
+ log.warn("not implemented yet");
+ }
+
+ }
+
+ public final static class IconDecoratorForLabels implements FontAwesomeDecorator<Component, Label> {
@Override
public Component decorate(
@@ -70,43 +86,13 @@ public class ActionFactoryVaa implements ActionUiModelFactory<Component> {
return new HorizontalLayout(uiComponent);
});
- return decoratedUiComponent;
+ return (HorizontalLayout)decoratedUiComponent;
}
}
-
- private final IconDecorator iconDecorator = new IconDecorator();
-
-
- @Override
- public ActionUiModel<Component> newAction(
- IsisWebAppCommonContext commonContext,
- String named,
- ManagedObject actionHolder,
- ObjectAction objectAction) {
-
- val model = new ActionVaa(
- this::createUiComponent,
- named,
- new ObjectVaa(commonContext, actionHolder),
- objectAction);
-
- return model;
- }
-
- // -- HELPER
-
- private Component createUiComponent(
- final ActionUiModel<Component> model) {
-
- val actionMeta = model.getActionUiMetaModel();
- val uiLabel = new Label(actionMeta.getLabel());
-
- return iconDecorator.decorate(uiLabel, actionMeta.getFontAwesomeUiModel());
-
- }
+
-}
\ No newline at end of file
+}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java
index d1b0cd7..c65062a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/CssClassFaBehavior.java
@@ -22,7 +22,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
-import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeUiModel;
import lombok.NonNull;
@@ -60,8 +59,4 @@ public class CssClassFaBehavior extends Behavior {
super.afterRender(component);
}
- @Deprecated // use constructor with FontAwesomeUiModel instead
- public static CssClassFaBehavior of(String cssClassFa, CssClassFaPosition position) {
- return new CssClassFaBehavior(FontAwesomeUiModel.of(cssClassFa, position).orElseThrow(_Exceptions::unexpectedCodeReach));
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Decorators.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Decorators.java
index fbf8827..62620b9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Decorators.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Decorators.java
@@ -52,7 +52,6 @@ public class Decorators {
}
- //TODO make available for reuse
public final static class IconDecorator implements FontAwesomeDecorator<Component, Component> {
@Override
@@ -65,7 +64,6 @@ public class Decorators {
}
- //TODO make available for reuse
public final static class MissingIconDecorator implements FontAwesomeDecorator<Component, Component> {
@Override