diff options
Diffstat (limited to 'src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java index a9f84e62b6..70ab452e4e 100644 --- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java +++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java @@ -104,7 +104,6 @@ public class JsonPaintTarget implements PaintTarget { cacheEnabled = cachingRequired; } - @Override public void startTag(String tagName) throws PaintException { startTag(tagName, false); } @@ -160,7 +159,7 @@ public class JsonPaintTarget implements PaintTarget { * @throws Paintexception * if the paint operation failed. */ - @Override + public void endTag(String tagName) throws PaintException { // In case of null data output nothing: if (tagName == null) { @@ -327,17 +326,15 @@ public class JsonPaintTarget implements PaintTarget { * if the paint operation failed. * */ - @Override + public void addText(String str) throws PaintException { tag.addData("\"" + escapeJSON(str) + "\""); } - @Override public void addAttribute(String name, boolean value) throws PaintException { tag.addAttribute("\"" + name + "\":" + (value ? "true" : "false")); } - @Override @SuppressWarnings("deprecation") public void addAttribute(String name, Resource value) throws PaintException { @@ -367,27 +364,22 @@ public class JsonPaintTarget implements PaintTarget { } - @Override public void addAttribute(String name, int value) throws PaintException { tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } - @Override public void addAttribute(String name, long value) throws PaintException { tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } - @Override public void addAttribute(String name, float value) throws PaintException { tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } - @Override public void addAttribute(String name, double value) throws PaintException { tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } - @Override public void addAttribute(String name, String value) throws PaintException { // In case of null data output nothing: if ((value == null) || (name == null)) { @@ -407,14 +399,12 @@ public class JsonPaintTarget implements PaintTarget { } - @Override public void addAttribute(String name, Component value) throws PaintException { final String id = value.getConnectorId(); addAttribute(name, id); } - @Override public void addAttribute(String name, Map<?, ?> value) throws PaintException { @@ -452,7 +442,6 @@ public class JsonPaintTarget implements PaintTarget { tag.addAttribute(sb.toString()); } - @Override public void addAttribute(String name, Object[] values) { // In case of null data output nothing: if ((values == null) || (name == null)) { @@ -473,49 +462,41 @@ public class JsonPaintTarget implements PaintTarget { tag.addAttribute(buf.toString()); } - @Override public void addVariable(VariableOwner owner, String name, String value) throws PaintException { tag.addVariable(new StringVariable(owner, name, escapeJSON(value))); } - @Override public void addVariable(VariableOwner owner, String name, Component value) throws PaintException { tag.addVariable(new StringVariable(owner, name, value.getConnectorId())); } - @Override public void addVariable(VariableOwner owner, String name, int value) throws PaintException { tag.addVariable(new IntVariable(owner, name, value)); } - @Override public void addVariable(VariableOwner owner, String name, long value) throws PaintException { tag.addVariable(new LongVariable(owner, name, value)); } - @Override public void addVariable(VariableOwner owner, String name, float value) throws PaintException { tag.addVariable(new FloatVariable(owner, name, value)); } - @Override public void addVariable(VariableOwner owner, String name, double value) throws PaintException { tag.addVariable(new DoubleVariable(owner, name, value)); } - @Override public void addVariable(VariableOwner owner, String name, boolean value) throws PaintException { tag.addVariable(new BooleanVariable(owner, name, value)); } - @Override public void addVariable(VariableOwner owner, String name, String[] value) throws PaintException { tag.addVariable(new ArrayVariable(owner, name, value)); @@ -534,7 +515,7 @@ public class JsonPaintTarget implements PaintTarget { * @throws PaintException * if the paint operation failed. */ - @Override + public void addUploadStreamVariable(VariableOwner owner, String name) throws PaintException { startTag("uploadstream"); @@ -554,7 +535,7 @@ public class JsonPaintTarget implements PaintTarget { * @throws PaintException * if the paint operation failed. */ - @Override + public void addSection(String sectionTagName, String sectionData) throws PaintException { tag.addData("{\"" + sectionTagName + "\":\"" + escapeJSON(sectionData) @@ -569,7 +550,7 @@ public class JsonPaintTarget implements PaintTarget { * @throws PaintException * if the paint operation failed. */ - @Override + public void addUIDL(String xml) throws PaintException { // Ensure that the target is open @@ -603,7 +584,7 @@ public class JsonPaintTarget implements PaintTarget { * @see com.vaadin.terminal.PaintTarget#addXMLSection(String, String, * String) */ - @Override + public void addXMLSection(String sectionTagName, String sectionData, String namespace) throws PaintException { @@ -668,7 +649,7 @@ public class JsonPaintTarget implements PaintTarget { * @see com.vaadin.terminal.PaintTarget#startPaintable(com.vaadin.terminal * .Paintable, java.lang.String) */ - @Override + public PaintStatus startPaintable(Component connector, String tagName) throws PaintException { boolean topLevelPaintable = openPaintables.isEmpty(); @@ -695,7 +676,6 @@ public class JsonPaintTarget implements PaintTarget { return PaintStatus.PAINTING; } - @Override public void endPaintable(Component paintable) throws PaintException { getLogger().fine( "endPaintable for " + paintable.getClass().getName() + "@" @@ -718,7 +698,7 @@ public class JsonPaintTarget implements PaintTarget { * * @see com.vaadin.terminal.PaintTarget#addCharacterData(java.lang.String ) */ - @Override + public void addCharacterData(String text) throws PaintException { if (text != null) { tag.addData(text); @@ -988,7 +968,6 @@ public class JsonPaintTarget implements PaintTarget { return usedResources; } - @Override @SuppressWarnings("unchecked") public String getTag(ClientConnector clientConnector) { Class<? extends ClientConnector> clientConnectorClass = clientConnector @@ -1011,7 +990,6 @@ public class JsonPaintTarget implements PaintTarget { return usedClientConnectors; } - @Override public void addVariable(VariableOwner owner, String name, StreamVariable value) throws PaintException { String url = manager.getStreamVariableTargetUrl((Connector) owner, @@ -1027,7 +1005,7 @@ public class JsonPaintTarget implements PaintTarget { * * @see com.vaadin.terminal.PaintTarget#isFullRepaint() */ - @Override + public boolean isFullRepaint() { return !cacheEnabled; } |