[svn r297] some hack work to enable some features and removed all compiler warnings
This commit is contained in:
parent
1e74f3c039
commit
6a2813f43d
20 changed files with 829 additions and 57 deletions
27
tests/META-INF/vasc-lang.eld
Normal file
27
tests/META-INF/vasc-lang.eld
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<eld xmlns:eld="http://x4o.idcanet.com/eld/eld-lang.eld">
|
||||
|
||||
<eld:elementRefectionBindingHandler parentClass="com.idcanet.x4o.obj.TestObjectParent" childClass="com.idcanet.x4o.obj.TestObjectChild" method="addTestObjectChild"/>
|
||||
<eld:elementRefectionBindingHandler parentClass="javax.swing.JComponent" childClass="javax.swing.JComponent" method="add"/>
|
||||
|
||||
<eld:elementClass tag="testObjectParent" objectClassName="com.idcanet.x4o.obj.TestObjectParent"/>
|
||||
<eld:elementClass tag="testObjectChild" objectClassName="com.idcanet.x4o.obj.TestObjectChild"/>
|
||||
<eld:elementClass tag="testBeanObjectChild" objectClassName="com.idcanet.x4o.obj.TestObjectChild" parentNamespace="http://iets.idcanet.com/eld/iets.eld" elementTag="superObject"/>
|
||||
<eld:elementClass tag="testBeanObjectChild" objectClassName="com.idcanet.x4o.obj.TestObjectChild">
|
||||
<eld:elementClassParentElementClass namespace="http://iets.idcanet.com/eld/iets.eld" elementTag="superObject"/>
|
||||
<eld:elementClassParentElementClass namespace="http://iets.idcanet.com/eld/iets.eld" elementTag="superObject2"/>
|
||||
</eld:elementClass>
|
||||
|
||||
<eld:elementClass tag="JFrame" objectClassName="javax.swing.JFrame">
|
||||
<eld:elementClassParameterConverter parameterName="bounds" bean.class="com.idcanet.x4o.x4o.BoundsConverter"/>
|
||||
</eld:elementClass>
|
||||
<eld:elementClass tag="JFrameContentPane" elementClassName="com.idcanet.x4o.x4o.ContentPaneElement"/>
|
||||
|
||||
<eld:elementClass tag="JLabel" objectClassName="javax.swing.JLabel"/>
|
||||
<eld:elementClass tag="JPanel" objectClassName="javax.swing.JPanel"/>
|
||||
<eld:elementClass tag="JTextField" objectClassName="javax.swing.JTextField"/>
|
||||
<eld:elementClass tag="JTextArea" objectClassName="javax.swing.JTextArea"/>
|
||||
|
||||
<eld:elementClass tag="JScrollPane" objectClassName="javax.swing.JScrollPane"/>
|
||||
|
||||
</eld>
|
||||
8
tests/META-INF/vasc-namespaces.xml
Normal file
8
tests/META-INF/vasc-namespaces.xml
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||
<properties>
|
||||
<comment>
|
||||
Vasc namespace for x4o vasc state/table/column language
|
||||
</comment>
|
||||
<entry key="eld.http://vasc.idcanet.com/eld/vasc-lang.eld">META-INF/vasc-lang.eld</entry>
|
||||
</properties>
|
||||
|
|
@ -31,11 +31,11 @@ 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.ui.VascList;
|
||||
import com.idcanet.vasc.core.ui.VascTextField;
|
||||
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;
|
||||
|
|
@ -44,9 +44,6 @@ 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.models.TestModel;
|
||||
import com.idcanet.xtes.core.TemplateStore;
|
||||
import com.idcanet.xtes.core.XTESParser;
|
||||
import com.idcanet.xtes.xpql.query.Query;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -122,9 +119,16 @@ public class TestTable {
|
|||
VascList list = new VascList();
|
||||
list.setVascSelectItemModel(data);
|
||||
column.setVascUIComponent(list);
|
||||
|
||||
|
||||
table.addTableColumns(column);
|
||||
|
||||
|
||||
column = new VascAnnotationTableColumn("hexColor");
|
||||
column.setDefaultValue("#FF3355");
|
||||
VascColorChooser ui = new VascColorChooser();
|
||||
ui.setHexSwingEncoding(true);
|
||||
column.setVascUIComponent(ui);
|
||||
table.addTableColumns(column);
|
||||
|
||||
return table;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ public class TestModel {
|
|||
private Boolean active = null;
|
||||
private Date date = null;
|
||||
private TestModel testModel = null;
|
||||
private String hexColor = null;
|
||||
|
||||
/**
|
||||
* @return the date
|
||||
|
|
@ -146,7 +147,18 @@ public class TestModel {
|
|||
public void setActive(Boolean active) {
|
||||
this.active = active;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @return the hexColor
|
||||
*/
|
||||
public String getHexColor() {
|
||||
return hexColor;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param hexColor the hexColor to set
|
||||
*/
|
||||
public void setHexColor(String hexColor) {
|
||||
this.hexColor = hexColor;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue