Also let through some other formatting changes that Eclipse insisted on when saving the touched files. Change-Id: I319de35c4862555b010d6da6d4a5e096619e2c34tags/7.4.0.alpha1
/* | |||||
/* | |||||
* Copyright 2000-2013 Vaadin Ltd. | * Copyright 2000-2013 Vaadin Ltd. | ||||
* | * | ||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||||
import com.google.gwt.user.client.ui.HasWidgets; | import com.google.gwt.user.client.ui.HasWidgets; | ||||
import com.google.gwt.user.client.ui.Widget; | import com.google.gwt.user.client.ui.Widget; | ||||
import com.vaadin.client.ApplicationConfiguration.ErrorMessage; | import com.vaadin.client.ApplicationConfiguration.ErrorMessage; | ||||
import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent; | |||||
import com.vaadin.client.ResourceLoader.ResourceLoadEvent; | import com.vaadin.client.ResourceLoader.ResourceLoadEvent; | ||||
import com.vaadin.client.ResourceLoader.ResourceLoadListener; | import com.vaadin.client.ResourceLoader.ResourceLoadListener; | ||||
import com.vaadin.client.communication.HasJavaScriptConnectorHelper; | import com.vaadin.client.communication.HasJavaScriptConnectorHelper; |
/* | /* | ||||
* Copyright 2000-2013 Vaadin Ltd. | * Copyright 2000-2013 Vaadin Ltd. | ||||
* | |||||
* | |||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | * 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 | * use this file except in compliance with the License. You may obtain a copy of | ||||
* the License at | * the License at | ||||
* | |||||
* | |||||
* http://www.apache.org/licenses/LICENSE-2.0 | * http://www.apache.org/licenses/LICENSE-2.0 | ||||
* | |||||
* | |||||
* Unless required by applicable law or agreed to in writing, software | * Unless required by applicable law or agreed to in writing, software | ||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||||
* @return The selectors in a comma delimited string. | * @return The selectors in a comma delimited string. | ||||
*/ | */ | ||||
protected String constructSelectorsForTarget() { | protected String constructSelectorsForTarget() { | ||||
String primaryStyle = this.target.getState().primaryStyleName; | |||||
String primaryStyle = target.getState().primaryStyleName; | |||||
StringBuilder selectors = new StringBuilder(); | StringBuilder selectors = new StringBuilder(); | ||||
selectors.append(".").append(primaryStyle); | 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(style); | ||||
selectors.append(",.").append(primaryStyle).append(".") | selectors.append(",.").append(primaryStyle).append(".") | ||||
.append(style); | .append(style); | ||||
} | } | ||||
// Allow the ID to be used as the selector as well for ranges | // 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(); | return selectors.toString(); | ||||
} | } | ||||
public void onUnregister() { | public void onUnregister() { | ||||
super.onUnregister(); | super.onUnregister(); | ||||
LayoutManager.get(getConnection()).removeElementResizeListener( | LayoutManager.get(getConnection()).removeElementResizeListener( | ||||
this.target.getWidget().getElement(), this); | |||||
target.getWidget().getElement(), this); | |||||
} | } | ||||
/** | /** | ||||
int height = event.getLayoutManager() | int height = event.getLayoutManager() | ||||
.getOuterHeight(event.getElement()); | .getOuterHeight(event.getElement()); | ||||
com.google.gwt.user.client.Element element = this.target.getWidget() | |||||
com.google.gwt.user.client.Element element = target.getWidget() | |||||
.getElement(); | .getElement(); | ||||
boolean forceRedraw = false; | boolean forceRedraw = false; | ||||
event.getElement()); | event.getElement()); | ||||
if (!"".equals(currentWidthRanges)) { | if (!"".equals(currentWidthRanges)) { | ||||
this.target.getWidget().getElement() | |||||
target.getWidget().getElement() | |||||
.setAttribute("width-range", currentWidthRanges); | .setAttribute("width-range", currentWidthRanges); | ||||
forceRedraw = true; | forceRedraw = true; | ||||
} else { | } else { | ||||
event.getElement()); | event.getElement()); | ||||
if (!"".equals(currentHeightRanges)) { | if (!"".equals(currentHeightRanges)) { | ||||
this.target.getWidget().getElement() | |||||
target.getWidget().getElement() | |||||
.setAttribute("height-range", currentHeightRanges); | .setAttribute("height-range", currentHeightRanges); | ||||
forceRedraw = true; | forceRedraw = true; | ||||
} else { | } else { |
/* | /* | ||||
* Copyright 2000-2014 Vaadin Ltd. | |||||
* Copyright 2000-2013 Vaadin Ltd. | |||||
* | * | ||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | * 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 | * use this file except in compliance with the License. You may obtain a copy of | ||||
* License for the specific language governing permissions and limitations under | * License for the specific language governing permissions and limitations under | ||||
* the License. | * the License. | ||||
*/ | */ | ||||
package com.vaadin.server; | package com.vaadin.server; | ||||
/** | /** |
/* | /* | ||||
* Copyright 2000-2014 Vaadin Ltd. | |||||
* Copyright 2000-2013 Vaadin Ltd. | |||||
* | * | ||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | * 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 | * use this file except in compliance with the License. You may obtain a copy of | ||||
* License for the specific language governing permissions and limitations under | * License for the specific language governing permissions and limitations under | ||||
* the License. | * the License. | ||||
*/ | */ | ||||
package com.vaadin.server; | package com.vaadin.server; | ||||
import com.vaadin.shared.ui.label.ContentMode; | import com.vaadin.shared.ui.label.ContentMode; |
/* | /* | ||||
* Copyright 2000-2013 Vaadin Ltd. | * Copyright 2000-2013 Vaadin Ltd. | ||||
* | |||||
* | |||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | * 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 | * use this file except in compliance with the License. You may obtain a copy of | ||||
* the License at | * the License at | ||||
* | |||||
* | |||||
* http://www.apache.org/licenses/LICENSE-2.0 | * http://www.apache.org/licenses/LICENSE-2.0 | ||||
* | |||||
* | |||||
* Unless required by applicable law or agreed to in writing, software | * Unless required by applicable law or agreed to in writing, software | ||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||||
* | * | ||||
* <pre> | * <pre> | ||||
* CssLayout layout = new CssLayout(); | * CssLayout layout = new CssLayout(); | ||||
* layout.setStyleName("responsive"); | |||||
* layout.setStyleName("responsive"); | |||||
* layout.setSizeFull(); | * layout.setSizeFull(); | ||||
* Responsive.makeResponsive(layout); | * Responsive.makeResponsive(layout); | ||||
* </pre> | * </pre> |