[svn r340] WIP commit
This commit is contained in:
willemc
parent
a40c22f13a
commit
435a26f4d6
108 changed files with 8325 additions and 680 deletions
|
|
@ -32,8 +32,7 @@ import java.util.logging.LogManager;
|
|||
import javax.swing.JFrame;
|
||||
import javax.swing.JPanel;
|
||||
|
||||
import com.idcanet.vasc.core.VascTable;
|
||||
import com.idcanet.vasc.impl.swing.SwingVascViewRenderer;
|
||||
import com.idcanet.vasc.core.VascEntry;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
|
|
@ -55,6 +54,15 @@ public class SwingTest extends TestCase {
|
|||
public void tearDown() throws Exception {
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
- default view field
|
||||
- Admin fields and order
|
||||
- Admin field groups -> 'collapse
|
||||
- List filters auto by type
|
||||
- search fields
|
||||
|
||||
*/
|
||||
public void testAll() throws Exception {
|
||||
JFrame.setDefaultLookAndFeelDecorated(false);
|
||||
|
||||
|
|
@ -75,6 +83,8 @@ public class SwingTest extends TestCase {
|
|||
// render
|
||||
render.initTable(table);
|
||||
|
||||
//table.getTableColumns().get(0).set
|
||||
|
||||
//render.renderEdit(table.getTableData().get(0));
|
||||
render.renderView();
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,11 @@ import java.util.ArrayList;
|
|||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import com.idcanet.vasc.core.AbstractVascDataSource;
|
||||
import com.idcanet.vasc.core.AbstractVascBackend;
|
||||
import com.idcanet.vasc.core.VascEntry;
|
||||
import com.idcanet.vasc.core.VascEntryField;
|
||||
import com.idcanet.vasc.core.entry.VascEntryFieldValue;
|
||||
import com.idcanet.vasc.core.entry.VascEntryRecordCreator;
|
||||
import com.idcanet.vasc.core.ui.VascSelectItem;
|
||||
import com.idcanet.vasc.core.ui.VascSelectItemModel;
|
||||
import com.idcanet.vasc.models.TestModel;
|
||||
|
|
@ -40,7 +44,7 @@ import com.idcanet.vasc.models.TestModel;
|
|||
* @author Willem Cazander
|
||||
* @version 1.0 Mar 21, 2007
|
||||
*/
|
||||
public class TestModelVascDataSource extends AbstractVascDataSource implements VascSelectItemModel {
|
||||
public class TestModelVascDataSource extends AbstractVascBackend implements VascSelectItemModel {
|
||||
|
||||
private List<Object> testModels = null;
|
||||
|
||||
|
|
@ -93,4 +97,12 @@ public class TestModelVascDataSource extends AbstractVascDataSource implements V
|
|||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
public VascEntryFieldValue provideVascEntryFieldValue(VascEntryField field) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public VascEntryRecordCreator provideVascEntryRecordCreator(VascEntry vascEntry) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -28,13 +28,11 @@ package com.idcanet.vasc;
|
|||
|
||||
import java.util.Date;
|
||||
|
||||
import com.idcanet.vasc.core.VascTable;
|
||||
import com.idcanet.vasc.core.column.VascAnnotationTableColumn;
|
||||
import com.idcanet.vasc.core.column.VascTableColumn;
|
||||
import com.idcanet.vasc.core.ui.VascColorChooser;
|
||||
import com.idcanet.vasc.core.VascEntry;
|
||||
import com.idcanet.vasc.core.VascEntryField;
|
||||
import com.idcanet.vasc.core.ui.VascList;
|
||||
import com.idcanet.vasc.core.ui.VascTextField;
|
||||
import com.idcanet.vasc.impl.BeanVascRecordCreator;
|
||||
import com.idcanet.vasc.impl.DefaultVascEntry;
|
||||
import com.idcanet.vasc.impl.DefaultVascEntryField;
|
||||
import com.idcanet.vasc.impl.DefaultVascTableController;
|
||||
import com.idcanet.vasc.impl.actions.AddRowAction;
|
||||
import com.idcanet.vasc.impl.actions.CSVExportGlobalAction;
|
||||
|
|
@ -42,7 +40,8 @@ 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.entry.BeanVascEntryRecordCreator;
|
||||
import com.idcanet.vasc.impl.entry.BeanPropertyVascEntryFieldValue;
|
||||
import com.idcanet.vasc.models.TestModel;
|
||||
|
||||
|
||||
|
|
@ -53,7 +52,7 @@ import com.idcanet.vasc.models.TestModel;
|
|||
*/
|
||||
public class TestTable {
|
||||
|
||||
static public VascTable getVascTable() throws Exception {
|
||||
static public VascEntry getVascTable() throws Exception {
|
||||
|
||||
// define query
|
||||
/*
|
||||
|
|
@ -67,69 +66,70 @@ public class TestTable {
|
|||
TestModelVascDataSource data = new TestModelVascDataSource();
|
||||
|
||||
// config table
|
||||
VascTable table = new VascTable();
|
||||
table.setName("Testje");
|
||||
table.setHeaderName("Test Table enzo");
|
||||
table.setHeaderToolTip("Met een hele coole tooltip");
|
||||
table.setHeaderImage("/resources/images/gabelfresser.gif");
|
||||
table.setHelpId("someKey");
|
||||
table.setVascTableController(new DefaultVascTableController());
|
||||
table.setVascDataSource(data);
|
||||
VascEntry entry = new DefaultVascEntry();
|
||||
entry.setName("Testje");
|
||||
entry.setHeaderName("Test Table enzo");
|
||||
entry.setHeaderDescription("Met een hele coole tooltip");
|
||||
entry.setHeaderImage("/resources/images/gabelfresser.gif");
|
||||
entry.setHelpId("someKey");
|
||||
//entry.setVascTableController(new DefaultVascTableController());
|
||||
entry.setVascBackend(data);
|
||||
|
||||
//table.setVascTextValue(new DefaultVascTextValue());
|
||||
table.setVascTextValue(new VascI18nTextValue());
|
||||
table.setVascRecordCreator(new BeanVascRecordCreator(TestModel.class));
|
||||
table.addRowActions(new AddRowAction());
|
||||
table.addRowActions(new EditRowAction());
|
||||
table.addRowActions(new DeleteRowAction());
|
||||
entry.setVascEntryResourceResolver(new VascI18nTextValue());
|
||||
|
||||
// entry.setVascEntryRecordCreator(new BeanVascEntryRecordCreator(TestModel.class));
|
||||
entry.addRowAction(new AddRowAction());
|
||||
entry.addRowAction(new EditRowAction());
|
||||
entry.addRowAction(new DeleteRowAction());
|
||||
|
||||
table.addGlobalActions(new XMLExportGlobalAction());
|
||||
table.addGlobalActions(new CSVExportGlobalAction());
|
||||
entry.addGlobalAction(new XMLExportGlobalAction());
|
||||
entry.addGlobalAction(new CSVExportGlobalAction());
|
||||
//table.addGlobalActions(new HTMLExportGlobalAction());
|
||||
table.addGlobalActions(new RefreshDataGlobalAction());
|
||||
entry.addGlobalAction(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.setVascUIComponent(new VascTextField());
|
||||
// column.setVascColumnRenderer(new DefaultVascColumnRenderer());
|
||||
column.setVascColumnValue(new BeanPropertyVascColumnValue("name"));
|
||||
table.addTableColumns(column);
|
||||
VascEntryField field = new DefaultVascEntryField();
|
||||
field.setName("test");
|
||||
field.setDescription("tooltip");
|
||||
field.setDefaultValue("DEFFFFFF");
|
||||
field.setHelpId("helpColumnKey");
|
||||
field.setImage("/META-INF/images/silk/png/tick.png");
|
||||
field.setVascEntryFieldType(vascEntryFieldType)
|
||||
field.setVascEntryFieldValue(new BeanPropertyVascEntryFieldValue("name"));
|
||||
entry.addVascEntryField(field);
|
||||
|
||||
column = new VascAnnotationTableColumn("description");
|
||||
table.addTableColumns(column);
|
||||
/*
|
||||
field = new VascAnnotationTableColumn("description");
|
||||
entry.addVascField(field);
|
||||
|
||||
column = new VascAnnotationTableColumn("active");
|
||||
column.setDefaultValue(true);
|
||||
table.addTableColumns(column);
|
||||
field = new VascAnnotationTableColumn("active");
|
||||
field.setDefaultValue(true);
|
||||
entry.addVascField(field);
|
||||
|
||||
column = new VascAnnotationTableColumn("date");
|
||||
column.setDefaultValue(new Date());
|
||||
table.addTableColumns(column);
|
||||
field = new VascAnnotationTableColumn("date");
|
||||
field.setDefaultValue(new Date());
|
||||
entry.addVascField(field);
|
||||
|
||||
column = new VascAnnotationTableColumn("testModel");
|
||||
field = new VascAnnotationTableColumn("testModel");
|
||||
VascList list = new VascList();
|
||||
list.setVascSelectItemModel(data);
|
||||
column.setVascUIComponent(list);
|
||||
table.addTableColumns(column);
|
||||
field.setVascUIComponent(list);
|
||||
entry.addVascField(field);
|
||||
|
||||
|
||||
column = new VascAnnotationTableColumn("hexColor");
|
||||
column.setDefaultValue("#FF3355");
|
||||
VascColorChooser ui = new VascColorChooser();
|
||||
ui.setHexSwingEncoding(true);
|
||||
column.setVascUIComponent(ui);
|
||||
table.addTableColumns(column);
|
||||
field = new VascAnnotationTableColumn("hexColor");
|
||||
field.setDefaultValue("#FF3355");
|
||||
//VascColorChooser ui = new VascColorChooser();
|
||||
//ui.setHexSwingEncoding(true);
|
||||
//field.setVascUIComponent(ui);
|
||||
entry.addVascField(field);
|
||||
*/
|
||||
|
||||
return table;
|
||||
return entry;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -31,14 +31,15 @@ import java.util.MissingResourceException;
|
|||
import java.util.ResourceBundle;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.idcanet.vasc.core.VascTextValue;
|
||||
import com.idcanet.vasc.core.entry.VascEntryResourceResolver;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Willem Cazander
|
||||
* @version 1.0 Aug 2, 2007
|
||||
*/
|
||||
public class VascI18nTextValue implements VascTextValue {
|
||||
public class VascI18nTextValue implements VascEntryResourceResolver {
|
||||
|
||||
|
||||
private String getKeyMapping(String key) {
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ import java.util.Date;
|
|||
|
||||
import org.hibernate.validator.NotNull;
|
||||
import org.hibernate.validator.Max;
|
||||
import org.w3c.dom.Node;
|
||||
|
||||
import com.idcanet.vasc.annotations.VascColumnWidth;
|
||||
import com.idcanet.vasc.annotations.VascDefaultValue;
|
||||
|
|
@ -39,6 +40,9 @@ import com.idcanet.vasc.annotations.VascImage;
|
|||
import com.idcanet.vasc.annotations.VascModelReference;
|
||||
import com.idcanet.vasc.annotations.VascName;
|
||||
import com.idcanet.vasc.annotations.VascToolTip;
|
||||
import com.idcanet.vasc.validator.VascDateFuture;
|
||||
import com.idcanet.vasc.validator.VascObjectNotNull;
|
||||
import com.idcanet.vasc.validator.VascStringLength;
|
||||
|
||||
/**
|
||||
* TestModel
|
||||
|
|
@ -57,10 +61,12 @@ public class TestModel {
|
|||
private Date date = null;
|
||||
private TestModel testModel = null;
|
||||
private String hexColor = null;
|
||||
private Node nonEditorField = null;
|
||||
|
||||
/**
|
||||
* @return the date
|
||||
*/
|
||||
@VascDateFuture
|
||||
public Date getDate() {
|
||||
return date;
|
||||
}
|
||||
|
|
@ -83,6 +89,8 @@ public class TestModel {
|
|||
@VascImage(image="/resources/images/gabelfresser.gif")
|
||||
@NotNull
|
||||
@Max(value=10)
|
||||
@VascObjectNotNull
|
||||
@VascStringLength(max=10)
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
|
@ -125,7 +133,7 @@ public class TestModel {
|
|||
@VascImage(image="/resources/images/gabelfresser.gif")
|
||||
@VascModelReference
|
||||
@NotNull
|
||||
@Max(value=10)
|
||||
@VascObjectNotNull
|
||||
public TestModel getTestModel() {
|
||||
return testModel;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue