Changeset 765

Show
Ignore:
Timestamp:
06/26/07 18:58:04 (2 years ago)
Author:
nozawa
Message:

Overwrite of the file was made possible.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateAction.java

    r747 r765  
    1919import org.eclipse.jface.dialogs.IInputValidator; 
    2020import org.eclipse.jface.dialogs.InputDialog; 
     21import org.eclipse.jface.dialogs.MessageDialog; 
    2122import org.eclipse.jface.viewers.ISelection; 
    2223import org.eclipse.jface.viewers.StructuredSelection; 
     
    2627import org.eclipse.ui.PlatformUI; 
    2728import org.jalcedo.generator.client.beans.BeanEditorGeneratorActivator; 
     29import org.jalcedo.generator.client.beans.SourceGenerator; 
    2830import org.jalcedo.generator.client.beans.model.BeanEditorInfo; 
    2931import org.jalcedo.generator.client.beans.model.TargetBean; 
     
    3133/** 
    3234 * @author nozawa 
    33  * 
     35 *  
    3436 */ 
    3537public abstract class GenerateAction implements IObjectActionDelegate { 
    3638    private ISelection selection; 
    37      
    38     /* (non-Javadoc) 
    39      * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) 
     39 
     40    /* 
     41     * (non-Javadoc) 
     42     *  
     43     * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, 
     44     *      org.eclipse.ui.IWorkbenchPart) 
    4045     */ 
    4146    public void setActivePart(IAction action, IWorkbenchPart targetPart) { 
     
    4449    } 
    4550 
    46     /* (non-Javadoc) 
     51    /* 
     52     * (non-Javadoc) 
     53     *  
    4754     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) 
    4855     */ 
    4956    abstract public void run(IAction action); 
    50      
    51     /* (non-Javadoc) 
    52      * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) 
     57 
     58    abstract public void generateSource(SourceGenerator sourceGenerator, 
     59            String idName, boolean force) throws CoreException; 
     60 
     61    public void doGenerate(String idName) { 
     62        SourceGenerator sourceGenerator = new SourceGenerator(); 
     63        ; 
     64        try { 
     65            this.generateSource(sourceGenerator, idName, false); 
     66        } catch (CoreException e) { 
     67            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() 
     68                    .getShell(); 
     69            boolean question = MessageDialog.openQuestion(shell, "", 
     70                    "The file may  already exist. Overwrite?"); 
     71 
     72            if (question) { 
     73                try { 
     74                    this.generateSource(sourceGenerator, idName, true); 
     75                } catch (CoreException e1) { 
     76                    // TODO Auto-generated catch block 
     77                    e1.printStackTrace(); 
     78                } 
     79            } 
     80        } 
     81    } 
     82 
     83    /* 
     84     * (non-Javadoc) 
     85     *  
     86     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, 
     87     *      org.eclipse.jface.viewers.ISelection) 
    5388     */ 
    5489    public void selectionChanged(IAction action, ISelection selection) { 
     
    5691 
    5792    } 
    58     protected BeanEditorInfo createBeanEditorInfo(String idName) { 
     93 
     94    protected BeanEditorInfo createBeanEditorInfo(String idName) 
     95            throws CoreException { 
    5996        BeanEditorGeneratorActivator generatorPlugin = BeanEditorGeneratorActivator 
    6097                .getDefault(); 
     
    63100        TargetBean targetBean; 
    64101 
    65         try { 
    66             targetBean = generatorPlugin.createTargetBean(beanType, idName); 
    67             IPackageFragment targetPackage = beanType.getPackageFragment(); 
    68             String packageName = targetPackage.getElementName();  
    69             if(packageName.endsWith("models")){ 
    70                 IPackageFragmentRoot root = (IPackageFragmentRoot)targetPackage.getParent(); 
    71                 String newPackageName = packageName.substring(0, packageName.length()-7);  
    72                 targetPackage = root.getPackageFragment(newPackageName); 
    73             } 
    74              
    75             return generatorPlugin 
    76                     .createBeanEditorInfo(targetBean, targetPackage); 
     102        targetBean = generatorPlugin.createTargetBean(beanType, idName); 
     103        IPackageFragment targetPackage = beanType.getPackageFragment(); 
     104        String packageName = targetPackage.getElementName(); 
     105        if (packageName.endsWith("models")) { 
     106            IPackageFragmentRoot root = (IPackageFragmentRoot) targetPackage 
     107                    .getParent(); 
     108            String newPackageName = packageName.substring(0, packageName 
     109                    .length() - 7); 
     110            targetPackage = root.getPackageFragment(newPackageName); 
     111        } 
    77112 
    78         } catch (CoreException e) { 
    79             // TODO Auto-generated catch block 
    80             e.printStackTrace(); 
    81         } 
    82         return null; 
     113        return generatorPlugin.createBeanEditorInfo(targetBean, targetPackage); 
    83114 
    84115    } 
    85116 
    86     protected InputDialog getIdInputDialog(){ 
    87         Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); 
    88         IInputValidator validator = new IInputValidator(){ 
     117    protected InputDialog getIdInputDialog() { 
     118        Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() 
     119                .getShell(); 
     120        IInputValidator validator = new IInputValidator() { 
    89121            public String isValid(String newText) { 
    90                 if(newText == null || newText.trim().equals(""))
     122                if (newText == null || newText.trim().equals(""))
    91123                    return "Id name is null."; 
    92124                } 
    93125                return null; 
    94             }           
    95         };      
    96         return new InputDialog(shell, "Id input dialog", "Input id property name", 
    97                 null, validator); 
     126            } 
     127        }; 
     128        return new InputDialog(shell, "Id input dialog", 
     129                "Input id property name", null, validator); 
    98130    } 
    99      
    100131 
    101132    protected IType getBeanType() { 
  • trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateComponentsFactoryAction.java

    r747 r765  
    99    @Override 
    1010    public void run(IAction action) { 
     11        doGenerate("id"); 
     12    } 
    1113 
    12         try { 
    13             SourceGenerator sourceGenerator = new SourceGenerator(); 
    14             sourceGenerator.generateComponentsFactory( 
    15                     createBeanEditorInfo("id"), null); 
    16         } catch (CoreException e) { 
    17             // TODO Auto-generated catch block 
    18             e.printStackTrace(); 
    19         } 
    20  
     14    @Override 
     15    public void generateSource(SourceGenerator sourceGenerator, String idName, 
     16            boolean force) throws CoreException { 
     17        sourceGenerator.generateComponentsFactory(createBeanEditorInfo(idName), 
     18                null, force); 
    2119    } 
    2220 
  • trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateControllersAction.java

    r747 r765  
    3434        if (dialog.open() == Window.OK) { 
    3535            String idName = dialog.getValue(); 
    36             try { 
    37                 SourceGenerator sourceGenerator = new SourceGenerator(); 
    38                 sourceGenerator.generateControllers( 
    39                         createBeanEditorInfo(idName), null); 
    40             } catch (CoreException e) { 
    41                 // TODO Auto-generated catch block 
    42                 e.printStackTrace(); 
    43             } 
     36            doGenerate(idName); 
    4437        } 
    4538    } 
    4639 
     40    @Override 
     41    public void generateSource(SourceGenerator sourceGenerator, String idName, 
     42            boolean force) throws CoreException { 
     43        sourceGenerator.generateControllers(createBeanEditorInfo(idName), null, 
     44                force); 
     45    } 
     46 
    4747} 
  • trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateModelsAction.java

    r747 r765  
    4141        if (dialog.open() == Window.OK) { 
    4242            String idName = dialog.getValue(); 
    43             try { 
    44                 SourceGenerator sourceGenerator = new SourceGenerator(); 
    45                 sourceGenerator.generateModels( 
    46                         createBeanEditorInfo(idName), null); 
    47             } catch (CoreException e) { 
    48                 // TODO Auto-generated catch block 
    49                 e.printStackTrace(); 
    50             } 
     43            doGenerate(idName); 
    5144        } 
    5245    } 
     46 
     47    @Override 
     48    public void generateSource(SourceGenerator sourceGenerator, String idName, 
     49            boolean force) throws CoreException { 
     50        sourceGenerator.generateModels(createBeanEditorInfo(idName), null, 
     51                force); 
     52    } 
     53 
    5354} 
  • trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateViewsAction.java

    r747 r765  
    2828    @Override 
    2929    public void run(IAction action) { 
    30  
    31         try { 
    32             SourceGenerator sourceGenerator = new SourceGenerator(); 
    33             sourceGenerator.generateViews(createBeanEditorInfo("id"), null); 
    34         } catch (CoreException e) { 
    35             // TODO Auto-generated catch block 
    36             e.printStackTrace(); 
    37         } 
     30        doGenerate("id"); 
    3831 
    3932    } 
    4033 
     34    @Override 
     35    public void generateSource(SourceGenerator sourceGenerator, String idName, 
     36            boolean force) throws CoreException { 
     37        sourceGenerator 
     38                .generateViews(createBeanEditorInfo(idName), null, force); 
     39    } 
     40 
    4141} 
  • trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanEditorGenerateWizard.java

    r712 r765  
    9595                    SourceGenerator sourceGenerator = new SourceGenerator(); 
    9696 
    97                     sourceGenerator.generateAll(beanEditorInfo, monitor); 
     97                    sourceGenerator.generateAll(beanEditorInfo, monitor, beanSelectionPage.getFileOverWriteCheck()); 
    9898                    IProject project = beanEditorInfo.getTargetSourceDir() 
    9999                            .getJavaProject().getProject(); 
  • trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanSelectionPage.java

    r751 r765  
    6565 
    6666    private Button extensionAddCheckBox; 
     67     
     68    private Button fileOverWriteCheckBox; 
    6769 
    6870    public BeanSelectionPage() { 
     
    227229        extensionAddCheckBox.setText("register generated view extension."); 
    228230        extensionAddCheckBox.setSelection(true); 
     231         
     232        fileOverWriteCheckBox = new Button(composite, SWT.CHECK); 
     233        GridData gd5 = new GridData(GridData.FILL_HORIZONTAL); 
     234        gd5.horizontalSpan = nColumns; 
     235        fileOverWriteCheckBox.setLayoutData(gd5); 
     236        fileOverWriteCheckBox.setText("Overwrite files, if the same files exist."); 
     237        fileOverWriteCheckBox.setSelection(false); 
    229238    } 
    230239 
     
    263272    public boolean getExtensionAddCheck() { 
    264273        return extensionAddCheckBox.getSelection(); 
     274    } 
     275     
     276    public boolean getFileOverWriteCheck(){ 
     277        return fileOverWriteCheckBox.getSelection(); 
    265278    } 
    266279 
  • trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/BeanEditorGeneratorActivator.java

    r727 r765  
    7171    } 
    7272 
    73 //  public void generateBeanEditor(BeanEditorInfo beanEditorInfo, 
    74 //          IProgressMonitor monitor) throws CoreException { 
    75 //      SourceGenerator sourceGenerator = new SourceGenerator(); 
    76 //      sourceGenerator.generateAll(beanEditorInfo, monitor); 
    77 //  } 
    78 //   
    79 //  public SourceGenerator createSourceGenerater(){ 
    80 //      return new SourceGenerator(); 
    81 //  } 
    82      
    83      
    8473    public TargetBean createTargetBean(IType iType, Property idProperty, Property[] properties) throws CoreException { 
    8574        return new TargetBeanImpl(iType, idProperty, properties); 
  • trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/SourceGenerator.java

    r743 r765  
    5353     */ 
    5454    public void generateAll(BeanEditorInfo beanEditorInfo, 
    55             IProgressMonitor monitor) throws CoreException { 
     55            IProgressMonitor monitor ,boolean force) throws CoreException { 
    5656        // 入力された情報(beanEditorInfo)からEventクラスを生成する. 
    57         BeanEvent event = this.generateEvent(beanEditorInfo, monitor); 
     57        BeanEvent event = this.generateEvent(beanEditorInfo, monitor, force); 
    5858        // 入力された情報とEventクラスからDataSourceクラスを生成する. 
    5959        BeanDataSource dataSource = this.generateDataSource(beanEditorInfo, 
    60                 event, monitor); 
     60                event, monitor, force); 
    6161 
    6262        BeanDetailComposite detailComposite = this.generateBeanDetailComposite( 
    63                 beanEditorInfo, monitor); 
     63                beanEditorInfo, monitor, force); 
    6464        BeanContentProvider contentProvider = this.generateBeanContentProvider( 
    65                 beanEditorInfo, event, monitor); 
     65                beanEditorInfo, event, monitor, force); 
    6666        BeanListComposite listComposite = this.generateBeanListComposite( 
    67                 beanEditorInfo, monitor); 
     67                beanEditorInfo, monitor, force); 
    6868 
    6969        BeanAddAction addAction = this.generateBeanAddAction(beanEditorInfo, 
    70                 monitor); 
     70                monitor, force); 
    7171        BeanRemoveAction removeAction = this.generateBeanRemoveAction( 
    72                 beanEditorInfo, monitor); 
     72                beanEditorInfo, monitor, force); 
    7373        BeanFetchAction fetchAction = this.generateBeanFetchAction( 
    74                 beanEditorInfo, event, monitor); 
     74                beanEditorInfo, event, monitor, force); 
    7575        BeanApplyAction applyAction = this.generateBeanApplyAction( 
    76                 beanEditorInfo, monitor); 
     76                beanEditorInfo, monitor, force); 
    7777 
    7878        BeanComponentsFactory componentsFactory = this 
     
    8080                        applyAction, fetchAction, removeAction, dataSource, 
    8181                        contentProvider, detailComposite, listComposite, 
    82                         monitor); 
     82                        monitor, force); 
    8383 
    8484        this.generateBeanView(beanEditorInfo, componentsFactory, listComposite, 
    85                 detailComposite, monitor); 
     85                detailComposite, monitor, force); 
    8686    } 
    8787 
     
    9494     */ 
    9595    public void generateModels(BeanEditorInfo beanEditorInfo, 
    96             IProgressMonitor monitor) throws CoreException { 
    97  
    98         BeanEvent event = this.generateEvent(beanEditorInfo, monitor); 
    99         this.generateDataSource(beanEditorInfo, event, monitor); 
     96            IProgressMonitor monitor,boolean force) throws CoreException { 
     97 
     98        BeanEvent event = this.generateEvent(beanEditorInfo, monitor, force); 
     99        this.generateDataSource(beanEditorInfo, event, monitor, force); 
    100100    } 
    101101 
     
    108108     */ 
    109109    public void generateControllers(BeanEditorInfo beanEditorInfo, 
    110             IProgressMonitor monitor) throws CoreException { 
     110            IProgressMonitor monitor,boolean force) throws CoreException { 
    111111 
    112112        BeanEvent event = new BeanEventImpl(beanEditorInfo); 
    113113 
    114         this.generateBeanAddAction(beanEditorInfo, monitor); 
    115         this.generateBeanRemoveAction(beanEditorInfo, monitor); 
    116         this.generateBeanFetchAction(beanEditorInfo, event, monitor); 
    117         this.generateBeanApplyAction(beanEditorInfo, monitor); 
     114        this.generateBeanAddAction(beanEditorInfo, monitor, force); 
     115        this.generateBeanRemoveAction(beanEditorInfo, monitor, force); 
     116        this.generateBeanFetchAction(beanEditorInfo, event, monitor, force); 
     117        this.generateBeanApplyAction(beanEditorInfo, monitor, force); 
    118118    } 
    119119 
     
    126126     */ 
    127127    public void generateViews(BeanEditorInfo beanEditorInfo, 
    128             IProgressMonitor monitor) throws CoreException { 
     128            IProgressMonitor monitor,boolean force) throws CoreException { 
    129129 
    130130        BeanEvent event = new BeanEventImpl(beanEditorInfo); 
     
    140140 
    141141        BeanDetailComposite detailComposite = this.generateBeanDetailComposite( 
    142                 beanEditorInfo, monitor); 
     142                beanEditorInfo, monitor, force); 
    143143        BeanContentProvider contentProvider = this.generateBeanContentProvider( 
    144                 beanEditorInfo, event, monitor); 
     144                beanEditorInfo, event, monitor, force); 
    145145        BeanListComposite listComposite = this.generateBeanListComposite( 
    146                 beanEditorInfo, monitor); 
     146                beanEditorInfo, monitor, force); 
    147147 
    148148        BeanComponentsFactory componentsFactory = new ComponentsFactoryImpl( 
     
    152152 
    153153        this.generateBeanView(beanEditorInfo, componentsFactory, listComposite, 
    154                 detailComposite, monitor); 
     154                detailComposite, monitor, force); 
    155155    } 
    156156     
    157157    public void generateComponentsFactory(BeanEditorInfo beanEditorInfo, 
    158     IProgressMonitor monitor) throws CoreException { 
     158    IProgressMonitor monitor, boolean force) throws CoreException { 
    159159         
    160160        BeanEvent event = new BeanEventImpl(beanEditorInfo); 
     
    179179                applyAction, fetchAction, removeAction, dataSource, 
    180180                contentProvider, detailComposite, listComposite, 
    181                 monitor); 
     181                monitor, force); 
    182182    } 
    183183 
     
    202202            BeanContentProvider contentProvider, 
    203203            BeanDetailComposite detailComposite, 
    204             BeanListComposite listComposite, IProgressMonitor monitor
     204            BeanListComposite listComposite, IProgressMonitor monitor, boolean force
    205205            throws CoreException { 
    206206        BeanComponentsFactory componentsFactory = new ComponentsFactoryImpl( 
     
    208208                removeAction, dataSource, contentProvider, detailComposite, 
    209209                listComposite); 
    210         componentsFactory.generate(monitor); 
     210        componentsFactory.generate(monitor, force); 
    211211        return componentsFactory; 
    212212    } 
     
    226226            BeanComponentsFactory componentsFactory, 
    227227            BeanListComposite listComposite, 
    228             BeanDetailComposite detailComposite, IProgressMonitor monitor
     228            BeanDetailComposite detailComposite, IProgressMonitor monitor, boolean force
    229229            throws CoreException { 
    230230        BeanView beanView = new BeanViewImpl(beanEditorInfo, componentsFactory, 
    231231                listComposite, detailComposite); 
    232         beanView.generate(monitor); 
     232        beanView.generate(monitor, force); 
    233233        return beanView; 
    234234    } 
     
    236236    protected BeanApplyAction generateBeanApplyAction( 
    237237            BeanEditorInfo beanEditorInfo, 
    238             IProgressMonitor monitor) throws CoreException { 
     238            IProgressMonitor monitor, boolean force) throws CoreException { 
    239239        BeanApplyAction applyAction = new BeanApplyActionImpl(beanEditorInfo); 
    240         applyAction.generate(monitor); 
     240        applyAction.generate(monitor, force); 
    241241        return applyAction; 
    242242    } 
     
    244244    protected BeanFetchAction generateBeanFetchAction( 
    245245            BeanEditorInfo beanEditorInfo, BeanEvent event, 
    246             IProgressMonitor monitor) throws CoreException { 
     246            IProgressMonitor monitor, boolean force) throws CoreException { 
    247247        BeanFetchAction fetchAction = new BeanFetchActionImpl(beanEditorInfo, 
    248248                event); 
    249         fetchAction.generate(monitor); 
     249        fetchAction.generate(monitor, force); 
    250250        return fetchAction; 
    251251    } 
     
    262262    protected BeanRemoveAction generateBeanRemoveAction( 
    263263            BeanEditorInfo beanEditorInfo, 
    264             IProgressMonitor monitor) throws CoreException { 
     264            IProgressMonitor monitor, boolean force) throws CoreException { 
    265265        BeanRemoveAction removeAction = new BeanRemoveActionImpl( 
    266266                beanEditorInfo); 
    267         removeAction.generate(monitor); 
     267        removeAction.generate(monitor, force); 
    268268        return removeAction; 
    269269    } 
     
    280280     */ 
    281281    protected BeanAddAction generateBeanAddAction( 
    282             BeanEditorInfo beanEditorInfo, IProgressMonitor monitor
     282            BeanEditorInfo beanEditorInfo, IProgressMonitor monitor, boolean force
    283283            throws CoreException { 
    284284        BeanAddAction addAction = new BeanAddActionImpl(beanEditorInfo); 
    285         addAction.generate(monitor); 
     285        addAction.generate(monitor,force); 
    286286        return addAction; 
    287287    } 
     
    296296     */ 
    297297    protected BeanListComposite generateBeanListComposite( 
    298             BeanEditorInfo beanEditorInfo, IProgressMonitor monitor
     298            BeanEditorInfo beanEditorInfo, IProgressMonitor monitor,boolean force
    299299            throws CoreException { 
    300300        BeanListComposite listComposite = new BeanListCompositeImpl( 
    301301                beanEditorInfo); 
    302         listComposite.generate(monitor); 
     302        listComposite.generate(monitor,force); 
    303303        return listComposite; 
    304304    } 
     
    315315    protected BeanContentProvider generateBeanContentProvider( 
    316316            BeanEditorInfo beanEditorInfo, BeanEvent beanEvent, 
    317             IProgressMonitor monitor) throws CoreException { 
     317            IProgressMonitor monitor, boolean force ) throws CoreException { 
    318318        BeanContentProvider contentProvider = new BeanContentProviderImpl( 
    319319                beanEditorInfo, beanEvent); 
    320         contentProvider.generate(monitor); 
     320        contentProvider.generate(monitor, force); 
    321321        return contentProvider; 
    322322    } 
     
    331331     */ 
    332332    protected BeanDetailComposite generateBeanDetailComposite( 
    333             BeanEditorInfo beanEditorInfo, IProgressMonitor monitor
     333            BeanEditorInfo beanEditorInfo, IProgressMonitor monitor, boolean force
    334334            throws CoreException { 
    335335        BeanDetailComposite detailComposite = new BeanDetailCompositeImpl( 
    336336                beanEditorInfo); 
    337         detailComposite.generate(monitor); 
     337        detailComposite.generate(monitor, force); 
    338338        return detailComposite; 
    339339    } 
     
    350350     */ 
    351351    protected BeanEvent generateEvent(BeanEditorInfo beanEditorInfo, 
    352             IProgressMonitor monitor) throws CoreException { 
     352            IProgressMonitor monitor, boolean force) throws CoreException { 
    353353        BeanEvent event = new BeanEventImpl(beanEditorInfo); 
    354         event.generate(monitor); 
     354        event.generate(monitor, force); 
    355355        return event; 
    356356    } 
     
    368368     */ 
    369369    protected BeanDataSource generateDataSource(BeanEditorInfo beanEditorInfo, 
    370             BeanEvent beanEvent, IProgressMonitor monitor) throws CoreException { 
     370            BeanEvent beanEvent, IProgressMonitor monitor,boolean force) throws CoreException { 
    371371        BeanDataSource beanDataSource = new BeanDataSourceImpl(beanEditorInfo, 
    372372                beanEvent); 
    373         beanDataSource.generate(monitor); 
     373        beanDataSource.generate(monitor, force); 
    374374        return beanDataSource; 
    375375    } 
  • trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/internal/model/GeneratableSupport.java

    r764 r765  
    5656     * @param monitor 
    5757     */ 
    58     public void generate(String source, IProgressMonitor monitor
     58    public void generate(String source, IProgressMonitor monitor, boolean force
    5959            throws CoreException { 
    6060        IPackageFragmentRoot sourceDir = this.getBeanEditorInfo() 
     
    6262        try { 
    6363            IPackageFragment targetPackage = sourceDir.createPackageFragment( 
    64                     this.getPackageName(), false, monitor); 
     64                    this.getPackageName(), force, monitor); 
    6565            targetPackage.createCompilationUnit(this.getClassName() + ".java", //$NON-NLS-1$ 
    66                     source, false, monitor); 
     66                    source, force, monitor); 
    6767        } catch (JavaModelException e) { 
    6868            throw new CoreException(new Status(IStatus.ERROR, 
     
    7272     
    7373     
    74     public void generate(IProgressMonitor monitor) throws CoreException { 
     74    public void generate(IProgressMonitor monitor,boolean force) throws CoreException { 
    7575        String source = this.generateSource(); 
    76         this.generate(source, monitor); 
     76        this.generate(source, monitor, force); 
    7777    } 
    7878 
  • trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/model/Generatable.java

    r586 r765  
    2525     * @throws CoreException 
    2626     */ 
    27     void generate(IProgressMonitor monitor) throws CoreException; 
     27    void generate(IProgressMonitor monitor, boolean force) throws CoreException; 
    2828}