summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Komissarchik2013-08-06 12:33:09 (EDT)
committer Neil Hauge2013-08-06 13:29:40 (EDT)
commita50a4f9a3bd7f752039cb8c45dd4ed0552fa4ad1 (patch)
treeef2c15aabeca6b89ecd53e8d409de3439a7a9028
parent633a6652fc4b72ab1d042e6302534562075670e1 (diff)
downloadwebtools.dali-a50a4f9a3bd7f752039cb8c45dd4ed0552fa4ad1.zip
webtools.dali-a50a4f9a3bd7f752039cb8c45dd4ed0552fa4ad1.tar.gz
webtools.dali-a50a4f9a3bd7f752039cb8c45dd4ed0552fa4ad1.tar.bz2
413117 - Fix JpaProjectPropertiesPage issue with library providerv201308062258
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 dbd5b32..543daa5 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(