Changeset 756

Show
Ignore:
Timestamp:
06/26/07 15:07:24 (2 years ago)
Author:
koshi
Message:

remove ComponentsFactory? (persistence-unitをDataSource?で取得)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/plugins/org.jalcedo.generator.client.jpa/src/org/jalcedo/generator/client/jpa/JpaSourceGenerator.java

    r728 r756  
    1414import org.eclipse.core.runtime.IProgressMonitor; 
    1515import org.jalcedo.generator.client.beans.SourceGenerator; 
    16 import org.jalcedo.generator.client.beans.model.BeanComponentsFactory; 
    1716import org.jalcedo.generator.client.beans.model.BeanEditorInfo; 
    18 import org.jalcedo.generator.client.beans.model.controller.BeanAddAction; 
    19 import org.jalcedo.generator.client.beans.model.controller.BeanApplyAction; 
    20 import org.jalcedo.generator.client.beans.model.controller.BeanFetchAction; 
    21 import org.jalcedo.generator.client.beans.model.controller.BeanRemoveAction; 
    2217import org.jalcedo.generator.client.beans.model.models.BeanDataSource; 
    2318import org.jalcedo.generator.client.beans.model.models.BeanEvent; 
    24 import org.jalcedo.generator.client.beans.model.view.BeanContentProvider; 
    25 import org.jalcedo.generator.client.beans.model.view.BeanDetailComposite; 
    26 import org.jalcedo.generator.client.beans.model.view.BeanListComposite; 
    27 import org.jalcedo.generator.client.jpa.internal.model.ComponentsFactoryImpl; 
    2819import org.jalcedo.generator.client.jpa.internal.model.models.JpaDataSourceImpl; 
    2920 
    …… 
    4233 
    4334    /** 
    44      * @param beanEditorInfo 
    45      * @param addAction 
    46      * @param applyAction 
    47      * @param fetchAction 
    48      * @param removeAction 
    49      * @param dataSource 
    50      * @param contentProvider 
    51      * @param detailComposite 
    52      * @param listComposite 
    53      * @param monitor 
    54      * @return 
    55      * @throws CoreException 
    56      */ 
    57     @Override 
    58     protected BeanComponentsFactory generateBeanComponentsFactory( 
    59             BeanEditorInfo beanEditorInfo, BeanAddAction addAction, 
    60             BeanApplyAction applyAction, BeanFetchAction fetchAction, 
    61             BeanRemoveAction removeAction, BeanDataSource dataSource, 
    62             BeanContentProvider contentProvider, 
    63             BeanDetailComposite detailComposite, 
    64             BeanListComposite listComposite, IProgressMonitor monitor) 
    65             throws CoreException { 
    66         BeanComponentsFactory componentsFactory = new ComponentsFactoryImpl( 
    67                 beanEditorInfo, addAction, applyAction, fetchAction, 
    68                 removeAction, dataSource, contentProvider, detailComposite, 
    69                 listComposite, persistenceUnitName); 
    70         componentsFactory.generate(monitor); 
    71         return componentsFactory; 
    72     } 
    73      
    74     /** 
    7535     * ターゲ�?トとなるBeanに対するDataSourceクラスを生成す�?. 
    7636     * <p> 
    …… 
    8747            BeanEvent beanEvent, IProgressMonitor monitor) throws CoreException { 
    8848        BeanDataSource beanDataSource = new JpaDataSourceImpl(beanEditorInfo, 
    89                 beanEvent); 
     49                beanEvent, persistenceUnitName); 
    9050        beanDataSource.generate(monitor); 
    9151        return beanDataSource; 

  • trunk/plugins/org.jalcedo.generator.client.jpa/src/org/jalcedo/generator/client/jpa/internal/model/models/JpaDataSourceImpl.java

    r738 r756  
    2727 
    2828    private BeanEvent beanEvent; 
     29    private String persistenceUnitName; 
    2930 
    30     public JpaDataSourceImpl(BeanEditorInfo beanEditorInfo, BeanEvent beanEvent) { 
     31    public JpaDataSourceImpl(BeanEditorInfo beanEditorInfo, BeanEvent beanEvent, 
     32            String persistenceUnitName) { 
    3133        super(beanEditorInfo); 
    3234        this.beanEvent = beanEvent; 
     35        this.persistenceUnitName = persistenceUnitName; 
    3336    } 
    3437 
    …… 
    4750    private String generateSource() throws CoreException { 
    4851        DataSourceGenerator generator = new DataSourceGenerator(); 
    49         return generator.generate(this, this.getBeanEditorInfo().getTargetBean(), beanEvent); 
     52        return generator.generate(this, this.getBeanEditorInfo().getTargetBean(), beanEvent, persistenceUnitName); 
    5053    } 
    5154 

  • trunk/plugins/org.jalcedo.generator.client.jpa/templates/DataSourceGenerator.jet

    r590 r756  
    2525import javax.persistence.EntityManagerFactory; 
    2626import javax.persistence.EntityTransaction; 
     27import javax.persistence.Persistence; 
    2728import javax.persistence.PersistenceUnit; 
    2829import javax.persistence.Query; 
    …… 
    4243    private EntityManagerFactory entityManagerFactory; 
    4344 
    44     public <%=dataSourceName%>(EntityManagerFactory entityManagerFactory) { 
     45    public <%=dataSourceName%>() { 
     46        this.entityManagerFactory = Persistence.createEntityManagerFactory("<%=persistenceUnitName%>"); 
     47         
    4548        // create test data. 
    46         this.entityManagerFactory = entityManagerFactory; 
    4749    } 
    4850 

  • trunk/plugins/org.jalcedo.generator.client.jpa/templates/skeleton/DataSourceGenerator.skeleton

    r744 r756  
    1616public class CLASS { 
    1717 
    18     public String generate(JClass generated, TargetBean targetBean, BeanEvent beanEvent) { 
     18    public String generate(JClass generated, TargetBean targetBean, BeanEvent beanEvent, 
     19            String persistenceUnitName) { 
    1920        return ""; 
    2021    }