Changeset 765
- Timestamp:
- 06/26/07 18:58:04 (2 years ago)
- Files:
-
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateAction.java (modified) (6 diffs)
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateComponentsFactoryAction.java (modified) (1 diff)
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateControllersAction.java (modified) (1 diff)
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateModelsAction.java (modified) (1 diff)
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateViewsAction.java (modified) (1 diff)
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanEditorGenerateWizard.java (modified) (1 diff)
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanSelectionPage.java (modified) (3 diffs)
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/IdSelectionPage.java (deleted)
- trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/BeanEditorGeneratorActivator.java (modified) (1 diff)
- trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/SourceGenerator.java (modified) (20 diffs)
- trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/internal/model/GeneratableSupport.java (modified) (3 diffs)
- trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/model/Generatable.java (modified) (1 diff)
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 19 19 import org.eclipse.jface.dialogs.IInputValidator; 20 20 import org.eclipse.jface.dialogs.InputDialog; 21 import org.eclipse.jface.dialogs.MessageDialog; 21 22 import org.eclipse.jface.viewers.ISelection; 22 23 import org.eclipse.jface.viewers.StructuredSelection; … … 26 27 import org.eclipse.ui.PlatformUI; 27 28 import org.jalcedo.generator.client.beans.BeanEditorGeneratorActivator; 29 import org.jalcedo.generator.client.beans.SourceGenerator; 28 30 import org.jalcedo.generator.client.beans.model.BeanEditorInfo; 29 31 import org.jalcedo.generator.client.beans.model.TargetBean; … … 31 33 /** 32 34 * @author nozawa 33 * 35 * 34 36 */ 35 37 public abstract class GenerateAction implements IObjectActionDelegate { 36 38 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) 40 45 */ 41 46 public void setActivePart(IAction action, IWorkbenchPart targetPart) { … … 44 49 } 45 50 46 /* (non-Javadoc) 51 /* 52 * (non-Javadoc) 53 * 47 54 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) 48 55 */ 49 56 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) 53 88 */ 54 89 public void selectionChanged(IAction action, ISelection selection) { … … 56 91 57 92 } 58 protected BeanEditorInfo createBeanEditorInfo(String idName) { 93 94 protected BeanEditorInfo createBeanEditorInfo(String idName) 95 throws CoreException { 59 96 BeanEditorGeneratorActivator generatorPlugin = BeanEditorGeneratorActivator 60 97 .getDefault(); … … 63 100 TargetBean targetBean; 64 101 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 } 77 112 78 } catch (CoreException e) { 79 // TODO Auto-generated catch block 80 e.printStackTrace(); 81 } 82 return null; 113 return generatorPlugin.createBeanEditorInfo(targetBean, targetPackage); 83 114 84 115 } 85 116 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() { 89 121 public String isValid(String newText) { 90 if (newText == null || newText.trim().equals("")){122 if (newText == null || newText.trim().equals("")) { 91 123 return "Id name is null."; 92 124 } 93 125 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); 98 130 } 99 100 131 101 132 protected IType getBeanType() { trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateComponentsFactoryAction.java
r747 r765 9 9 @Override 10 10 public void run(IAction action) { 11 doGenerate("id"); 12 } 11 13 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); 21 19 } 22 20 trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateControllersAction.java
r747 r765 34 34 if (dialog.open() == Window.OK) { 35 35 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); 44 37 } 45 38 } 46 39 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 47 47 } trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateModelsAction.java
r747 r765 41 41 if (dialog.open() == Window.OK) { 42 42 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); 51 44 } 52 45 } 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 53 54 } trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/actions/GenerateViewsAction.java
r747 r765 28 28 @Override 29 29 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"); 38 31 39 32 } 40 33 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 41 41 } trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanEditorGenerateWizard.java
r712 r765 95 95 SourceGenerator sourceGenerator = new SourceGenerator(); 96 96 97 sourceGenerator.generateAll(beanEditorInfo, monitor );97 sourceGenerator.generateAll(beanEditorInfo, monitor, beanSelectionPage.getFileOverWriteCheck()); 98 98 IProject project = beanEditorInfo.getTargetSourceDir() 99 99 .getJavaProject().getProject(); trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanSelectionPage.java
r751 r765 65 65 66 66 private Button extensionAddCheckBox; 67 68 private Button fileOverWriteCheckBox; 67 69 68 70 public BeanSelectionPage() { … … 227 229 extensionAddCheckBox.setText("register generated view extension."); 228 230 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); 229 238 } 230 239 … … 263 272 public boolean getExtensionAddCheck() { 264 273 return extensionAddCheckBox.getSelection(); 274 } 275 276 public boolean getFileOverWriteCheck(){ 277 return fileOverWriteCheckBox.getSelection(); 265 278 } 266 279 trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/BeanEditorGeneratorActivator.java
r727 r765 71 71 } 72 72 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 84 73 public TargetBean createTargetBean(IType iType, Property idProperty, Property[] properties) throws CoreException { 85 74 return new TargetBeanImpl(iType, idProperty, properties); trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/SourceGenerator.java
r743 r765 53 53 */ 54 54 public void generateAll(BeanEditorInfo beanEditorInfo, 55 IProgressMonitor monitor ) throws CoreException {55 IProgressMonitor monitor ,boolean force) throws CoreException { 56 56 // 入力された情報(beanEditorInfo)からEventクラスを生成する. 57 BeanEvent event = this.generateEvent(beanEditorInfo, monitor );57 BeanEvent event = this.generateEvent(beanEditorInfo, monitor, force); 58 58 // 入力された情報とEventクラスからDataSourceクラスを生成する. 59 59 BeanDataSource dataSource = this.generateDataSource(beanEditorInfo, 60 event, monitor );60 event, monitor, force); 61 61 62 62 BeanDetailComposite detailComposite = this.generateBeanDetailComposite( 63 beanEditorInfo, monitor );63 beanEditorInfo, monitor, force); 64 64 BeanContentProvider contentProvider = this.generateBeanContentProvider( 65 beanEditorInfo, event, monitor );65 beanEditorInfo, event, monitor, force); 66 66 BeanListComposite listComposite = this.generateBeanListComposite( 67 beanEditorInfo, monitor );67 beanEditorInfo, monitor, force); 68 68 69 69 BeanAddAction addAction = this.generateBeanAddAction(beanEditorInfo, 70 monitor );70 monitor, force); 71 71 BeanRemoveAction removeAction = this.generateBeanRemoveAction( 72 beanEditorInfo, monitor );72 beanEditorInfo, monitor, force); 73 73 BeanFetchAction fetchAction = this.generateBeanFetchAction( 74 beanEditorInfo, event, monitor );74 beanEditorInfo, event, monitor, force); 75 75 BeanApplyAction applyAction = this.generateBeanApplyAction( 76 beanEditorInfo, monitor );76 beanEditorInfo, monitor, force); 77 77 78 78 BeanComponentsFactory componentsFactory = this … … 80 80 applyAction, fetchAction, removeAction, dataSource, 81 81 contentProvider, detailComposite, listComposite, 82 monitor );82 monitor, force); 83 83 84 84 this.generateBeanView(beanEditorInfo, componentsFactory, listComposite, 85 detailComposite, monitor );85 detailComposite, monitor, force); 86 86 } 87 87 … … 94 94 */ 95 95 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); 100 100 } 101 101 … … 108 108 */ 109 109 public void generateControllers(BeanEditorInfo beanEditorInfo, 110 IProgressMonitor monitor ) throws CoreException {110 IProgressMonitor monitor,boolean force) throws CoreException { 111 111 112 112 BeanEvent event = new BeanEventImpl(beanEditorInfo); 113 113 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); 118 118 } 119 119 … … 126 126 */ 127 127 public void generateViews(BeanEditorInfo beanEditorInfo, 128 IProgressMonitor monitor ) throws CoreException {128 IProgressMonitor monitor,boolean force) throws CoreException { 129 129 130 130 BeanEvent event = new BeanEventImpl(beanEditorInfo); … … 140 140 141 141 BeanDetailComposite detailComposite = this.generateBeanDetailComposite( 142 beanEditorInfo, monitor );142 beanEditorInfo, monitor, force); 143 143 BeanContentProvider contentProvider = this.generateBeanContentProvider( 144 beanEditorInfo, event, monitor );144 beanEditorInfo, event, monitor, force); 145 145 BeanListComposite listComposite = this.generateBeanListComposite( 146 beanEditorInfo, monitor );146 beanEditorInfo, monitor, force); 147 147 148 148 BeanComponentsFactory componentsFactory = new ComponentsFactoryImpl( … … 152 152 153 153 this.generateBeanView(beanEditorInfo, componentsFactory, listComposite, 154 detailComposite, monitor );154 detailComposite, monitor, force); 155 155 } 156 156 157 157 public void generateComponentsFactory(BeanEditorInfo beanEditorInfo, 158 IProgressMonitor monitor ) throws CoreException {158 IProgressMonitor monitor, boolean force) throws CoreException { 159 159 160 160 BeanEvent event = new BeanEventImpl(beanEditorInfo); … … 179 179 applyAction, fetchAction, removeAction, dataSource, 180 180 contentProvider, detailComposite, listComposite, 181 monitor );181 monitor, force); 182 182 } 183 183 … … 202 202 BeanContentProvider contentProvider, 203 203 BeanDetailComposite detailComposite, 204 BeanListComposite listComposite, IProgressMonitor monitor )204 BeanListComposite listComposite, IProgressMonitor monitor, boolean force) 205 205 throws CoreException { 206 206 BeanComponentsFactory componentsFactory = new ComponentsFactoryImpl( … … 208 208 removeAction, dataSource, contentProvider, detailComposite, 209 209 listComposite); 210 componentsFactory.generate(monitor );210 componentsFactory.generate(monitor, force); 211 211 return componentsFactory; 212 212 } … … 226 226 BeanComponentsFactory componentsFactory, 227 227 BeanListComposite listComposite, 228 BeanDetailComposite detailComposite, IProgressMonitor monitor )228 BeanDetailComposite detailComposite, IProgressMonitor monitor, boolean force) 229 229 throws CoreException { 230 230 BeanView beanView = new BeanViewImpl(beanEditorInfo, componentsFactory, 231 231 listComposite, detailComposite); 232 beanView.generate(monitor );232 beanView.generate(monitor, force); 233 233 return beanView; 234 234 } … … 236 236 protected BeanApplyAction generateBeanApplyAction( 237 237 BeanEditorInfo beanEditorInfo, 238 IProgressMonitor monitor ) throws CoreException {238 IProgressMonitor monitor, boolean force) throws CoreException { 239 239 BeanApplyAction applyAction = new BeanApplyActionImpl(beanEditorInfo); 240 applyAction.generate(monitor );240 applyAction.generate(monitor, force); 241 241 return applyAction; 242 242 } … … 244 244 protected BeanFetchAction generateBeanFetchAction( 245 245 BeanEditorInfo beanEditorInfo, BeanEvent event, 246 IProgressMonitor monitor ) throws CoreException {246 IProgressMonitor monitor, boolean force) throws CoreException { 247 247 BeanFetchAction fetchAction = new BeanFetchActionImpl(beanEditorInfo, 248 248 event); 249 fetchAction.generate(monitor );249 fetchAction.generate(monitor, force); 250 250 return fetchAction; 251 251 } … … 262 262 protected BeanRemoveAction generateBeanRemoveAction( 263 263 BeanEditorInfo beanEditorInfo, 264 IProgressMonitor monitor ) throws CoreException {264 IProgressMonitor monitor, boolean force) throws CoreException { 265 265 BeanRemoveAction removeAction = new BeanRemoveActionImpl( 266 266 beanEditorInfo); 267 removeAction.generate(monitor );267 removeAction.generate(monitor, force); 268 268 return removeAction; 269 269 } … … 280 280 */ 281 281 protected BeanAddAction generateBeanAddAction( 282 BeanEditorInfo beanEditorInfo, IProgressMonitor monitor )282 BeanEditorInfo beanEditorInfo, IProgressMonitor monitor, boolean force) 283 283 throws CoreException { 284 284 BeanAddAction addAction = new BeanAddActionImpl(beanEditorInfo); 285 addAction.generate(monitor );285 addAction.generate(monitor,force); 286 286 return addAction; 287 287 } … … 296 296 */ 297 297 protected BeanListComposite generateBeanListComposite( 298 BeanEditorInfo beanEditorInfo, IProgressMonitor monitor )298 BeanEditorInfo beanEditorInfo, IProgressMonitor monitor,boolean force) 299 299 throws CoreException { 300 300 BeanListComposite listComposite = new BeanListCompositeImpl( 301 301 beanEditorInfo); 302 listComposite.generate(monitor );302 listComposite.generate(monitor,force); 303 303 return listComposite; 304 304 } … … 315 315 protected BeanContentProvider generateBeanContentProvider( 316 316 BeanEditorInfo beanEditorInfo, BeanEvent beanEvent, 317 IProgressMonitor monitor ) throws CoreException {317 IProgressMonitor monitor, boolean force ) throws CoreException { 318 318 BeanContentProvider contentProvider = new BeanContentProviderImpl( 319 319 beanEditorInfo, beanEvent); 320 contentProvider.generate(monitor );320 contentProvider.generate(monitor, force); 321 321 return contentProvider; 322 322 } … … 331 331 */ 332 332 protected BeanDetailComposite generateBeanDetailComposite( 333 BeanEditorInfo beanEditorInfo, IProgressMonitor monitor )333 BeanEditorInfo beanEditorInfo, IProgressMonitor monitor, boolean force) 334 334 throws CoreException { 335 335 BeanDetailComposite detailComposite = new BeanDetailCompositeImpl( 336 336 beanEditorInfo); 337 detailComposite.generate(monitor );337 detailComposite.generate(monitor, force); 338 338 return detailComposite; 339 339 } … … 350 350 */ 351 351 protected BeanEvent generateEvent(BeanEditorInfo beanEditorInfo, 352 IProgressMonitor monitor ) throws CoreException {352 IProgressMonitor monitor, boolean force) throws CoreException { 353 353 BeanEvent event = new BeanEventImpl(beanEditorInfo); 354 event.generate(monitor );354 event.generate(monitor, force); 355 355 return event; 356 356 } … … 368 368 */ 369 369 protected BeanDataSource generateDataSource(BeanEditorInfo beanEditorInfo, 370 BeanEvent beanEvent, IProgressMonitor monitor ) throws CoreException {370 BeanEvent beanEvent, IProgressMonitor monitor,boolean force) throws CoreException { 371 371 BeanDataSource beanDataSource = new BeanDataSourceImpl(beanEditorInfo, 372 372 beanEvent); 373 beanDataSource.generate(monitor );373 beanDataSource.generate(monitor, force); 374 374 return beanDataSource; 375 375 } trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/internal/model/GeneratableSupport.java
r764 r765 56 56 * @param monitor 57 57 */ 58 public void generate(String source, IProgressMonitor monitor )58 public void generate(String source, IProgressMonitor monitor, boolean force) 59 59 throws CoreException { 60 60 IPackageFragmentRoot sourceDir = this.getBeanEditorInfo() … … 62 62 try { 63 63 IPackageFragment targetPackage = sourceDir.createPackageFragment( 64 this.getPackageName(), f alse, monitor);64 this.getPackageName(), force, monitor); 65 65 targetPackage.createCompilationUnit(this.getClassName() + ".java", //$NON-NLS-1$ 66 source, f alse, monitor);66 source, force, monitor); 67 67 } catch (JavaModelException e) { 68 68 throw new CoreException(new Status(IStatus.ERROR, … … 72 72 73 73 74 public void generate(IProgressMonitor monitor ) throws CoreException {74 public void generate(IProgressMonitor monitor,boolean force) throws CoreException { 75 75 String source = this.generateSource(); 76 this.generate(source, monitor );76 this.generate(source, monitor, force); 77 77 } 78 78 trunk/plugins/org.jalcedo.generator.client.beans/src/org/jalcedo/generator/client/beans/model/Generatable.java
r586 r765 25 25 * @throws CoreException 26 26 */ 27 void generate(IProgressMonitor monitor ) throws CoreException;27 void generate(IProgressMonitor monitor, boolean force) throws CoreException; 28 28 }
