From 52ea97e792e287cf623dce14d784a014c747f687 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Fri, 9 Apr 2010 10:08:45 +0000 Subject: [PATCH] #4500 move Reservr outside Vaadin core svn changeset:12426/svn branch:6.3 --- WebContent/VAADIN/readme.txt | 2 +- WebContent/VAADIN/themes/liferay/styles.css | 5 - WebContent/VAADIN/themes/reservr/bmw.jpg | Bin 17736 -> 0 bytes WebContent/VAADIN/themes/reservr/favicon.ico | Bin 1150 -> 0 bytes WebContent/VAADIN/themes/reservr/reservr.jpg | Bin 1080 -> 0 bytes WebContent/VAADIN/themes/reservr/styles.css | 56 --- WebContent/WEB-INF/liferay-display.xml | 1 - WebContent/WEB-INF/liferay-portlet.xml | 5 - WebContent/WEB-INF/portlet.xml | 48 +- WebContent/WEB-INF/web.xml | 69 --- build/build.xml | 32 -- build/package/WebContent/WEB-INF/web.xml | 54 -- build/package/eclipse-classpath | 1 - .../com/vaadin/tests/QueryContainerDemo.java | 193 ------- tests/src/com/vaadin/tests/TestBench.java | 5 +- .../tests/TestComponentsAndLayouts.java | 470 ------------------ tests/src/com/vaadin/tests/TestIFrames.java | 8 +- 17 files changed, 10 insertions(+), 939 deletions(-) delete mode 100644 WebContent/VAADIN/themes/reservr/bmw.jpg delete mode 100644 WebContent/VAADIN/themes/reservr/favicon.ico delete mode 100644 WebContent/VAADIN/themes/reservr/reservr.jpg delete mode 100644 WebContent/VAADIN/themes/reservr/styles.css delete mode 100644 tests/src/com/vaadin/tests/QueryContainerDemo.java delete mode 100644 tests/src/com/vaadin/tests/TestComponentsAndLayouts.java diff --git a/WebContent/VAADIN/readme.txt b/WebContent/VAADIN/readme.txt index 672862a35c..ee64a23423 100644 --- a/WebContent/VAADIN/readme.txt +++ b/WebContent/VAADIN/readme.txt @@ -28,7 +28,7 @@ Vaadin Development --------------------------- When developing the Vaadin Library itself, change to "build" directory and run "ant widgetsets" to compile all widgetsets or "ant widgetset-default", -"ant-widgetset-reserver", or "ant widgetset-colorpicker" to compile individual +"ant-widgetset-sampler", or "ant widgetset-colorpicker" to compile individual widgetsets. You must have GWT installed under build/gwt. See http://dev.vaadin.com/wiki/DevDocs/StartingDevelopment for instructions for diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css index 51a32d1fee..e60cc98ace 100644 --- a/WebContent/VAADIN/themes/liferay/styles.css +++ b/WebContent/VAADIN/themes/liferay/styles.css @@ -30,8 +30,3 @@ input[type="text"].v-filterselect-input { padding: 3px 0px 0px 4px; } -.simplereserver div.v-datefield-entrycalendar-hours { - height: 200px; - overflow: auto; -} - diff --git a/WebContent/VAADIN/themes/reservr/bmw.jpg b/WebContent/VAADIN/themes/reservr/bmw.jpg deleted file mode 100644 index 5d91713a11c032a7c1a97b15f7b2c1b4d95e7887..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17736 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 diff --git a/WebContent/VAADIN/themes/reservr/favicon.ico b/WebContent/VAADIN/themes/reservr/favicon.ico deleted file mode 100644 index e58158c02c46f37dc315a8f1c79fd46dfdae952a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmbu8ze>YU6o-G(qDTchIS8U-cLhOFTm*dzM}3AaiueZy2cN;w)xkH&?jQ&Xii(1$ z1s@=OKhgskZfn{me7T2n&v$ZjlSpHn&8E06Xs<5KNNNEoGDV&td33II2s!-19jt%` zV2j#I_yqU4fkFJJJ@5LrL;A-({PBwYQvMq52W(d8k@9!(yeDsP2Fp-~c;@ohChyu; znCjNdFX$jqq3z$D1XEXer(2!k{O0}~T7BgC-~l9h#nnVpjjC}}3Z zz{t$Z%*4#X&IyrY1hN@e+1NP*g$#ui9YsWy0+o$S5(^tIsyYRyG_`Izd>N=ul92(; zOa=}n7ItQ!l!hP!BhV8pjI1y#fkra0u(AmXDH^gXIVK7R7B(*2`2Q9I571Rig3N*p z_6$3u4zBq%zvAl5Z#yixk~$7<+N#-N6%y96^T0=@rXZ#U2FBa(*BF+HM@BGgUXf^j z>(TtLVN32@ODsKR&O6~)SL>GrE}xlyn)z1DE_*nC*NGz4b?>gUM=~GHZ9jC%UVwjU zf@$@<%2`J)r+#Pf?q*Dib_a zW^6v2Ew|70b8>J~#oOOX@_#bZjQ8w47Flk)d{(S^z}nBcKY5>STeorft;J@seJgnk zf-c>15|MfOZ{hRf2XA~^^;0=Uzi^iR$x7dC^Ve(_y~O@3ORgzpYIHv zx_oZ$m-iNTBu;91JU?mc$I^IQWy!odVI7xp8P6@bIXC2u{-L5WeWRmUb5nCOeIh4b zdlA32@M}!aC9aq^HSH=Bk2`IZPd)#1ci%}%aY;QX#aaSme;$81b2zyt-2w z_&oyMJI_xqynpfYF2ULQQ?_@+Oqf@#cJKMih^;~QYER8Mbcj!6s~rDS;ooP>%I^Nw z*Uk6b_-XmZWtVqKXF9MHzn1S<7_e>mgp=t^dskh5xHs=rv2t_ujIArPf*nNbJ_I#g z{?PANZ*}{2@r66tB6pTqPm5SHk7spXdRA5SUoXWvnI(dkCRMl>`7;#1KF{1Ow|Do` zcXCS~i5u1Z;H#VR+_&ual-pmqPM1_m%s8YND>3QuCZ&~IRCRYuo!{x)S0U$oZI##U z$xgYO7rb$A{(AnK{+0DF-8Ijv?3sIE;fYWDJGN{IsjoWt&tTDZ5C2U{X7=CeUxoja eN_G`-P+0Lje#80?i@FqSoUAk!b+pv~zX - diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml index cff3366a41..f3c18e57d0 100644 --- a/WebContent/WEB-INF/liferay-portlet.xml +++ b/WebContent/WEB-INF/liferay-portlet.xml @@ -7,11 +7,6 @@ true false - - SimpleReserverPortlet - true - false - SelectDemoPortlet true diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index 6cd7f70a48..265c3b3869 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -14,7 +14,7 @@ widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet + com.vaadin.demo.sampler.gwt.SamplerWidgetSet text/html @@ -40,46 +40,6 @@ user - - SimpleReserverPortlet - Vaadin SimpleReserver - com.vaadin.terminal.gwt.server.ApplicationPortlet - - application - SimpleReserver - - - style - height:400px - - - widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet - - - text/html - view - edit - help - - - SimpleReserver - SimpleReserver - - - - administrator - - - guest - - - power-user - - - user - - FeatureBrowserPortlet Vaadin FeatureBrowser @@ -94,7 +54,7 @@ widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet + com.vaadin.demo.sampler.gwt.SamplerWidgetSet text/html @@ -295,7 +255,7 @@ widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet + com.vaadin.demo.sampler.gwt.SamplerWidgetSet text/html @@ -335,7 +295,7 @@ widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet + com.vaadin.demo.sampler.gwt.SamplerWidgetSet text/html diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 096828c99f..dfdedf5dce 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -129,45 +129,6 @@ - - Reservr - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.demo.reservation.ReservationApplication - - - widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet - - - - - SimpleReserver - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.demo.reservation.simple.SimpleReserver - - - widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet - - - - - CalendarDemo - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.demo.reservation.CalendarDemo - - - widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet - - - CustomLayoutDemo com.vaadin.terminal.gwt.server.ApplicationServlet @@ -231,15 +192,6 @@ - - QueryContainerDemo - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.tests.QueryContainerDemo - - - TreeFilesystemContainer com.vaadin.terminal.gwt.server.ApplicationServlet @@ -391,22 +343,6 @@ /t/* - - Reservr - /Reservr/* - - - - SimpleReserver - /SimpleReserver/* - - - - - CalendarDemo - /CalendarDemo/* - - CustomLayoutDemo /CustomLayoutDemo/* @@ -449,11 +385,6 @@ /UpgradingSample/* - - QueryContainerDemo - /QueryContainerDemo/* - - TreeFilesystemContainer /TreeFilesystemContainer/* diff --git a/build/build.xml b/build/build.xml index dd79f3ff8f..0f57c5e315 100644 --- a/build/build.xml +++ b/build/build.xml @@ -694,37 +694,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Compiled ReservationWidgetSet - - @@ -790,7 +759,6 @@ - diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml index dc18d792fb..7048ffd64e 100644 --- a/build/package/WebContent/WEB-INF/web.xml +++ b/build/package/WebContent/WEB-INF/web.xml @@ -64,48 +64,6 @@ - - - Reservr - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.demo.reservation.ReservationApplication - - - widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet - - - - - - SimpleReserver - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.demo.reservation.simple.SimpleReserver - - - widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet - - - - - - CalendarDemo - com.vaadin.terminal.gwt.server.ApplicationServlet - - application - com.vaadin.demo.reservation.CalendarDemo - - - widgetset - com.vaadin.demo.reservation.gwt.ReservationWidgetSet - - - HelloWorld @@ -184,18 +142,6 @@ VaadinApplicationRunner /run/* - - Reservr - /Reservr/* - - - SimpleReserver - /SimpleReserver/* - - - CalendarDemo - /CalendarDemo/* - FeatureBrowser /FeatureBrowser/* diff --git a/build/package/eclipse-classpath b/build/package/eclipse-classpath index f8420353c8..1f70f30d0e 100644 --- a/build/package/eclipse-classpath +++ b/build/package/eclipse-classpath @@ -5,7 +5,6 @@ - diff --git a/tests/src/com/vaadin/tests/QueryContainerDemo.java b/tests/src/com/vaadin/tests/QueryContainerDemo.java deleted file mode 100644 index abd98016cd..0000000000 --- a/tests/src/com/vaadin/tests/QueryContainerDemo.java +++ /dev/null @@ -1,193 +0,0 @@ -/* -@ITMillApache2LicenseForJavaFiles@ - */ - -package com.vaadin.tests; - -import java.sql.SQLException; - -import com.vaadin.data.util.QueryContainer; -import com.vaadin.demo.util.SampleDatabase; -import com.vaadin.event.Action; -import com.vaadin.ui.Label; -import com.vaadin.ui.Select; -import com.vaadin.ui.Table; -import com.vaadin.ui.Tree; -import com.vaadin.ui.Window; - -/** - * This example shows how Table, Select and Tree UI components can use - * Containers. QueryContainer is used to bind SQL table rows into Vaadin UI - * components. Table has few example actions added. Also embedding XHTML through - * Label components is used. Demonstrates: how to create - * com.vaadin.data.Container and set it as datasource to UI - * components com.vaadin.ui.Component.Tree, how to receive - * ExpandEvent and implement com.vaadin.ui.Tree.ExpandListener, how - * to use com.vaadin.event.Action. - * - * @author IT Mill Ltd. - * @since 4.0.0 - * - */ -public class QueryContainerDemo extends com.vaadin.Application implements - Action.Handler { - - private static final String ACTION_DESCRIPTION = "Try right mouse button to initiate " - + "actions menu.
Note: on Opera you use meta key " - + "and left mouse button."; - - private static final String TABLE_CAPTION = SampleDatabase.ROWCOUNT - + " dynamically loaded rows from example SQL table"; - - // Table component where SQL rows are attached (using QueryContainer) - private final Table table = new Table(); - - private final Label tableLastAction = new Label( - "No action selected for table."); - - // Select component where SQL rows are attached (using QueryContainer) - private final Select select = new Select(); - - // Tree component that uses select as datasource - private final Tree tree = new Tree(); - - private final Label treeLastAction = new Label( - "No action selected for tree."); - - // Database provided with sample data - private SampleDatabase sampleDatabase; - - // Example Actions for table - private final Action ACTION1 = new Action("Upload"); - - private final Action ACTION2 = new Action("Download"); - - private final Action ACTION3 = new Action("Show history"); - - private final Action[] actions = new Action[] { ACTION1, ACTION2, ACTION3 }; - - /** - * Initialize Application. Demo components are added to main window. - */ - @Override - public void init() { - final Window main = new Window("QueryContainer demo"); - setMainWindow(main); - - // Main window contains heading, table, select and tree - main - .addComponent(new Label( - "

QueryContainer demo

" - + "Rows are loaded from the server as they are needed.
" - + "Try scrolling the table to see it in action.
" - + ACTION_DESCRIPTION, Label.CONTENT_XHTML)); - main.addComponent(table); - main.addComponent(tableLastAction); - main.addComponent(new Label("
", Label.CONTENT_XHTML)); - main.addComponent(select); - main.addComponent(new Label("
", Label.CONTENT_XHTML)); - main.addComponent(tree); - main.addComponent(treeLastAction); - - // create demo database - sampleDatabase = new SampleDatabase(); - - // initialize demo components - initTable(); - initSelect(); - initTree(); - } - - /** - * Populates table component with all rows from employee table. - * - */ - private void initTable() { - // init table - table.setCaption(TABLE_CAPTION); - table.setPageLength(10); - table.setSelectable(true); - table.setRowHeaderMode(Table.ROW_HEADER_MODE_INDEX); - table.setColumnCollapsingAllowed(true); - table.setColumnReorderingAllowed(true); - table.setSelectable(true); - // this class handles table actions (see handleActions method below) - table.addActionHandler(this); - table.setDescription(ACTION_DESCRIPTION); - - // populate Vaadin table component with test SQL table rows - try { - final QueryContainer qc = new QueryContainer( - "SELECT * FROM employee", sampleDatabase.getConnection()); - table.setContainerDataSource(qc); - } catch (final SQLException e) { - e.printStackTrace(); - } - // define which columns should be visible on Table component - table.setVisibleColumns(new Object[] { "FIRSTNAME", "LASTNAME", - "TITLE", "UNIT" }); - table.setItemCaptionPropertyId("ID"); - } - - /** - * Populates select component with distinct unit values from employee table. - * - */ - private void initSelect() { - // init select - select.setCaption("All distinct units from employee table."); - select.setItemCaptionPropertyId("UNIT"); - - // populate Vaadin select component with test SQL table rows - try { - final QueryContainer qc = new QueryContainer( - "SELECT DISTINCT UNIT FROM employee", sampleDatabase - .getConnection()); - select.setContainerDataSource(qc); - } catch (final SQLException e) { - e.printStackTrace(); - } - } - - /** - * Populates tree component using select component as data source for root - * nodes, child nodes are queried from database. Implementation is done for - * example purposes only. - * - */ - private void initTree() { - // init tree - tree.setCaption("All distinct units from employee table."); - tree.setItemCaptionPropertyId("UNIT"); - tree.setSelectable(true); - // this class handles tree actions (see handleActions method below) - tree.addActionHandler(this); - tree.setDescription("Try right mouse button to initiate " - + "actions menu. Note: on Opera you use meta key " - + "and left mouse button."); - - // Populate Vaadin Tree using select component as data source - tree.setContainerDataSource(select.getContainerDataSource()); - } - - /** - * Return example actions - */ - public Action[] getActions(Object target, Object sender) { - return actions; - } - - /** - * Executed by right mouse button on table or tree component. - */ - public void handleAction(Action action, Object sender, Object target) { - if (sender == table) { - tableLastAction.setValue("Last action clicked was '" - + action.getCaption() + "' on item " + target); - } else if (sender == tree) { - treeLastAction.setValue("Last action clicked was '" - + action.getCaption() + "' on item " + target); - } - } - -} diff --git a/tests/src/com/vaadin/tests/TestBench.java b/tests/src/com/vaadin/tests/TestBench.java index be3471c02d..1e71c6fa91 100644 --- a/tests/src/com/vaadin/tests/TestBench.java +++ b/tests/src/com/vaadin/tests/TestBench.java @@ -44,9 +44,8 @@ public class TestBench extends com.vaadin.Application implements // Add here packages which are used for finding testable classes String[] testablePackages = { "com.vaadin.tests", "com.vaadin.demo", - "com.vaadin.demo.colorpicker", "com.vaadin.demo.reservation", - "com.vaadin.demo.features", "com.vaadin.tests.tickets", - "com.vaadin.tests.book" }; + "com.vaadin.demo.colorpicker", "com.vaadin.demo.features", + "com.vaadin.tests.tickets", "com.vaadin.tests.book" }; HierarchicalContainer testables = new HierarchicalContainer(); diff --git a/tests/src/com/vaadin/tests/TestComponentsAndLayouts.java b/tests/src/com/vaadin/tests/TestComponentsAndLayouts.java deleted file mode 100644 index ba9fbe86d0..0000000000 --- a/tests/src/com/vaadin/tests/TestComponentsAndLayouts.java +++ /dev/null @@ -1,470 +0,0 @@ -/* -@ITMillApache2LicenseForJavaFiles@ - */ - -package com.vaadin.tests; - -import java.io.File; -import java.sql.SQLException; - -import com.vaadin.Application; -import com.vaadin.data.Container; -import com.vaadin.data.util.FilesystemContainer; -import com.vaadin.data.util.QueryContainer; -import com.vaadin.demo.util.SampleDatabase; -import com.vaadin.demo.util.SampleDirectory; -import com.vaadin.event.Action; -import com.vaadin.terminal.ClassResource; -import com.vaadin.terminal.ErrorMessage; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.UserError; -import com.vaadin.ui.AbstractComponent; -import com.vaadin.ui.Accordion; -import com.vaadin.ui.Button; -import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Component; -import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.DateField; -import com.vaadin.ui.Embedded; -import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.Layout; -import com.vaadin.ui.Link; -import com.vaadin.ui.NativeSelect; -import com.vaadin.ui.OptionGroup; -import com.vaadin.ui.OrderedLayout; -import com.vaadin.ui.Panel; -import com.vaadin.ui.RichTextArea; -import com.vaadin.ui.Select; -import com.vaadin.ui.Slider; -import com.vaadin.ui.SplitPanel; -import com.vaadin.ui.TabSheet; -import com.vaadin.ui.Table; -import com.vaadin.ui.TextField; -import com.vaadin.ui.Tree; -import com.vaadin.ui.TwinColSelect; -import com.vaadin.ui.Upload; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import com.vaadin.ui.Component.Event; -import com.vaadin.ui.Component.Listener; - -/** - * Search for "TWEAK these" keyword and configure Custom/AbstractComponents to - * various states and see how they work inside different Layouts. - * - */ -public class TestComponentsAndLayouts extends Application implements Listener, - Action.Handler { - - // event listener feedback (see console) - Label eventListenerFeedback = new Label( - "See console for event listener log."); - int eventCount = 0; - - Window window; - - // component counter - int count = 0; - - SampleDatabase sampleDatabase; - - // Example Actions for table - private final Action ACTION1 = new Action("Upload"); - private final Action ACTION2 = new Action("Download"); - private final Action ACTION3 = new Action("Show history"); - private final Action[] actions = new Action[] { ACTION1, ACTION2, ACTION3 }; - - @Override - public void init() { - sampleDatabase = new SampleDatabase(); - createNewView(); - } - - public void createNewView() { - final Window main = new Window("Main window"); - setMainWindow(main); - - // By default push all containers inside main window - Layout target = main.getLayout(); - - main - .addComponent(new Label( - "Each Layout and their contained components should " - + "have icon, caption, description, user error defined. " - + "Eeach layout should contain similar components. " - + "All components are in immmediate mode. See source how to tweak this test.")); - main.addComponent(eventListenerFeedback); - - // ////////////////////////////////////////////////////////////////////// - // //// - if (false) { - window = new Window("Components inside Window (TEST: Window)"); - - if (false) { - // push every container and their components inside window - target = window.getLayout(); - } else { - // window is just one container to be tested - populateLayout(window.getLayout()); - } - getMainWindow().addWindow(window); - } - - // ////////////////////////////////////////////////////////////////////// - // //// - if (false) { - target - .addComponent(new Label( - "

Components inside horizontal OrderedLayout

", - Label.CONTENT_XHTML)); - final OrderedLayout ol = new OrderedLayout( - OrderedLayout.ORIENTATION_HORIZONTAL); - populateLayout(ol); - target.addComponent(ol); - } - - // ////////////////////////////////////////////////////////////////////// - // //// - if (false) { - target - .addComponent(new Label( - "


Components inside vertical OrderedLayout

", - Label.CONTENT_XHTML)); - final OrderedLayout ol2 = new OrderedLayout( - OrderedLayout.ORIENTATION_VERTICAL); - populateLayout(ol2); - target.addComponent(ol2); - } - - // ////////////////////////////////////////////////////////////////////// - // //// - if (false) { - target.addComponent(new Label( - "

Components inside TabSheet

", - Label.CONTENT_XHTML)); - final TabSheet tabsheet = new TabSheet(); - final OrderedLayout tab1 = new OrderedLayout(); - tab1.addComponent(new Label("try tab2")); - final OrderedLayout tab2 = new OrderedLayout(); - populateLayout(tab2); - tabsheet.addTab(tab1, "TabSheet tab1", new ClassResource("m.gif", - this)); - tabsheet.addTab(tab2, "TabSheet tab2", new ClassResource("m.gif", - this)); - target.addComponent(tabsheet); - // test(tabsheet); - // test(tab1); - // test(tab2); - // test(expandLayout); - } - - // ////////////////////////////////////////////////////////////////////// - // //// - if (true) { - target.addComponent(new Label( - "

Components inside Accordion

", - Label.CONTENT_XHTML)); - final Accordion accordion = new Accordion(); - accordion.setHeight(500); - final OrderedLayout acc1 = new OrderedLayout(); - acc1.addComponent(new Label("try acc2")); - final OrderedLayout acc2 = new OrderedLayout(); - populateLayout(acc2); - accordion.addTab(acc1, "Accordion acc1", new ClassResource("m.gif", - this)); - accordion.addTab(acc2, "Accordion acc2", new ClassResource("m.gif", - this)); - target.addComponent(accordion); - // test(accordion); - // test(acc1); - // test(acc2); - // test(expandLayout); - } - - // ////////////////////////////////////////////////////////////////////// - // //// - if (false) { - target.addComponent(new Label( - "

Components inside GridLayout

", - Label.CONTENT_XHTML)); - final GridLayout gridLayout = new GridLayout(4, 100); - populateLayout(gridLayout); - target.addComponent(gridLayout); - // test(gridLayout); - } - - // ////////////////////////////////////////////////////////////////////// - // //// - if (false) { - target.addComponent(new Label( - "

Components inside Panel

", - Label.CONTENT_XHTML)); - final Panel panel = new Panel("Panel"); - populateLayout(panel.getLayout()); - target.addComponent(panel); - } - - // ////////////////////////////////////////////////////////////////////// - // //// - if (false) { - target - .addComponent(new Label( - "

Components inside horizontal SplitPanel (splitpanel is under 250px height ExpandLayout)

", - Label.CONTENT_XHTML)); - final VerticalLayout sp2l = new VerticalLayout(); - sp2l.setHeight(250, SplitPanel.UNITS_PIXELS); - final SplitPanel sp2 = new SplitPanel( - SplitPanel.ORIENTATION_HORIZONTAL); - sp2l.addComponent(sp2); - final VerticalLayout sp2first = new VerticalLayout(); - final VerticalLayout sp2second = new VerticalLayout(); - sp2.setFirstComponent(sp2first); - populateLayout(sp2first); - populateLayout(sp2second); - sp2.setSecondComponent(sp2second); - target.addComponent(sp2l); - } - - } - - void populateLayout(Layout layout) { - final Button button = new Button("Button " + count++); - test(layout, button); - - final DateField df = new DateField("DateField " + count++); - test(layout, df); - - final CheckBox cb = new CheckBox("Checkbox " + count++); - test(layout, cb); - - final ClassResource flashResource = new ClassResource( - "vaadin_spin.swf", this); - final Embedded emb = new Embedded("Embedded " + count++, flashResource); - emb.setType(Embedded.TYPE_OBJECT); - emb.setMimeType("application/x-shockwave-flash"); - emb.setWidth("250px"); - emb.setHeight("100px"); - test(layout, emb); - - final Panel panel = new Panel("Panel " + count++); - test(layout, panel); - - final Label label = new Label("Label " + count++); - test(layout, label); - - final Link link = new Link("Link " + count++, new ExternalResource( - "www.vaadin.com")); - test(layout, link); - - final NativeSelect nativeSelect = new NativeSelect("NativeSelect " - + count++); - nativeSelect.setContainerDataSource(getContainer()); - test(layout, nativeSelect); - - final OptionGroup optionGroup = new OptionGroup("OptionGroup " - + count++); - optionGroup.setContainerDataSource(getSmallContainer()); - optionGroup.setItemCaptionPropertyId("UNIT"); - test(layout, optionGroup); - - // final ProgressIndicator pi = new ProgressIndicator(); - // pi.setCaption("ProgressIndicator"); - // test(layout, pi); - - final RichTextArea rta = new RichTextArea(); - test(layout, rta); - - final Select select = new Select("Select " + count++); - select.setContainerDataSource(getSmallContainer()); - select.setItemCaptionPropertyId("UNIT"); - test(layout, select); - - final Slider slider = new Slider("Slider " + count++); - test(layout, slider); - - final Table table = new Table("Table " + count++); - table.setPageLength(10); - table.setSelectable(true); - table.setRowHeaderMode(Table.ROW_HEADER_MODE_INDEX); - table.setColumnCollapsingAllowed(true); - table.setColumnReorderingAllowed(true); - table.setSelectable(true); - table.addActionHandler(this); - table.setContainerDataSource(getContainer()); - table.setVisibleColumns(new Object[] { "FIRSTNAME", "LASTNAME", - "TITLE", "UNIT" }); - table.setItemCaptionPropertyId("ID"); - test(layout, table); - - final TabSheet tabsheet = new TabSheet(); - final VerticalLayout tab1 = new VerticalLayout(); - tab1.addComponent(new Label("tab1 " + count++)); - final VerticalLayout tab2 = new VerticalLayout(); - tab2.addComponent(new Label("tab2 " + count++)); - tabsheet.addTab(tab1, "Default (not configured) TabSheet tab1", - new ClassResource("m.gif", this)); - tabsheet.addTab(tab2, "Configured TabSheet tab2", new ClassResource( - "m.gif", this)); - test(layout, tabsheet); - - final Accordion accordion = new Accordion(); - final VerticalLayout acc1 = new VerticalLayout(); - acc1.addComponent(new Label("acc1 " + count++)); - final VerticalLayout acc2 = new VerticalLayout(); - acc2.addComponent(new Label("acc2 " + count++)); - accordion.addTab(acc1, "Default (not configured) Accordion acc1", - new ClassResource("m.gif", this)); - accordion.addTab(acc2, "Configured Accordion acc2", new ClassResource( - "m.gif", this)); - test(layout, accordion); - - final TextField tf = new TextField("Textfield " + count++); - test(layout, tf); - // do not configure acc1 - // test(acc1); - test(acc2); - - final Tree tree = new Tree("Tree " + count++); - final File sampleDir = SampleDirectory.getDirectory(this); - final FilesystemContainer fsc = new FilesystemContainer(sampleDir, true); - tree.setContainerDataSource(fsc); - test(layout, tree); - - final TwinColSelect twinColSelect = new TwinColSelect("TwinColSelect " - + count++); - twinColSelect.setContainerDataSource(getSmallContainer()); - twinColSelect.setItemCaptionPropertyId("UNIT"); - test(layout, twinColSelect); - - final Upload upload = new Upload("Upload (non-functional)", null); - test(layout, upload); - - // Custom components - layout.addComponent(new Label("Below are few custom components", - Label.CONTENT_XHTML)); - final TestForUpload tfu = new TestForUpload(); - layout.addComponent(tfu); - layout.addComponent(new Label("
----------

", - Label.CONTENT_XHTML)); - test(tfu); - - // DISABLED - // TableSelectTest tst = new TableSelectTest(); - // layout.addComponent(tst); - // test(tst); - // layout.addComponent(new Label("
", Label.CONTENT_XHTML)); - - } - - Container getContainer() { - // populate container with test SQL table rows - try { - return new QueryContainer("SELECT * FROM employee", sampleDatabase - .getConnection()); - } catch (final SQLException e) { - e.printStackTrace(); - } - return null; - } - - Container getSmallContainer() { - // populate container with test SQL table rows - try { - return new QueryContainer( - "SELECT DISTINCT UNIT AS UNIT FROM employee", - sampleDatabase.getConnection()); - } catch (final SQLException e) { - e.printStackTrace(); - } - return null; - } - - // common component configuration - void setComponentProperties(Component c) { - // TWEAK these - // c.setEnabled(false); - // c.setVisible(false); - // c.setStyleName("testStyleName"); - // c.setReadOnly(true); - - // try to add listener - try { - c.addListener(this); - } catch (final Exception e) { - System.err.println("Could not add listener for component " + c - + ", count was " + count); - } - } - - /** - * Stresses component by configuring it - * - * @param c - */ - void test(AbstractComponent c) { - // configure common component properties - // setComponentProperties(c); - - // AbstractComponent specific configuration - final ClassResource res = new ClassResource("m.gif", this); - final ErrorMessage errorMsg = new UserError("User error " + c); - if ((c.getCaption() == null) || (c.getCaption().length() <= 0)) { - c.setCaption("Caption " + c); - } - - // TWEAK these - // c.setComponentError(errorMsg); - // c.setIcon(res); - // c.setImmediate(true); - // c.addStyleName("addedTestStyleName"); - // c.setStyleName("singleTestStyleName"); - // c.setDescription("Description here.."); - } - - void test(CustomComponent c) { - // configure common component properties - setComponentProperties(c); - - // CustomComponent specific configuration - // TWEAK these - // c.setComponentType("foo"); - c.addStyleName("addedTestStyleName"); - } - - /** - * Stresses component by configuring it in a given layout - * - * @param c - */ - void test(Layout layout, AbstractComponent c) { - test(c); - layout.addComponent(c); - // add separator - if (!(layout instanceof GridLayout)) { - layout.addComponent(new Label("
NEXT

", - Label.CONTENT_XHTML)); - } - } - - public void componentEvent(Event event) { - eventCount++; - final String feedback = "eventCount=" + eventCount + ", class=" - + event.getClass() + ", source=" + event.getSource() - + ", toString()=" + event.toString(); - System.out.println("eventListenerFeedback: " + feedback); - eventListenerFeedback.setValue("Events: " + eventCount); - } - - // For sample actions - public Action[] getActions(Object target, Object sender) { - return actions; - } - - // For sample actions - public void handleAction(Action action, Object sender, Object target) { - System.out.println("ACTION: " + action.getCaption() + " on item " - + target); - } - -} diff --git a/tests/src/com/vaadin/tests/TestIFrames.java b/tests/src/com/vaadin/tests/TestIFrames.java index 6719820c44..b955a023f7 100644 --- a/tests/src/com/vaadin/tests/TestIFrames.java +++ b/tests/src/com/vaadin/tests/TestIFrames.java @@ -19,13 +19,11 @@ public class TestIFrames extends CustomComponent { public void createNewView() { main.removeAllComponents(); - main.addComponent(createEmbedded("../Reservr/")); + main.addComponent(createEmbedded("../sampler/")); main.addComponent(createEmbedded("../colorpicker")); // main.addComponent(createEmbedded("../TestForNativeWindowing")); - main - .addComponent(createEmbedded("http://toolkit.itmill.com/demo/FeaturesApplication")); - main - .addComponent(createEmbedded("http://toolkit.itmill.com/demo/TableDemo")); + main.addComponent(createEmbedded("http://demo.vaadin.com/timeline")); + main.addComponent(createEmbedded("http://demo.vaadin.com/colorpicker")); } private Label createEmbedded(String URL) { -- 2.39.5