Author: vjrj Date: 2008-07-03 04:29:31 +0200 (Thu, 03 Jul 2008) New Revision: 781 Modified: sandbox4/pom.xml sandbox4/src/main/java/org/op/client/BasicDialog.java sandbox4/src/main/java/org/op/client/BasicDialogExtended.java sandbox4/src/main/java/org/op/client/BasicDialogForm.java sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java sandbox4/src/main/java/org/op/client/DefaultTabbedForm.java sandbox4/src/main/java/org/op/client/Sandbox.java sandbox4/src/main/java/org/op/client/Sandbox2.java sandbox4/src/main/java/org/op/client/SandboxCollapse.java sandbox4/src/main/java/org/op/client/SandboxTooltip.java sandbox4/src/main/java/org/op/public/Sandbox.html Log: more ext probes Modified: sandbox4/pom.xml =================================================================== --- sandbox4/pom.xml 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/pom.xml 2008-07-03 02:29:31 UTC (rev 781) @@ -127,7 +127,7 @@ <dependency> <groupId>com.extjs</groupId> <artifactId>gxt</artifactId> - <version>1.0-beta3</version> + <version>1.0-rc2</version> </dependency> <dependency> Modified: sandbox4/src/main/java/org/op/client/BasicDialog.java =================================================================== --- sandbox4/src/main/java/org/op/client/BasicDialog.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/BasicDialog.java 2008-07-03 02:29:31 UTC (rev 781) @@ -27,41 +27,41 @@ public class BasicDialog extends Window { public BasicDialog(final String caption, final boolean modal) { - this(caption, modal, Scroll.AUTO); + this(caption, modal, Scroll.AUTO); } public BasicDialog(final String caption, final boolean modal, final Scroll scroll) { - setAutoWidth(true); - // Param values - setHeading(caption); - setModal(modal); - setScrollMode(scroll); - setButtonAlign(HorizontalAlignment.RIGHT); + setAutoWidth(true); + // Param values + setHeading(caption); + setModal(modal); + setScrollMode(scroll); + setButtonAlign(HorizontalAlignment.RIGHT); - // Def values - setShadow(true); - setPlain(true); - setClosable(true); - setResizable(true); - setCollapsible(true); + // Def values + setShadow(true); + setPlain(true); + setClosable(true); + setResizable(true); + setCollapsible(true); } public BasicDialog(final String caption, final boolean modal, final Scroll scroll, final int width, final int height) { - this(caption, modal, scroll); - setWidth(width); - setHeight(height); + this(caption, modal, scroll); + setWidth(width); + setHeight(height); } public BasicDialog(final String caption, final boolean modal, final Scroll scroll, final int width, - final int height, final int minWidth, final int minHeight) { - this(caption, modal, scroll, width, height); - setMinWidth(minWidth); - setMinHeight(minHeight); + final int height, final int minWidth, final int minHeight) { + this(caption, modal, scroll, width, height); + setMinWidth(minWidth); + setMinHeight(minHeight); } public void renderIfNeeded() { - if (this.isRendered()) { - this.layout(true); - } + if (this.isRendered()) { + this.layout(); + } } } Modified: sandbox4/src/main/java/org/op/client/BasicDialogExtended.java =================================================================== --- sandbox4/src/main/java/org/op/client/BasicDialogExtended.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/BasicDialogExtended.java 2008-07-03 02:29:31 UTC (rev 781) @@ -24,46 +24,46 @@ import com.extjs.gxt.ui.client.Style.Scroll; import com.extjs.gxt.ui.client.event.ComponentEvent; import com.extjs.gxt.ui.client.event.SelectionListener; -import com.extjs.gxt.ui.client.widget.Button; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.layout.FitLayout; import com.google.gwt.user.client.ui.Widget; public class BasicDialogExtended extends BasicDialog { public BasicDialogExtended(final String title, final boolean modal, final Scroll scroll, final int width, - final int heigth, final String iconStyle, final String firstButtonTitle, final String cancelButtonTitle, - final BasicDialogListener listener) { - super(title, modal, scroll, width, heigth); - super.setLayout(new FitLayout()); - super.setCollapsible(false); - if (iconStyle != null) { - super.setIconStyle(iconStyle); - } + final int heigth, final String iconStyle, final String firstButtonTitle, final String cancelButtonTitle, + final BasicDialogListener listener) { + super(title, modal, scroll, width, heigth); + super.setLayout(new FitLayout()); + super.setCollapsible(false); + if (iconStyle != null) { + super.setIconStyle(iconStyle); + } - final Button firstButton = new Button(firstButtonTitle, new SelectionListener<ComponentEvent>() { - public void componentSelected(ComponentEvent ce) { - listener.onFirstButtonClick(); - } - }); + final Button firstButton = new Button(firstButtonTitle, new SelectionListener<ComponentEvent>() { + public void componentSelected(ComponentEvent ce) { + listener.onFirstButtonClick(); + } + }); - firstButton.setTabIndex(1); + firstButton.setTabIndex(1); - final Button cancel = new Button(cancelButtonTitle, new SelectionListener<ComponentEvent>() { - public void componentSelected(ComponentEvent ce) { - listener.onCancelButtonClick(); - } - }); + final Button cancel = new Button(cancelButtonTitle, new SelectionListener<ComponentEvent>() { + public void componentSelected(ComponentEvent ce) { + listener.onCancelButtonClick(); + } + }); - cancel.setTabIndex(2); + cancel.setTabIndex(2); - super.addButton(firstButton); - super.addButton(cancel); + super.addButton(firstButton); + super.addButton(cancel); } @Override public boolean add(final Widget widget) { - boolean value = super.add(widget); - super.renderIfNeeded(); - return value; + final boolean value = super.add(widget); + super.renderIfNeeded(); + return value; } } Modified: sandbox4/src/main/java/org/op/client/BasicDialogForm.java =================================================================== --- sandbox4/src/main/java/org/op/client/BasicDialogForm.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/BasicDialogForm.java 2008-07-03 02:29:31 UTC (rev 781) @@ -18,53 +18,53 @@ private final BasicDialogListener listener; public BasicDialogForm(final String title, final boolean modal, final Scroll scroll, final int width, - final int heigth, final String iconStyle, final String firstButtonTitle, final String cancelButtonTitle, - final BasicDialogListener listener) { - this.title = title; - this.modal = modal; - this.scroll = scroll; - this.width = width; - this.heigth = heigth; - this.iconStyle = iconStyle; - this.firstButtonTitle = firstButtonTitle; - this.cancelButtonTitle = cancelButtonTitle; - this.listener = listener; - formPanel = new FormPanel(); - // formPanel.setLayout(new FillLayout(10)); - // formPanel.setFrame(true); - formPanel.setBorders(false); - formPanel.setHeaderVisible(false); - formPanel.setScrollMode(scroll); - formPanel.setLabelWidth(100); - formPanel.setWidth(width - 10); + final int heigth, final String iconStyle, final String firstButtonTitle, final String cancelButtonTitle, + final BasicDialogListener listener) { + this.title = title; + this.modal = modal; + this.scroll = scroll; + this.width = width; + this.heigth = heigth; + this.iconStyle = iconStyle; + this.firstButtonTitle = firstButtonTitle; + this.cancelButtonTitle = cancelButtonTitle; + this.listener = listener; + formPanel = new FormPanel(); + // formPanel.setLayout(new FillLayout(10)); + // formPanel.setFrame(true); + formPanel.setBorders(false); + formPanel.setHeaderVisible(false); + formPanel.setScrollMode(scroll); + formPanel.setLabelWidth(100); + formPanel.setWidth(width - 10); } public void addField(final Field<?> field) { - field.setValidateOnBlur(false); - formPanel.add(field); - renderIfNeeded(); + field.setValidateOnBlur(false); + formPanel.add(field); + renderIfNeeded(); } public void hide() { - dialog.hide(); + dialog.hide(); } public void show() { - if (dialog == null) { - dialog = new BasicDialogExtended(title, modal, scroll, width, heigth, iconStyle, firstButtonTitle, - cancelButtonTitle, listener); - dialog.add(formPanel); - } - dialog.show(); + if (dialog == null) { + dialog = new BasicDialogExtended(title, modal, scroll, width, heigth, iconStyle, firstButtonTitle, + cancelButtonTitle, listener); + dialog.add(formPanel); + } + dialog.show(); } private void renderIfNeeded() { - if (formPanel.isRendered()) { - formPanel.layout(true); - } - if (dialog != null) { - dialog.renderIfNeeded(); - } + if (formPanel.isRendered()) { + formPanel.layout(); + } + if (dialog != null) { + dialog.renderIfNeeded(); + } } } Modified: sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java =================================================================== --- sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java 2008-07-03 02:29:31 UTC (rev 781) @@ -13,128 +13,128 @@ public class DefaultBorderLayout { public enum Position { - NORTH, CENTER, SOUTH, EAST, WEST + NORTH, CENTER, SOUTH, EAST, WEST } protected static final int DEF_TOOLBAR_HEIGHT = 20; private static final int NO_SIZE = -1; private static LayoutRegion[] regionPositions = new LayoutRegion[] { LayoutRegion.NORTH, LayoutRegion.CENTER, - LayoutRegion.SOUTH, LayoutRegion.EAST, LayoutRegion.WEST }; + LayoutRegion.SOUTH, LayoutRegion.EAST, LayoutRegion.WEST }; private final LayoutContainer container; public DefaultBorderLayout() { - container = new LayoutContainer(); - container.setData("layout", new FitLayout()); - container.setLayout(new BorderLayout()); - container.setBorders(false); + container = new LayoutContainer(); + container.setData("layout", new FitLayout()); + container.setLayout(new BorderLayout()); + container.setBorders(false); } public Component getPanel() { - return container; + return container; }; public void setStyleName(final String style) { - container.setStyleName(style); + container.setStyleName(style); } protected void add(final Component panel, final Position position) { - add(panel, position, false, false); + add(panel, position, false, false); } protected void add(final Component panel, final Position position, final boolean split, final boolean collapsible) { - add(panel, position, split, collapsible, NO_SIZE); + add(panel, position, split, collapsible, NO_SIZE); } protected void add(final Component panel, final Position position, final boolean split, final boolean collapsible, - final int size) { - LayoutRegion regionPosition = regionPositions[position.ordinal()]; - BorderLayoutData borderLayoutData; - if (size != NO_SIZE) { - borderLayoutData = new BorderLayoutData(regionPosition, size); - } else { - borderLayoutData = new BorderLayoutData(regionPosition); - } - borderLayoutData.setSplit(split); - borderLayoutData.setCollapsible(collapsible); - if (split) { - // Not implemented yet: - // borderLayoutData.collapseMode = "mini"; - switch (position) { - case EAST: - borderLayoutData.setMargins(new Margins(0, 0, 0, 5)); - break; - case WEST: - borderLayoutData.setMargins(new Margins(0, 5, 0, 0)); - break; - case NORTH: - borderLayoutData.setMargins(new Margins(0, 0, 5, 0)); - break; - case SOUTH: - borderLayoutData.setMargins(new Margins(5, 0, 0, 0)); - break; - default: - break; - } - } else { - borderLayoutData.setMargins(new Margins(0, 0, 0, 0)); - } - container.add(panel, borderLayoutData); - doLayoutIfNeeded(); + final int size) { + final LayoutRegion regionPosition = regionPositions[position.ordinal()]; + BorderLayoutData borderLayoutData; + if (size != NO_SIZE) { + borderLayoutData = new BorderLayoutData(regionPosition, size); + } else { + borderLayoutData = new BorderLayoutData(regionPosition); + } + borderLayoutData.setSplit(split); + borderLayoutData.setCollapsible(collapsible); + if (split) { + // Not implemented yet: + // borderLayoutData.collapseMode = "mini"; + switch (position) { + case EAST: + borderLayoutData.setMargins(new Margins(0, 0, 0, 5)); + break; + case WEST: + borderLayoutData.setMargins(new Margins(0, 5, 0, 0)); + break; + case NORTH: + borderLayoutData.setMargins(new Margins(0, 0, 5, 0)); + break; + case SOUTH: + borderLayoutData.setMargins(new Margins(5, 0, 0, 0)); + break; + default: + break; + } + } else { + borderLayoutData.setMargins(new Margins(0, 0, 0, 0)); + } + container.add(panel, borderLayoutData); + doLayoutIfNeeded(); } protected void add(final Component panel, final Position position, final int size) { - add(panel, position, false, false, size); + add(panel, position, false, false, size); } protected void add(final DefaultPanel panel, final Widget widget) { - panel.add(widget); - if (panel.isRendered()) { - panel.layout(true); - } + panel.add(widget); + if (panel.isRendered()) { + panel.layout(); + } } protected ToolBar createBottomBar(final DefaultPanel panel) { - return createBottomBar(panel, null); + return createBottomBar(panel, null); } protected ToolBar createBottomBar(final DefaultPanel panel, final String cssStyle) { - final ToolBar bottomToolBar = new ToolBar(); - bottomToolBar.setHeight(DEF_TOOLBAR_HEIGHT); - if (cssStyle != null) { - bottomToolBar.setStyleName(cssStyle); - } - panel.setBottomComponent(bottomToolBar); - return bottomToolBar; + final ToolBar bottomToolBar = new ToolBar(); + bottomToolBar.setHeight(DEF_TOOLBAR_HEIGHT); + if (cssStyle != null) { + bottomToolBar.setStyleName(cssStyle); + } + panel.setBottomComponent(bottomToolBar); + return bottomToolBar; } protected ToolBar createTopBar(final DefaultPanel panel) { - return createTopBar(panel, null); + return createTopBar(panel, null); } protected ToolBar createTopBar(final DefaultPanel panel, final String cssStyle) { - final ToolBar topToolBar = new ToolBar(); - topToolBar.setHeight(DEF_TOOLBAR_HEIGHT); - if (cssStyle != null) { - topToolBar.setStyleName(cssStyle); - } - panel.setTopComponent(topToolBar); - return topToolBar; + final ToolBar topToolBar = new ToolBar(); + topToolBar.setHeight(DEF_TOOLBAR_HEIGHT); + if (cssStyle != null) { + topToolBar.setStyleName(cssStyle); + } + panel.setTopComponent(topToolBar); + return topToolBar; } protected void doLayoutIfNeeded() { - if (container.isRendered()) { - container.layout(true); - } + if (container.isRendered()) { + container.layout(); + } } protected void setBorders(final boolean show) { - container.setBorders(show); + container.setBorders(show); } protected void setPanel(final DefaultPanel panel, final View view) { - Widget widget = (Widget) view; - panel.removeAll(); - add(panel, widget); + final Widget widget = (Widget) view; + panel.removeAll(); + add(panel, widget); } } Modified: sandbox4/src/main/java/org/op/client/DefaultTabbedForm.java =================================================================== --- sandbox4/src/main/java/org/op/client/DefaultTabbedForm.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/DefaultTabbedForm.java 2008-07-03 02:29:31 UTC (rev 781) @@ -1,9 +1,9 @@ package org.op.client; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.TabItem; import com.extjs.gxt.ui.client.widget.TabPanel; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.form.FormPanel; import com.extjs.gxt.ui.client.widget.layout.FormLayout; @@ -12,34 +12,34 @@ private final TabPanel tabPanel; public DefaultTabbedForm(final int width, final int labelWidth) { - formPanel = new FormPanel(); - formPanel.setFrame(true); - formPanel.setLabelWidth(labelWidth); - formPanel.setBorders(false); - formPanel.setWidth(width); - formPanel.setButtonAlign(HorizontalAlignment.RIGHT); + formPanel = new FormPanel(); + formPanel.setFrame(true); + formPanel.setLabelWidth(labelWidth); + formPanel.setBorders(false); + formPanel.setWidth(width); + formPanel.setButtonAlign(HorizontalAlignment.RIGHT); - tabPanel = new TabPanel(); - formPanel.add(tabPanel); + tabPanel = new TabPanel(); + formPanel.add(tabPanel); } public void addButton(final Button button) { - formPanel.addButton(button); + formPanel.addButton(button); } public void addTab(final String title, final TabItem tab) { - tab.setTitle(title); - tab.setLayout(new FormLayout()); - tab.setAutoHeight(true); - // tab.setPaddings(10); - tabPanel.add(tab); - if (tabPanel.isRendered()) { - tabPanel.render(tab.getElement()); - } + tab.setTitle(title); + tab.setLayout(new FormLayout()); + tab.setAutoHeight(true); + // tab.setPaddings(10); + tabPanel.add(tab); + if (tabPanel.isRendered()) { + tabPanel.render(tab.getElement()); + } } public FormPanel getForm() { - return formPanel; + return formPanel; } } Modified: sandbox4/src/main/java/org/op/client/Sandbox.java =================================================================== --- sandbox4/src/main/java/org/op/client/Sandbox.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/Sandbox.java 2008-07-03 02:29:31 UTC (rev 781) @@ -4,10 +4,10 @@ import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.Scroll; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.TabItem; import com.extjs.gxt.ui.client.widget.TabPanel; import com.extjs.gxt.ui.client.widget.Viewport; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.form.TextField; import com.extjs.gxt.ui.client.widget.layout.FillLayout; import com.extjs.gxt.ui.client.widget.layout.FitLayout; @@ -26,44 +26,44 @@ public class Sandbox implements EntryPoint { class LabelWrapper extends Label implements View { - public LabelWrapper(final String text) { - super(text); - } + public LabelWrapper(final String text) { + super(text); + } } class MenuBarWrapper extends Composite implements View { - public MenuBarWrapper() { + public MenuBarWrapper() { - // Make a command that we will execute from all leaves. - Command cmd = new Command() { - public void execute() { - Window.alert("You selected a menu item!"); - } - }; + // Make a command that we will execute from all leaves. + final Command cmd = new Command() { + public void execute() { + Window.alert("You selected a menu item!"); + } + }; - // Make some sub-menus that we will cascade from the top menu. - MenuBar fooMenu = new MenuBar(true); - fooMenu.addItem("the", cmd); - fooMenu.addItem("foo", cmd); - fooMenu.addItem("menu", cmd); + // Make some sub-menus that we will cascade from the top menu. + final MenuBar fooMenu = new MenuBar(true); + fooMenu.addItem("the", cmd); + fooMenu.addItem("foo", cmd); + fooMenu.addItem("menu", cmd); - MenuBar barMenu = new MenuBar(true); - barMenu.addItem("the", cmd); - barMenu.addItem("bar", cmd); - barMenu.addItem("menu", cmd); + final MenuBar barMenu = new MenuBar(true); + barMenu.addItem("the", cmd); + barMenu.addItem("bar", cmd); + barMenu.addItem("menu", cmd); - MenuBar bazMenu = new MenuBar(true); - bazMenu.addItem("the", cmd); - bazMenu.addItem("baz", cmd); - bazMenu.addItem("menu", cmd); + final MenuBar bazMenu = new MenuBar(true); + bazMenu.addItem("the", cmd); + bazMenu.addItem("baz", cmd); + bazMenu.addItem("menu", cmd); - // Make a new menu bar, adding a few cascading menus to it. - MenuBar menu = new MenuBar(); - menu.addItem("foo", fooMenu); - menu.addItem("bar", barMenu); - menu.addItem("baz", bazMenu); - initWidget(menu); - } + // Make a new menu bar, adding a few cascading menus to it. + final MenuBar menu = new MenuBar(); + menu.addItem("foo", fooMenu); + menu.addItem("bar", barMenu); + menu.addItem("baz", bazMenu); + initWidget(menu); + } } private BasicDialogForm dialog; @@ -73,114 +73,114 @@ * This is the entry point method. */ public void onModuleLoad() { - Viewport vp = new Viewport(); - // Test fit vs fill layout - vp.setLayout(new FillLayout(4)); - Workspace wk = new Workspace(); - vp.add(wk.getPanel()); - vp.layout(); - RootPanel.get().add(vp); - wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); - wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); - wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); - wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); - wk.getEntityWorkspace().setTitle(new LabelWrapper("Title 2")); - wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); - wk.getSiteBar().addView(new LabelWrapper("sitebar-right")); + final Viewport vp = new Viewport(); + // Test fit vs fill layout + vp.setLayout(new FillLayout()); + final Workspace wk = new Workspace(); + vp.add(wk.getPanel()); + vp.layout(); + RootPanel.get().add(vp); + wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); + wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); + wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); + wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); + wk.getEntityWorkspace().setTitle(new LabelWrapper("Title 2")); + wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); + wk.getSiteBar().addView(new LabelWrapper("sitebar-right")); - dialog = new BasicDialogForm("Test dialog", false, Scroll.AUTO, 380, 200, null, "Join", "Cancel", - new BasicDialogListener() { - public void onCancelButtonClick() { - dialog.hide(); - } + dialog = new BasicDialogForm("Test dialog", false, Scroll.AUTO, 380, 200, null, "Join", "Cancel", + new BasicDialogListener() { + public void onCancelButtonClick() { + dialog.hide(); + } - public void onFirstButtonClick() { - dialog.hide(); - } - }); + public void onFirstButtonClick() { + dialog.hide(); + } + }); - TextField jid = new TextField(); - jid.setMessageTarget("tooltip"); - jid.setToolTip(new ToolTipConfig("Information", "Prints the current document")); - jid.setFieldLabel("Jabber id"); - dialog.addField(jid); - dialog.show(); + final TextField jid = new TextField(); + jid.setMessageTarget("tooltip"); + jid.setToolTip(new ToolTipConfig("Information", "Prints the current document")); + jid.setFieldLabel("Jabber id"); + dialog.addField(jid); + dialog.show(); - BasicDialog dialog2 = new BasicDialog("Hellooooo", false); - dialog2.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " - + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); - dialog2.show(); + final BasicDialog dialog2 = new BasicDialog("Hellooooo", false); + dialog2.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " + + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); + dialog2.show(); - dialog3 = new BasicDialogExtended("Dialog extended", false, Scroll.NONE, 300, 200, "", "Yes", "No", - new BasicDialogListener() { + dialog3 = new BasicDialogExtended("Dialog extended", false, Scroll.NONE, 300, 200, "", "Yes", "No", + new BasicDialogListener() { - public void onCancelButtonClick() { - dialog3.hide(); - } + public void onCancelButtonClick() { + dialog3.hide(); + } - public void onFirstButtonClick() { - dialog3.hide(); - } - }); - dialog3.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " - + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); - dialog3.show(); + public void onFirstButtonClick() { + dialog3.hide(); + } + }); + dialog3.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " + + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); + dialog3.show(); - BasicDialog chatDialog = new BasicDialog("Emite chat", false, Scroll.NONE, 600, 415, 300, 300); - chatDialog.setMaximizable(true); - // chatDialog.setBodyBorder(false); - chatDialog.setBorders(false); - // chatDialog.setBodyBorder(false); - // chatDialog.setBorders(false); - chatDialog.setLayout(new FitLayout()); - Button sendBtn = new Button("Send"); - sendBtn.setToolTip("send"); - chatDialog.addButton(sendBtn); - chatDialog.setButtonAlign(HorizontalAlignment.LEFT); - DefaultBorderLayout chatPanel = new DefaultBorderLayout(); - DefaultPanel east = new DefaultPanel("Users"); - DefaultPanel south = new DefaultPanel(); - DefaultPanel north = new DefaultPanel(); - chatPanel.createTopBar(south); - chatPanel.createTopBar(north); - chatPanel.createBottomBar(east); - chatPanel.createTopBar(north); - chatPanel.add(north, Position.NORTH, false, false, 22); - TabPanel centerPanel = new TabPanel(); - TabItem item1 = new TabItem("Chat1"); - item1.setIconStyle("icon1"); - item1.setLayout(new FitLayout()); - ToolTipConfig tipConfig = new ToolTipConfig("[email protected]"); - item1.setToolTip(tipConfig); - // item.getHeader().setToolTip("Test"); (in beta3) - TabItem item2 = new TabItem("Chat1"); - item2.setIconStyle("icon1"); - item2.setLayout(new FitLayout()); - centerPanel.add(item1); - centerPanel.add(item2); - chatPanel.add(centerPanel, Position.CENTER); - chatPanel.add(east, Position.EAST, false, true, 150); - chatPanel.add(south, Position.SOUTH, true, false, 75); - chatDialog.add(chatPanel.getPanel()); - chatDialog.show(); - chatDialog.layout(); - item1.setIconStyle("icon2"); - item1.setText("<span ext:qtip=\"kk\" style=\"icon2\">chat1</span>"); - item1.layout(true); - // chatDialog.renderIfNeeded(); + final BasicDialog chatDialog = new BasicDialog("Emite chat", false, Scroll.NONE, 600, 415, 300, 300); + chatDialog.setMaximizable(true); + // chatDialog.setBodyBorder(false); + chatDialog.setBorders(false); + // chatDialog.setBodyBorder(false); + // chatDialog.setBorders(false); + chatDialog.setLayout(new FitLayout()); + final Button sendBtn = new Button("Send"); + sendBtn.setToolTip("send"); + chatDialog.addButton(sendBtn); + chatDialog.setButtonAlign(HorizontalAlignment.LEFT); + final DefaultBorderLayout chatPanel = new DefaultBorderLayout(); + final DefaultPanel east = new DefaultPanel("Users"); + final DefaultPanel south = new DefaultPanel(); + final DefaultPanel north = new DefaultPanel(); + chatPanel.createTopBar(south); + chatPanel.createTopBar(north); + chatPanel.createBottomBar(east); + chatPanel.createTopBar(north); + chatPanel.add(north, Position.NORTH, false, false, 22); + final TabPanel centerPanel = new TabPanel(); + final TabItem item1 = new TabItem("Chat1"); + item1.setIconStyle("icon1"); + item1.setLayout(new FitLayout()); + final ToolTipConfig tipConfig = new ToolTipConfig("[email protected]"); + item1.setToolTip(tipConfig); + // item.getHeader().setToolTip("Test"); (in beta3) + final TabItem item2 = new TabItem("Chat1"); + item2.setIconStyle("icon1"); + item2.setLayout(new FitLayout()); + centerPanel.add(item1); + centerPanel.add(item2); + chatPanel.add(centerPanel, Position.CENTER); + chatPanel.add(east, Position.EAST, false, true, 150); + chatPanel.add(south, Position.SOUTH, true, false, 75); + chatDialog.add(chatPanel.getPanel()); + chatDialog.show(); + chatDialog.layout(); + item1.setIconStyle("icon2"); + item1.setText("<span ext:qtip=\"kk\" style=\"icon2\">chat1</span>"); + item1.layout(); + // chatDialog.renderIfNeeded(); - // BasicDialog chatDialog2 = new BasicDialog("Layout sample", false, - // Scroll.NONE, 600, 415, 300, 300); - // chatDialog2.setLayout(new FitLayout()); - // TestBorderLayout testBL = new TestBorderLayout(); - // chatDialog2.add(testBL); - // chatDialog2.show(); - // chatDialog2.layout(); - // - // vp.add(chatPanel.getPanel()); - // vp.layout(); - // RootPanel.get().add(vp); + // BasicDialog chatDialog2 = new BasicDialog("Layout sample", false, + // Scroll.NONE, 600, 415, 300, 300); + // chatDialog2.setLayout(new FitLayout()); + // TestBorderLayout testBL = new TestBorderLayout(); + // chatDialog2.add(testBL); + // chatDialog2.show(); + // chatDialog2.layout(); + // + // vp.add(chatPanel.getPanel()); + // vp.layout(); + // RootPanel.get().add(vp); - // wk.getEntityWorkspace().setContent(chatPanel.getPanel());// + // wk.getEntityWorkspace().setContent(chatPanel.getPanel());// } } Modified: sandbox4/src/main/java/org/op/client/Sandbox2.java =================================================================== --- sandbox4/src/main/java/org/op/client/Sandbox2.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/Sandbox2.java 2008-07-03 02:29:31 UTC (rev 781) @@ -4,10 +4,10 @@ import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.Scroll; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.TabItem; import com.extjs.gxt.ui.client.widget.TabPanel; import com.extjs.gxt.ui.client.widget.Viewport; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.form.TextField; import com.extjs.gxt.ui.client.widget.layout.FillLayout; import com.extjs.gxt.ui.client.widget.layout.FitLayout; @@ -26,44 +26,44 @@ public class Sandbox2 implements EntryPoint { class LabelWrapper extends Label implements View { - public LabelWrapper(final String text) { - super(text); - } + public LabelWrapper(final String text) { + super(text); + } } class MenuBarWrapper extends Composite implements View { - public MenuBarWrapper() { + public MenuBarWrapper() { - // Make a command that we will execute from all leaves. - Command cmd = new Command() { - public void execute() { - Window.alert("You selected a menu item!"); - } - }; + // Make a command that we will execute from all leaves. + final Command cmd = new Command() { + public void execute() { + Window.alert("You selected a menu item!"); + } + }; - // Make some sub-menus that we will cascade from the top menu. - MenuBar fooMenu = new MenuBar(true); - fooMenu.addItem("the", cmd); - fooMenu.addItem("foo", cmd); - fooMenu.addItem("menu", cmd); + // Make some sub-menus that we will cascade from the top menu. + final MenuBar fooMenu = new MenuBar(true); + fooMenu.addItem("the", cmd); + fooMenu.addItem("foo", cmd); + fooMenu.addItem("menu", cmd); - MenuBar barMenu = new MenuBar(true); - barMenu.addItem("the", cmd); - barMenu.addItem("bar", cmd); - barMenu.addItem("menu", cmd); + final MenuBar barMenu = new MenuBar(true); + barMenu.addItem("the", cmd); + barMenu.addItem("bar", cmd); + barMenu.addItem("menu", cmd); - MenuBar bazMenu = new MenuBar(true); - bazMenu.addItem("the", cmd); - bazMenu.addItem("baz", cmd); - bazMenu.addItem("menu", cmd); + final MenuBar bazMenu = new MenuBar(true); + bazMenu.addItem("the", cmd); + bazMenu.addItem("baz", cmd); + bazMenu.addItem("menu", cmd); - // Make a new menu bar, adding a few cascading menus to it. - MenuBar menu = new MenuBar(); - menu.addItem("foo", fooMenu); - menu.addItem("bar", barMenu); - menu.addItem("baz", bazMenu); - initWidget(menu); - } + // Make a new menu bar, adding a few cascading menus to it. + final MenuBar menu = new MenuBar(); + menu.addItem("foo", fooMenu); + menu.addItem("bar", barMenu); + menu.addItem("baz", bazMenu); + initWidget(menu); + } } private BasicDialogForm dialog; @@ -73,112 +73,112 @@ * This is the entry point method. */ public void onModuleLoad() { - Viewport vp = new Viewport(); - // Test fit vs fill layout - vp.setLayout(new FillLayout(4)); - Workspace wk = new Workspace(); - vp.add(wk.getPanel()); - vp.layout(); - RootPanel.get().add(vp); - wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); - wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); - wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); - wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); - wk.getEntityWorkspace().setTitle(new LabelWrapper("Title 2")); - wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); - wk.getSiteBar().addView(new LabelWrapper("sitebar-right")); + final Viewport vp = new Viewport(); + // Test fit vs fill layout + vp.setLayout(new FillLayout()); + final Workspace wk = new Workspace(); + vp.add(wk.getPanel()); + vp.layout(); + RootPanel.get().add(vp); + wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); + wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); + wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); + wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); + wk.getEntityWorkspace().setTitle(new LabelWrapper("Title 2")); + wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); + wk.getSiteBar().addView(new LabelWrapper("sitebar-right")); - dialog = new BasicDialogForm("Test dialog", false, Scroll.AUTO, 380, 200, null, "Join", "Cancel", - new BasicDialogListener() { - public void onCancelButtonClick() { - dialog.hide(); - } + dialog = new BasicDialogForm("Test dialog", false, Scroll.AUTO, 380, 200, null, "Join", "Cancel", + new BasicDialogListener() { + public void onCancelButtonClick() { + dialog.hide(); + } - public void onFirstButtonClick() { - dialog.hide(); - } - }); + public void onFirstButtonClick() { + dialog.hide(); + } + }); - TextField jid = new TextField(); - jid.setMessageTarget("tooltip"); - jid.setToolTip(new ToolTipConfig("Information", "Prints the current document")); - jid.setFieldLabel("Jabber id"); - dialog.addField(jid); - dialog.show(); + final TextField jid = new TextField(); + jid.setMessageTarget("tooltip"); + jid.setToolTip(new ToolTipConfig("Information", "Prints the current document")); + jid.setFieldLabel("Jabber id"); + dialog.addField(jid); + dialog.show(); - BasicDialog dialog2 = new BasicDialog("Hellooooo", false); - dialog2.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " - + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); - dialog2.show(); + final BasicDialog dialog2 = new BasicDialog("Hellooooo", false); + dialog2.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " + + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); + dialog2.show(); - dialog3 = new BasicDialogExtended("Dialog extended", false, Scroll.NONE, 300, 200, "", "Yes", "No", - new BasicDialogListener() { + dialog3 = new BasicDialogExtended("Dialog extended", false, Scroll.NONE, 300, 200, "", "Yes", "No", + new BasicDialogListener() { - public void onCancelButtonClick() { - dialog3.hide(); - } + public void onCancelButtonClick() { + dialog3.hide(); + } - public void onFirstButtonClick() { - dialog3.hide(); - } - }); - dialog3.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " - + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); - dialog3.show(); + public void onFirstButtonClick() { + dialog3.hide(); + } + }); + dialog3.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " + + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); + dialog3.show(); - BasicDialog chatDialog = new BasicDialog("Emite chat", false, Scroll.NONE, 600, 415, 300, 300); - chatDialog.setMaximizable(true); - // chatDialog.setBodyBorder(false); - chatDialog.setBorders(false); - // chatDialog.setBorders(false); - chatDialog.setLayout(new FitLayout()); - Button sendBtn = new Button("Send"); - sendBtn.setToolTip("send"); - chatDialog.addButton(sendBtn); - chatDialog.setButtonAlign(HorizontalAlignment.LEFT); - DefaultBorderLayout chatPanel = new DefaultBorderLayout(); - DefaultPanel east = new DefaultPanel("Users"); - DefaultPanel south = new DefaultPanel(); - DefaultPanel north = new DefaultPanel(); - chatPanel.createTopBar(south); - chatPanel.createTopBar(north); - chatPanel.createBottomBar(east); - chatPanel.createTopBar(north); - chatPanel.add(north, Position.NORTH, false, false, 22); - TabPanel centerPanel = new TabPanel(); - TabItem item1 = new TabItem("Chat1"); - item1.setIconStyle("icon1"); - item1.setLayout(new FitLayout()); - ToolTipConfig tipConfig = new ToolTipConfig("[email protected]"); - item1.setToolTip(tipConfig); - TabItem item2 = new TabItem("Chat1"); - item2.setIconStyle("icon1"); - item2.setLayout(new FitLayout()); - centerPanel.add(item1); - centerPanel.add(item2); - chatPanel.add(centerPanel, Position.CENTER); - chatPanel.add(east, Position.EAST, false, true, 150); - chatPanel.add(south, Position.SOUTH, true, false, 75); - chatDialog.add(chatPanel.getPanel()); - chatDialog.show(); - chatDialog.layout(); - item1.setIconStyle("icon2"); - item1.setText("<span ext:qtip=\"kk\" style=\"icon2\">chat1</span>"); - item1.layout(true); - // chatDialog.renderIfNeeded(); + final BasicDialog chatDialog = new BasicDialog("Emite chat", false, Scroll.NONE, 600, 415, 300, 300); + chatDialog.setMaximizable(true); + // chatDialog.setBodyBorder(false); + chatDialog.setBorders(false); + // chatDialog.setBorders(false); + chatDialog.setLayout(new FitLayout()); + final Button sendBtn = new Button("Send"); + sendBtn.setToolTip("send"); + chatDialog.addButton(sendBtn); + chatDialog.setButtonAlign(HorizontalAlignment.LEFT); + final DefaultBorderLayout chatPanel = new DefaultBorderLayout(); + final DefaultPanel east = new DefaultPanel("Users"); + final DefaultPanel south = new DefaultPanel(); + final DefaultPanel north = new DefaultPanel(); + chatPanel.createTopBar(south); + chatPanel.createTopBar(north); + chatPanel.createBottomBar(east); + chatPanel.createTopBar(north); + chatPanel.add(north, Position.NORTH, false, false, 22); + final TabPanel centerPanel = new TabPanel(); + final TabItem item1 = new TabItem("Chat1"); + item1.setIconStyle("icon1"); + item1.setLayout(new FitLayout()); + final ToolTipConfig tipConfig = new ToolTipConfig("[email protected]"); + item1.setToolTip(tipConfig); + final TabItem item2 = new TabItem("Chat1"); + item2.setIconStyle("icon1"); + item2.setLayout(new FitLayout()); + centerPanel.add(item1); + centerPanel.add(item2); + chatPanel.add(centerPanel, Position.CENTER); + chatPanel.add(east, Position.EAST, false, true, 150); + chatPanel.add(south, Position.SOUTH, true, false, 75); + chatDialog.add(chatPanel.getPanel()); + chatDialog.show(); + chatDialog.layout(); + item1.setIconStyle("icon2"); + item1.setText("<span ext:qtip=\"kk\" style=\"icon2\">chat1</span>"); + item1.layout(); + // chatDialog.renderIfNeeded(); - // BasicDialog chatDialog2 = new BasicDialog("Layout sample", false, - // Scroll.NONE, 600, 415, 300, 300); - // chatDialog2.setLayout(new FitLayout()); - // TestBorderLayout testBL = new TestBorderLayout(); - // chatDialog2.add(testBL); - // chatDialog2.show(); - // chatDialog2.layout(); - // - // vp.add(chatPanel.getPanel()); - // vp.layout(); - // RootPanel.get().add(vp); + // BasicDialog chatDialog2 = new BasicDialog("Layout sample", false, + // Scroll.NONE, 600, 415, 300, 300); + // chatDialog2.setLayout(new FitLayout()); + // TestBorderLayout testBL = new TestBorderLayout(); + // chatDialog2.add(testBL); + // chatDialog2.show(); + // chatDialog2.layout(); + // + // vp.add(chatPanel.getPanel()); + // vp.layout(); + // RootPanel.get().add(vp); - // wk.getEntityWorkspace().setContent(chatPanel.getPanel());// + // wk.getEntityWorkspace().setContent(chatPanel.getPanel());// } } Modified: sandbox4/src/main/java/org/op/client/SandboxCollapse.java =================================================================== --- sandbox4/src/main/java/org/op/client/SandboxCollapse.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/SandboxCollapse.java 2008-07-03 02:29:31 UTC (rev 781) @@ -2,9 +2,9 @@ import com.extjs.gxt.ui.client.Style.LayoutRegion; import com.extjs.gxt.ui.client.util.Margins; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.ContentPanel; import com.extjs.gxt.ui.client.widget.Viewport; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.layout.BorderLayout; import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData; import com.google.gwt.core.client.EntryPoint; @@ -12,26 +12,26 @@ public class SandboxCollapse implements EntryPoint { public void onModuleLoad() { - Viewport viewport = new Viewport(); - viewport.setLayout(new BorderLayout()); + final Viewport viewport = new Viewport(); + viewport.setLayout(new BorderLayout()); - BorderLayoutData westData = new BorderLayoutData(LayoutRegion.WEST, 125, 0, 200); - westData.setSplit(true); - westData.setCollapsible(true); - // westData.collapseMode = "mini"; - westData.setMargins(new Margins(5, 5, 5, 5)); - BorderLayoutData centerData = new BorderLayoutData(LayoutRegion.CENTER); + final BorderLayoutData westData = new BorderLayoutData(LayoutRegion.WEST, 125, 0, 200); + westData.setSplit(true); + westData.setCollapsible(true); + // westData.collapseMode = "mini"; + westData.setMargins(new Margins(5, 5, 5, 5)); + final BorderLayoutData centerData = new BorderLayoutData(LayoutRegion.CENTER); - ContentPanel west = new ContentPanel(); - west.setHeaderVisible(false); - ContentPanel center = new ContentPanel(); - west.setTitle("Testing"); - center.add(new Button("button1")); - west.add(new Button("button2")); + final ContentPanel west = new ContentPanel(); + west.setHeaderVisible(false); + final ContentPanel center = new ContentPanel(); + west.setTitle("Testing"); + center.add(new Button("button1")); + west.add(new Button("button2")); - viewport.add(west, westData); - viewport.add(center, centerData); - viewport.layout(); - RootPanel.get().add(viewport); + viewport.add(west, westData); + viewport.add(center, centerData); + viewport.layout(); + RootPanel.get().add(viewport); } } \ No newline at end of file Modified: sandbox4/src/main/java/org/op/client/SandboxTooltip.java =================================================================== --- sandbox4/src/main/java/org/op/client/SandboxTooltip.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/SandboxTooltip.java 2008-07-03 02:29:31 UTC (rev 781) @@ -1,8 +1,8 @@ package org.op.client; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.Viewport; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.form.FormPanel; import com.extjs.gxt.ui.client.widget.form.TextField; import com.extjs.gxt.ui.client.widget.layout.FillLayout; @@ -12,22 +12,22 @@ public class SandboxTooltip implements EntryPoint { public void onModuleLoad() { - Viewport viewport = new Viewport(); - viewport.setLayout(new FillLayout(5)); + final Viewport viewport = new Viewport(); + viewport.setLayout(new FillLayout()); - FormPanel form = new FormPanel(); - form.setHeading("Form title"); - form.setToolTip(new ToolTipConfig("form title tip", "form text tip")); - form.setButtonAlign(HorizontalAlignment.LEFT); - TextField field = new TextField(); - field.setFieldLabel("Some label"); - field.setToolTip(new ToolTipConfig("field title", "field text tip")); - form.add(field); - Button button = new Button("Ok"); - button.setToolTip(new ToolTipConfig("button title", "button text tip")); - form.addButton(button); - viewport.add(form); + final FormPanel form = new FormPanel(); + form.setHeading("Form title"); + form.setToolTip(new ToolTipConfig("form title tip", "form text tip")); + form.setButtonAlign(HorizontalAlignment.LEFT); + final TextField field = new TextField(); + field.setFieldLabel("Some label"); + field.setToolTip(new ToolTipConfig("field title", "field text tip")); + form.add(field); + final Button button = new Button("Ok"); + button.setToolTip(new ToolTipConfig("button title", "button text tip")); + form.addButton(button); + viewport.add(form); - RootPanel.get().add(viewport); + RootPanel.get().add(viewport); } } Modified: sandbox4/src/main/java/org/op/public/Sandbox.html =================================================================== --- sandbox4/src/main/java/org/op/public/Sandbox.html 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/public/Sandbox.html 2008-07-03 02:29:31 UTC (rev 781) @@ -1,3 +1,4 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" --> <!-- "http://www.w3.org/TR/html4/loose.dtd"> -->