svn commit: r678077 - in /maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model: ModelMarshaller.java ModelTransformerContext.java

[sisbell]

Author: sisbell
Date: Fri Jul 18 16:59:27 2008
New Revision: 678077

URL: http://svn.apache.org/viewvc?rev=678077&view=rev
Log:
Minor cleanup of xml output.

Modified:
    
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
    
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java

Modified: 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java?rev=678077&r1=678076&r2=678077&view=diff
==============================================================================
--- 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
 (original)
+++ 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelMarshaller.java
 Fri Jul 18 16:59:27 2008
@@ -79,6 +79,7 @@
                     }
                     case XMLStreamConstants.ATTRIBUTE: {
                         for (int i = 0; i < 
xmlStreamReader.getAttributeCount(); i++) {
+
                             attributes.put(tagName + "#property/" + 
xmlStreamReader.getAttributeName(i).getLocalPart(),
                                     xmlStreamReader.getAttributeValue(i));
                         }
@@ -183,12 +184,12 @@
 
     private static String toStartTag(String value, ModelProperty attribute) {
         StringBuffer sb = new StringBuffer();
-        sb.append("<").append(value);
+        sb.append("\r\n<").append(value);
         if(attribute != null) {
             sb.append(" 
").append(attribute.getUri().substring(attribute.getUri().indexOf("#property/") 
+ 10)).append("=\"")
                     .append(attribute.getValue()).append("\" ");
         }
-        sb.append(">\r\n");
+        sb.append(">");
         return sb.toString();
     }
 
@@ -197,7 +198,7 @@
             return "";
         }
         StringBuffer sb = new StringBuffer();
-        sb.append("\r\n</").append(value).append(">\r\n");
+        sb.append("</").append(value).append(">");
         return sb.toString();
     }
 

Modified: 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=678077&r1=678076&r2=678077&view=diff
==============================================================================
--- 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
 (original)
+++ 
maven/sandbox/trunk/shared/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
 Fri Jul 18 16:59:27 2008
@@ -178,7 +178,7 @@
                 projectIsContained = true;
                 processedProperties.add(p);
                 position.add(0, uri);
-            } else if (!position.contains(uri) || 
parentUri.contains("#collection")) {
+            } else if (!position.contains(uri) || 
(parentUri.contains("#collection"))) {
                 int pst = position.indexOf(parentUri) + 1;
                 processedProperties.add(pst, p);
                 position.add(pst, uri);