Browse Source

Global code clean up

Change-Id: I380d6afbc6b30d817ea6cca3d6b4634ab12522b1
tags/7.1.0.beta1
Leif Åstrand 11 years ago
parent
commit
220b1150ca

+ 1
- 2
client/src/com/vaadin/client/communication/AtmospherePushConnection.java View File

@@ -246,8 +246,7 @@ public class AtmospherePushConnection implements PushConnection {
*
*/
protected void onError() {
VConsole.error("Push connection using "
+ getConfig().getTransport()
VConsole.error("Push connection using " + getConfig().getTransport()
+ " failed!");
}


+ 2
- 3
client/src/com/vaadin/client/ui/AbstractClickEventHandler.java View File

@@ -78,9 +78,8 @@ public abstract class AbstractClickEventHandler implements MouseDownHandler,
&& elementUnderMouse == lastMouseDownTarget) {
mouseUpPreviewMatched = true;
} else {
VConsole.log("Ignoring mouseup from "
+ elementUnderMouse + " when mousedown was on "
+ lastMouseDownTarget);
VConsole.log("Ignoring mouseup from " + elementUnderMouse
+ " when mousedown was on " + lastMouseDownTarget);
}
}
}

+ 0
- 6
client/src/com/vaadin/client/ui/VNativeButton.java View File

@@ -16,14 +16,9 @@

package com.vaadin.client.ui;

import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.dom.client.Document;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.NativeEvent;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.MouseEvent;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.Button;
@@ -31,7 +26,6 @@ import com.vaadin.client.ApplicationConnection;
import com.vaadin.client.BrowserInfo;
import com.vaadin.client.MouseEventDetailsBuilder;
import com.vaadin.client.Util;
import com.vaadin.client.VConsole;
import com.vaadin.shared.MouseEventDetails;
import com.vaadin.shared.ui.button.ButtonServerRpc;


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

@@ -571,7 +571,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
}
}

public void updateMaximizeRestoreClassName(boolean visible, WindowMode windowMode) {
public void updateMaximizeRestoreClassName(boolean visible,
WindowMode windowMode) {
String className;
if (windowMode == WindowMode.MAXIMIZED) {
className = CLASSNAME + "-restorebox";

+ 0
- 2
server/src/com/vaadin/ui/DateField.java View File

@@ -19,10 +19,8 @@ package com.vaadin.ui;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;

+ 4
- 2
server/src/com/vaadin/ui/UI.java View File

@@ -118,7 +118,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements

private Page page = new Page(this);

private LoadingIndicatorConfiguration loadingIndicatorConfiguration = new LoadingIndicatorConfigurationImpl(this);
private LoadingIndicatorConfiguration loadingIndicatorConfiguration = new LoadingIndicatorConfigurationImpl(
this);

/**
* Scroll Y position.
@@ -167,7 +168,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements

private boolean closing = false;

private TooltipConfiguration tooltipConfiguration = new TooltipConfigurationImpl(this);
private TooltipConfiguration tooltipConfiguration = new TooltipConfigurationImpl(
this);

/**
* Creates a new empty UI without a caption. The content of the UI must be

+ 0
- 1
shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java View File

@@ -15,7 +15,6 @@
*/
package com.vaadin.shared.ui.datefield;


public class InlineDateFieldState extends TextualDateFieldState {
{
primaryStyleName = "v-inline-datefield";

+ 1
- 1
theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java View File

@@ -36,7 +36,7 @@ public class VaadinResolver implements ScssStylesheetResolver {
}

InputSource source = null;
// Can we find the scss from the file system?
ScssStylesheetResolver resolver = new FilesystemResolver();
source = resolver.resolve(identifier);

+ 15
- 18
uitest/src/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java View File

@@ -47,27 +47,24 @@ public class LoadingIndicatorConfigurationTest extends AbstractTestUIWithLog {
});
secondDelay = createIntegerTextField("Second delay (ms)",
getState().loadingIndicatorConfiguration.secondDelay);
secondDelay
.addValueChangeListener(new Property.ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
getLoadingIndicatorConfiguration().setSecondDelay(
(Integer) secondDelay.getConvertedValue());
}
});
secondDelay.addValueChangeListener(new Property.ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
getLoadingIndicatorConfiguration().setSecondDelay(
(Integer) secondDelay.getConvertedValue());
}
});
thirdDelay = createIntegerTextField("Third delay (ms)",
getState().loadingIndicatorConfiguration.thirdDelay);
thirdDelay
.addValueChangeListener(new Property.ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
getLoadingIndicatorConfiguration().setThirdDelay(
(Integer) thirdDelay.getConvertedValue());
}
});
thirdDelay.addValueChangeListener(new Property.ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
getLoadingIndicatorConfiguration().setThirdDelay(
(Integer) thirdDelay.getConvertedValue());
}
});

getLayout()
.addComponents(firstDelay, secondDelay, thirdDelay);
getLayout().addComponents(firstDelay, secondDelay, thirdDelay);

HorizontalLayout hl = new HorizontalLayout();
hl.setMargin(true);

+ 2
- 2
uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.java View File

@@ -41,8 +41,8 @@ public class TooltipConfiguration extends AbstractTestUIWithLog {
maxWidth.addValueChangeListener(new Property.ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
getTooltipConfiguration()
.setMaxWidth((Integer) maxWidth.getConvertedValue());
getTooltipConfiguration().setMaxWidth(
(Integer) maxWidth.getConvertedValue());
}
});
openDelay = createIntegerTextField("Open delay",

+ 0
- 1
uitest/src/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java View File

@@ -1,6 +1,5 @@
package com.vaadin.tests.layouts;

import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.HorizontalLayout;

+ 1
- 1
uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java View File

@@ -1,4 +1,3 @@
package com.vaadin.tests.minitutorials.broadcastingmessages;
/*
* Copyright 2000-2013 Vaadin Ltd.
*
@@ -15,6 +14,7 @@ package com.vaadin.tests.minitutorials.broadcastingmessages;
* the License.
*/

package com.vaadin.tests.minitutorials.broadcastingmessages;

import java.util.ArrayList;
import java.util.List;

+ 0
- 1
uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java View File

@@ -1,6 +1,5 @@
package com.vaadin.tests.minitutorials.broadcastingmessages;


import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.minitutorials.broadcastingmessages.Broadcaster.BroadcastListener;
import com.vaadin.ui.Button;

+ 2
- 1
uitest/src/com/vaadin/tests/widgetset/server/RoundTripTester.java View File

@@ -43,7 +43,8 @@ public class RoundTripTester extends AbstractComponent {
public void start(long testDuration, int payloadSize) {
testStart = System.currentTimeMillis();
testEnd = testStart + testDuration;
getRpcProxy(RoundTripTesterRpc.class).ping(1, generatePayload(payloadSize));
getRpcProxy(RoundTripTesterRpc.class).ping(1,
generatePayload(payloadSize));
}

private String generatePayload(int payloadSize) {

Loading…
Cancel
Save