diff --git a/.classpath b/.classpath index 94b3dde..fa68597 100644 --- a/.classpath +++ b/.classpath @@ -10,13 +10,10 @@ + - - - - diff --git a/.project b/.project index 6f15e5d..7d4a4b1 100644 --- a/.project +++ b/.project @@ -12,6 +12,8 @@ + org.eclipse.jem.workbench.JavaEMFNature org.eclipse.jdt.core.javanature + org.eclipse.jem.beaninfo.BeanInfoNature diff --git a/doc/README.txt b/doc/README.txt index 9b0610e..e4d4e34 100644 --- a/doc/README.txt +++ b/doc/README.txt @@ -1,4 +1,9 @@ + +To build/run the swt stuyff you need the Visual Editor plugin installed from the calisto site. + +Swing will run by default. + ---- Object tree: diff --git a/src/com/idcanet/vasc/impl/swing/SwingVascViewRenderer.java b/src/com/idcanet/vasc/impl/swing/SwingVascViewRenderer.java index 402717b..0ec6236 100644 --- a/src/com/idcanet/vasc/impl/swing/SwingVascViewRenderer.java +++ b/src/com/idcanet/vasc/impl/swing/SwingVascViewRenderer.java @@ -27,6 +27,7 @@ package com.idcanet.vasc.impl.swing; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Component; import java.awt.Container; import java.awt.Font; @@ -374,19 +375,24 @@ public class SwingVascViewRenderer implements VascViewRenderer { JPanel topPanel = new JPanel(); topPanel.setLayout(new BorderLayout()); + //topPanel.setBackground(Color.PINK); JPanel n = new JPanel(); topPanel.add(n,BorderLayout.NORTH); renderHeader(n); JPanel c = new JPanel(); + c.setLayout(new BorderLayout()); topPanel.add(c,BorderLayout.CENTER); renderBody(c); JPanel f = new JPanel(); + //f.setBackground(Color.BLUE); topPanel.add(f,BorderLayout.SOUTH); renderFooter(f); + //parent.setBackground(Color.CYAN); + parent.setLayout(new BorderLayout()); parent.add(topPanel); } diff --git a/tests/com/idcanet/vasc/SWTTest.java b/tests/com/idcanet/vasc/SWTTest.java index 07f165d..426df33 100644 --- a/tests/com/idcanet/vasc/SWTTest.java +++ b/tests/com/idcanet/vasc/SWTTest.java @@ -32,26 +32,7 @@ import java.util.logging.LogManager; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import com.idcanet.vasc.core.VascTable; -import com.idcanet.vasc.core.column.VascAnnotationTableColumn; -import com.idcanet.vasc.core.column.VascTableColumn; -import com.idcanet.vasc.impl.BeanVascRecordCreator; -import com.idcanet.vasc.impl.DefaultVascTableController; -import com.idcanet.vasc.impl.DefaultVascTextValue; -import com.idcanet.vasc.impl.actions.AddRowAction; -import com.idcanet.vasc.impl.actions.CSVExportGlobalAction; -import com.idcanet.vasc.impl.actions.DeleteRowAction; -import com.idcanet.vasc.impl.actions.EditRowAction; -import com.idcanet.vasc.impl.actions.RefreshDataGlobalAction; -import com.idcanet.vasc.impl.actions.XMLExportGlobalAction; -import com.idcanet.vasc.impl.column.BeanPropertyVascColumnValue; -import com.idcanet.vasc.impl.column.DefaultVascColumnEditor; -import com.idcanet.vasc.impl.column.DefaultVascColumnRenderer; import com.idcanet.vasc.impl.swt.SwtVascViewRenderer; -import com.idcanet.vasc.models.TestModel; -import com.idcanet.xtes.core.TemplateStore; -import com.idcanet.xtes.core.XTESParser; -import com.idcanet.xtes.xpql.query.Query; import junit.framework.TestCase; @@ -80,11 +61,11 @@ public class SWTTest extends TestCase { // get GUI Display display = new Display(); Shell shell = new Shell(display); - shell.setText("Hello, world!"); + shell.setText("Vasc Test - Swt"); // define redering and render SwtVascViewRenderer render = new SwtVascViewRenderer(shell); - render.renderView(getVascTable()); + render.renderView(TestTable.getVascTable()); // view shell.open(); @@ -99,53 +80,5 @@ public class SWTTest extends TestCase { } - static public VascTable getVascTable() throws Exception { - - // define query - XTESParser parser = new XTESParser(); - parser.parseResource("/META-INF/xtes/tests.xml"); - TemplateStore store = XTESParser.getTemplateStore(parser.getElementContext()); - Query query = store.getQuery("testUsers2"); - - // config table - VascTable table = new VascTable(); - table.setName("Testje"); - table.setHeaderName("TableHeader"); - table.setToolTip("tooltip text"); - table.setDescription("en de omscheiving"); - table.setHelpId("someKey"); - table.setVascTableController(new DefaultVascTableController()); - table.setVascDataSource(new TestModelVascDataSource()); - table.setVascTextValue(new DefaultVascTextValue()); - table.setQuery(query); - table.setVascRecordCreator(new BeanVascRecordCreator(TestModel.class)); - table.addRowActions(new AddRowAction()); - table.addRowActions(new EditRowAction()); - table.addRowActions(new DeleteRowAction()); - - table.addGlobalActions(new XMLExportGlobalAction()); - table.addGlobalActions(new CSVExportGlobalAction()); - //table.addGlobalActions(new HTMLExportGlobalAction()); - table.addGlobalActions(new RefreshDataGlobalAction()); - - //table.addUserOptions(userOption); - - //table.addColumnActions(new GraphColumnAction()); - - VascTableColumn column = new VascTableColumn(); - column.setName("test"); - column.setToolTip("tooltip"); - column.setDefaultValue("DEFFFFFF"); - column.setHelpId("helpColumnKey"); - column.setImage("/META-INF/images/silk/png/tick.png"); - column.setWidth(400); - column.setVascColumnEditor(new DefaultVascColumnEditor()); - column.setVascColumnRenderer(new DefaultVascColumnRenderer()); - column.setVascColumnValue(new BeanPropertyVascColumnValue("name")); - table.addTableColumns(column); - - column = new VascAnnotationTableColumn("description"); - table.addTableColumns(column); - return table; - } + } \ No newline at end of file diff --git a/tests/com/idcanet/vasc/SwingTest.java b/tests/com/idcanet/vasc/SwingTest.java index cdcf1b9..28b8182 100644 --- a/tests/com/idcanet/vasc/SwingTest.java +++ b/tests/com/idcanet/vasc/SwingTest.java @@ -59,25 +59,21 @@ public class SwingTest extends TestCase { // get GUI JFrame frame = new JFrame(); - frame.setTitle("Swing Vasc Test"); + frame.setTitle("Vasc Test - Swing"); frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - - frame.pack(); - frame.setBounds(150,150,900,700); + frame.setLocationRelativeTo(null); - - JPanel panel = new JPanel(); - frame.add(panel); // define redering + JPanel panel = new JPanel(); SwingVascViewRenderer render = new SwingVascViewRenderer(panel); + frame.add(panel); // render - render.renderView(SWTTest.getVascTable()); + render.renderView(TestTable.getVascTable()); // view - frame.getContentPane().validate(); + frame.pack(); frame.setVisible(true); - frame.repaint(); while (frame.isVisible()) { Thread.sleep(1000); diff --git a/tests/com/idcanet/vasc/TestTable.java b/tests/com/idcanet/vasc/TestTable.java new file mode 100644 index 0000000..5ce3b1d --- /dev/null +++ b/tests/com/idcanet/vasc/TestTable.java @@ -0,0 +1,107 @@ +/* + * Copyright 2004-2006 IDCA. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the + * following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and + * the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions + * and the following disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY IDCA AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL IDCA OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the authors and + * should not be interpreted as representing official policies, either expressed or implied, of IDCA. + */ + +package com.idcanet.vasc; + +import com.idcanet.vasc.core.VascTable; +import com.idcanet.vasc.core.column.VascAnnotationTableColumn; +import com.idcanet.vasc.core.column.VascTableColumn; +import com.idcanet.vasc.impl.BeanVascRecordCreator; +import com.idcanet.vasc.impl.DefaultVascTableController; +import com.idcanet.vasc.impl.DefaultVascTextValue; +import com.idcanet.vasc.impl.actions.AddRowAction; +import com.idcanet.vasc.impl.actions.CSVExportGlobalAction; +import com.idcanet.vasc.impl.actions.DeleteRowAction; +import com.idcanet.vasc.impl.actions.EditRowAction; +import com.idcanet.vasc.impl.actions.RefreshDataGlobalAction; +import com.idcanet.vasc.impl.actions.XMLExportGlobalAction; +import com.idcanet.vasc.impl.column.BeanPropertyVascColumnValue; +import com.idcanet.vasc.impl.column.DefaultVascColumnEditor; +import com.idcanet.vasc.impl.column.DefaultVascColumnRenderer; +import com.idcanet.vasc.models.TestModel; +import com.idcanet.xtes.core.TemplateStore; +import com.idcanet.xtes.core.XTESParser; +import com.idcanet.xtes.xpql.query.Query; + + +/** + * + * @author Willem Cazander + * @version 1.0 Aug 2, 2007 + */ +public class TestTable { + + static public VascTable getVascTable() throws Exception { + + // define query + XTESParser parser = new XTESParser(); + parser.parseResource("/META-INF/xtes/tests.xml"); + TemplateStore store = XTESParser.getTemplateStore(parser.getElementContext()); + Query query = store.getQuery("testUsers2"); + + // config table + VascTable table = new VascTable(); + table.setName("Testje"); + table.setHeaderName("TableHeader"); + table.setToolTip("tooltip text"); + table.setDescription("en de omscheiving"); + table.setHelpId("someKey"); + table.setVascTableController(new DefaultVascTableController()); + table.setVascDataSource(new TestModelVascDataSource()); + table.setVascTextValue(new DefaultVascTextValue()); + table.setQuery(query); + table.setVascRecordCreator(new BeanVascRecordCreator(TestModel.class)); + table.addRowActions(new AddRowAction()); + table.addRowActions(new EditRowAction()); + table.addRowActions(new DeleteRowAction()); + + table.addGlobalActions(new XMLExportGlobalAction()); + table.addGlobalActions(new CSVExportGlobalAction()); + //table.addGlobalActions(new HTMLExportGlobalAction()); + table.addGlobalActions(new RefreshDataGlobalAction()); + + //table.addUserOptions(userOption); + + //table.addColumnActions(new GraphColumnAction()); + + VascTableColumn column = new VascTableColumn(); + column.setName("test"); + column.setToolTip("tooltip"); + column.setDefaultValue("DEFFFFFF"); + column.setHelpId("helpColumnKey"); + column.setImage("/META-INF/images/silk/png/tick.png"); + column.setWidth(400); + column.setVascColumnEditor(new DefaultVascColumnEditor()); + column.setVascColumnRenderer(new DefaultVascColumnRenderer()); + column.setVascColumnValue(new BeanPropertyVascColumnValue("name")); + table.addTableColumns(column); + + column = new VascAnnotationTableColumn("description"); + table.addTableColumns(column); + return table; + } + +} \ No newline at end of file