svn commit: r653554 - in /incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor: DefaultStAXArtifactProcessorExtensionPoint.java DefaultURLArtifactProcessorExtensionPoint.java

[jsdelfino]

Author: jsdelfino
Date: Mon May  5 11:50:39 2008
New Revision: 653554

URL: http://svn.apache.org/viewvc?rev=653554&view=rev
Log:
Check for nulls in artifact processor registration, allowing processor 
declarations to omit either the qname or the model type.

Modified:
    
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
    
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java

Modified: 
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java?rev=653554&r1=653553&r2=653554&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
 Mon May  5 11:50:39 2008
@@ -66,13 +66,21 @@
     }
 
     public void addArtifactProcessor(StAXArtifactProcessor artifactProcessor) {
-        
processorsByArtifactType.put((Object)artifactProcessor.getArtifactType(), 
artifactProcessor);
-        processorsByModelType.put(artifactProcessor.getModelType(), 
artifactProcessor);
+        if (artifactProcessor.getArtifactType() != null) {
+            
processorsByArtifactType.put((Object)artifactProcessor.getArtifactType(), 
artifactProcessor);
+        }
+        if (artifactProcessor.getModelType() != null) {
+            processorsByModelType.put(artifactProcessor.getModelType(), 
artifactProcessor);
+        }
     }
 
     public void removeArtifactProcessor(StAXArtifactProcessor 
artifactProcessor) {
-        
processorsByArtifactType.remove((Object)artifactProcessor.getArtifactType());
-        processorsByModelType.remove(artifactProcessor.getModelType());
+        if (artifactProcessor.getArtifactType() != null) {
+            
processorsByArtifactType.remove((Object)artifactProcessor.getArtifactType());
+        }
+        if (artifactProcessor.getModelType() != null) {
+            processorsByModelType.remove(artifactProcessor.getModelType());
+        }
     }
 
     @Override
@@ -264,7 +272,7 @@
         }
 
         public Class<?> getModelType() {
-            if (modelType == null) {
+            if (modelTypeName != null && modelType == null) {
                 try {
                     modelType = processorDeclaration.loadClass(modelTypeName);
                 } catch (Exception e) {

Modified: 
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java?rev=653554&r1=653553&r2=653554&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
 Mon May  5 11:50:39 2008
@@ -62,13 +62,21 @@
     }
 
     public void addArtifactProcessor(URLArtifactProcessor artifactProcessor) {
-        
processorsByArtifactType.put((Object)artifactProcessor.getArtifactType(), 
artifactProcessor);
-        processorsByModelType.put(artifactProcessor.getModelType(), 
artifactProcessor);
+        if (artifactProcessor.getArtifactType() != null) {
+            
processorsByArtifactType.put((Object)artifactProcessor.getArtifactType(), 
artifactProcessor);
+        }
+        if (artifactProcessor.getModelType() != null) {
+            processorsByModelType.put(artifactProcessor.getModelType(), 
artifactProcessor);
+        }
     }
     
     public void removeArtifactProcessor(URLArtifactProcessor 
artifactProcessor) {
-        
processorsByArtifactType.remove((Object)artifactProcessor.getArtifactType());
-        processorsByModelType.remove(artifactProcessor.getModelType());        
+        if (artifactProcessor.getArtifactType() != null) {
+            
processorsByArtifactType.remove((Object)artifactProcessor.getArtifactType());
+        }
+        if (artifactProcessor.getModelType() != null) {
+            processorsByModelType.remove(artifactProcessor.getModelType());
+        }
     }
     
     @Override