[jbosstools-commits] JBoss Tools SVN: r44078 - in trunk/runtime/plugins: org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-09-27 03:43:04 -0400 (Thu, 27 Sep 2012)
New Revision: 44078

Modified:
   trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
   trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java
Log:
JBIDE-12582 to trunk

Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java	2012-09-27 05:37:06 UTC (rev 44077)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java	2012-09-27 07:43:04 UTC (rev 44078)
@@ -284,11 +284,12 @@
 					Node node = runtimes.item(i);
 					if (node.getNodeType() == Node.ELEMENT_NODE) {
 						Element element = (Element) node;
-						String id = element.getAttribute("id"); //$NON-NLS-1$
-						String name = element.getAttribute("name"); //$NON-NLS-1$
-						String version = element.getAttribute("version"); //$NON-NLS-1$
-						String url = element.getAttribute("url"); //$NON-NLS-1$
-						String disclaimer = element.getAttribute("disclaimer"); //$NON-NLS-1$
+						String id = element.getAttribute(ID);
+						String name = element.getAttribute(NAME); 
+						String version = element.getAttribute(VERSION); 
+						String url = element.getAttribute(URL);
+						String disclaimer = element.getAttribute(DISCLAIMER);
+						String licenseUrl = element.getAttribute(LICENSE_URL);
 						if (id == null || name == null || version == null || url == null) {
 							IStatus status = new Status(IStatus.WARNING, 
 									RuntimeCoreActivator.PLUGIN_ID,
@@ -297,7 +298,8 @@
 							RuntimeCoreActivator.getDefault().getLog().log(status);
 						} else {
 							DownloadRuntime runtime = new DownloadRuntime(id, name, version, url);
-							runtime.setDisclaimer("true".equals(disclaimer)); //$NON-NLS-1$
+							runtime.setLicenseURL(licenseUrl);
+							runtime.setDisclaimer(Boolean.parseBoolean(disclaimer));
 							map.put(id, runtime);
 						}
 					}

Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java	2012-09-27 05:37:06 UTC (rev 44077)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java	2012-09-27 07:43:04 UTC (rev 44078)
@@ -234,6 +234,8 @@
 				if( licenseApproved(downloadRuntime)) {
 					saveLocationDialog = new DownloadRuntimeDialog(getShell(), downloadRuntime);
 					saveLocationDialog.open();
+				} else {
+					return;
 				}
 			}
 		}