Skip to content

Commit 9a085ab

Browse files
committed
#4 FileBufferModelManager.detectContentType should ignore FNFEs on file stores
1 parent ace69bc commit 9a085ab

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

core/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Automatic-Module-Name: org.eclipse.wst.sse.core
44
Bundle-Name: %pluginName
55
Bundle-SymbolicName: org.eclipse.wst.sse.core; singleton:=true
6-
Bundle-Version: 1.2.1200.qualifier
6+
Bundle-Version: 1.2.1300.qualifier
77
Bundle-Activator: org.eclipse.wst.sse.core.internal.SSECorePlugin
88
Bundle-Vendor: %providerName
99
Bundle-Localization: plugin

core/bundles/org.eclipse.wst.sse.core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<groupId>org.eclipse.webtools.sourceediting</groupId>
2323
<artifactId>org.eclipse.wst.sse.core</artifactId>
24-
<version>1.2.1200-SNAPSHOT</version>
24+
<version>1.2.1300-SNAPSHOT</version>
2525
<packaging>eclipse-plugin</packaging>
2626

2727
<build>

core/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/FileBufferModelManager.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2001, 2023 IBM Corporation and others.
2+
* Copyright (c) 2001, 2024 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -603,7 +603,10 @@ IContentType detectContentType(IFileBuffer buffer) {
603603
*/
604604
}
605605
catch (CoreException e) {
606-
Logger.logException(e);
606+
/*
607+
* Also failure. Resort to finding the content type based
608+
* solely on the file name.
609+
*/
607610
}
608611
if (type == null) {
609612
type = Platform.getContentTypeManager().findContentTypeFor(fileStore.getName());

xml/features/org.eclipse.wst.xml_core.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<feature
1515
id="org.eclipse.wst.xml_core.feature"
1616
label="%featureName"
17-
version="3.31.0.qualifier"
17+
version="3.33.0.qualifier"
1818
provider-name="%providerName"
1919
license-feature="org.eclipse.license"
2020
license-feature-version="0.0.0">

xml/features/org.eclipse.wst.xml_core.feature/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<groupId>org.eclipse.webtools.sourceediting</groupId>
2323
<artifactId>org.eclipse.wst.xml_core.feature</artifactId>
24-
<version>3.31.0-SNAPSHOT</version>
24+
<version>3.33.0-SNAPSHOT</version>
2525
<packaging>eclipse-feature</packaging>
2626

2727
<build>

0 commit comments

Comments
 (0)