[581425] Update versions and optimize XSL FileUtils Change-Id: Ic2b1a3bf24a08628e579de1281ca3f685c217d65
diff --git a/xsl/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF b/xsl/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF index 1e028b1..a404a91 100644 --- a/xsl/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF +++ b/xsl/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF
@@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 +Automatic-Module-Name: org.eclipse.wst.xsl.core Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xsl.core;singleton:=true -Bundle-Version: 1.2.100.qualifier +Bundle-Version: 1.2.200.qualifier Bundle-Activator: org.eclipse.wst.xsl.core.internal.XSLCorePlugin Require-Bundle: org.apache.xalan;bundle-version="[2.7.1,2.8.0)", org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
diff --git a/xsl/bundles/org.eclipse.wst.xsl.core/pom.xml b/xsl/bundles/org.eclipse.wst.xsl.core/pom.xml index 3ba4cce..461dc1b 100644 --- a/xsl/bundles/org.eclipse.wst.xsl.core/pom.xml +++ b/xsl/bundles/org.eclipse.wst.xsl.core/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xsl.core</artifactId> - <version>1.2.100-SNAPSHOT</version> + <version>1.2.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>XSLT Core Plugin</name>
diff --git a/xsl/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/FileUtil.java b/xsl/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/FileUtil.java index 4839c26..df3ced9 100644 --- a/xsl/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/FileUtil.java +++ b/xsl/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/FileUtil.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -35,9 +35,11 @@ { IContentTypeManager contentTypeManager = Platform.getContentTypeManager(); IContentType[] types = contentTypeManager.findContentTypesFor(file.getName()); + IContentType xmlContentType = contentTypeManager.getContentType("org.eclipse.core.runtime.xml"); //$NON-NLS-1$ + IContentType illformedXML = contentTypeManager.getContentType("org.eclipse.wst.xml.core.xmlsource"); //$NON-NLS-1$ for (IContentType contentType : types) { - if (contentType.isKindOf(contentTypeManager.getContentType("org.eclipse.core.runtime.xml")) || contentType.isKindOf(contentTypeManager.getContentType("org.eclipse.wst.xml.core.xmlsource"))) //$NON-NLS-1$ //$NON-NLS-2$ + if (contentType.isKindOf(xmlContentType) || contentType.isKindOf(illformedXML)) { return true; } @@ -54,10 +56,11 @@ public static boolean isXSLFile(IFile file) { IContentTypeManager contentTypeManager = Platform.getContentTypeManager(); + IContentType xslContentType = contentTypeManager.getContentType(XSLCore.XSL_CONTENT_TYPE); IContentType[] types = contentTypeManager.findContentTypesFor(file.getName()); for (IContentType contentType : types) { - if (contentType.equals(contentTypeManager.getContentType(XSLCore.XSL_CONTENT_TYPE))) + if (contentType.equals(xslContentType)) { return true; }
diff --git a/xsl/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF b/xsl/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF index 03f6d88..97eefa1 100644 --- a/xsl/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF +++ b/xsl/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.wst.xsl.debug.ui Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xsl.debug.ui;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.100.qualifier Bundle-Activator: org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)",
diff --git a/xsl/bundles/org.eclipse.wst.xsl.debug.ui/pom.xml b/xsl/bundles/org.eclipse.wst.xsl.debug.ui/pom.xml index 7489ed3..156eb67 100644 --- a/xsl/bundles/org.eclipse.wst.xsl.debug.ui/pom.xml +++ b/xsl/bundles/org.eclipse.wst.xsl.debug.ui/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xsl.debug.ui</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>XSLT Debug UI Plugin</name>
diff --git a/xsl/features/org.eclipse.wst.xsl.feature/feature.xml b/xsl/features/org.eclipse.wst.xsl.feature/feature.xml index b41b3c0..5a8eb9f 100644 --- a/xsl/features/org.eclipse.wst.xsl.feature/feature.xml +++ b/xsl/features/org.eclipse.wst.xsl.feature/feature.xml
@@ -14,7 +14,7 @@ <feature id="org.eclipse.wst.xsl.feature" label="%featureName" - version="1.3.1300.qualifier" + version="1.3.1400.qualifier" provider-name="%providerName" plugin="org.eclipse.wst.xsl" license-feature="org.eclipse.license"
diff --git a/xsl/features/org.eclipse.wst.xsl.feature/pom.xml b/xsl/features/org.eclipse.wst.xsl.feature/pom.xml index d85fd5d..4154b8d 100644 --- a/xsl/features/org.eclipse.wst.xsl.feature/pom.xml +++ b/xsl/features/org.eclipse.wst.xsl.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xsl.feature</artifactId> - <version>1.3.1300-SNAPSHOT</version> + <version>1.3.1400-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <name>XSLT FeaturePlugin</name>
diff --git a/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml b/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml index b99e6e5..0690829 100644 --- a/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml +++ b/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
@@ -11,11 +11,10 @@ Contributors: IBM Corporation - initial API and implementation --> - <feature id="org.eclipse.wst.xsl_sdk.feature" label="%featureName" - version="1.1.1100.qualifier" + version="1.1.1200.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="0.0.0"> @@ -31,6 +30,7 @@ <license url="%licenseURL"> %license </license> + <requires> <import feature="org.eclipse.wst.xsl.feature" version="0.0.0" match="greaterOrEqual"/> <import feature="org.eclipse.wst.xml.xpath2.processor.feature" version="0.0.0" match="greaterOrEqual"/>
diff --git a/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml b/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml index 55f77e8..d6d94c2 100644 --- a/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml +++ b/xsl/features/org.eclipse.wst.xsl_sdk.feature/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xsl_sdk.feature</artifactId> - <version>1.1.1100-SNAPSHOT</version> + <version>1.1.1200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>