summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Komissarchik2013-08-06 12:33:09 (EDT)
committerNeil Hauge2013-08-06 12:34:39 (EDT)
commit06c95d2bca8c3f2211ddcd1b1bd00a27393d0ca1 (patch)
tree6b9894d2af47b45e7ddba44b4acc8e2d9ee345cd
parent39b8f4d3ba75265be7a1f360a230a08262880084 (diff)
downloadwebtools.dali-06c95d2bca8c3f2211ddcd1b1bd00a27393d0ca1.zip
webtools.dali-06c95d2bca8c3f2211ddcd1b1bd00a27393d0ca1.tar.gz
webtools.dali-06c95d2bca8c3f2211ddcd1b1bd00a27393d0ca1.tar.bz2
413117 - Fix JpaProjectPropertiesPage issue with library providerv201308072132
context. Signed-off-by: Neil Hauge <neil.hauge@oracle.com> Signed-off-by: Konstantin Komissarchik <konstantin.komissarchik@oracle.com>
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
index 9bd75b6..9e68090 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
@@ -969,8 +969,11 @@ public class JpaProjectPropertiesPage
return;
}
+ JpaPlatform.Config jpaPlatformConfig = this.jpaPlatformConfigModel.getValue();
+ String jpaPlatformID = (jpaPlatformConfig == null) ? "" : jpaPlatformConfig.getId(); //$NON-NLS-1$
+
Map<String, Object> enablementVariables = new HashMap<String, Object>();
- enablementVariables.put(JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_ENABLEMENT_EXP, this.jpaPlatformConfigModel.getValue());
+ enablementVariables.put(JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_ENABLEMENT_EXP, jpaPlatformID);
enablementVariables.put(JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_DESCRIPTION_ENABLEMENT_EXP, this.jpaProjectModel.getValue().getJpaPlatform().getConfig());
if ( ! libInstallDelegate.getLibraryProvider().isEnabledFor(