diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java')
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java index 5e2a9a7aae..381710e360 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java @@ -66,6 +66,7 @@ public class GenerateEntitiesAction extends ProjectAction { wizard.getPackageGeneratorConfig(), wizard.getEntityGeneratorConfig(), wizard.getSelectedTables(), + wizard.synchronizePersistenceXml(), project, new OverwriteConfirmer(this.targetPart.getSite().getShell()) ); @@ -88,6 +89,7 @@ public class GenerateEntitiesAction extends ProjectAction { private final PackageGenerator.Config packageConfig; private final EntityGenerator.Config entityConfig; private final Collection selectedTables; + private final boolean synchronizePersistenceXml; private final EntityGenerator.OverwriteConfirmer overwriteConfirmer; private final IJpaProject project; @@ -95,6 +97,7 @@ public class GenerateEntitiesAction extends ProjectAction { PackageGenerator.Config packageConfig, EntityGenerator.Config entityConfig, Collection selectedTables, + boolean synchronizePersistenceXml, IJpaProject project, EntityGenerator.OverwriteConfirmer overwriteConfirmer ) { @@ -102,6 +105,7 @@ public class GenerateEntitiesAction extends ProjectAction { this.packageConfig = packageConfig; this.entityConfig = entityConfig; this.selectedTables = selectedTables; + this.synchronizePersistenceXml = synchronizePersistenceXml; this.overwriteConfirmer = overwriteConfirmer; this.project = project; } @@ -110,11 +114,13 @@ public class GenerateEntitiesAction extends ProjectAction { monitor.beginTask("", 1000); try { PackageGenerator.generateEntities(this.packageConfig, this.entityConfig, this.selectedTables, this.overwriteConfirmer, monitor); - // we currently only support *one* persistence.xml file per project - IJpaFile resource = project.getPlatform().validPersistenceXmlFiles().next(); - if(resource != null){ - SynchronizeClassesJob job = new SynchronizeClassesJob(resource.getFile()); - job.schedule(); + if (synchronizePersistenceXml) { + // we currently only support *one* persistence.xml file per project + IJpaFile resource = project.getPlatform().validPersistenceXmlFiles().next(); + if (resource != null) { + SynchronizeClassesJob job = new SynchronizeClassesJob(resource.getFile()); + job.schedule(); + } } } catch (OperationCanceledException ex) { // fall through and tell monitor we are done |