svn commit: r689387 - /maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java

[sisbell]

Author: sisbell
Date: Tue Aug 26 23:55:34 2008
New Revision: 689387

URL: http://svn.apache.org/viewvc?rev=689387&view=rev
Log:
Fix: needed to peek ahead and see if a tag has a property before declaring it 
empty and removing it.

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

Modified: 
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=689387&r1=689386&r2=689387&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
 (original)
+++ 
maven/shared/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
 Tue Aug 26 23:55:34 2008
@@ -128,7 +128,7 @@
         for(ModelProperty mp: transformedProperties)
         {
             if(isEmptyTag(mp, transformedProperties))
-            {    
+            {   System.out.println("Removing tag: " + mp); 
                 emptyTags.add(mp);
             }
         }
@@ -331,6 +331,15 @@
     {
         if(modelProperty.getValue() != null)
         {
+            int index = modelProperties.indexOf(modelProperty);
+            if(index + 1 < modelProperties.size())
+            {
+                String peekPropertyUri = modelProperties.get(index + 
1).getUri();
+                if(peekPropertyUri.contains("#property") && 
peekPropertyUri.startsWith(modelProperty.getUri()) )
+                {
+                    return false;
+                }
+            }
             return modelProperty.getValue().trim().equals("");
         }