aboutsummaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-10-26 10:13:39 +0300
committerArtur Signell <artur@vaadin.com>2012-10-26 10:15:16 +0300
commit0965cfdef02a76097a7777091f310a0e022c6ff3 (patch)
tree7440adcde9017b5d74b265c2536f33635c0017b6 /client
parent1a4ed78eb700fb6c64dcfa83098e72c6be2c6800 (diff)
downloadvaadin-framework-0965cfdef02a76097a7777091f310a0e022c6ff3.tar.gz
vaadin-framework-0965cfdef02a76097a7777091f310a0e022c6ff3.zip
Formatted project
Change-Id: I771ca4edea66ad29a80628ee1a98d1c5ff1679ab
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java2
-rw-r--r--client/src/com/vaadin/client/ui/combobox/VFilterSelect.java1
-rw-r--r--client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java3
-rw-r--r--client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java4
-rw-r--r--client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java2
-rw-r--r--client/src/com/vaadin/client/ui/menubar/VMenuBar.java2
-rw-r--r--client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java3
-rw-r--r--client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java1
-rw-r--r--client/src/com/vaadin/client/ui/slider/VSlider.java4
-rw-r--r--client/src/com/vaadin/client/ui/table/VScrollTable.java6
10 files changed, 12 insertions, 16 deletions
diff --git a/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java b/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
index fbf534a5b5..7c1c734aa0 100644
--- a/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
+++ b/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
@@ -558,7 +558,7 @@ public class VAbsoluteLayout extends ComplexPanel {
protected void updateStyleNames() {
setStyleName(VAbsoluteLayout.this.getStylePrimaryName()
+ "-wrapper");
- if(extraStyleNames != null){
+ if (extraStyleNames != null) {
for (String stylename : extraStyleNames) {
addStyleDependentName(stylename);
}
diff --git a/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java b/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java
index 4ce651cde0..c08371af95 100644
--- a/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java
+++ b/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java
@@ -218,7 +218,6 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
root.appendChild(down);
root.appendChild(status);
-
DOM.sinkEvents(root, Event.ONMOUSEDOWN | Event.ONMOUSEWHEEL);
addCloseHandler(this);
}
diff --git a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
index b2a5b49212..6f23d42de9 100644
--- a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
@@ -145,8 +145,7 @@ public class PopupDateFieldConnector extends TextualDateConnector {
// prefix
if (!styleName.startsWith("-")) {
getWidget().popup.setStyleName(getWidget().getStylePrimaryName()
- + "-popup-" + styleName,
- add);
+ + "-popup-" + styleName, add);
} else {
getWidget().popup.setStyleName(getWidget().getStylePrimaryName()
+ "-popup" + styleName, add);
diff --git a/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java b/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java
index 2323035e58..a9528cd145 100644
--- a/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java
+++ b/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java
@@ -502,7 +502,9 @@ public class VCalendarPanel extends FocusableFlexTable implements
"v-first");
days.getFlexCellFormatter().setStyleName(headerRow,
firstWeekdayColumn, "");
- days.getRowFormatter().addStyleName(headerRow,
+ days.getRowFormatter()
+ .addStyleName(
+ headerRow,
parent.getStylePrimaryName()
+ "-calendarpanel-weeknumbers");
} else {
diff --git a/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java b/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java
index 2f2c3b3290..39972e7214 100644
--- a/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java
+++ b/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java
@@ -56,7 +56,7 @@ public class VDateFieldCalendar extends VDateField {
}
});
}
-
+
/**
* TODO refactor: almost same method as in VPopupCalendar.updateValue
*/
diff --git a/client/src/com/vaadin/client/ui/menubar/VMenuBar.java b/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
index e38e6816ad..38d6d513bf 100644
--- a/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
+++ b/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
@@ -894,7 +894,7 @@ public class VMenuBar extends SimpleFocusablePanel implements
} else {
addStyleDependentName("disabled");
}
-
+
if (selected && isSelectable()) {
addStyleDependentName("selected");
// needed for IE6 to have a single style name to match for an
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index 9707db610e..ea4048515c 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -90,8 +90,7 @@ public abstract class AbstractOrderedLayoutConnector extends
(String[]) null);
} else {
getWidget().setSlotStyleNames(child.getWidget(),
- childStyles.toArray(new String[childStyles
- .size()]));
+ childStyles.toArray(new String[childStyles.size()]));
}
updateSlotListeners(child);
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java b/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java
index 99fd681d63..0159e491b2 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java
@@ -56,7 +56,6 @@ public class VOrderedLayout extends FlowPanel {
private LayoutManager layoutManager;
-
public VOrderedLayout(boolean vertical) {
this.vertical = vertical;
}
diff --git a/client/src/com/vaadin/client/ui/slider/VSlider.java b/client/src/com/vaadin/client/ui/slider/VSlider.java
index c7e9d35c83..58db8494f0 100644
--- a/client/src/com/vaadin/client/ui/slider/VSlider.java
+++ b/client/src/com/vaadin/client/ui/slider/VSlider.java
@@ -129,7 +129,6 @@ public class VSlider extends SimpleFocusablePanel implements Field,
sinkEvents(Event.MOUSEEVENTS | Event.ONMOUSEWHEEL | Event.KEYEVENTS
| Event.FOCUSEVENTS | Event.TOUCHEVENTS);
-
feedbackPopup.setWidget(feedback);
}
@@ -183,8 +182,7 @@ public class VSlider extends SimpleFocusablePanel implements Field,
feedbackPopup.setPopupPosition(
handle.getAbsoluteLeft() + handle.getOffsetWidth() / 2
- feedbackPopup.getOffsetWidth() / 2,
- handle.getAbsoluteTop()
- - feedbackPopup.getOffsetHeight());
+ handle.getAbsoluteTop() - feedbackPopup.getOffsetHeight());
}
}
diff --git a/client/src/com/vaadin/client/ui/table/VScrollTable.java b/client/src/com/vaadin/client/ui/table/VScrollTable.java
index 6a171c5b30..df44f58740 100644
--- a/client/src/com/vaadin/client/ui/table/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/table/VScrollTable.java
@@ -2251,7 +2251,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
final String ALIGN_PREFIX = primaryStyleName
+ "-caption-container-align-";
-
+
switch (align) {
case ALIGN_CENTER:
captionContainer.addClassName(ALIGN_PREFIX + "center");
@@ -2261,9 +2261,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
break;
default:
captionContainer.addClassName(ALIGN_PREFIX + "left");
- break;
+ break;
}
-
+
}
public void disableAutoWidthCalculation() {