*** empty log message ***
diff --git a/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.pde.prefs
index 1c5d1f1..c1fc3ed 100644
--- a/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.pde.prefs
+++ b/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.pde.prefs
@@ -1,16 +1,24 @@
-#Fri Jan 04 09:12:34 EST 2008
+#Wed Jul 30 20:56:56 BST 2008
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
compilers.incompatible-environment=1
compilers.p.build=0
compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
compilers.p.missing-bundle-classpath-entries=0
compilers.p.missing-packages=2
compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
+compilers.p.not-externalized-att=1
compilers.p.unknown-attribute=0
compilers.p.unknown-class=1
compilers.p.unknown-element=0
+compilers.p.unknown-identifier=1
compilers.p.unknown-resource=1
compilers.p.unresolved-ex-points=0
compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
compilers.use-project=true
eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.xsl.launching/plugin.properties b/bundles/org.eclipse.wst.xsl.launching/plugin.properties
index 1268bc7..d3fbdda 100644
--- a/bundles/org.eclipse.wst.xsl.launching/plugin.properties
+++ b/bundles/org.eclipse.wst.xsl.launching/plugin.properties
@@ -1,6 +1,6 @@
#Properties file for org.eclipse.wst.xsl.launching
Bundle-Name.0 = XSL Transform Launching (Incubating)
-launchConfigurationType.name.0 = XSL (Java)
+launchConfigurationType.name.0 = XSL
sourceLocator.name.0 = XSLT Source Lookup Director
processorType.label.0 = JRE Default
processor.label.0 = JRE Instance Default
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchHelper.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchHelper.java
index 7d79978..bc655de 100644
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchHelper.java
+++ b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchHelper.java
@@ -47,7 +47,6 @@
public class LaunchHelper
{
- private IPath sourceFile;
private final URL source;
private final File target;
private final LaunchFeatures features;
@@ -183,7 +182,7 @@
}
}
- private LaunchProperties hydrateOutputProperties(ILaunchConfiguration configuration) throws CoreException
+ public static LaunchProperties hydrateOutputProperties(ILaunchConfiguration configuration) throws CoreException
{
LaunchProperties properties = null;
boolean usePreferenceProperties = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_PROPERTIES_FROM_PREFERENCES, true);
@@ -283,7 +282,7 @@
return null;
}
- private LaunchPipeline hydratePipeline(ILaunchConfiguration configuration) throws CoreException
+ private static LaunchPipeline hydratePipeline(ILaunchConfiguration configuration) throws CoreException
{
LaunchPipeline pipeline = null;
String s = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PIPELINE, (String) null);
@@ -295,15 +294,19 @@
return pipeline;
}
- private URL hydrateSourceFileURL(ILaunchConfiguration configuration) throws CoreException
+ public static URL hydrateSourceFileURL(ILaunchConfiguration configuration) throws CoreException
+ {
+ IPath sourceFile = hydrateSourceFile(configuration);
+ return pathToURL(sourceFile);
+ }
+
+ private static IPath hydrateSourceFile(ILaunchConfiguration configuration) throws CoreException
{
String sourceFileExpr = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, (String) null);
- sourceFile = getSubstitutedPath(sourceFileExpr);
- URL url = pathToURL(sourceFile);
- return url;
+ return getSubstitutedPath(sourceFileExpr);
}
- private URL pathToURL(IPath sourceFile) throws CoreException
+ private static URL pathToURL(IPath sourceFile) throws CoreException
{
URL url = null;
try
@@ -317,7 +320,7 @@
return url;
}
- private File hydrateOutputFile(ILaunchConfiguration configuration) throws CoreException
+ public static File hydrateOutputFile(ILaunchConfiguration configuration) throws CoreException
{
IPath outputFile = null;
boolean useDefaultOutputFile = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_OUTPUT_FILE, true);
@@ -330,7 +333,7 @@
{
// TODO: where is the default output file? And must share this with
// the value displayed in the UI.
- outputFile = (IPath) sourceFile.clone();
+ outputFile = (IPath) hydrateSourceFile(configuration);
outputFile = outputFile.addFileExtension("out").addFileExtension("xml"); //$NON-NLS-1$ //$NON-NLS-2$
}
return outputFile.toFile();
@@ -346,7 +349,7 @@
return null;
}
- private IProcessorInstall getProcessorInstall(ILaunchConfiguration configuration) throws CoreException
+ public static IProcessorInstall getProcessorInstall(ILaunchConfiguration configuration) throws CoreException
{
boolean useDefaultProcessor = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
if (useDefaultProcessor)
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs
index fdd8568..e1e68b9 100644
--- a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs
+++ b/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs
@@ -1,16 +1,24 @@
-#Fri Jan 04 09:04:43 EST 2008
+#Wed Jul 30 20:57:15 BST 2008
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
compilers.incompatible-environment=1
compilers.p.build=0
compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
compilers.p.missing-bundle-classpath-entries=0
compilers.p.missing-packages=2
compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
+compilers.p.not-externalized-att=1
compilers.p.unknown-attribute=0
compilers.p.unknown-class=1
compilers.p.unknown-element=0
+compilers.p.unknown-identifier=1
compilers.p.unknown-resource=1
compilers.p.unresolved-ex-points=0
compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
compilers.use-project=true
eclipse.preferences.version=1