Problems with editors (cvs commit: xml-axis/java/src/org/apache/axis/utils XMLUtils.java)

[Russell Butek <bu...@us.ibm.com>]

Berin,

It looks like your IDE messed with you again.  It changed explicit imports
to a single wildcard import:

  -import org.w3c.dom.Attr;
  -import org.w3c.dom.Document;
  -import org.w3c.dom.Element;
  -import org.w3c.dom.NamedNodeMap;
  -import org.w3c.dom.Node;

  +import org.w3c.dom.*;

I just fixed this, but I also discovered a clash between your editor and
mine.  Yours puts ctrl-M's at the end of each line you add.  My editor
changes those ctrl-M's to tabs for some reason.  So when I check something
in I end up getting a report not only of my changes, but of yours as well.
The changing to tabs is my editor's fault.  But I don't like the ctrl-M's
your editor puts on, either.  It makes it look like there's a blank line
between every real line.

So, could you figure out how to keep the ctrl-M's off your lines?

And as for the rest of us, in case our editors do strange things for us,
let's be very careful that we don't make changes other than what we detail
in our commit comments.  I've begun doing a diff before I do an update to
catch these.

Russell Butek
butek@us.ibm.com
---------------------- Forwarded by Russell Butek/Austin/IBM on 10/10/2001
12:10 PM ---------------------------





bloritsch@apache.org on 10/10/2001 11:17:56 AM

Please respond to axis-dev@xml.apache.org

To:   xml-axis-cvs@apache.org
cc:

Subject:  cvs commit: xml-axis/java/src/org/apache/axis/utils XMLUtils.java




bloritsch    01/10/10 09:17:56

  Modified:    java/src/org/apache/axis/utils XMLUtils.java
  Log:
  collapse the explicit Document variable.  We may not have to do XInclude
after all.

  Revision  Changes    Path
  1.21      +3 -8
xml-axis/java/src/org/apache/axis/utils/XMLUtils.java

  Index: XMLUtils.java
  ===================================================================
  RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/utils/XMLUtils.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- XMLUtils.java 2001/10/10 15:33:39  1.20
  +++ XMLUtils.java 2001/10/10 16:17:56  1.21
  @@ -55,12 +55,8 @@

   package org.apache.axis.utils ;

  -import org.apache.axis.Constants;
  -import org.w3c.dom.Attr;
  -import org.w3c.dom.Document;
  -import org.w3c.dom.Element;
  -import org.w3c.dom.NamedNodeMap;
  -import org.w3c.dom.Node;
  +import org.apache.axis.Constants;
  +import org.w3c.dom.*;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;

  @@ -195,8 +191,7 @@

       public static Document newDocument(InputSource inp) {
           try {
  -            Document doc = dbf.newDocumentBuilder().parse( inp );
  -            return( doc );
  +            return( dbf.newDocumentBuilder().parse( inp ) );
           }
           catch( Exception e ) {
               e.printStackTrace();