This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 240282cee695a770887daebf9383e8e458c9f638
Author: Dan Haywood <d...@haywood-associates.co.uk>
AuthorDate: Mon Mar 5 10:24:55 2018 +0000
ISIS-1888: further tidy up of CSS classes, fully qualified and no longer
lower-caes
---
.../viewer/wicket/model/models/ScalarModel.java | 32 ++++++++++++----------
.../components/actions/ActionParametersForm.java | 15 ++++++++--
.../ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../components/scalars/ScalarPanelAbstract2.java | 6 ++--
.../viewer/wicket/ui/util/CssClassAppender.java | 2 +-
5 files changed, 35 insertions(+), 22 deletions(-)
diff --git
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 035d795..8ad74ca 100644
---
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -51,6 +51,7 @@ import
org.apache.isis.core.metamodel.facets.value.bigdecimal.BigDecimalValueFac
import
org.apache.isis.core.metamodel.facets.value.string.StringValueSemanticsProvider;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
@@ -101,13 +102,11 @@ public class ScalarModel extends EntityModel implements
LinksProvider,FormExecut
}
@Override
- public String getLongName(final ScalarModel scalarModel) {
-
- ObjectSpecId objectSpecId =
-
scalarModel.getParentEntityModel().getTypeOfSpecification().getSpecId();
-
- final String specShortName =
SpecUtils.getSpecificationFor(objectSpecId,
scalarModel.getSpecificationLoader()).getShortIdentifier();
- return specShortName + "-" +
scalarModel.getPropertyMemento().getProperty(scalarModel.getSpecificationLoader()).getId();
+ public String getCssClass(final ScalarModel scalarModel) {
+ final String objectSpecId =
+
scalarModel.getParentEntityModel().getTypeOfSpecification().getSpecId().asString().replace(".",
"-");
+ final String propertyId = getIdentifier(scalarModel);
+ return "isis-" + objectSpecId + "-" + propertyId;
}
@Override
@@ -334,16 +333,19 @@ public class ScalarModel extends EntityModel implements
LinksProvider,FormExecut
}
@Override
- public String getLongName(final ScalarModel scalarModel) {
+ public String getCssClass(final ScalarModel scalarModel) {
final ObjectAdapterMemento adapterMemento =
scalarModel.getObjectAdapterMemento();
if (adapterMemento == null) {
// shouldn't happen
return null;
}
- ObjectSpecId objectSpecId = adapterMemento.getObjectSpecId();
- final String specShortName =
SpecUtils.getSpecificationFor(objectSpecId,
scalarModel.getSpecificationLoader()).getShortIdentifier();
- final String parmId =
scalarModel.getParameterMemento().getActionParameter(scalarModel.getSpecificationLoader()).getIdentifier().toNameIdentityString();
- return specShortName + "-" + parmId + "-" +
scalarModel.getParameterMemento().getNumber();
+ final ObjectActionParameter actionParameter =
scalarModel.getParameterMemento()
+
.getActionParameter(scalarModel.getSpecificationLoader());
+ final ObjectAction action = actionParameter.getAction();
+ final String objectSpecId =
action.getOnType().getSpecId().asString().replace(".", "-");
+ final String parmId = actionParameter.getId();
+
+ return "isis-" + objectSpecId + "-" + action.getId() + "-" +
parmId;
}
@Override
@@ -585,7 +587,7 @@ public class ScalarModel extends EntityModel implements
LinksProvider,FormExecut
public abstract String validate(ScalarModel scalarModel, ObjectAdapter
proposedAdapter);
- public abstract String getLongName(ScalarModel scalarModel);
+ public abstract String getCssClass(ScalarModel scalarModel);
public abstract boolean isRequired(ScalarModel scalarModel);
@@ -860,8 +862,8 @@ public class ScalarModel extends EntityModel implements
LinksProvider,FormExecut
return kind.isRequired(this);
}
- public String getLongName() {
- return kind.getLongName(this);
+ public String getCssClass() {
+ return kind.getCssClass(this);
}
public <T extends Facet> T getFacet(final Class<T> facetType) {
diff --git
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
index 99e5953..9ad8edd 100644
---
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
+++
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersForm.java
@@ -34,6 +34,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.viewer.wicket.model.hints.IsisActionCompletedEvent;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
@@ -92,8 +93,18 @@ class ActionParametersForm extends
PromptFormAbstract<ActionModel> {
if(component instanceof MarkupContainer) {
final MarkupContainer markupContainer = (MarkupContainer)
component;
- final String paramId =
model.getParameterMemento().getActionParameter(getSpecificationLoader()).getId();
- CssClassAppender.appendCssClassTo(markupContainer,
CssClassAppender.asCssStyle("isis-" + paramId));
+
+ // TODO: copy-n-paste of
ScalarModel.Kind#getCssClass(ScalarModel), so could perhaps unify
+ final ObjectActionParameter actionParameter =
model.getParameterMemento()
+ .getActionParameter(getSpecificationLoader());
+
+ final ObjectAction action = actionParameter.getAction();
+ final String objectSpecId =
action.getOnType().getSpecId().asString().replace(".", "-");
+ final String parmId = actionParameter.getId();
+
+ final String css = "isis-" + objectSpecId + "-" + action.getId() +
"-" + parmId;
+
+ CssClassAppender.appendCssClassTo(markupContainer,
CssClassAppender.asCssStyle(css));
}
final ScalarPanelAbstract2 paramPanel =
component instanceof ScalarPanelAbstract2
diff --git
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 75c5a57..b923863 100644
---
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -259,7 +259,7 @@ public abstract class ScalarPanelAbstract extends
PanelAbstract<ScalarModel> imp
protected abstract void addFormComponentBehavior(Behavior behavior);
private void addCssForMetaModel() {
- final String cssForMetaModel = getModel().getLongName();
+ final String cssForMetaModel = getModel().getCssClass();
if (cssForMetaModel != null) {
add(new AttributeAppender("class", Model.of(cssForMetaModel), "
"));
}
diff --git
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 348a25e..fa47ecb 100644
---
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -363,9 +363,9 @@ public abstract class ScalarPanelAbstract2 extends
PanelAbstract<ScalarModel> im
private void addCssFromMetaModel() {
- final String cssForMetaModel = getModel().getLongName();
- if (cssForMetaModel != null) {
- add(new AttributeAppender("class", Model.of(cssForMetaModel), "
"));
+ final String cssForMetaModel = getModel().getCssClass();
+ if (!Strings.isNullOrEmpty(cssForMetaModel)) {
+ CssClassAppender.appendCssClassTo(this,
CssClassAppender.asCssStyle(cssForMetaModel));
}
ScalarModel model = getModel();
diff --git
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
index 884bd26..d88a2f3 100644
---
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
+++
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
@@ -70,6 +70,6 @@ public class CssClassAppender extends AttributeAppender {
* Utility method to sanitize string into a single CSS class.
*/
public static String asCssStyle(final String str) {
- return str.toLowerCase().replaceAll("[^A-Za-z0-9- ]",
"").replaceAll("\\s+", "-");
+ return str.replaceAll("[^A-Za-z0-9- ]", "").replaceAll("\\s+", "-");
}
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
