From 914825d39079ae957e0ac1bb6d7439bfb6fea45d Mon Sep 17 00:00:00 2001
From: David Inglis
Date: Thu, 1 Apr 2004 02:39:16 +0000
Subject: removed xerces dependency
---
core/org.eclipse.cdt.ui/.classpath | 4 +-
core/org.eclipse.cdt.ui/ChangeLog | 6 ++
core/org.eclipse.cdt.ui/plugin.xml | 99 ++++++++++++----------
.../cdt/internal/corext/template/TemplateSet.java | 31 ++++---
4 files changed, 80 insertions(+), 60 deletions(-)
diff --git a/core/org.eclipse.cdt.ui/.classpath b/core/org.eclipse.cdt.ui/.classpath
index 61b33a8512d..aa069b2d8d0 100644
--- a/core/org.eclipse.cdt.ui/.classpath
+++ b/core/org.eclipse.cdt.ui/.classpath
@@ -2,9 +2,9 @@
+
+
-
-
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 250956cca36..60a83527dd7 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-31 David Inglis
+
+ removed org.apache.xerces dependency
+
+ * src/org/eclipse/cdt/internal/corext/template/TemplateSet.java
+
2004-03-31 David Daoust
Changed the default value for the preference "LinkToEditor" to be
off -- the same as in the JDT.
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 3d45df2fe1b..08db7bdc7e0 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -27,7 +27,6 @@
-
@@ -49,49 +48,49 @@
pattern=".*">
@@ -188,35 +187,35 @@
id="org.eclipse.cdt.ui.ceditor"
point="org.eclipse.ui.editors">
@@ -285,16 +284,16 @@
@@ -305,16 +304,16 @@
@@ -344,24 +343,24 @@
@@ -402,8 +401,8 @@
@@ -462,8 +461,8 @@
@@ -475,24 +474,24 @@
pageId="org.eclipse.cdt.ui.CSearchPage"
label="%ElementNameSorter.label"
icon="icons/full/clcl16/search_sortmatch.gif"
- class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
tooltip="%ElementNameSorter.tooltip"
+ class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
id="org.eclipse.cdt.search.internal.ui.ElementNameSorter">
@@ -545,16 +544,16 @@
@@ -588,11 +587,11 @@
contributesToHeader="false"
overviewRulerPreferenceValue="false"
presentationLayer="3"
- textStylePreferenceValue="NONE"
symbolicIcon="warning"
+ textStylePreferenceValue="NONE"
icon="icons/full/obj16/unknown_obj.gif"
- label="Index Markers"
textPreferenceValue="false"
+ label="Index Markers"
textPreferenceKey="indexResultIndication"
verticalRulerPreferenceKey="indexResultIndicationInVerticalRuler"
overviewRulerPreferenceKey="indexResultIndicationInOverviewRuler">
@@ -614,22 +613,32 @@
id="org.eclipse.cdt.ui.preferneces.WorkInProgressPreferencePage">
-
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/TemplateSet.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/TemplateSet.java
index fecaf546dca..dcbe75a13be 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/TemplateSet.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/TemplateSet.java
@@ -5,9 +5,6 @@ package org.eclipse.cdt.internal.corext.template;
* All Rights Reserved.
*/
-import org.eclipse.cdt.internal.ui.CStatusConstants;
-import org.eclipse.cdt.internal.ui.CUIException;
-import org.eclipse.cdt.internal.ui.CUIStatus;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -23,13 +20,18 @@ import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.Serializer;
-import org.apache.xml.serialize.SerializerFactory;
+import org.eclipse.cdt.internal.ui.CStatusConstants;
+import org.eclipse.cdt.internal.ui.CUIException;
+import org.eclipse.cdt.internal.ui.CUIStatus;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
-
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -217,14 +219,17 @@ public class TemplateSet {
node.appendChild(pattern);
}
- OutputFormat format = new OutputFormat();
- format.setPreserveSpace(true);
- Serializer serializer = SerializerFactory.getSerializerFactory("xml").makeSerializer(stream, format); //$NON-NLS-1$
- serializer.asDOMSerializer().serialize(document);
-
+ Transformer transformer=TransformerFactory.newInstance().newTransformer();
+ transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
+ transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$
+ transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
+ DOMSource source = new DOMSource(document);
+ StreamResult result = new StreamResult(stream);
+
+ transformer.transform(source,result);
} catch (ParserConfigurationException e) {
throwWriteException(e);
- } catch (IOException e) {
+ } catch (TransformerException e) {
throwWriteException(e);
}
}
--
cgit v1.2.3