Author: sisbell
Date: Fri Sep 5 01:04:27 2008
New Revision: 692376
URL: http://svn.apache.org/viewvc?rev=692376&view=rev
Log:
Don't need to remove empty tags, a previous fix makes this code obsolete.
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=692376&r1=692375&r2=692376&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
Fri Sep 5 01:04:27 2008
@@ -123,8 +123,6 @@
List<ModelProperty> transformedProperties =
importModelProperties(importModels,
fromModelTransformer.transformToModelProperties( domainModels ));
- transformedProperties.removeAll(findEmptyTags(transformedProperties));
-
String baseUriForModel = fromModelTransformer.getBaseUri();
List<ModelProperty> modelProperties =
sort( transformedProperties, baseUriForModel );
@@ -313,47 +311,4 @@
}
return processedProperties;
}
-
- private List<ModelProperty> findEmptyTags(List<ModelProperty>
modelProperties)
- {
- List<ModelProperty> props = new
ArrayList<ModelProperty>(modelProperties);
- List<ModelProperty> emptyTags = new ArrayList<ModelProperty>();
- for(ModelProperty mp: props)
- {
- if(isEmptyTag(mp, props))
- {
- emptyTags.add(mp);
- props.remove(mp);
- emptyTags.addAll(findEmptyTags(props));
- break;
- }
- }
- return emptyTags;
- }
-
- private static boolean isEmptyTag(ModelProperty modelProperty,
List<ModelProperty> modelProperties)
- {
- 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("");
- }
-
- String uri = modelProperty.getUri();
- for(ModelProperty mp: modelProperties) {
- if(mp.getUri().startsWith(uri) && !mp.equals(modelProperty))
- {
- return false;
- }
- }
- return true;
- }
}
\ No newline at end of file
