From b50abbbba749deee3fbe4cbab0c47426b46b083b Mon Sep 17 00:00:00 2001 From: Chris Goldthorpe Date: Mon, 20 Sep 2010 20:20:10 +0000 Subject: Bug 325355 - Intro theme not working if comma is in installation path --- .../ui/internal/intro/impl/model/AbstractIntroElement.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroElement.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroElement.java index 0f62b02c2..a34abd3f4 100644 --- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroElement.java +++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -273,10 +273,14 @@ public abstract class AbstractIntroElement implements Cloneable { if (element.hasAttribute(att)) { String value = element.getAttribute(att); if (value!=null) { - IntroModelRoot root = getModelRoot(); - if (root!=null) - value = root.resolveVariables(value); - return StringUtil.split(value, ","); //$NON-NLS-1$ + String[] splitValues = StringUtil.split(value, ","); //$NON-NLS-1$ + IntroModelRoot root = getModelRoot(); + if (root!=null) { + for (int i = 0; i < splitValues.length; i++) { + splitValues[i] = root.resolveVariables(splitValues[i]); + } + } + return splitValues; } } /* -- cgit v1.2.3