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/05/27 08:42:40 UTC

[isis] branch master updated (de85e7d -> 022dc6a)

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from de85e7d  ISIS-2340: simplify and fix parented collections (Vaadin)
     new fcca13c  ISIS-2340: cleanup prev commit
     new 022dc6a  ISIS-2340: bump vaadin.version -> 14.2.0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 core/pom.xml                                                       | 2 +-
 examples/demo/vaadin/pom.xml                                       | 2 +-
 .../viewer/vaadin/ui/components/object/ObjectFormView.java         | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)


[isis] 01/02: ISIS-2340: cleanup prev commit

Posted by ah...@apache.org.
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

commit fcca13c894170618c8c8eb646839728019080e18
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 27 10:33:38 2020 +0200

    ISIS-2340: cleanup prev commit
---
 .../viewer/vaadin/ui/components/object/ObjectFormView.java         | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectFormView.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectFormView.java
index e5c4322..58672d4 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectFormView.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/components/object/ObjectFormView.java
@@ -18,9 +18,6 @@
  */
 package org.apache.isis.incubator.viewer.vaadin.ui.components.object;
 
-import java.util.Collection;
-
-import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasComponents;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
@@ -33,7 +30,6 @@ import com.vaadin.flow.component.orderedlayout.FlexLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.tabs.Tab;
 import com.vaadin.flow.component.tabs.Tabs;
-import com.vaadin.flow.component.textfield.TextField;
 
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.layout.component.ActionLayoutData;
@@ -48,7 +44,6 @@ import org.apache.isis.applib.layout.grid.bootstrap3.BS3Tab;
 import org.apache.isis.applib.layout.grid.bootstrap3.BS3TabGroup;
 import org.apache.isis.core.metamodel.interactions.managed.ActionInteraction;
 import org.apache.isis.core.metamodel.interactions.managed.CollectionInteraction;
-import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
 import org.apache.isis.core.metamodel.interactions.managed.PropertyInteraction;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
 import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa;
@@ -64,8 +59,6 @@ public class ObjectFormView extends VerticalLayout {
 
     private static final long serialVersionUID = 1L;
 
-    private static final String NULL_LITERAL = "<NULL>";
-
     /**
      * Constructs given domain object's view, with all its visible members and actions.
      * @param managedObject - domain object


[isis] 02/02: ISIS-2340: bump vaadin.version -> 14.2.0

Posted by ah...@apache.org.
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

commit 022dc6a26aa707cd81a116a63511dc3b23e3e3e9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 27 10:42:28 2020 +0200

    ISIS-2340: bump vaadin.version -> 14.2.0
---
 core/pom.xml                 | 2 +-
 examples/demo/vaadin/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 886b54c..47012dd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -174,7 +174,7 @@
 
 		<togglz.version>2.1.0.Final</togglz.version>
 
-		<vaadin.version>14.1.25</vaadin.version>
+		<vaadin.version>14.2.0</vaadin.version>
 
 		<wicket.version>8.8.0</wicket.version>
 		<wicket-bootstrap.version>2.0.13</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap-core -->
diff --git a/examples/demo/vaadin/pom.xml b/examples/demo/vaadin/pom.xml
index a54f7fa..f7c4683 100644
--- a/examples/demo/vaadin/pom.xml
+++ b/examples/demo/vaadin/pom.xml
@@ -42,7 +42,7 @@
 			-->
 		<node.version>v12.14.0</node.version>
 		<npm.version>6.13.1</npm.version>
-		<vaadin.version>14.1.23</vaadin.version>
+		<vaadin.version>14.2.0</vaadin.version>
 
 	</properties>