summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorDenis <denis@vaadin.com>2017-01-19 10:01:03 +0200
committerGitHub <noreply@github.com>2017-01-19 10:01:03 +0200
commitf42b9657b818da483b839d3b43b4cf55552ef034 (patch)
treedd65e611eb326469b4dbeb84eefc2c69b57f3e5f /shared
parentdafc8310259a2e79bb203c7f786c9aba5354937b (diff)
downloadvaadin-framework-f42b9657b818da483b839d3b43b4cf55552ef034.tar.gz
vaadin-framework-f42b9657b818da483b839d3b43b4cf55552ef034.zip
Introduce DateTimeFile and InlineDateTimeField. (#8218)
* Introduce DateTimeFile and InlineDateTimeField. Fixes #8132 * Correct and provide declarative tests. * Provide a date converter and UI tests.
Diffstat (limited to 'shared')
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/datefield/DateTimeResolution.java2
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/datefield/InlineDateTimeFieldState.java26
-rw-r--r--shared/src/main/java/com/vaadin/shared/ui/datefield/LocalDateTimeFieldState.java2
3 files changed, 28 insertions, 2 deletions
diff --git a/shared/src/main/java/com/vaadin/shared/ui/datefield/DateTimeResolution.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/DateTimeResolution.java
index 7876fb51f4..9b7aeca48c 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/datefield/DateTimeResolution.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/DateTimeResolution.java
@@ -16,7 +16,7 @@
package com.vaadin.shared.ui.datefield;
/**
- * Resolutions for DateTimeFields
+ * Resolutions for DateTimeFields.
*
* @author Vaadin Ltd.
* @since 8.0
diff --git a/shared/src/main/java/com/vaadin/shared/ui/datefield/InlineDateTimeFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/InlineDateTimeFieldState.java
new file mode 100644
index 0000000000..ed64569c7d
--- /dev/null
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/InlineDateTimeFieldState.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2016 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.shared.ui.datefield;
+
+/**
+ * @author Vaadin Ltd
+ *
+ */
+public class InlineDateTimeFieldState extends AbstractTextualDateFieldState {
+ {
+ primaryStyleName = "v-inline-datefield";
+ }
+}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/datefield/LocalDateTimeFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/LocalDateTimeFieldState.java
index cb439dd1a8..82cfe8ee6f 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/datefield/LocalDateTimeFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/LocalDateTimeFieldState.java
@@ -21,6 +21,6 @@ package com.vaadin.shared.ui.datefield;
* @author Vaadin Ltd
*
*/
-public class LocalDateTimeFieldState extends AbstractTextualDateFieldState {
+public class LocalDateTimeFieldState extends TextualDateFieldState {
}