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 2018/09/26 20:52:02 UTC
[isis] branch v2 updated: ISIS-1976: further cleanup
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 30eb4df ISIS-1976: further cleanup
30eb4df is described below
commit 30eb4dfc198bbc1232e0c16895c3c92c42f32d3c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 26 22:04:11 2018 +0200
ISIS-1976: further cleanup
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../wicket/ui/components/scalars/uuid/UuidConverter.java | 11 ++++++-----
.../standalonecollection/StandaloneCollectionPanel.java | 3 ---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java
index a8b5183..0b30223 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/uuid/UuidConverter.java
@@ -18,20 +18,21 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.uuid;
import java.util.Locale;
import java.util.UUID;
-import java.util.regex.Pattern;
-
-import org.apache.isis.commons.internal.base._Strings;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.isis.commons.internal.base._Strings;
+
/**
* The {@link IConverter} implementation that our {@link UuidTextField} delegates to for converting strings into values.
*/
public class UuidConverter implements IConverter<UUID>
{
- private final static Pattern pattern = Pattern.compile(
- "[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
+ private static final long serialVersionUID = 1L;
+
+// private final static Pattern pattern = Pattern.compile(
+// "[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
@Override
public UUID convertToObject(String value, Locale locale)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index dbe2202..24332ba 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -65,9 +65,6 @@ implements CollectionCountProvider, CollectionSelectorProvider, BulkActionsProvi
private MarkupContainer outerDiv = this;
- /**
- * note that the bulk actions components are added in {@link #configureBulkActions(org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn)}.
- */
public StandaloneCollectionPanel(final String id, final EntityCollectionModel entityCollectionModel) {
super(id, entityCollectionModel);