summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-12-29 14:11:12 +0200
committerArtur Signell <artur@vaadin.com>2014-12-29 14:12:27 +0200
commit32a5d8f3827fbf0ba2c0c3102f0d818d7b7a3873 (patch)
treea060131679bfeb133934c800b00a01f893feb1bd /client
parentb89213ee880dd1197bc7696f6f5a1919c0ff02c1 (diff)
downloadvaadin-framework-32a5d8f3827fbf0ba2c0c3102f0d818d7b7a3873.tar.gz
vaadin-framework-32a5d8f3827fbf0ba2c0c3102f0d818d7b7a3873.zip
Reformat project using Eclipse Luna SR1
Change-Id: I58748499c87d470e70304d882d3227cda5803481
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java2
-rw-r--r--client/src/com/vaadin/client/ui/VPopupView.java7
-rw-r--r--client/src/com/vaadin/client/ui/VTabsheet.java23
3 files changed, 18 insertions, 14 deletions
diff --git a/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java b/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java
index dca5931640..e67fee96cf 100644
--- a/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java
+++ b/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java
@@ -161,7 +161,7 @@ public abstract class ConnectorBundleLoader {
private HTML notice;
// Not using Vaadin notifications (#14597)
- private void notice(String productName) {
+ private void notice(String productName) {
if (notice == null) {
notice = new HTML();
notice.addClickHandler(new ClickHandler() {
diff --git a/client/src/com/vaadin/client/ui/VPopupView.java b/client/src/com/vaadin/client/ui/VPopupView.java
index 5b37a90915..1923fc55e6 100644
--- a/client/src/com/vaadin/client/ui/VPopupView.java
+++ b/client/src/com/vaadin/client/ui/VPopupView.java
@@ -92,7 +92,7 @@ public class VPopupView extends HTML implements HasEnabled, Iterable<Widget>,
addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
- if(isEnabled()) {
+ if (isEnabled()) {
preparePopup(popup);
showPopup(popup);
center();
@@ -206,8 +206,9 @@ public class VPopupView extends HTML implements HasEnabled, Iterable<Widget>,
/**
* Sets whether this popup is enabled.
*
- * @param enabled <code>true</code> to enable the popup, <code>false</code>
- * to disable it
+ * @param enabled
+ * <code>true</code> to enable the popup, <code>false</code> to
+ * disable it
* @since 7.3.4
*/
@Override
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index 2d34897986..96af09bb32 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -735,9 +735,10 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware
/**
* The id of the tab at position scrollerIndex. This is used for keeping the
* scroll position unchanged when a tab is removed from the server side and
- * the removed tab lies to the left of the current scroll position. For other
- * cases scrollerIndex alone would be sufficient. Since the tab at the current
- * scroll position can be removed, scrollerIndex is required in addition to this variable.
+ * the removed tab lies to the left of the current scroll position. For
+ * other cases scrollerIndex alone would be sufficient. Since the tab at the
+ * current scroll position can be removed, scrollerIndex is required in
+ * addition to this variable.
*/
private String scrollerPositionTabId;
@@ -1081,7 +1082,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware
}
private boolean isScrollerPrevDisabled() {
- return scrollerPrev.getClassName().contains(PREV_SCROLLER_DISABLED_CLASSNAME);
+ return scrollerPrev.getClassName().contains(
+ PREV_SCROLLER_DISABLED_CLASSNAME);
}
private boolean isIndexSkippingHiddenTabs() {
@@ -1103,9 +1105,9 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware
// Should not set tabs visible if they are scrolled out of view
tab.setVisible(false);
} else {
- //reset the scroller index back to zero if tab is visible
- //again and tab is in view
- if(isIndexSkippingHiddenTabs() && tabState.visible) {
+ // reset the scroller index back to zero if tab is visible
+ // again and tab is in view
+ if (isIndexSkippingHiddenTabs() && tabState.visible) {
scrollerIndex = 0;
}
tab.setVisible(tabState.visible);
@@ -1247,7 +1249,9 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware
if (tb.getTabCount() > 0 && tb.isVisible() && (scrolled || clipped)) {
scroller.getStyle().clearDisplay();
DOM.setElementProperty(scrollerPrev, "className",
- SCROLLER_CLASSNAME + (scrolled ? "Prev" : PREV_SCROLLER_DISABLED_CLASSNAME));
+ SCROLLER_CLASSNAME
+ + (scrolled ? "Prev"
+ : PREV_SCROLLER_DISABLED_CLASSNAME));
DOM.setElementProperty(scrollerNext, "className",
SCROLLER_CLASSNAME + (clipped ? "Next" : "Next-disabled"));
@@ -1861,8 +1865,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware
}
if (scrollerIndex >= 0 && scrollerIndex < tb.getTabCount()) {
scrollerPositionTabId = tb.getTab(scrollerIndex).id;
- }
- else{
+ } else {
scrollerPositionTabId = null;
}
}