Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2007-08-24 18:35:05 +0000
committerkmoore2007-08-24 18:35:05 +0000
commit55580097214dde1308b382dbf24d35bb0bdfc98e (patch)
tree49053eb9ad47d6d9a59d2371612a73e502cdb66d /jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt
parent8e54cd25993356d41fdbe15cf12900f79090dcd2 (diff)
downloadwebtools.dali-55580097214dde1308b382dbf24d35bb0bdfc98e.tar.gz
webtools.dali-55580097214dde1308b382dbf24d35bb0bdfc98e.tar.xz
webtools.dali-55580097214dde1308b382dbf24d35bb0bdfc98e.zip
194387 - fixed NPE setting generation strategy without checking the Primary Key Generation check box.
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt')
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java
index c13c5f7954..3299892119 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java
@@ -163,8 +163,8 @@ public class GeneratedValueComposite extends BaseJpaComposite
}
private void createGeneratedValue() {
- IGeneratedValue generatedValue = this.id.createGeneratedValue();
- this.id.setGeneratedValue(generatedValue);
+ this.generatedValue = this.id.createGeneratedValue();
+ this.id.setGeneratedValue(this.generatedValue);
}
@@ -203,7 +203,7 @@ public class GeneratedValueComposite extends BaseJpaComposite
this.generatedValue = this.id.getGeneratedValue();
}
if (this.generatedValue == null) {
- this.strategyComboViewer.getCombo().deselectAll();
+ this.strategyComboViewer.getCombo().setText("");
this.generatorNameCombo.setText("");
this.populating = false;
return;

Back to the top