summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-03-19 16:30:23 +0200
committerArtur Signell <artur@vaadin.com>2014-03-19 16:32:32 +0200
commit227a937af1d844f7372a5a3071c1e204e25a49c0 (patch)
tree9428bffbb09cfadb9fd3ec932652a96fc52b76f4 /client/src
parent23891f2519410d174e9e923e2ca5842c78c8e757 (diff)
downloadvaadin-framework-227a937af1d844f7372a5a3071c1e204e25a49c0.tar.gz
vaadin-framework-227a937af1d844f7372a5a3071c1e204e25a49c0.zip
Format project files according to conventions
Change-Id: I2522698237eb2a21c0896605bed8e73a82795c97
Diffstat (limited to 'client/src')
-rw-r--r--client/src/com/vaadin/client/ComponentLocator.java6
-rw-r--r--client/src/com/vaadin/client/ui/VScrollTable.java13
-rw-r--r--client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java3
3 files changed, 16 insertions, 6 deletions
diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java
index ef7ccc3b65..f30528c0c0 100644
--- a/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@ -22,11 +22,13 @@ package com.vaadin.client;
* @since 5.4
* @deprecated Moved to com.vaadin.client.componentlocator.ComponentLocator
*/
-public class ComponentLocator extends com.vaadin.client.componentlocator.ComponentLocator {
+public class ComponentLocator extends
+ com.vaadin.client.componentlocator.ComponentLocator {
/**
* Construct a ComponentLocator for the given ApplicationConnection.
*
- * @param client ApplicationConnection instance for the application.
+ * @param client
+ * ApplicationConnection instance for the application.
*/
public ComponentLocator(ApplicationConnection client) {
super(client);
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 1b0dd646d1..54aca5381f 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -7828,10 +7828,16 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
private static final String SUBPART_FOOTER = "footer";
private static final String SUBPART_ROW = "row";
private static final String SUBPART_COL = "col";
- /** Matches header[ix] - used for extracting the index of the targeted header cell */
+ /**
+ * Matches header[ix] - used for extracting the index of the targeted header
+ * cell
+ */
private static final RegExp SUBPART_HEADER_REGEXP = RegExp
.compile(SUBPART_HEADER + "\\[(\\d+)\\]");
- /** Matches footer[ix] - used for extracting the index of the targeted footer cell */
+ /**
+ * Matches footer[ix] - used for extracting the index of the targeted footer
+ * cell
+ */
private static final RegExp SUBPART_FOOTER_REGEXP = RegExp
.compile(SUBPART_FOOTER + "\\[(\\d+)\\]");
/** Matches row[ix] - used for extracting the index of the targeted row */
@@ -7839,7 +7845,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
+ "\\[(\\d+)]");
/** Matches col[ix] - used for extracting the index of the targeted column */
private static final RegExp SUBPART_ROW_COL_REGEXP = RegExp
- .compile(SUBPART_ROW + "\\[(\\d+)\\]/" + SUBPART_COL + "\\[(\\d+)\\]");
+ .compile(SUBPART_ROW + "\\[(\\d+)\\]/" + SUBPART_COL
+ + "\\[(\\d+)\\]");
@Override
public Element getSubPartElement(String subPart) {
diff --git a/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java b/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java
index 9ce418c358..0df413c1c3 100644
--- a/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java
+++ b/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java
@@ -81,7 +81,8 @@ public class MenuBarConnector extends AbstractComponentConnector implements
+ Util.escapeAttribute(client
.translateVaadinUri(moreItemUIDL
.getStringAttribute("icon")))
- + "\" class=\"" + ImageIcon.CLASSNAME + "\" alt=\"\" />");
+ + "\" class=\"" + ImageIcon.CLASSNAME
+ + "\" alt=\"\" />");
}
String moreItemText = moreItemUIDL.getStringAttribute("text");