Changeset 772

Show
Ignore:
Timestamp:
06/27/07 17:35:57 (2 years ago)
Author:
koshi
Message:

Overwrite of the file and "Jalcedo Tools" were made possible.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r756 r772  
    3333 
    3434    /** 
     35     * generate models package. 
     36     *  
     37     * @param beanEditorInfo 
     38     * @param monitor 
     39     * @throws CoreException 
     40     */ 
     41    public void generateModels(BeanEditorInfo beanEditorInfo, 
     42            IProgressMonitor monitor, String persistenceUnitName ,boolean force) throws CoreException { 
     43 
     44        this.persistenceUnitName = persistenceUnitName; 
     45        BeanEvent event = this.generateEvent(beanEditorInfo, monitor, force); 
     46        this.generateDataSource(beanEditorInfo, event, monitor, force); 
     47    } 
     48 
     49    /** 
    3550     * ターゲ�?トとなるBeanに対するDataSourceクラスを生成す�?. 
    3651     * <p> 
    …… 
    4560    @Override 
    4661    protected BeanDataSource generateDataSource(BeanEditorInfo beanEditorInfo, 
    47             BeanEvent beanEvent, IProgressMonitor monitor) throws CoreException { 
     62            BeanEvent beanEvent, IProgressMonitor monitor ,boolean force) throws CoreException { 
    4863        BeanDataSource beanDataSource = new JpaDataSourceImpl(beanEditorInfo, 
    4964                beanEvent, persistenceUnitName); 
    50         beanDataSource.generate(monitor); 
     65        beanDataSource.generate(monitor, force); 
    5166        return beanDataSource; 
    5267    } 

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

    r590 r772  
    2626/** 
    2727 *  
    28  * @author koshi 
     28 * @author yuanying 
    2929 *  
    3030 */ 
    …… 
    4444    } 
    4545 
     46    protected String getTargetClassName(){ 
     47        return this.getBeanEditorInfo().getTargetBean().getClassName(); 
     48    } 
     49     
     50    protected String getTargetPackageName() { 
     51        return getBeanEditorInfo().getTargetPackage().getElementName(); 
     52    } 
     53     
    4654    /** 
    4755     *  
    …… 
    4957     * @param monitor 
    5058     */ 
    51     public void generate(String source, IProgressMonitor monitor) 
     59    public void generate(String source, IProgressMonitor monitor, boolean force) 
    5260            throws CoreException { 
    5361        IPackageFragmentRoot sourceDir = this.getBeanEditorInfo() 
    …… 
    5563        try { 
    5664            IPackageFragment targetPackage = sourceDir.createPackageFragment( 
    57                     this.getPackageName(), false, monitor); 
     65                    this.getPackageName(), force, monitor); 
    5866            targetPackage.createCompilationUnit(this.getClassName() + ".java", //$NON-NLS-1$ 
    59                     source, false, monitor); 
     67                    source, force, monitor); 
    6068        } catch (JavaModelException e) { 
    6169            throw new CoreException(new Status(IStatus.ERROR, 
    …… 
    6371        } 
    6472    } 
     73     
     74     
     75    public void generate(IProgressMonitor monitor,boolean force) throws CoreException { 
     76        String source = this.generateSource(); 
     77        this.generate(source, monitor, force); 
     78    } 
    6579 
     80    abstract protected String generateSource() throws CoreException; 
     81     
    6682} 

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

    r756 r772  
    1212 
    1313import org.eclipse.core.runtime.CoreException; 
    14 import org.eclipse.core.runtime.IProgressMonitor; 
    1514import org.jalcedo.generator.client.beans.model.BeanEditorInfo; 
     15import org.jalcedo.generator.client.beans.model.models.BeanDataSource; 
    1616import org.jalcedo.generator.client.beans.model.models.BeanEvent; 
    17 import org.jalcedo.generator.client.beans.model.models.BeanDataSource; 
    1817import org.jalcedo.generator.client.jpa.internal.model.GeneratableSupport; 
    1918import org.jalcedo.generator.client.jpa.internal.resource.Messages; 
    …… 
    3635    } 
    3736 
    38     public void generate(IProgressMonitor monitor) throws CoreException { 
    39         String source = this.generateSource(); 
    40         this.generate(source, monitor); 
    41     } 
    42  
    4337    /** 
    4438     * DataSourceクラスのソースを生成する. (for example, use JET) 
    …… 
    4842     * @throws CoreException 
    4943     */ 
    50     private String generateSource() throws CoreException { 
     44    protected String generateSource() throws CoreException { 
    5145        DataSourceGenerator generator = new DataSourceGenerator(); 
    5246        return generator.generate(this, this.getBeanEditorInfo().getTargetBean(), beanEvent, persistenceUnitName); 
    …… 
    5448 
    5549    public String getClassName() { 
    56         return this.getBeanEditorInfo().getTargetBean().getClassName() 
     50        return getTargetClassName() 
    5751                + Messages.getString("DataSource_suffix"); //$NON-NLS-1$ 
    5852    } 
    5953 
    6054    public String getPackageName() { 
    61         return this.getBeanEditorInfo().getTargetPackage().getElementName() 
    62                 + Messages.getString("ModelPackage_suffix"); //$NON-NLS-1$ 
     55        return getTargetPackageName() 
     56                + Messages.getString("ModelPackage_suffix") + getTargetClassName().toLowerCase(); //$NON-NLS-1$ 
    6357    } 
    64  
    65 //  public TargetBean getTargetBean() { 
    66 //      return this.getBeanEditorInfo().getTargetBean(); 
    67 //  } 
    68  
    6958} 

  • trunk/plugins/org.jalcedo.generator.client.jpa/src/org/jalcedo/generator/client/jpa/internal/resource/messages.properties

    r427 r772  
    22TargetBeanImpl_createProperties_error=Cannot create properties. 
    33 
    4 ControllerPackage_suffix=.controllers 
    5 EventPackage_suffix=.events 
    6 ModelPackage_suffix=.models 
    7 ViewPackage_suffix=.views 
     4ControllerPackage_suffix=.controllers. 
     5EventPackage_suffix=.models. 
     6ModelPackage_suffix=.models. 
     7ViewPackage_suffix=.views. 
    88 
    99AbstractAction_prefix=Abstract 
    1010AbstractAction_suffix=Action 
    1111AddAction_suffix=AddAction 
    12 DeleteAction_suffix=DeleteAction 
     12DeleteAction_suffix=RemoveAction 
    1313EditAction_suffix=EditAction 
    1414