Changeset 724

Show
Ignore:
Timestamp:
06/19/07 15:18:52 (2 years ago)
Author:
nozawa
Message:

DataSource? is set by using the interface.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/plugins/org.jalcedo.client.examples/src/org/jalcedo/client/examples/controllers/ItemApplyAction.java

    r723 r724  
    1313    String idPropertyname = targetBean.getIdField().getTypeName(); 
    1414     
    15     String dataSourceName = dataSource.getClassName(); 
    16     String dataSourceFQDN = dataSource.getPackageName() + "." + dataSourceName; 
    1715%>*//*-*/ 
    1816 
    …… 
    2119import org.jalcedo.client.ds.DataSource; 
    2220import /*=<%=beanFQDN%>*/org.jalcedo.client.examples.models.Item/*-*/; 
    23 //import /*=<%=dataSourceFQDN%>*/org.jalcedo.client.examples.models.ItemDataSource/*-*/; 
    2421 
    2522import org.eclipse.jface.viewers.ISelection; 

  • trunk/plugins/org.jalcedo.client.examples/src/org/jalcedo/client/examples/controllers/ItemRemoveAction.java

    r723 r724  
    1010    String beanFQDN = targetBean.getPackageName() + "." + beanName; 
    1111    String beanInstanceName = beanName.toLowerCase(); 
     12    String idPropertyname = targetBean.getIdField().getTypeName(); 
    1213     
    13     String dataSourceName = dataSource.getClassName(); 
    14     String dataSourceFQDN = dataSource.getPackageName() + "." + dataSourceName; 
    1514%>*//*-*/ 
    1615 
    …… 
    1918import org.jalcedo.client.ds.DataSource; 
    2019import /*=<%=beanFQDN%>*/org.jalcedo.client.examples.models.Item/*-*/; 
    21 //import /*=<%=dataSourceFQDN%>*/org.jalcedo.client.examples.models.ItemDataSource/*-*/; 
    2220 
    2321import org.eclipse.jface.viewers.ISelection; 

  • trunk/plugins/org.jalcedo.generator.client.beans/templates/ApplyActionGenerator.jet

    r710 r724  
    1111    String beanInstanceName = beanName.toLowerCase(); 
    1212    String idGetterName = targetBean.getIdField().getGetterName(); 
     13    String idPropertyname = targetBean.getIdField().getTypeName(); 
    1314     
    14     String dataSourceName = dataSource.getClassName(); 
    15     String dataSourceFQDN = dataSource.getPackageName() + "." + dataSourceName; 
    1615%> 
    1716 
    1817package <%=applyActionPackageName%>; 
    1918 
     19import org.jalcedo.client.ds.DataSource; 
    2020import <%=beanFQDN%>; 
    21 import <%=dataSourceFQDN%>; 
    2221 
    2322import org.eclipse.jface.viewers.ISelection; 
    …… 
    3029public class <%=applyActionName%> implements SelectionListener{ 
    3130 
    32     private <%=dataSourceName%> dataSource; 
     31    private DataSource<<%=idPropertyname%>, <%=beanName%>> dataSource; 
    3332    private ISelectionProvider selectionProvider; 
    3433 
    …… 
    4140    } 
    4241 
    43     public <%=dataSourceName%> getDataSource() { 
     42    public DataSource<<%=idPropertyname%>, <%=beanName%>> getDataSource() { 
    4443        return dataSource; 
    4544    } 
    4645 
    47     public void setDataSource(<%=dataSourceName%> dataSource) { 
     46    public void setDataSource(DataSource<<%=idPropertyname%>, <%=beanName%>> dataSource) { 
    4847        this.dataSource = dataSource; 
    4948    } 

  • trunk/plugins/org.jalcedo.generator.client.beans/templates/RemoveActionGenerator.jet

    r710 r724  
    1010    String beanFQDN = targetBean.getPackageName() + "." + beanName; 
    1111    String beanInstanceName = beanName.toLowerCase(); 
     12    String idPropertyname = targetBean.getIdField().getTypeName(); 
    1213     
    13     String dataSourceName = dataSource.getClassName(); 
    14     String dataSourceFQDN = dataSource.getPackageName() + "." + dataSourceName; 
    1514%> 
    1615 
    1716package <%=removeActionPackageName%>; 
    1817 
     18import org.jalcedo.client.ds.DataSource; 
    1919import <%=beanFQDN%>; 
    20 import <%=dataSourceFQDN%>; 
    2120 
    2221import org.eclipse.jface.viewers.ISelection; 
    …… 
    2928public class <%=removeActionName%> implements SelectionListener { 
    3029 
    31     private <%=dataSourceName%> dataSource; 
     30    private DataSource<<%=idPropertyname%>, <%=beanName%>> dataSource; 
    3231    private ISelectionProvider selectionProvider; 
    3332 
    …… 
    4039    } 
    4140 
    42     public  <%=dataSourceName%> getDataSource() { 
     41    public  DataSource<<%=idPropertyname%>, <%=beanName%>> getDataSource() { 
    4342        return dataSource; 
    4443    } 
    4544 
    46     public void setDataSource( <%=dataSourceName%> dataSource) { 
     45    public void setDataSource( DataSource<<%=idPropertyname%>, <%=beanName%>> dataSource) { 
    4746        this.dataSource = dataSource; 
    4847    }