diff --git a/src/main/java/com/reandroid/xml/XMLElement.java b/src/main/java/com/reandroid/xml/XMLElement.java index 945f1ee..ea4a5c7 100755 --- a/src/main/java/com/reandroid/xml/XMLElement.java +++ b/src/main/java/com/reandroid/xml/XMLElement.java @@ -24,9 +24,8 @@ import java.util.*; public class XMLElement extends XMLNode{ static final long DEBUG_TO_STRING=500; private String mTagName; - private XMLTextAttribute mTextAttribute; private final List mAttributes = new ArrayList<>(); - private final List mChildes = new ArrayList<>(); + private final List mChildElements = new ArrayList<>(); private List mComments; private final List mTexts = new ArrayList<>(); private XMLElement mParent; @@ -191,7 +190,7 @@ public class XMLElement extends XMLNode{ addChildNoCheck(child, true); } private void clearChildElements(){ - mChildes.clear(); + mChildElements.clear(); } private void clearTexts(){ mTexts.clear(); @@ -208,7 +207,7 @@ public class XMLElement extends XMLNode{ public void hideComments(boolean recursive, boolean hide){ hideComments(hide); if(recursive){ - for(XMLElement child:mChildes){ + for(XMLElement child: mChildElements){ child.hideComments(recursive, hide); } } @@ -260,22 +259,22 @@ public class XMLElement extends XMLNode{ } } public void removeChildElements(){ - mChildes.clear(); + mChildElements.clear(); } public List listAttributes(){ return mAttributes; } public int getChildesCount(){ - return mChildes.size(); + return mChildElements.size(); } public List listChildElements(){ - return mChildes; + return mChildElements; } public XMLElement getChildAt(int index){ - if(index<0 || index>=mChildes.size()){ + if(index<0 || index>= mChildElements.size()){ return null; } - return mChildes.get(index); + return mChildElements.get(index); } public int getAttributeCount(){ return mAttributes.size(); @@ -409,7 +408,7 @@ public class XMLElement extends XMLNode{ if(comparator==null){ return; } - mChildes.sort(comparator); + mChildElements.sort(comparator); } public void sortAttributes(Comparator comparator){ if(comparator==null){ @@ -439,7 +438,7 @@ public class XMLElement extends XMLNode{ } child.setParent(this); child.setIndent(getChildIndent()); - mChildes.add(child); + mChildElements.add(child); if(addSupper){ super.addChildNodeInternal(child); } @@ -454,7 +453,8 @@ public class XMLElement extends XMLNode{ return rs; } int getIndent(){ - if(hasTextContent()){ + XMLElement parent = getParent(); + if(parent!=null && parent.hasTextContent()){ return 0; } return mIndent; @@ -477,7 +477,7 @@ public class XMLElement extends XMLNode{ public void setIndent(int indent){ mIndent=indent; int chIndent=getChildIndent(); - for(XMLElement child:mChildes){ + for(XMLElement child: mChildElements){ child.setIndent(chIndent); } if(mComments!=null){ @@ -525,25 +525,6 @@ public class XMLElement extends XMLNode{ } return i; } - private String getIndentText(){ - float scale=getIndentScale(); - scale = scale * (float) getIndent(); - int i=(int)scale; - if(i<=0){ - return ""; - } - if(i>40){ - i=40; - } - StringBuilder builder=new StringBuilder(); - int max=i; - i=0; - while (i