Changeset 728

Show
Ignore:
Timestamp:
06/19/07 18:20:46 (2 years ago)
Author:
koshi
Message:

beansプラグインのアーキテクチャ変更に伴う修正

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/plugins/org.jalcedo.client.examples.jpa/src/org/jalcedo/client/examples/jpa/Application.java

    r371 r728  
    11package org.jalcedo.client.examples.jpa; 
    22 
    3 import org.eclipse.core.runtime.IPlatformRunnable; 
     3import org.eclipse.equinox.app.IApplication; 
     4import org.eclipse.equinox.app.IApplicationContext; 
    45import org.eclipse.swt.widgets.Display; 
     6import org.eclipse.ui.IWorkbench; 
    57import org.eclipse.ui.PlatformUI; 
    68 
    …… 
    810 * This class controls all aspects of the application's execution 
    911 */ 
    10 public class Application implements IPlatformRunnable { 
     12public class Application implements IApplication { 
    1113 
    1214    /* (non-Javadoc) 
    13      * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object) 
     15     * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext) 
    1416     */ 
    15     public Object run(Object args) throws Exception { 
     17    public Object start(IApplicationContext context) { 
    1618        Display display = PlatformUI.createDisplay(); 
    1719        try { 
    1820            int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor()); 
    1921            if (returnCode == PlatformUI.RETURN_RESTART) { 
    20                 return IPlatformRunnable.EXIT_RESTART; 
     22                return IApplication.EXIT_RESTART; 
    2123            } 
    22             return IPlatformRunnable.EXIT_OK; 
     24            return IApplication.EXIT_OK; 
    2325        } finally { 
    2426            display.dispose(); 
    2527        } 
    2628    } 
     29 
     30    /* (non-Javadoc) 
     31     * @see org.eclipse.equinox.app.IApplication#stop() 
     32     */ 
     33    public void stop() { 
     34        final IWorkbench workbench = PlatformUI.getWorkbench(); 
     35        if (workbench == null) 
     36            return; 
     37        final Display display = workbench.getDisplay(); 
     38        display.syncExec(new Runnable() { 
     39            public void run() { 
     40                if (!display.isDisposed()) 
     41                    workbench.close(); 
     42            } 
     43        }); 
     44    } 
    2745} 

  • trunk/plugins/org.jalcedo.client.examples.jpa/src/org/jalcedo/client/examples/jpa/views/JpaItemView.java

    r722 r728  
    9090 
    9191    } 
    92     private ItemDetailComposite createDetailComposite(Composite parent, 
     92    private /*=<%=detailCompositeName%>*/ItemDetailComposite/*-*/ createDetailComposite(Composite parent, 
    9393            /*=<%=componentsFactoryName%>*/JpaItemComponentsFactory/*-*/ factory) { 
    9494        GridData gridData = new GridData(); 
    …… 
    100100    } 
    101101 
    102     private ItemListComposite createListComposite(Composite parent, 
     102    private /*=<%=listCompositeName%>*/ItemListComposite/*-*/ createListComposite(Composite parent, 
    103103            /*=<%=componentsFactoryName%>*/JpaItemComponentsFactory/*-*/ factory) { 
    104104        GridData gridData = new GridData(); 

  • trunk/plugins/org.jalcedo.generator.client.jpa/META-INF/MANIFEST.MF

    r590 r728  
    99 org.eclipse.core.runtime, 
    1010 org.eclipse.jdt.core, 
    11  org.jalcedo.generator.client.beans 
     11 org.jalcedo.generator.client.beans, 
     12 org.eclipse.core.databinding, 
     13 org.eclipse.core.databinding.beans, 
     14 org.eclipse.jface.databinding 
    1215Eclipse-LazyStart: true 
    1316Bundle-ClassPath: . 

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

    r590 r728  
    1414import org.eclipse.core.runtime.IProgressMonitor; 
    1515import org.jalcedo.generator.client.beans.SourceGenerator; 
     16import org.jalcedo.generator.client.beans.model.BeanComponentsFactory; 
    1617import org.jalcedo.generator.client.beans.model.BeanEditorInfo; 
    1718import org.jalcedo.generator.client.beans.model.controller.BeanAddAction; 
    18 import org.jalcedo.generator.client.beans.model.controller.BeanDeleteAction; 
    19 import org.jalcedo.generator.client.beans.model.controller.BeanEditAction; 
    20 import org.jalcedo.generator.client.beans.model.event.BeanEvent; 
     19import org.jalcedo.generator.client.beans.model.controller.BeanApplyAction; 
     20import org.jalcedo.generator.client.beans.model.controller.BeanFetchAction; 
     21import org.jalcedo.generator.client.beans.model.controller.BeanRemoveAction; 
    2122import org.jalcedo.generator.client.beans.model.models.BeanDataSource; 
     23import org.jalcedo.generator.client.beans.model.models.BeanEvent; 
    2224import org.jalcedo.generator.client.beans.model.view.BeanContentProvider; 
    23 import org.jalcedo.generator.client.beans.model.view.BeanLabelProvider; 
     25import org.jalcedo.generator.client.beans.model.view.BeanDetailComposite; 
    2426import org.jalcedo.generator.client.beans.model.view.BeanListComposite; 
    25 import org.jalcedo.generator.client.beans.model.view.BeanView; 
     27import org.jalcedo.generator.client.jpa.internal.model.ComponentsFactoryImpl; 
    2628import org.jalcedo.generator.client.jpa.internal.model.models.JpaDataSourceImpl; 
    27 import org.jalcedo.generator.client.jpa.internal.model.view.BeanViewImpl; 
    2829 
    2930/** 
    …… 
    4243    /** 
    4344     * @param beanEditorInfo 
    44      * @param beanAddAction 
    45      * @param beanDeleteAction 
    46      * @param beanEditAction 
    47      * @param beanDataSource 
    48      * @param beanListComposite 
    49      * @param beanContentProvider 
    50      * @param beanLabelProvider 
     45     * @param addAction 
     46     * @param applyAction 
     47     * @param fetchAction 
     48     * @param removeAction 
     49     * @param dataSource 
     50     * @param contentProvider 
     51     * @param detailComposite 
     52     * @param listComposite 
    5153     * @param monitor 
    5254     * @return 
    5355     * @throws CoreException 
    5456     */ 
    55     /** 
    56      * @param beanEditorInfo 
    57      * @param monitor 
    58      * @throws CoreException 
    59      */ 
    6057    @Override 
    61     protected BeanView generateBeanView(BeanEditorInfo beanEditorInfo, 
    62             BeanAddAction beanAddAction, BeanDeleteAction beanDeleteAction, 
    63             BeanEditAction beanEditAction, BeanDataSource beanDataSource, 
    64             BeanListComposite beanListComposite, 
    65             BeanContentProvider beanContentProvider, 
    66             BeanLabelProvider beanLabelProvider,  
    67             IProgressMonitor monitor) 
     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) 
    6865            throws CoreException { 
    69         BeanView beanView = new BeanViewImpl(beanEditorInfo, beanAddAction, 
    70                 beanDeleteAction, beanEditAction, beanDataSource, 
    71                 beanListComposite, beanContentProvider, beanLabelProvider, persistenceUnitName); 
    72         beanView.generate(monitor); 
    73         return beanView; 
     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; 
    7472    } 
    7573     

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

    • Property svn:ignore set to
      ComponentsFactoryGenerator.java

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

    r590 r728  
    1515import org.jalcedo.generator.client.beans.model.BeanEditorInfo; 
    1616import org.jalcedo.generator.client.beans.model.TargetBean; 
    17 import org.jalcedo.generator.client.beans.model.event.BeanEvent; 
     17import org.jalcedo.generator.client.beans.model.models.BeanEvent; 
    1818import org.jalcedo.generator.client.beans.model.models.BeanDataSource; 
    1919import org.jalcedo.generator.client.jpa.internal.model.GeneratableSupport; 

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

    r586 r728  
    11import org.jalcedo.generator.client.beans.model.JClass; 
    22import org.jalcedo.generator.client.beans.model.TargetBean; 
    3 import org.jalcedo.generator.client.beans.model.event.BeanEvent; 
     3import org.jalcedo.generator.client.beans.model.models.BeanEvent; 
    44 
    55public class CLASS {