svn commit: r472489 - /incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractDescriptorWriter.java

[grantm]

Author: grantm
Date: Wed Nov  8 05:34:52 2006
New Revision: 472489

URL: http://svn.apache.org/viewvc?view=rev&rev=472489
Log:
issue: SM-721, description: added return of updated counter to namespace map 
construction

Modified:
    
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractDescriptorWriter.java

Modified: 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractDescriptorWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractDescriptorWriter.java?view=diff&rev=472489&r1=472488&r2=472489
==============================================================================
--- 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractDescriptorWriter.java
 (original)
+++ 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/AbstractDescriptorWriter.java
 Wed Nov  8 05:34:52 2006
@@ -35,24 +35,24 @@
                int namespaceCounter = 1;
                for (Iterator iterator = provides.iterator(); 
iterator.hasNext();) {
                        Provides providesEntry = (Provides) iterator.next();
-                       resolveMapEntry(namespaceMap, 
providesEntry.getInterfaceName(),
+                       namespaceCounter = resolveMapEntry(namespaceMap, 
providesEntry.getInterfaceName(),
                                        namespaceCounter);
-                       resolveMapEntry(namespaceMap, 
providesEntry.getServiceName(),
+                       namespaceCounter = resolveMapEntry(namespaceMap, 
providesEntry.getServiceName(),
                                        namespaceCounter);
                }
        
                for (Iterator iterator = consumes.iterator(); 
iterator.hasNext();) {
                        Consumes consumesEntry = (Consumes) iterator.next();
-                       resolveMapEntry(namespaceMap, 
consumesEntry.getInterfaceName(),
+                       namespaceCounter = resolveMapEntry(namespaceMap, 
consumesEntry.getInterfaceName(),
                                        namespaceCounter);
-                       resolveMapEntry(namespaceMap, 
consumesEntry.getServiceName(),
+                       namespaceCounter = resolveMapEntry(namespaceMap, 
consumesEntry.getServiceName(),
                                        namespaceCounter);
                }
        
                return namespaceMap;
        }
 
-       private void resolveMapEntry(Map namespaceMap, QName qname, int 
namespaceCounter) {
+       private int resolveMapEntry(Map namespaceMap, QName qname, int 
namespaceCounter) {
                if ((qname != null)
                                && 
(!namespaceMap.containsKey(qname.getNamespaceURI()))) {
                        if (qname.getPrefix() == null || 
qname.getPrefix().equals("") ) {
@@ -61,6 +61,7 @@
                        } else
                                namespaceMap.put(qname.getNamespaceURI(), 
qname.getPrefix());
                }
+               return namespaceCounter;
        }
 
 }