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/07/08 10:20:42 UTC
[isis] branch master updated: ISIS-2340: renaming
FontAwesomeDecorator -> IconDecorator
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 3fa917e ISIS-2340: renaming FontAwesomeDecorator -> IconDecorator
3fa917e is described below
commit 3fa917ee5fdd5514d3c0d5e11bbc08ca2f8a998e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jul 8 12:20:26 2020 +0200
ISIS-2340: renaming FontAwesomeDecorator -> IconDecorator
---
.../isis/incubator/viewer/javafx/model/context/UiContext.java | 6 +++---
.../isis/incubator/viewer/javafx/model/icon/IconService.java | 2 +-
.../viewer/javafx/ui/IsisModuleIncViewerJavaFxUi.java | 2 +-
.../javafx/ui/decorator/icon/IconDecoratorForLabeled.java | 6 +++---
.../javafx/ui/decorator/icon/IconDecoratorForMenuItem.java | 6 +++---
.../viewer/javafx/ui/decorator/icon/IconServiceDefault.java | 2 +-
.../viewer/javafx/ui/{services => main}/UiContextDefault.java | 8 ++++----
.../incubator/viewer/vaadin/model/decorator/Decorators.java | 6 +++---
.../incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java | 4 ++--
.../isis/viewer/common/model/action/ActionUiMetaModel.java | 2 +-
.../common/model/action/decorator/ActionUiDecorator.java | 4 ++--
.../common/model/decorator/disable/DisablingUiModel.java | 1 -
.../model/decorator/{fa => icon}/FontAwesomeUiModel.java | 2 +-
.../{fa/FontAwesomeDecorator.java => icon/IconDecorator.java} | 4 ++--
.../wicket/ui/components/actionmenu/CssClassFaBehavior.java | 2 +-
.../java/org/apache/isis/viewer/wicket/ui/util/Decorators.java | 10 +++++-----
.../isis/viewer/wicket/ui/util/FontAwesomeCssReferenceWkt.java | 4 ++--
17 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/context/UiContext.java b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/context/UiContext.java
index c680af3..9fa8240 100644
--- a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/context/UiContext.java
+++ b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/context/UiContext.java
@@ -22,7 +22,7 @@ import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
import org.apache.isis.incubator.viewer.javafx.model.action.ActionUiModelFactoryFx;
import org.apache.isis.incubator.viewer.javafx.model.form.FormField;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingDecorator;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeDecorator;
+import org.apache.isis.viewer.common.model.decorator.icon.IconDecorator;
import org.apache.isis.viewer.common.model.decorator.prototyping.PrototypingDecorator;
import javafx.scene.Node;
@@ -37,8 +37,8 @@ public interface UiContext {
// -- DECORATORS
- FontAwesomeDecorator<Labeled, Labeled> getIconDecoratorForLabeled();
- FontAwesomeDecorator<MenuItem, MenuItem> getIconDecoratorForMenuItem();
+ IconDecorator<Labeled, Labeled> getIconDecoratorForLabeled();
+ IconDecorator<MenuItem, MenuItem> getIconDecoratorForMenuItem();
DisablingDecorator<Button> getDisablingDecoratorForButton();
DisablingDecorator<FormField> getDisablingDecoratorForFormField();
diff --git a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/icon/IconService.java b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/icon/IconService.java
index 63934ce..c4b3e7b 100644
--- a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/icon/IconService.java
+++ b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/icon/IconService.java
@@ -20,7 +20,7 @@ package org.apache.isis.incubator.viewer.javafx.model.icon;
import java.util.Optional;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeUiModel;
+import org.apache.isis.viewer.common.model.decorator.icon.FontAwesomeUiModel;
import javafx.scene.image.Image;
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/IsisModuleIncViewerJavaFxUi.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/IsisModuleIncViewerJavaFxUi.java
index 45cbc2f..e84855b 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/IsisModuleIncViewerJavaFxUi.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/IsisModuleIncViewerJavaFxUi.java
@@ -36,8 +36,8 @@ import org.apache.isis.incubator.viewer.javafx.ui.decorator.prototyping.Prototyp
import org.apache.isis.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingInfoPopupProvider;
import org.apache.isis.incubator.viewer.javafx.ui.main.UiActionHandler;
import org.apache.isis.incubator.viewer.javafx.ui.main.UiBuilder;
+import org.apache.isis.incubator.viewer.javafx.ui.main.UiContextDefault;
import org.apache.isis.incubator.viewer.javafx.ui.main.UiController;
-import org.apache.isis.incubator.viewer.javafx.ui.services.UiContextDefault;
import org.apache.isis.viewer.common.model.IsisModuleViewerCommon;
/**
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
index 1023745..d0ac682 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForLabeled.java
@@ -26,8 +26,8 @@ import org.springframework.stereotype.Component;
import org.apache.isis.incubator.viewer.javafx.model.icon.IconService;
import org.apache.isis.incubator.viewer.javafx.model.util._fx;
-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.icon.FontAwesomeUiModel;
+import org.apache.isis.viewer.common.model.decorator.icon.IconDecorator;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -38,7 +38,7 @@ import javafx.scene.image.ImageView;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
-public class IconDecoratorForLabeled implements FontAwesomeDecorator<Labeled, Labeled> {
+public class IconDecoratorForLabeled implements IconDecorator<Labeled, Labeled> {
private final IconService iconService;
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
index 5612177..5c2516e 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconDecoratorForMenuItem.java
@@ -26,8 +26,8 @@ import org.springframework.stereotype.Component;
import org.apache.isis.incubator.viewer.javafx.model.icon.IconService;
import org.apache.isis.incubator.viewer.javafx.model.util._fx;
-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.icon.FontAwesomeUiModel;
+import org.apache.isis.viewer.common.model.decorator.icon.IconDecorator;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -38,7 +38,7 @@ import javafx.scene.image.ImageView;
@Component
@RequiredArgsConstructor(onConstructor_ = {@Inject})
-public class IconDecoratorForMenuItem implements FontAwesomeDecorator<MenuItem, MenuItem> {
+public class IconDecoratorForMenuItem implements IconDecorator<MenuItem, MenuItem> {
private final IconService iconService;
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
index 2388fd3..e4e9372 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/decorator/icon/IconServiceDefault.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.incubator.viewer.javafx.model.icon.IconService;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeUiModel;
+import org.apache.isis.viewer.common.model.decorator.icon.FontAwesomeUiModel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/services/UiContextDefault.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiContextDefault.java
similarity index 89%
rename from incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/services/UiContextDefault.java
rename to incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiContextDefault.java
index e7779ad..3a86bf6 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/services/UiContextDefault.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiContextDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.incubator.viewer.javafx.ui.services;
+package org.apache.isis.incubator.viewer.javafx.ui.main;
import javax.inject.Inject;
@@ -27,7 +27,7 @@ import org.apache.isis.incubator.viewer.javafx.model.action.ActionUiModelFactory
import org.apache.isis.incubator.viewer.javafx.model.context.UiContext;
import org.apache.isis.incubator.viewer.javafx.model.form.FormField;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingDecorator;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeDecorator;
+import org.apache.isis.viewer.common.model.decorator.icon.IconDecorator;
import org.apache.isis.viewer.common.model.decorator.prototyping.PrototypingDecorator;
import lombok.Getter;
@@ -51,9 +51,9 @@ public class UiContextDefault implements UiContext {
// -- DECORATORS
@Getter(onMethod_ = {@Override})
- private final FontAwesomeDecorator<Labeled, Labeled> iconDecoratorForLabeled;
+ private final IconDecorator<Labeled, Labeled> iconDecoratorForLabeled;
@Getter(onMethod_ = {@Override})
- private final FontAwesomeDecorator<MenuItem, MenuItem> iconDecoratorForMenuItem;
+ private final IconDecorator<MenuItem, MenuItem> iconDecoratorForMenuItem;
@Getter(onMethod_ = {@Override})
private final DisablingDecorator<Button> disablingDecoratorForButton;
diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java
index 6c0dd56..bdf72aa 100644
--- a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java
+++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java
@@ -30,8 +30,8 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
-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.icon.FontAwesomeUiModel;
+import org.apache.isis.viewer.common.model.decorator.icon.IconDecorator;
import org.apache.isis.viewer.common.model.decorator.tooltip.TooltipDecorator;
import org.apache.isis.viewer.common.model.decorator.tooltip.TooltipUiModel;
import org.apache.isis.viewer.common.model.userprofile.UserProfileUiModel;
@@ -65,7 +65,7 @@ public class Decorators {
}
- public final static class Icon implements FontAwesomeDecorator<Component, Component> {
+ public final static class Icon implements IconDecorator<Component, Component> {
@Override
public Component decorate(
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
index 48a2f1f..626f1f1 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainViewVaa.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.incubator.viewer.vaadin.ui.util.LocalResourceUtil;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeDecorator;
+import org.apache.isis.viewer.common.model.decorator.icon.IconDecorator;
import org.apache.isis.viewer.common.model.header.HeaderUiModelProvider;
import lombok.val;
@@ -77,7 +77,7 @@ implements BeforeEnterObserver {
@Override
public void beforeEnter(BeforeEnterEvent event) {
- val faStyleSheet = LocalResourceUtil.ResourceDescriptor.webjars(FontAwesomeDecorator.FONTAWESOME_RESOURCE);
+ val faStyleSheet = LocalResourceUtil.ResourceDescriptor.webjars(IconDecorator.FONTAWESOME_RESOURCE);
LocalResourceUtil.addStyleSheet(faStyleSheet);
setPrimarySection(Section.NAVBAR);
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionUiMetaModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionUiMetaModel.java
index 0ce8208..6d800c5 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionUiMetaModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionUiMetaModel.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingUiModel;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeUiModel;
+import org.apache.isis.viewer.common.model.decorator.icon.FontAwesomeUiModel;
import org.apache.isis.viewer.common.model.mementos.ActionMemento;
import lombok.AccessLevel;
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/decorator/ActionUiDecorator.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/decorator/ActionUiDecorator.java
index f676c18..2544dcd 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/decorator/ActionUiDecorator.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/decorator/ActionUiDecorator.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.common.model.action.decorator;
import org.apache.isis.viewer.common.model.decorator.confirm.ConfirmDecorator;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingDecorator;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeDecorator;
+import org.apache.isis.viewer.common.model.decorator.icon.IconDecorator;
import org.apache.isis.viewer.common.model.decorator.prototyping.PrototypingDecorator;
import org.apache.isis.viewer.common.model.decorator.tooltip.TooltipDecorator;
@@ -43,7 +43,7 @@ public class ActionUiDecorator<T> {
private final DisablingDecorator<T> disableDecorator;
private final ConfirmDecorator<T> confirmDecorator;
private final PrototypingDecorator<T, T> prototypingDecorator;
- private final FontAwesomeDecorator<T, T> iconDecorator;
+ private final IconDecorator<T, T> iconDecorator;
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/disable/DisablingUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/disable/DisablingUiModel.java
index cf9e841..bf771a4 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/disable/DisablingUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/disable/DisablingUiModel.java
@@ -25,7 +25,6 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.interactions.managed.ManagedMember;
import lombok.AccessLevel;
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/fa/FontAwesomeUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/icon/FontAwesomeUiModel.java
similarity index 97%
rename from viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/fa/FontAwesomeUiModel.java
rename to viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/icon/FontAwesomeUiModel.java
index 65e165d..147614b 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/fa/FontAwesomeUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/icon/FontAwesomeUiModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.common.model.decorator.fa;
+package org.apache.isis.viewer.common.model.decorator.icon;
import java.io.Serializable;
import java.util.Optional;
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/fa/FontAwesomeDecorator.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/icon/IconDecorator.java
similarity index 92%
rename from viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/fa/FontAwesomeDecorator.java
rename to viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/icon/IconDecorator.java
index 045b7c4..c872265 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/fa/FontAwesomeDecorator.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorator/icon/IconDecorator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.common.model.decorator.fa;
+package org.apache.isis.viewer.common.model.decorator.icon;
import java.util.Optional;
@@ -24,7 +24,7 @@ import java.util.Optional;
* @param <T> UI component type to decorate
* @param <R> resulting UI component type
*/
-public interface FontAwesomeDecorator<T, R> {
+public interface IconDecorator<T, R> {
/**
* corresponds to the webjars path as provided by the maven artifact
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 6f991be..610ddfd 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,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeUiModel;
+import org.apache.isis.viewer.common.model.decorator.icon.FontAwesomeUiModel;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
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 b243baf..fa106a7 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
@@ -31,8 +31,8 @@ import org.apache.isis.viewer.common.model.decorator.confirm.ConfirmUiModel;
import org.apache.isis.viewer.common.model.decorator.danger.DangerDecorator;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingDecorator;
import org.apache.isis.viewer.common.model.decorator.disable.DisablingUiModel;
-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.icon.FontAwesomeUiModel;
+import org.apache.isis.viewer.common.model.decorator.icon.IconDecorator;
import org.apache.isis.viewer.common.model.decorator.prototyping.PrototypingDecorator;
import org.apache.isis.viewer.common.model.decorator.prototyping.PrototypingUiModel;
import org.apache.isis.viewer.common.model.decorator.tooltip.TooltipDecorator;
@@ -62,7 +62,7 @@ public class Decorators {
@Getter(lazy = true) private final static Danger danger = new Danger();
- @Getter(lazy = true) private final static IconDecorator icon = new IconDecorator();
+ @Getter(lazy = true) private final static IconDecoratorWkt icon = new IconDecoratorWkt();
@Getter(lazy = true) private final static MissingIconDecorator missingIcon = new MissingIconDecorator();
// -- ADVANCED DECORATORS
@@ -133,7 +133,7 @@ public class Decorators {
}
}
- public final static class IconDecorator implements FontAwesomeDecorator<Component, Component> {
+ public final static class IconDecoratorWkt implements IconDecorator<Component, Component> {
@Override
public Component decorate(Component uiComponent, Optional<FontAwesomeUiModel> fontAwesome) {
if(fontAwesome.isPresent()) {
@@ -143,7 +143,7 @@ public class Decorators {
}
}
- public final static class MissingIconDecorator implements FontAwesomeDecorator<Component, Component> {
+ public final static class MissingIconDecorator implements IconDecorator<Component, Component> {
@Override
public Component decorate(Component uiComponent, Optional<FontAwesomeUiModel> fontAwesome) {
if(!fontAwesome.isPresent()) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/FontAwesomeCssReferenceWkt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/FontAwesomeCssReferenceWkt.java
index 0d22d83..d0ff457 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/FontAwesomeCssReferenceWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/FontAwesomeCssReferenceWkt.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.wicket.ui.util;
-import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeDecorator;
+import org.apache.isis.viewer.common.model.decorator.icon.IconDecorator;
import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
@@ -44,7 +44,7 @@ public class FontAwesomeCssReferenceWkt extends WebjarsCssResourceReference {
* Private constructor.
*/
private FontAwesomeCssReferenceWkt() {
- super(FontAwesomeDecorator.FONTAWESOME_RESOURCE);
+ super(IconDecorator.FONTAWESOME_RESOURCE);
}
}