From 960cdf2a72b47f750cb5ec13e88845d10de843b2 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Sat, 11 Jul 2015 21:09:55 +0300 Subject: Remove remaining OutOfSync message references Change-Id: I98004d88f5449e4bc851b4cc7ecc05e48040cc35 --- .../vaadin/server/CustomizedSystemMessages.java | 44 ---------------------- server/src/com/vaadin/server/SystemMessages.java | 11 ------ 2 files changed, 55 deletions(-) diff --git a/server/src/com/vaadin/server/CustomizedSystemMessages.java b/server/src/com/vaadin/server/CustomizedSystemMessages.java index f7049e3688..9aef4f5cf3 100644 --- a/server/src/com/vaadin/server/CustomizedSystemMessages.java +++ b/server/src/com/vaadin/server/CustomizedSystemMessages.java @@ -239,50 +239,6 @@ public class CustomizedSystemMessages extends SystemMessages implements this.internalErrorMessage = internalErrorMessage; } - /** - * Sets the URL to go to when the client is out-of-sync. - * - * @param outOfSyncURL - * the URL to go to, or null to reload current - */ - public void setOutOfSyncURL(String outOfSyncURL) { - this.outOfSyncURL = outOfSyncURL; - } - - /** - * Enables or disables the notification. If disabled, the set URL (or - * current) is loaded directly. - * - * @param outOfSyncNotificationEnabled - * true = enabled, false = disabled - */ - public void setOutOfSyncNotificationEnabled( - boolean outOfSyncNotificationEnabled) { - this.outOfSyncNotificationEnabled = outOfSyncNotificationEnabled; - } - - /** - * Sets the caption of the notification. Set to null for no caption. If both - * caption and message is null, the notification is disabled; - * - * @param outOfSyncCaption - * the caption - */ - public void setOutOfSyncCaption(String outOfSyncCaption) { - this.outOfSyncCaption = outOfSyncCaption; - } - - /** - * Sets the message of the notification. Set to null for no message. If both - * caption and message is null, the notification is disabled; - * - * @param outOfSyncMessage - * the message - */ - public void setOutOfSyncMessage(String outOfSyncMessage) { - this.outOfSyncMessage = outOfSyncMessage; - } - /** * Sets the URL to redirect to when the browser has cookies disabled. * diff --git a/server/src/com/vaadin/server/SystemMessages.java b/server/src/com/vaadin/server/SystemMessages.java index 51cc7d497d..3bcf0a90fa 100644 --- a/server/src/com/vaadin/server/SystemMessages.java +++ b/server/src/com/vaadin/server/SystemMessages.java @@ -43,12 +43,6 @@ import java.io.Serializable; *
  • internalErrorCaption = "Internal error"
  • *
  • internalErrorMessage = "Please notify the administrator.
    * Take note of any unsaved data, and click here to continue."
  • - *
  • outOfSyncURL = null
  • - *
  • outOfSyncNotificationEnabled = true
  • - *
  • outOfSyncCaption = "Out of sync"
  • - *
  • outOfSyncMessage = "Something has caused us to be out of sync with - * the server.
    - * Take note of any unsaved data, and click here to re-sync."
  • *
  • cookiesDisabledURL = null
  • *
  • cookiesDisabledNotificationEnabled = true
  • *
  • cookiesDisabledCaption = "Cookies disabled"
  • @@ -80,11 +74,6 @@ public class SystemMessages implements Serializable { protected String internalErrorCaption = "Internal error"; protected String internalErrorMessage = "Please notify the administrator.
    Take note of any unsaved data, and click here or press ESC to continue."; - protected String outOfSyncURL = null; - protected boolean outOfSyncNotificationEnabled = true; - protected String outOfSyncCaption = "Out of sync"; - protected String outOfSyncMessage = "Something has caused us to be out of sync with the server.
    Take note of any unsaved data, and click here or press ESC to re-sync."; - protected String cookiesDisabledURL = null; protected boolean cookiesDisabledNotificationEnabled = true; protected String cookiesDisabledCaption = "Cookies disabled"; -- cgit v1.2.3