diff options
| author | Henrik Paul <henrik@vaadin.com> | 2014-03-03 11:46:35 +0200 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2014-03-03 09:56:47 +0000 |
| commit | 3798a8ab782d5e68b269692bbb784069b9312122 (patch) | |
| tree | 248e2d6317f11a6906c2c13161609c118ffff8c4 /shared/src | |
| parent | 54b448d018922f6315bb756c24c6ce7feff6e14d (diff) | |
| parent | 6b7ad587042d2c98c2133c93382fb5ea8cdded8c (diff) | |
| download | vaadin-framework-3798a8ab782d5e68b269692bbb784069b9312122.tar.gz vaadin-framework-3798a8ab782d5e68b269692bbb784069b9312122.zip | |
Merge branch 'master' into grid
Change-Id: I2f1134ce1bd5e8dbb183881fc69120e964271245
Diffstat (limited to 'shared/src')
| -rw-r--r-- | shared/src/com/vaadin/shared/ApplicationConstants.java | 1 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/EventId.java | 2 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java | 30 |
3 files changed, 33 insertions, 0 deletions
diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java index a81f29b77c..d54823ee60 100644 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -35,6 +35,7 @@ public class ApplicationConstants implements Serializable { public static final String APP_PROTOCOL_PREFIX = "app://"; public static final String VAADIN_PROTOCOL_PREFIX = "vaadin://"; + public static final String FONTICON_PROTOCOL_PREFIX = "fonticon://"; public static final String PUBLISHED_PROTOCOL_NAME = "published"; public static final String PUBLISHED_PROTOCOL_PREFIX = PUBLISHED_PROTOCOL_NAME + "://"; diff --git a/shared/src/com/vaadin/shared/EventId.java b/shared/src/com/vaadin/shared/EventId.java index d669f8fa83..7cf760b885 100644 --- a/shared/src/com/vaadin/shared/EventId.java +++ b/shared/src/com/vaadin/shared/EventId.java @@ -23,4 +23,6 @@ public interface EventId extends Serializable { public static final String CLICK_EVENT_IDENTIFIER = "click"; public static final String LAYOUT_CLICK_EVENT_IDENTIFIER = "lClick"; public static final String POLL = "poll"; + public static final String CHANGE = "change"; + } diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java b/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java new file mode 100644 index 0000000000..79a6778da3 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java @@ -0,0 +1,30 @@ +/* + * Copyright 2000-2013 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.upload; + +import com.vaadin.shared.communication.ServerRpc; + +public interface UploadServerRpc extends ServerRpc { + + /** + * Event sent when the file name of the upload component is changed. + * + * @param filename + * The filename + */ + void change(String filename); + +} |