#122 fixed SuperTextArea, #123 moved interfaces around

vaadin-miki · Jun 4, 2020 · 6377661 · 6377661
1 parent 5173e80
commit 6377661
Show file tree

Hide file tree

Showing 17 changed files with 77 additions and 27 deletions.
diff --git a/demo-v14/src/main/java/org/vaadin/miki/MainView.java b/demo-v14/src/main/java/org/vaadin/miki/MainView.java
@@ -25,7 +25,7 @@
 import org.vaadin.miki.markers.HasLocale;
 import org.vaadin.miki.superfields.dates.DatePattern;
 import org.vaadin.miki.superfields.dates.DatePatterns;
-import org.vaadin.miki.superfields.dates.HasDatePattern;
+import org.vaadin.miki.markers.HasDatePattern;
 import org.vaadin.miki.superfields.dates.SuperDatePicker;
 import org.vaadin.miki.superfields.dates.SuperDateTimePicker;
 import org.vaadin.miki.superfields.itemgrid.ItemGrid;
@@ -40,11 +40,11 @@
 import org.vaadin.miki.superfields.tabs.SuperTabs;
 import org.vaadin.miki.superfields.tabs.TabHandler;
 import org.vaadin.miki.superfields.tabs.TabHandlers;
-import org.vaadin.miki.superfields.text.CanReceiveSelectionEventsFromClient;
-import org.vaadin.miki.superfields.text.CanSelectText;
+import org.vaadin.miki.markers.CanReceiveSelectionEventsFromClient;
+import org.vaadin.miki.markers.CanSelectText;
 import org.vaadin.miki.superfields.text.SuperTextArea;
 import org.vaadin.miki.superfields.text.SuperTextField;
-import org.vaadin.miki.superfields.text.TextSelectionNotifier;
+import org.vaadin.miki.events.text.TextSelectionNotifier;
 import org.vaadin.miki.superfields.unload.UnloadObserver;
 
 import java.time.LocalDate;

diff --git a/.../superfields/text/TextSelectionEvent.java → .../miki/events/text/TextSelectionEvent.java b/.../superfields/text/TextSelectionEvent.java → .../miki/events/text/TextSelectionEvent.java
@@ -1,7 +1,8 @@
-package org.vaadin.miki.superfields.text;
+package org.vaadin.miki.events.text;
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEvent;
+import org.vaadin.miki.markers.CanSelectText;
 
 import java.util.Optional;
 

diff --git a/...perfields/text/TextSelectionListener.java → ...ki/events/text/TextSelectionListener.java b/...perfields/text/TextSelectionListener.java → ...ki/events/text/TextSelectionListener.java
@@ -1,7 +1,8 @@
-package org.vaadin.miki.superfields.text;
+package org.vaadin.miki.events.text;
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEventListener;
+import org.vaadin.miki.markers.CanSelectText;
 
 /**
  * Marker interface for objects

diff --git a/...perfields/text/TextSelectionNotifier.java → ...ki/events/text/TextSelectionNotifier.java b/...perfields/text/TextSelectionNotifier.java → ...ki/events/text/TextSelectionNotifier.java
@@ -1,7 +1,8 @@
-package org.vaadin.miki.superfields.text;
+package org.vaadin.miki.events.text;
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.shared.Registration;
+import org.vaadin.miki.markers.CanSelectText;
 
 /**
  * Marker interface for objects that broadcast {@link TextSelectionEvent}.

diff --git a/.../CanReceiveSelectionEventsFromClient.java → .../CanReceiveSelectionEventsFromClient.java b/.../CanReceiveSelectionEventsFromClient.java → .../CanReceiveSelectionEventsFromClient.java
@@ -1,4 +1,6 @@
-package org.vaadin.miki.superfields.text;
+package org.vaadin.miki.markers;
+
+import org.vaadin.miki.events.text.TextSelectionEvent;
 
 /**
  * Marker interface for objects capable of receiving text selection events from client-side code.

diff --git a/.../miki/superfields/text/CanSelectText.java → ...rg/vaadin/miki/markers/CanSelectText.java b/.../miki/superfields/text/CanSelectText.java → ...rg/vaadin/miki/markers/CanSelectText.java
@@ -1,4 +1,4 @@
-package org.vaadin.miki.superfields.text;
+package org.vaadin.miki.markers;
 
 import com.vaadin.flow.component.HasElement;
 

diff --git a/...iki/superfields/dates/HasDatePattern.java → ...g/vaadin/miki/markers/HasDatePattern.java b/...iki/superfields/dates/HasDatePattern.java → ...g/vaadin/miki/markers/HasDatePattern.java
@@ -1,4 +1,6 @@
-package org.vaadin.miki.superfields.dates;
+package org.vaadin.miki.markers;
+
+import org.vaadin.miki.superfields.dates.DatePattern;
 
 /**
  * Marker interface for objects that have a {@link DatePattern}.

diff --git a/...perfields/dates/WithDatePatternMixin.java → ...in/miki/markers/WithDatePatternMixin.java b/...perfields/dates/WithDatePatternMixin.java → ...in/miki/markers/WithDatePatternMixin.java
@@ -1,4 +1,6 @@
-package org.vaadin.miki.superfields.dates;
+package org.vaadin.miki.markers;
+
+import org.vaadin.miki.superfields.dates.DatePattern;
 
 /**
  * Mixin interface to allow chaining {@link #setDatePattern(DatePattern)}.

diff --git a/...eivingSelectionEventsFromClientMixin.java → ...eivingSelectionEventsFromClientMixin.java b/...eivingSelectionEventsFromClientMixin.java → ...eivingSelectionEventsFromClientMixin.java
@@ -1,4 +1,4 @@
-package org.vaadin.miki.superfields.text;
+package org.vaadin.miki.markers;
 
 /**
  * Marker interface for chaining {@link #setReceivingSelectionEventsFromClient(boolean)}.

diff --git a/...perfields/text/TextSelectionDelegate.java → ...ki/shared/text/TextSelectionDelegate.java b/...perfields/text/TextSelectionDelegate.java → ...ki/shared/text/TextSelectionDelegate.java
@@ -1,7 +1,10 @@
-package org.vaadin.miki.superfields.text;
+package org.vaadin.miki.shared.text;
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEventBus;
+import org.vaadin.miki.markers.CanReceiveSelectionEventsFromClient;
+import org.vaadin.miki.markers.CanSelectText;
+import org.vaadin.miki.events.text.TextSelectionEvent;
 
 import java.io.Serializable;
 import java.util.Objects;

diff --git a/superfields/src/main/java/org/vaadin/miki/superfields/dates/DatePatternDelegate.java b/superfields/src/main/java/org/vaadin/miki/superfields/dates/DatePatternDelegate.java
@@ -2,6 +2,7 @@
 
 import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.Component;
+import org.vaadin.miki.markers.HasDatePattern;
 
 import java.io.Serializable;
 import java.time.LocalDate;

diff --git a/superfields/src/main/java/org/vaadin/miki/superfields/dates/SuperDatePicker.java b/superfields/src/main/java/org/vaadin/miki/superfields/dates/SuperDatePicker.java
@@ -8,21 +8,23 @@
 import com.vaadin.flow.component.datepicker.DatePicker;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.shared.Registration;
+import org.vaadin.miki.markers.HasDatePattern;
 import org.vaadin.miki.markers.HasLabel;
 import org.vaadin.miki.markers.HasLocale;
 import org.vaadin.miki.markers.HasPlaceholder;
+import org.vaadin.miki.markers.WithDatePatternMixin;
 import org.vaadin.miki.markers.WithIdMixin;
 import org.vaadin.miki.markers.WithLabelMixin;
 import org.vaadin.miki.markers.WithLocaleMixin;
 import org.vaadin.miki.markers.WithPlaceholderMixin;
 import org.vaadin.miki.markers.WithValueMixin;
-import org.vaadin.miki.superfields.text.CanReceiveSelectionEventsFromClient;
-import org.vaadin.miki.superfields.text.CanSelectText;
-import org.vaadin.miki.superfields.text.TextSelectionDelegate;
-import org.vaadin.miki.superfields.text.TextSelectionEvent;
-import org.vaadin.miki.superfields.text.TextSelectionListener;
-import org.vaadin.miki.superfields.text.TextSelectionNotifier;
-import org.vaadin.miki.superfields.text.WithReceivingSelectionEventsFromClientMixin;
+import org.vaadin.miki.markers.CanReceiveSelectionEventsFromClient;
+import org.vaadin.miki.markers.CanSelectText;
+import org.vaadin.miki.shared.text.TextSelectionDelegate;
+import org.vaadin.miki.events.text.TextSelectionEvent;
+import org.vaadin.miki.events.text.TextSelectionListener;
+import org.vaadin.miki.events.text.TextSelectionNotifier;
+import org.vaadin.miki.markers.WithReceivingSelectionEventsFromClientMixin;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;

diff --git a/superfields/src/main/java/org/vaadin/miki/superfields/dates/SuperDateTimePicker.java b/superfields/src/main/java/org/vaadin/miki/superfields/dates/SuperDateTimePicker.java
@@ -6,8 +6,10 @@
 import com.vaadin.flow.component.datetimepicker.DateTimePicker;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.timepicker.TimePicker;
+import org.vaadin.miki.markers.HasDatePattern;
 import org.vaadin.miki.markers.HasLabel;
 import org.vaadin.miki.markers.HasLocale;
+import org.vaadin.miki.markers.WithDatePatternMixin;
 import org.vaadin.miki.markers.WithIdMixin;
 import org.vaadin.miki.markers.WithLabelMixin;
 import org.vaadin.miki.markers.WithLocaleMixin;
@@ -29,7 +31,7 @@
 public class SuperDateTimePicker extends DateTimePicker
         implements HasLocale, HasLabel, HasDatePattern,
                    WithLocaleMixin<SuperDateTimePicker>, WithLabelMixin<SuperDateTimePicker>,
-                   WithDatePatternMixin<SuperDateTimePicker>, WithIdMixin<SuperDateTimePicker>,
+        WithDatePatternMixin<SuperDateTimePicker>, WithIdMixin<SuperDateTimePicker>,
                    WithValueMixin<AbstractField.ComponentValueChangeEvent<DateTimePicker, LocalDateTime>, LocalDateTime, SuperDateTimePicker> {
 
     // so, this component is a composition of DatePicker and TimePicker

diff --git a/superfields/src/main/java/org/vaadin/miki/superfields/numbers/AbstractSuperNumberField.java b/superfields/src/main/java/org/vaadin/miki/superfields/numbers/AbstractSuperNumberField.java
@@ -23,13 +23,13 @@
 import org.vaadin.miki.markers.WithPlaceholderMixin;
 import org.vaadin.miki.markers.WithTitleMixin;
 import org.vaadin.miki.markers.WithValueMixin;
-import org.vaadin.miki.superfields.text.CanReceiveSelectionEventsFromClient;
-import org.vaadin.miki.superfields.text.CanSelectText;
+import org.vaadin.miki.markers.CanReceiveSelectionEventsFromClient;
+import org.vaadin.miki.markers.CanSelectText;
 import org.vaadin.miki.superfields.text.SuperTextField;
-import org.vaadin.miki.superfields.text.TextSelectionEvent;
-import org.vaadin.miki.superfields.text.TextSelectionListener;
-import org.vaadin.miki.superfields.text.TextSelectionNotifier;
-import org.vaadin.miki.superfields.text.WithReceivingSelectionEventsFromClientMixin;
+import org.vaadin.miki.events.text.TextSelectionEvent;
+import org.vaadin.miki.events.text.TextSelectionListener;
+import org.vaadin.miki.events.text.TextSelectionNotifier;
+import org.vaadin.miki.markers.WithReceivingSelectionEventsFromClientMixin;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;

diff --git a/superfields/src/main/java/org/vaadin/miki/superfields/text/SuperTextArea.java b/superfields/src/main/java/org/vaadin/miki/superfields/text/SuperTextArea.java
@@ -1,17 +1,25 @@
 package org.vaadin.miki.superfields.text;
 
 import com.vaadin.flow.component.AbstractField;
+import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.ClientCallable;
+import com.vaadin.flow.component.DetachEvent;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.textfield.TextArea;
 import com.vaadin.flow.shared.Registration;
+import org.vaadin.miki.events.text.TextSelectionEvent;
+import org.vaadin.miki.events.text.TextSelectionListener;
+import org.vaadin.miki.events.text.TextSelectionNotifier;
+import org.vaadin.miki.markers.CanSelectText;
 import org.vaadin.miki.markers.HasLabel;
 import org.vaadin.miki.markers.HasPlaceholder;
 import org.vaadin.miki.markers.WithIdMixin;
 import org.vaadin.miki.markers.WithLabelMixin;
 import org.vaadin.miki.markers.WithPlaceholderMixin;
+import org.vaadin.miki.markers.WithReceivingSelectionEventsFromClientMixin;
 import org.vaadin.miki.markers.WithValueMixin;
+import org.vaadin.miki.shared.text.TextSelectionDelegate;
 
 /**
  * An extension of {@link TextArea} with some useful features.
@@ -57,6 +65,21 @@ public SuperTextArea(String label, String initialValue, ValueChangeListener<? su
         super(label, initialValue, listener);
     }
 
+    @Override
+    protected void onAttach(AttachEvent attachEvent) {
+        // sadly there are no mixin classes in java for protected methods
+        this.delegate.informClientAboutSendingEvents(this.isReceivingSelectionEventsFromClient());
+        super.onAttach(attachEvent);
+    }
+
+    @Override
+    protected void onDetach(DetachEvent detachEvent) {
+        // detaching means server should not be informed
+        if(this.isReceivingSelectionEventsFromClient())
+            this.delegate.informClientAboutSendingEvents(false);
+        super.onDetach(detachEvent);
+    }
+
     @Override
     public boolean isReceivingSelectionEventsFromClient() {
         return this.receivingSelectionEventsFromClient;

diff --git a/superfields/src/main/java/org/vaadin/miki/superfields/text/SuperTextField.java b/superfields/src/main/java/org/vaadin/miki/superfields/text/SuperTextField.java
@@ -8,12 +8,18 @@
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.shared.Registration;
+import org.vaadin.miki.events.text.TextSelectionEvent;
+import org.vaadin.miki.events.text.TextSelectionListener;
+import org.vaadin.miki.events.text.TextSelectionNotifier;
+import org.vaadin.miki.markers.CanSelectText;
 import org.vaadin.miki.markers.HasLabel;
 import org.vaadin.miki.markers.HasPlaceholder;
 import org.vaadin.miki.markers.WithIdMixin;
 import org.vaadin.miki.markers.WithLabelMixin;
 import org.vaadin.miki.markers.WithPlaceholderMixin;
+import org.vaadin.miki.markers.WithReceivingSelectionEventsFromClientMixin;
 import org.vaadin.miki.markers.WithValueMixin;
+import org.vaadin.miki.shared.text.TextSelectionDelegate;
 
 /**
  * An extension of {@link TextField} with some useful (hopefully) features.

diff --git a/superfields/src/test/java/org/vaadin/miki/superfields/text/AbstractTestForTextSelection.java b/superfields/src/test/java/org/vaadin/miki/superfields/text/AbstractTestForTextSelection.java
@@ -7,6 +7,10 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.vaadin.miki.events.text.TextSelectionNotifier;
+import org.vaadin.miki.markers.CanReceiveSelectionEventsFromClient;
+import org.vaadin.miki.markers.CanSelectText;
+import org.vaadin.miki.shared.text.TextSelectionDelegate;
 
 abstract class AbstractTestForTextSelection<C extends Component & CanSelectText & HasValue<?, String> & CanReceiveSelectionEventsFromClient & TextSelectionNotifier<C>> {