You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/05 02:27:02 UTC
svn commit: r525653 - in
/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution:
ArtifactProcessorRegistry.java DefaultArtifactProcessorRegistry.java
DefaultStAXArtifactProcessorRegistry.java
Author: jsdelfino
Date: Wed Apr 4 17:27:02 2007
New Revision: 525653
URL: http://svn.apache.org/viewvc?view=rev&rev=525653
Log:
More generics fixes in the registry, and renamed the load method to read.
Modified:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java?view=diff&rev=525653&r1=525652&r2=525653
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ArtifactProcessorRegistry.java Wed Apr 4 17:27:02 2007
@@ -31,6 +31,6 @@
* Add an artifact processor.
* @param artifactProcessor the artifact processor to add
*/
- void addArtifactProcessor(ArtifactProcessor<S, M, T> artifactProcessor);
+ void addArtifactProcessor(ArtifactProcessor<S, ?, T> artifactProcessor);
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java?view=diff&rev=525653&r1=525652&r2=525653
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultArtifactProcessorRegistry.java Wed Apr 4 17:27:02 2007
@@ -27,8 +27,8 @@
* @version $Rev$ $Date$
*/
abstract class DefaultArtifactProcessorRegistry<S, M, K> implements ArtifactProcessorRegistry<S, M, K> {
- private final Map<K, ArtifactProcessor<S, M, K>> processorsByArtifactType = new HashMap<K, ArtifactProcessor<S, M, K>>();
- private final Map<Class<?>, ArtifactProcessor<S, M, K>> processorsByModelType = new HashMap<Class<?>, ArtifactProcessor<S, M, K>>();
+ private final Map<K, ArtifactProcessor<S, ?, K>> processorsByArtifactType = new HashMap<K, ArtifactProcessor<S, ?, K>>();
+ private final Map<Class<?>, ArtifactProcessor<S, ?, K>> processorsByModelType = new HashMap<Class<?>, ArtifactProcessor<S, ?, K>>();
/**
* Constructs a new loader registry.
@@ -41,7 +41,7 @@
* @param artifactType an artifact type
* @return the processor associated with the given artifact type
*/
- protected ArtifactProcessor<S, M, K> getProcessor(K artifactType) {
+ protected ArtifactProcessor<S, ?, K> getProcessor(K artifactType) {
return processorsByArtifactType.get(artifactType);
}
@@ -50,18 +50,19 @@
* @param modelType a model type
* @return the processor associated with the given model type
*/
- protected ArtifactProcessor<S, M, K> getProcessor(Class<M> modelType) {
+ protected ArtifactProcessor<S, ?, K> getProcessor(Class<M> modelType) {
Class<?>[] classes = modelType.getClasses();
for (Class<?> c: classes) {
- ArtifactProcessor<S, M, K> processor = processorsByModelType.get(c);
+ ArtifactProcessor<S, ?, K> processor = processorsByModelType.get(c);
if (processor != null)
return processor;
}
return null;
}
- public void addArtifactProcessor(ArtifactProcessor<S, M, K> artifactProcessor) {
+ public void addArtifactProcessor(ArtifactProcessor<S, ?, K> artifactProcessor) {
processorsByArtifactType.put(artifactProcessor.getArtifactType(), artifactProcessor);
+ processorsByModelType.put(artifactProcessor.getModelType(), artifactProcessor);
}
public K getArtifactType() {
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java?view=diff&rev=525653&r1=525652&r2=525653
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/DefaultStAXArtifactProcessorRegistry.java Wed Apr 4 17:27:02 2007
@@ -83,7 +83,7 @@
}
}
- public <MO> MO load(URL url, Class<MO> type) throws ContributionReadException {
+ public <MO> MO read(URL url, Class<MO> type) throws ContributionReadException {
try {
XMLStreamReader reader;
InputStream is;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org