Browse Source

Formatted project

Change-Id: I771ca4edea66ad29a80628ee1a98d1c5ff1679ab
tags/7.0.0.beta7
Artur Signell 11 years ago
parent
commit
0965cfdef0

+ 1
- 1
client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java View File

@@ -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);
}

+ 0
- 1
client/src/com/vaadin/client/ui/combobox/VFilterSelect.java View File

@@ -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);
}

+ 1
- 2
client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java View File

@@ -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);

+ 3
- 1
client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java View File

@@ -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 {

+ 1
- 1
client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java View File

@@ -56,7 +56,7 @@ public class VDateFieldCalendar extends VDateField {
}
});
}
/**
* TODO refactor: almost same method as in VPopupCalendar.updateValue
*/

+ 1
- 1
client/src/com/vaadin/client/ui/menubar/VMenuBar.java View File

@@ -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

+ 1
- 2
client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java View File

@@ -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);

+ 0
- 1
client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java View File

@@ -56,7 +56,6 @@ public class VOrderedLayout extends FlowPanel {

private LayoutManager layoutManager;


public VOrderedLayout(boolean vertical) {
this.vertical = vertical;
}

+ 1
- 3
client/src/com/vaadin/client/ui/slider/VSlider.java View File

@@ -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());
}
}


+ 3
- 3
client/src/com/vaadin/client/ui/table/VScrollTable.java View File

@@ -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() {

+ 2
- 1
server/src/com/vaadin/DefaultDeploymentConfiguration.java View File

@@ -219,7 +219,8 @@ public class DefaultDeploymentConfiguration implements DeploymentConfiguration {
try {
heartbeatInterval = Integer
.parseInt(getApplicationOrSystemProperty(
Constants.SERVLET_PARAMETER_HEARTBEAT_INTERVAL, "300"));
Constants.SERVLET_PARAMETER_HEARTBEAT_INTERVAL,
"300"));
} catch (NumberFormatException e) {
getLogger().warning(
Constants.WARNING_HEARTBEAT_INTERVAL_NOT_NUMERIC);

+ 0
- 1
shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java View File

@@ -1,6 +1,5 @@
package com.vaadin.shared.ui.orderedlayout;


public class HorizontalLayoutState extends AbstractOrderedLayoutState {
{
primaryStyleName = "v-horizontallayout";

+ 0
- 1
shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java View File

@@ -1,6 +1,5 @@
package com.vaadin.shared.ui.splitpanel;


public class HorizontalSplitPanelState extends AbstractSplitPanelState {
{
primaryStyleName = "v-splitpanel-horizontal";

+ 6
- 6
uitest/src/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java View File

@@ -13,19 +13,19 @@ public class DateFieldPrimaryStyleNames extends TestBase {
final DateField df = new DateField();
df.setPrimaryStyleName("my-datefield");
addComponent(df);
final InlineDateField idf = new InlineDateField();
idf.setPrimaryStyleName("my-inline-datefield");
addComponent(idf);
addComponent(new Button("Set primary stylename",
new Button.ClickListener() {
@Override
public void buttonClick(ClickEvent event) {
@Override
public void buttonClick(ClickEvent event) {
df.setPrimaryStyleName("my-second-datefield");
idf.setPrimaryStyleName("my-second-inline-datefield");
}
}));
}
}));

}


+ 1
- 2
uitest/src/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java View File

@@ -12,8 +12,7 @@ public class ListSelectPrimaryStylename extends TestBase {
@Override
protected void setup() {
final ListSelect list = new ListSelect("Caption", Arrays.asList(
"Option 1",
"Option 2", "Option 3"));
"Option 1", "Option 2", "Option 3"));
list.setPrimaryStyleName("my-list");
addComponent(list);


+ 0
- 1
uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.java View File

@@ -24,7 +24,6 @@ public class OrderedLayoutSlotStyleNames extends TestBase {

addComponent(vl);


HorizontalLayout hl = new HorizontalLayout();

lbl = new Label("A label");

Loading…
Cancel
Save