aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-05-24 09:06:44 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-05-24 09:06:44 -0700
commit68d5abeaffd1006b59d0a5dcee666e168d1c4c78 (patch)
tree9b484875e573bc7b4646dd01f7b1752be063ae50 /activesupport/lib
parentdea40350820a51c72924bd10817d93b2d5c2229b (diff)
parent89da0d3ab9ac705c61e4e9b718268b2dab1df393 (diff)
downloadrails-68d5abeaffd1006b59d0a5dcee666e168d1c4c78.tar.gz
rails-68d5abeaffd1006b59d0a5dcee666e168d1c4c78.tar.bz2
rails-68d5abeaffd1006b59d0a5dcee666e168d1c4c78.zip
Merge pull request #1251 from arunagw/java_import
Using java_import instead of import. Need to do this with rake 0.9.0 #jruby
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/xml_mini/jdom.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/xml_mini/jdom.rb b/activesupport/lib/active_support/xml_mini/jdom.rb
index 48c1cb3fe9..7aefabfdd1 100644
--- a/activesupport/lib/active_support/xml_mini/jdom.rb
+++ b/activesupport/lib/active_support/xml_mini/jdom.rb
@@ -5,12 +5,12 @@ include Java
require 'active_support/core_ext/object/blank'
-import javax.xml.parsers.DocumentBuilder unless defined? DocumentBuilder
-import javax.xml.parsers.DocumentBuilderFactory unless defined? DocumentBuilderFactory
-import java.io.StringReader unless defined? StringReader
-import org.xml.sax.InputSource unless defined? InputSource
-import org.xml.sax.Attributes unless defined? Attributes
-import org.w3c.dom.Node unless defined? Node
+java_import javax.xml.parsers.DocumentBuilder unless defined? DocumentBuilder
+java_import javax.xml.parsers.DocumentBuilderFactory unless defined? DocumentBuilderFactory
+java_import java.io.StringReader unless defined? StringReader
+java_import org.xml.sax.InputSource unless defined? InputSource
+java_import org.xml.sax.Attributes unless defined? Attributes
+java_import org.w3c.dom.Node unless defined? Node
# = XmlMini JRuby JDOM implementation
module ActiveSupport