diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java index 60bb5e05c..d7e966cc9 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java @@ -57,7 +57,7 @@ public class EclipseLauncherParser { URI launcherFolder = launcherData.getLauncher().getParentFile().toURI(); getStartup(lines, launcherFolder); - // getFrameworkJar(lines, launcherFolder, laubncherData); + getFrameworkJar(lines, launcherFolder, launcherData); URI osgiInstallArea = getOSGiInstallArea(lines, launcherFolder); if (osgiInstallArea == null) { osgiInstallArea = launcherData.getFwJar() != null ? launcherData.getFwJar().getParentFile().toURI() : launcherFolder; @@ -74,6 +74,15 @@ public class EclipseLauncherParser { Log.log(LogService.LOG_INFO, NLS.bind(Messages.log_configFile, launcherConfigFile.getAbsolutePath())); } + private void getFrameworkJar(List lines, URI launcherFolder, LauncherData launcherData) { + File fwJar = launcherData.getFwJar(); + if (fwJar != null) + return; + URI location = ParserUtils.getFrameworkJar(lines, launcherFolder); + if (location != null) + launcherData.setFwJar(URIUtil.toFile(location)); + } + private void getPersistentDataLocation(List lines, URI osgiInstallArea, URI configArea, LauncherData launcherData) { //TODO The setting of the -clean could only do properly once config.ini has been read if (launcherData.getFwPersistentDataLocation() == null) { |