Updated to the most recent version of JDOM.

jploski · May 1, 2008 · aedeadc · aedeadc
1 parent 299628e
commit aedeadc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/org.epic.lib/.classpath b/org.epic.lib/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry exported="true" kind="lib" path="lib/brazil_mini.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gnu-regexp-1.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.5.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

diff --git a/org.epic.lib/META-INF/MANIFEST.MF b/org.epic.lib/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.osgi
 Bundle-ClassPath: lib/brazil_mini.jar,
  lib/gnu-regexp-1.1.4.jar,
- lib/jdom.jar,
+ lib/jdom-1.1.jar,
  lib/antlr-2.7.5.jar
 Export-Package: antlr,
  antlr.actions.cpp,

diff --git a/org.epic.lib/lib/jdom-1.1.jar b/org.epic.lib/lib/jdom-1.1.jar
diff --git a/org.epic.perleditor/src/org/epic/core/util/XMLUtilities.java b/org.epic.perleditor/src/org/epic/core/util/XMLUtilities.java
@@ -122,12 +122,12 @@ public void writeIncludeEntries(IProject project, String[] items) throws IOExcep
 	}
 
 	private void writeOutput(Document doc, OutputStream out) throws IOException {
-		XMLOutputter xmlout = new XMLOutputter();
+		Format xmlFormat = Format.getPrettyFormat();
+		xmlFormat.setLineSeparator(System.getProperty("line.separator"));
+		//xmlFormat.setTextMode(Format.TextMode.NORMALIZE);
+		xmlFormat.setEncoding(CHARSET);
 
-		xmlout.setIndent(true);
-		xmlout.setNewlines(true);
-		//xmlout.setTextNormalize(true);
-		xmlout.setEncoding(CHARSET);
+		XMLOutputter xmlout = new XMLOutputter(xmlFormat);
         xmlout.output(doc, out);
 	}