Browse Source

Run formatter to the code (#11227)

tags/8.7.0.alpha1
Sun Zhe 5 years ago
parent
commit
2c59809dd2
No account linked to committer's email address

+ 2
- 2
client/src/main/java/com/vaadin/client/ui/VComboBox.java View File

@@ -257,12 +257,12 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
return $entry(function(e) {
var deltaX = e.deltaX ? e.deltaX : -0.5*e.wheelDeltaX;
var deltaY = e.deltaY ? e.deltaY : -0.5*e.wheelDeltaY;
// IE8 has only delta y
if (isNaN(deltaY)) {
deltaY = -0.5*e.wheelDelta;
}
@com.vaadin.client.ui.VComboBox.JsniUtil::moveScrollFromEvent(*)(widget, deltaX, deltaY, e, e.deltaMode);
});
}-*/;

+ 1
- 1
server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java View File

@@ -46,7 +46,7 @@ public interface ErrorHandlingRunnable extends Runnable, Serializable {
* returned. If the runnable does not extend {@link ErrorHandlingRunnable},
* then the original exception is returned.
*
* @since
* @since
* @param runnable
* the runnable for which the exception should be processed, not
* <code>null</code>

+ 2
- 2
server/src/main/java/com/vaadin/ui/Grid.java View File

@@ -3010,8 +3010,8 @@ public class Grid<T> extends AbstractListing<T> implements HasComponents,
/**
* Gets a {@link Column} of this grid by its identifying string.
*
* When you use the Grid constructor with bean class, the columns are
* initialised with columnId being the property name.
* When you use the Grid constructor with bean class, the columns are
* initialised with columnId being the property name.
*
* @see Column#setId(String)
*

+ 7
- 7
server/src/main/java/com/vaadin/ui/UI.java View File

@@ -230,8 +230,8 @@ public abstract class UI extends AbstractSingleComponentContainer
}
json.append("]}");
getRpcProxy(DebugWindowClientRpc.class)
.reportLayoutProblems(json.toString());
}
.reportLayoutProblems(json.toString());
}

@Override
public void showServerDesign(Connector connector) {
@@ -1581,10 +1581,10 @@ public abstract class UI extends AbstractSingleComponentContainer
"access() task ignored because UI got detached after the task was enqueued."
+ " To suppress this message, change the task to implement {} and make it handle {}."
+ " Affected task: {}",
new Object[] {
ErrorHandlingRunnable.class.getName(),
UIDetachedException.class.getName(),
runnable });
new Object[] {
ErrorHandlingRunnable.class.getName(),
UIDetachedException.class.getName(),
runnable });
} else if (exception != null) {
/*
* If no ErrorHandlingRunnable, or if it threw an
@@ -1727,7 +1727,7 @@ public abstract class UI extends AbstractSingleComponentContainer
// If pushMode is disabled then there should never be a pushConnection;
// if enabled there should always be
assert (pushConnection == null)
^ getPushConfiguration().getPushMode().isEnabled();
^ getPushConfiguration().getPushMode().isEnabled();

if (pushConnection == this.pushConnection) {
return;

+ 8
- 5
shared/src/main/java/com/vaadin/osgi/resources/impl/VaadinResourceTrackerComponent.java View File

@@ -204,9 +204,10 @@ public class VaadinResourceTrackerComponent {
*/
@Activate
protected void activate() throws NamespaceException {
for(Delegate registration : resourceToRegistration.values()) {
for (Delegate registration : resourceToRegistration.values()) {
registration.init(httpService);
httpService.registerResources(registration.alias, registration.path, registration);
httpService.registerResources(registration.alias, registration.path,
registration);
}
}

@@ -215,10 +216,11 @@ public class VaadinResourceTrackerComponent {
*/
@Deactivate
protected void deactivate() {
for(final Delegate registration : resourceToRegistration.values()) {
for (final Delegate registration : resourceToRegistration.values()) {
unregisterResource(registration);
}
for(List<ServiceRegistration<? extends OsgiVaadinResource>> registrations : contributorToRegistrations.values()) {
for (List<ServiceRegistration<? extends OsgiVaadinResource>> registrations : contributorToRegistrations
.values()) {
for (ServiceRegistration<? extends OsgiVaadinResource> reg : registrations) {
reg.unregister();
}
@@ -263,7 +265,8 @@ public class VaadinResourceTrackerComponent {

private void registerResource(String alias, String path, Bundle bundle,
Long serviceId) {
resourceToRegistration.put(serviceId, new Delegate(alias, path, bundle));
resourceToRegistration.put(serviceId,
new Delegate(alias, path, bundle));
}

private void unregisterResource(Long serviceId) {

Loading…
Cancel
Save