Bläddra i källkod

Fix copyright headers not passing the validation

Also let through some other formatting changes that Eclipse insisted on
when saving the touched files.

Change-Id: I319de35c4862555b010d6da6d4a5e096619e2c34
tags/7.4.0.alpha1
Leif Åstrand 10 år sedan
förälder
incheckning
c544c6cbfa

+ 1
- 2
client/src/com/vaadin/client/ApplicationConnection.java Visa fil

@@ -1,4 +1,4 @@
/*
/*
* Copyright 2000-2013 Vaadin Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -65,7 +65,6 @@ import com.google.gwt.user.client.Window.ClosingHandler;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Widget;
import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent;
import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
import com.vaadin.client.ResourceLoader.ResourceLoadListener;
import com.vaadin.client.communication.HasJavaScriptConnectorHelper;

+ 13
- 13
client/src/com/vaadin/client/extensions/ResponsiveConnector.java Visa fil

@@ -1,12 +1,12 @@
/*
* Copyright 2000-2013 Vaadin Ltd.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -100,13 +100,13 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements
* @return The selectors in a comma delimited string.
*/
protected String constructSelectorsForTarget() {
String primaryStyle = this.target.getState().primaryStyleName;
String primaryStyle = target.getState().primaryStyleName;
StringBuilder selectors = new StringBuilder();
selectors.append(".").append(primaryStyle);

if (this.target.getState().styles != null
&& this.target.getState().styles.size() > 0) {
for (String style : this.target.getState().styles) {
if (target.getState().styles != null
&& target.getState().styles.size() > 0) {
for (String style : target.getState().styles) {
selectors.append(",.").append(style);
selectors.append(",.").append(primaryStyle).append(".")
.append(style);
@@ -118,8 +118,8 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements
}

// Allow the ID to be used as the selector as well for ranges
if (this.target.getState().id != null) {
selectors.append(",#").append(this.target.getState().id);
if (target.getState().id != null) {
selectors.append(",#").append(target.getState().id);
}
return selectors.toString();
}
@@ -128,7 +128,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements
public void onUnregister() {
super.onUnregister();
LayoutManager.get(getConnection()).removeElementResizeListener(
this.target.getWidget().getElement(), this);
target.getWidget().getElement(), this);
}

/**
@@ -314,7 +314,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements
int height = event.getLayoutManager()
.getOuterHeight(event.getElement());

com.google.gwt.user.client.Element element = this.target.getWidget()
com.google.gwt.user.client.Element element = target.getWidget()
.getElement();
boolean forceRedraw = false;

@@ -323,7 +323,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements
event.getElement());

if (!"".equals(currentWidthRanges)) {
this.target.getWidget().getElement()
target.getWidget().getElement()
.setAttribute("width-range", currentWidthRanges);
forceRedraw = true;
} else {
@@ -335,7 +335,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements
event.getElement());

if (!"".equals(currentHeightRanges)) {
this.target.getWidget().getElement()
target.getWidget().getElement()
.setAttribute("height-range", currentHeightRanges);
forceRedraw = true;
} else {

+ 2
- 1
server/src/com/vaadin/server/FontAwesome.java Visa fil

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
* Copyright 2000-2013 Vaadin Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
@@ -13,6 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/

package com.vaadin.server;

/**

+ 2
- 1
server/src/com/vaadin/server/FontIcon.java Visa fil

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
* Copyright 2000-2013 Vaadin Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
@@ -13,6 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/

package com.vaadin.server;

import com.vaadin.shared.ui.label.ContentMode;

+ 4
- 4
server/src/com/vaadin/server/Responsive.java Visa fil

@@ -1,12 +1,12 @@
/*
* Copyright 2000-2013 Vaadin Ltd.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -49,7 +49,7 @@ import com.vaadin.ui.Component;
*
* <pre>
* CssLayout layout = new CssLayout();
* layout.setStyleName("responsive");
* layout.setStyleName(&quot;responsive&quot;);
* layout.setSizeFull();
* Responsive.makeResponsive(layout);
* </pre>

Laddar…
Avbryt
Spara