This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch dev/2.0.0/ISIS-898-treeview in repository https://gitbox.apache.org/repos/asf/isis.git
commit b02c336eebb0507e1bf2dd552ad1062947dfed1c Author: Andi Huber <ahu...@apache.org> AuthorDate: Tue Apr 17 05:54:24 2018 +0200 ISIS-898 further reduce compiler warnings --- .../value/ValueSemanticsProviderAbstractTemporal.java | 3 ++- .../facets/value/image/ImageValueSemanticsProvider.java | 1 - .../imageawt/JavaAwtImageValueSemanticsProvider.java | 1 - .../bookmarks/BookmarkServiceInternalDefault.java | 17 +++++++++-------- .../core/runtime/persistence/adapter/PojoAdapter.java | 8 +++----- .../isis/viewer/wicket/model/models/ScalarModel.java | 2 +- .../actions/ActionParametersFormPanelFactory.java | 6 ++---- .../ui/components/actions/ActionParametersPanel.java | 4 +++- .../bookmarkedpages/BookmarkedPagesPanel.java | 8 ++++++-- .../ui/components/scalars/markup/MarkupPanel.java | 3 +-- 10 files changed, 27 insertions(+), 26 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java index 1d4fa11..41cd71a 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java @@ -33,6 +33,7 @@ import java.util.TimeZone; import com.google.common.collect.Maps; import org.apache.isis.applib.adapters.EncodingException; +import org.apache.isis.applib.internal.base._Casts; import org.apache.isis.core.commons.config.ConfigurationConstants; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.Facet; @@ -200,7 +201,7 @@ public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSem } try { - T date = (T) object; + T date = _Casts.uncheckedCast(object); final StringTokenizer st = new StringTokenizer(str.substring(1), " "); while (st.hasMoreTokens()) { final String token = st.nextToken(); diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProvider.java index ceea52e..0b5cd74 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProvider.java @@ -20,7 +20,6 @@ package org.apache.isis.core.metamodel.facets.value.image; import org.apache.isis.applib.value.Image; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java index 422cf73..c6e768b 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java @@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.value.imageawt; import java.awt.Image; -import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.value.image.ImageValueSemanticsProviderAbstract; diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java index 771629d..e08334a 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java @@ -202,14 +202,15 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ // -- HELPER private final static Set<Class<? extends Serializable>> serializableFinalTypes = _Sets.of( - String.class, - Boolean.class, boolean.class, - Byte.class, byte.class, - Short.class, short.class, - Integer.class, int.class, - Long.class, long.class, - Float.class, float.class, - Double.class, double.class + String.class, String[].class, + Class.class, Class[].class, + Boolean.class, boolean.class, Boolean[].class, boolean[].class, + Byte.class, byte.class, Byte[].class, byte[].class, + Short.class, short.class, Short[].class, short[].class, + Integer.class, int.class, Integer[].class, int[].class, + Long.class, long.class, Long[].class, long[].class, + Float.class, float.class, Float[].class, float[].class, + Double.class, double.class, Double[].class, double[].class ); private final static List<Class<? extends Serializable>> serializableTypes = _Lists.of( diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java index f9ad222..09e6bd8 100644 --- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java +++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java @@ -19,14 +19,9 @@ package org.apache.isis.core.runtime.persistence.adapter; -import org.datanucleus.enhancement.Persistable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Objects; import org.apache.isis.core.commons.authentication.AuthenticationSession; -import org.apache.isis.core.commons.ensure.Ensure; import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.commons.util.ToString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -45,6 +40,9 @@ import org.apache.isis.core.metamodel.spec.Specification; import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.isis.core.metamodel.specloader.SpecificationLoader; import org.apache.isis.core.runtime.system.persistence.PersistenceSession5; +import org.datanucleus.enhancement.Persistable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PojoAdapter extends InstanceAbstract implements ObjectAdapter { 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 64be5e7..b92f239 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 @@ -80,7 +80,7 @@ import com.google.common.collect.Lists; * common superclass for both EntityModel and ScalarModel. * </p> */ -public class ScalarModel extends EntityModel implements LinksProvider,FormExecutorContext, ActionArgumentModel { +public class ScalarModel extends EntityModel implements LinksProvider, FormExecutorContext, ActionArgumentModel { private static final long serialVersionUID = 1L; diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java index bb515d0..8ae4779 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanelFactory.java @@ -19,14 +19,12 @@ package org.apache.isis.viewer.wicket.ui.components.actions; -import org.apache.wicket.Component; -import org.apache.wicket.model.IModel; -import org.apache.wicket.request.resource.CssResourceReference; - import org.apache.isis.viewer.wicket.model.models.ActionModel; import org.apache.isis.viewer.wicket.ui.ComponentFactory; import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract; import org.apache.isis.viewer.wicket.ui.ComponentType; +import org.apache.wicket.Component; +import org.apache.wicket.model.IModel; /** * {@link ComponentFactory} for {@link ActionParametersFormPanel}. diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java index dc17e3c..48349cc 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java @@ -83,7 +83,9 @@ public class ActionParametersPanel extends PanelAbstract<ActionModel> { WebMarkupContainer header = new WebMarkupContainer(ID_HEADER) { - @Override + private static final long serialVersionUID = 5410724436024228792L; + + @Override protected void onConfigure() { super.onConfigure(); setVisible(showHeader); diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java index 5c455c2..eee3102 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java @@ -205,14 +205,18 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> { protected Component addHelpText(final BookmarkedPagesModel bookmarkedPagesModel) { IModel<String> helpTextModel = new AbstractReadOnlyModel<String>() { - @Override + private static final long serialVersionUID = -2445813533787596379L; + + @Override public String getObject() { return bookmarkedPagesModel.isEmpty() ? "You have no bookmarks!" : ""; } }; Label helpText = new Label(ID_BOOKMARKS_HELP_TEXT, helpTextModel) { - @Override + private static final long serialVersionUID = -8364098044839077580L; + + @Override protected void onConfigure() { super.onConfigure(); diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java index 633daac..cbd5573 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanel.java @@ -30,8 +30,7 @@ import org.apache.wicket.model.Model; /** * Panel for rendering scalars of type {@link org.apache.isis.applib.value.Markup}. */ -public class MarkupPanel extends ScalarPanelTextFieldParseableAbstract -{ +public class MarkupPanel extends ScalarPanelTextFieldParseableAbstract { private static final long serialVersionUID = 1L; -- To stop receiving notification emails like this one, please contact ahu...@apache.org.