[203290] Snippet URL causes errors w/ JP workspace path
diff --git a/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF b/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF
index 7e20bd2..157af8b 100644
--- a/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF
+++ b/org.eclipse.wst.common.snippets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Snippets_View.name
Bundle-SymbolicName: org.eclipse.wst.common.snippets; singleton:=true
-Bundle-Version: 1.1.101.qualifier
+Bundle-Version: 1.1.200.qualifier
Bundle-Activator: org.eclipse.wst.common.snippets.internal.SnippetsPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/model/SnippetManager.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/model/SnippetManager.java
index f8a96f2..dd7433a 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/model/SnippetManager.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/internal/model/SnippetManager.java
@@ -12,6 +12,7 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -54,7 +55,7 @@
*/
public class SnippetManager implements ISnippetManager, PropertyChangeListener {
- protected static String hiddenStateFilename = "hidden.xml"; //$NON-NLS-1$
+ private static File hiddenStateFile = new File("/hidden.xml"); //$NON-NLS-1$
private static SnippetManager instance = null;
@@ -62,10 +63,10 @@
if (instance == null) {
instance = new SnippetManager();
try {
- hiddenStateFilename = SnippetsPlugin.getDefault().getStateLocation().append("hidden.xml").toOSString(); //$NON-NLS-1$
+ hiddenStateFile = SnippetsPlugin.getDefault().getStateLocation().append("hidden.xml").toFile(); //$NON-NLS-1$
}
catch (Exception e) {
- hiddenStateFilename = "/hidden.xml"; //$NON-NLS-1$
+ hiddenStateFile = new File("/hidden.xml"); //$NON-NLS-1$
}
// hook resource listener and load categories from workspace
// nsd_TODO: disable in-workspace support until fully stabilized
@@ -251,7 +252,7 @@
try {
DocumentBuilder builder = CommonXML.getDocumentBuilder();
if (builder != null) {
- document = builder.parse(hiddenStateFilename);
+ document = builder.parse(hiddenStateFile);
}
else {
Logger.log(Logger.ERROR, "SnippetManager couldn't obtain a DocumentBuilder"); //$NON-NLS-1$
@@ -372,7 +373,7 @@
protected void saveHiddenState() {
Document document = CommonXML.getDocumentBuilder().getDOMImplementation().createDocument(null, "hidden", null); //$NON-NLS-1$
try {
- FileOutputStream ostream = new FileOutputStream(hiddenStateFilename);
+ FileOutputStream ostream = new FileOutputStream(hiddenStateFile);
List categoryIDs = new ArrayList(0);
List itemIDs = new ArrayList(0);
// collect all of the hidden entry IDs
