Changeset 805
- Timestamp:
- 06/29/07 12:58:53 (2 years ago)
- Files:
-
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/config/ProjectConfiguration.java (modified) (1 diff)
- trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanEditorGenerateWizard.java (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/config/ProjectConfiguration.java
r761 r805 25 25 import org.eclipse.pde.core.plugin.IPluginModel; 26 26 import org.eclipse.pde.core.plugin.IPluginObject; 27 import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModelBase;28 27 import org.eclipse.pde.internal.ui.editor.PDEFormEditor; 29 28 import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor; trunk/plugins/org.jalcedo.generator.client.beans.ui/src/org/jalcedo/generator/client/beans/ui/internal/wizards/BeanEditorGenerateWizard.java
r776 r805 22 22 import org.eclipse.jdt.core.IType; 23 23 import org.eclipse.jface.dialogs.ErrorDialog; 24 import org.eclipse.jface.dialogs.MessageDialog; 24 25 import org.eclipse.jface.viewers.IStructuredSelection; 25 26 import org.eclipse.jface.wizard.Wizard; 27 import org.eclipse.swt.widgets.Shell; 26 28 import org.eclipse.ui.INewWizard; 27 29 import org.eclipse.ui.IWorkbench; 30 import org.eclipse.ui.PlatformUI; 28 31 import org.eclipse.ui.actions.WorkspaceModifyOperation; 29 32 import org.jalcedo.generator.client.beans.BeanEditorGeneratorActivator; … … 75 78 @Override 76 79 protected void execute(IProgressMonitor monitor) 77 throws CoreException, InvocationTargetException,78 InterruptedException {80 throws InvocationTargetException, InterruptedException, 81 CoreException { 79 82 try { 80 83 BeanEditorGeneratorActivator generatorPlugin = BeanEditorGeneratorActivator … … 82 85 83 86 TargetBean targetBean = generatorPlugin.createTargetBean( 84 beanInfoPage.getBeanType(), 85 beanInfoPage.getIdProperty(),86 beanInfoPage.getEditableProperties());87 beanInfoPage.getBeanType(), beanInfoPage 88 .getIdProperty(), beanInfoPage 89 .getEditableProperties()); 87 90 BeanEditorInfo beanEditorInfo = generatorPlugin 88 .createBeanEditorInfo(targetBean, targetEnvironmentPage89 .getPackageFragment());91 .createBeanEditorInfo(targetBean, 92 targetEnvironmentPage.getPackageFragment()); 90 93 91 SourceGenerator sourceGenerator = new SourceGenerator();92 93 sourceGenerator.generateAll(beanEditorInfo, monitor, targetEnvironmentPage.getFileOverWriteCheck());94 94 IProject project = beanEditorInfo.getTargetSourceDir() 95 95 .getJavaProject().getProject(); 96 97 96 ProjectConfiguration config = new ProjectConfiguration( 98 97 project); … … 106 105 monitor); 107 106 } 107 SourceGenerator sourceGenerator = new SourceGenerator(); 108 109 try { 110 sourceGenerator.generateAll(beanEditorInfo, monitor, 111 targetEnvironmentPage.getFileOverWriteCheck()); 112 } catch (CoreException e) { 113 114 Shell shell = PlatformUI.getWorkbench() 115 .getActiveWorkbenchWindow().getShell(); 116 boolean question = MessageDialog.openQuestion(shell, 117 "", "The file may already exist. Overwrite?"); 118 119 if (question) { 120 sourceGenerator.generateAll(beanEditorInfo, 121 monitor, true); 122 123 } 124 } 125 108 126 } finally { 109 127 monitor.done();
