forceLayout.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- // TODO for each client in appconf force layout
- // VDebugConsole.this.client.forceLayout();
+ for (ApplicationConnection applicationConnection : ApplicationConfiguration
+ .getRunningApplications()) {
+ applicationConnection.forceLayout();
+ }
}
});
}
private void setStyles(String[] styles) {
- String style = CLASSNAME;
+ String styleName = CLASSNAME;
+
if (styles != null) {
- for (int i = 0; i < styles.length; i++) {
- style += " " + CLASSNAME + "-" + styles[i];
+ for (String style : styles) {
+ if (ApplicationConnection.DISABLED_CLASSNAME.equals(style)) {
+ // Add v-disabled also without classname prefix so
+ // generic v-disabled CSS rules work
+ styleName += " " + style;
+ }
+
+ styleName += " " + CLASSNAME + "-" + style;
}
}
- setStyleName(style);
+
+ setStyleName(styleName);
}
public void updateCaption(UIDL uidl) {
@Override
public void setWidth(String newWidth) {
- if (!"".equals(newWidth) && (width == null || !newWidth.equals(width))) {
+ if (!"".equals(newWidth) && (isUndefinedWidth() || !newWidth.equals(width))) {
if (BrowserInfo.get().isIE6()) {
// in IE6 cols ~ min-width
DOM.setElementProperty(text.getElement(), "size", "1");
needLayout = false;
}
} else {
- if ("".equals(newWidth) && width != null && !"".equals(width)) {
+ if ("".equals(newWidth) && !isUndefinedWidth()) {
+ // Changing from defined to undefined
if (BrowserInfo.get().isIE6()) {
// revert IE6 hack
DOM.setElementProperty(text.getElement(), "size", "");
}
super.setWidth("");
- needLayout = true;
- iLayout();
- needLayout = false;
+ iLayout(true);
width = null;
}
}
}
+ protected boolean isUndefinedWidth() {
+ return width == null || "".equals(width);
+ }
/**
* Returns pixels in x-axis reserved for other than textfield content.
* automatically adjusted by the browser.
*/
public void updateWidth() {
- if (!needLayout) {
+ if (isUndefinedWidth()) {
return;
}
-
+ needLayout = true;
fieldExtraWidth = -1;
- iLayout();
+ iLayout(true);
}
public void iLayout() {
- if (needLayout) {
+ iLayout(false);
+ }
+
+ public void iLayout(boolean force) {
+ if (needLayout || force) {
int textFieldWidth = getOffsetWidth() - getFieldExtraWidth();
if (textFieldWidth < 0) {
// Field can never be smaller than 0 (causes exception in IE)
fi
echo Cleaning deploy dir
-rm -rf /home/integration/deploy/*
+ant -f /home/integration/deploy.xml clean
+
AGE=$[($DATE - $LOCK_AGE)/60]
- if [ "$AGE" -gt "15" ]
+ if [ "$AGE" -gt "20" ]
then
echo lock.file is $AGE min old.
./cleanup.sh
</antcall>\r
</target>\r
\r
+ <target name="integration-test-weblogic12">\r
+ <antcall target="run-generic-integration-test">\r
+ <param name="target-port" value="7001" />\r
+ <param name="target-server" value="weblogic12" />\r
+ </antcall>\r
+ </target>\r
+ \r
\r
<target name="integration-test-weblogicPortal">\r
<fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" />\r
<antcall target="integration-test-liferay5" />\r
<antcall target="integration-test-weblogic9" />\r
<antcall target="integration-test-weblogic10" />\r
+ <!--<antcall target="integration-test-weblogic12" />-->\r
<antcall target="integration-test-gatein3" />\r
<antcall target="integration-test-glassfish2" />\r
<antcall target="integration-test-glassfish3" />\r
</fileset>
- <for threadCount="40" parallel="true" keepgoing="true" param="target">
+ <for threadCount="30" parallel="true" keepgoing="true" param="target">
<path>
<fileset refid="tests-fileset" />
</path>
<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxIdenticalItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>
<td>enter</td>
</tr>
+<tr>
+ <td>pause</td>
+ <td>100</td>
+ <td></td>
+</tr>
<tr>
<td>assertText</td>
<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxIdenticalItems::PID_SLog_row_0</td>
<td>4. Item one-1 selected</td>
</tr>
-
</tbody></table>
</body>
</html>
setChildState(0, 1, 2);
// Height: 100% to middle child
setChildState(1, 1, 4);
+ // Alignment: bottom left to right child
+ setChildState(2, 4, 7);
}
}));
setChildState(0, 1, 2);
// Height: 100% to middle child
setChildState(1, 1, 4);
+ // Alignment: bottom left to right child
+ setChildState(2, 4, 7);
}
}));