[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [3004] trunk/com.aptana.rdt

[<caw...@us...>]

Revision: 3004
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3004&view=rev
Author:   cawilliams
Date:     2007-08-17 10:58:58 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
fix discouraged access warnings

Modified Paths:
--------------
    trunk/com.aptana.rdt/META-INF/MANIFEST.MF
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/DynamicVariableAliasesLocal.java

Added Paths:
-----------
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/XMLWriter.java

Modified: trunk/com.aptana.rdt/META-INF/MANIFEST.MF
===================================================================
--- trunk/com.aptana.rdt/META-INF/MANIFEST.MF	2007-08-17 17:53:42 UTC (rev 3003)
+++ trunk/com.aptana.rdt/META-INF/MANIFEST.MF	2007-08-17 17:58:58 UTC (rev 3004)
@@ -10,7 +10,7 @@
 Export-Package: com.aptana.rdt,
  com.aptana.rdt.core.gems,
  com.aptana.rdt.internal.core.gems;x-friends:="com.aptana.rdt.tests",
- com.aptana.rdt.internal.parser.warnings;x-friends:="com.aptana.rdt.tests",
+ com.aptana.rdt.internal.parser.warnings;x-friends:="com.aptana.rdt.tests,com.aptana.rdt.ui",
  com.aptana.rdt.launching
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,

Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java	2007-08-17 17:53:42 UTC (rev 3003)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java	2007-08-17 17:58:58 UTC (rev 3004)
@@ -29,7 +29,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.eclipse.core.internal.resources.XMLWriter;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;

Added: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/XMLWriter.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/XMLWriter.java	                        (rev 0)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/XMLWriter.java	2007-08-17 17:58:58 UTC (rev 3004)
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.aptana.rdt.internal.core.gems;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Iterator;
+
+/**
+ * A simple XML writer.
+ */
+public class XMLWriter extends PrintWriter {
+	protected int tab;
+
+	/* constants */
+	protected static final String XML_VERSION = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; //$NON-NLS-1$
+
+	public XMLWriter(OutputStream output) throws UnsupportedEncodingException {
+		super(new OutputStreamWriter(output, "UTF8")); //$NON-NLS-1$
+		tab = 0;
+		println(XML_VERSION);
+	}
+
+	public void endTag(String name) {
+		tab--;
+		printTag('/' + name, null);
+	}
+
+	public void printSimpleTag(String name, Object value) {
+		if (value != null) {
+			printTag(name, null, true, false);
+			print(getEscaped(String.valueOf(value)));
+			printTag('/' + name, null, false, true);
+		}
+	}
+
+	public void printTabulation() {
+		for (int i = 0; i < tab; i++)
+			super.print('\t');
+	}
+
+	public void printTag(String name, HashMap parameters) {
+		printTag(name, parameters, true, true);
+	}
+
+	public void printTag(String name, HashMap parameters, boolean shouldTab, boolean newLine) {
+		StringBuffer sb = new StringBuffer();
+		sb.append("<"); //$NON-NLS-1$
+		sb.append(name);
+		if (parameters != null)
+			for (Iterator it = parameters.keySet().iterator(); it.hasNext();) {
+				sb.append(" "); //$NON-NLS-1$
+				String key = (String) it.next();
+				sb.append(key);
+				sb.append("=\""); //$NON-NLS-1$
+				sb.append(getEscaped(String.valueOf(parameters.get(key))));
+				sb.append("\""); //$NON-NLS-1$
+			}
+		sb.append(">"); //$NON-NLS-1$
+		if (shouldTab)
+			printTabulation();
+		if (newLine)
+			println(sb.toString());
+		else
+			print(sb.toString());
+	}
+
+	public void startTag(String name, HashMap parameters) {
+		startTag(name, parameters, true);
+	}
+
+	public void startTag(String name, HashMap parameters, boolean newLine) {
+		printTag(name, parameters, true, newLine);
+		tab++;
+	}
+
+	private static void appendEscapedChar(StringBuffer buffer, char c) {
+		String replacement = getReplacement(c);
+		if (replacement != null) {
+			buffer.append('&');
+			buffer.append(replacement);
+			buffer.append(';');
+		} else {
+			buffer.append(c);
+		}
+	}
+
+	public static String getEscaped(String s) {
+		StringBuffer result = new StringBuffer(s.length() + 10);
+		for (int i = 0; i < s.length(); ++i)
+			appendEscapedChar(result, s.charAt(i));
+		return result.toString();
+	}
+
+	private static String getReplacement(char c) {
+		// Encode special XML characters into the equivalent character references.
+		// These five are defined by default for all XML documents.
+		switch (c) {
+			case '<' :
+				return "lt"; //$NON-NLS-1$
+			case '>' :
+				return "gt"; //$NON-NLS-1$
+			case '"' :
+				return "quot"; //$NON-NLS-1$
+			case '\'' :
+				return "apos"; //$NON-NLS-1$
+			case '&' :
+				return "amp"; //$NON-NLS-1$
+		}
+		return null;
+	}
+}


Property changes on: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/XMLWriter.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/DynamicVariableAliasesLocal.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/DynamicVariableAliasesLocal.java	2007-08-17 17:53:42 UTC (rev 3003)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/DynamicVariableAliasesLocal.java	2007-08-17 17:58:58 UTC (rev 3004)
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.jruby.ast.ArrayNode;
 import org.jruby.ast.IterNode;
 import org.jruby.ast.ListNode;
 import org.jruby.ast.LocalAsgnNode;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.