hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahue...@apache.org
Subject svn commit: r489648 - in /hivemind/branches/branch-2-0-annot: framework/src/java/org/apache/hivemind/definition/ framework/src/java/org/apache/hivemind/definition/impl/ xml/src/java/org/apache/hivemind/impl/ xml/src/java/org/apache/hivemind/xml/definit...
Date Fri, 22 Dec 2006 13:18:25 GMT
Author: ahuegen
Date: Fri Dec 22 05:18:25 2006
New Revision: 489648

URL: http://svn.apache.org/viewvc?view=rev&rev=489648
Log:
Cleaned up definition interfaces
Removed setter methods

Modified:
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlCoreServicesProvider.java
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/xml/definition/impl/XmlConfigurationPointDefinitionImpl.java

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationPointDefinition.java
Fri Dec 22 05:18:25 2006
@@ -11,8 +11,6 @@
 
     public Occurances getExpectedContributions();
 
-    public void setExpectedContributions(Occurances expectedContributions);
-
     public List getContributions();
 
     public void addContribution(ContributionDefinition contribution);

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ContributionDefinition.java
Fri Dec 22 05:18:25 2006
@@ -6,8 +6,6 @@
 {
     public Contribution getContributionConstructor();
 
-    public void setContributionConstructor(Contribution contributionConstructor);
-
     /**
      * @return  true if the contribution is the initial one to be processed first. Only one
      *          contribution of a configuration point is allowed to return true here. 

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionDefinition.java
Fri Dec 22 05:18:25 2006
@@ -1,8 +1,8 @@
 package org.apache.hivemind.definition;
 
-import org.apache.hivemind.Location;
+import org.apache.hivemind.Locatable;
 
-public interface ExtensionDefinition
+public interface ExtensionDefinition extends Locatable
 {
     /**
      * @return the id of the module that contributed this extension
@@ -13,9 +13,5 @@
      * @return  the module that contributed this extension
      */
     public ModuleDefinition getModule();
-
-    public Location getLocation();
-
-    public void setLocation(Location location);
 
 }

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
Fri Dec 22 05:18:25 2006
@@ -1,8 +1,8 @@
 package org.apache.hivemind.definition;
 
-import org.apache.hivemind.Location;
+import org.apache.hivemind.Locatable;
 
-public interface ExtensionPointDefinition
+public interface ExtensionPointDefinition extends Locatable
 {
     /**
      * @return the id of the module that defined this extension point
@@ -13,14 +13,6 @@
 
     public String getId();
 
-    public void setId(String id);
-
-    public Location getLocation();
-
-    public void setLocation(Location location);
-
     public Visibility getVisibility();
-
-    public void setVisibility(Visibility visibility);
 
 }

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ModuleDefinition.java
Fri Dec 22 05:18:25 2006
@@ -1,7 +1,6 @@
 package org.apache.hivemind.definition;
 
 import java.util.Collection;
-import java.util.List;
 
 import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.hivemind.ClassResolver;
@@ -70,12 +69,12 @@
     public void addParser(String qualifiedConfigurationPointId,
             ConfigurationParserDefinition parser);
     
-    public List getContributions();
+    public Collection getContributions();
 
-    public List getImplementations();
+    public Collection getImplementations();
 
-    public List getInterceptors();
+    public Collection getInterceptors();
     
-    public List getParsers();
+    public Collection getParsers();
 
 }

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceImplementationDefinition.java
Fri Dec 22 05:18:25 2006
@@ -4,17 +4,12 @@
 
 public interface ServiceImplementationDefinition extends ExtensionDefinition
 {
-
     public String getServiceModel();
 
-    public void setServiceModel(String interfaceClassName);
-
     public boolean isDefault();
 
     public void setDefault(boolean isDefault);
 
     public ImplementationConstructor getServiceConstructor();
-
-    public void setServiceConstructor(ImplementationConstructor serviceConstructor);
 
 }

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServiceInterceptorDefinition.java
Fri Dec 22 05:18:25 2006
@@ -11,6 +11,4 @@
 
     public String getName();
 
-    public void setName(String name);
-
 }

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ServicePointDefinition.java
Fri Dec 22 05:18:25 2006
@@ -7,8 +7,6 @@
 
     public String getInterfaceClassName();
 
-    public void setInterfaceClassName(String interfaceClassName);
-
     public List getImplementations();
 
     public ServiceImplementationDefinition getDefaultImplementation();

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java
Fri Dec 22 05:18:25 2006
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.hivemind.ApplicationRuntimeException;
@@ -35,13 +34,13 @@
     
     private Collection _dependencies = new ArrayList();
 
-    private List _unresolvedImplementations = new ArrayList();
+    private Collection _unresolvedImplementations = new ArrayList();
 
-    private List _unresolvedContributions = new ArrayList();
+    private Collection _unresolvedContributions = new ArrayList();
 
-    private List _unresolvedInterceptors = new ArrayList();
+    private Collection _unresolvedInterceptors = new ArrayList();
     
-    private List _unresolvedParsers = new ArrayList();
+    private Collection _unresolvedParsers = new ArrayList();
     
     public ModuleDefinitionImpl()
     {
@@ -245,7 +244,7 @@
     /**
      * @see org.apache.hivemind.definition.ModuleDefinition#getContributions()
      */
-    public List getContributions()
+    public Collection getContributions()
     {
         return _unresolvedContributions;
     }
@@ -253,7 +252,7 @@
     /**
      * @see org.apache.hivemind.definition.ModuleDefinition#getImplementations()
      */
-    public List getImplementations()
+    public Collection getImplementations()
     {
         return _unresolvedImplementations;
     }
@@ -261,12 +260,15 @@
     /**
      * @see org.apache.hivemind.definition.ModuleDefinition#getInterceptors()
      */
-    public List getInterceptors()
+    public Collection getInterceptors()
     {
         return _unresolvedInterceptors;
     }
 
-    public List getParsers()
+    /**
+     * @see org.apache.hivemind.definition.ModuleDefinition#getParsers()
+     */
+    public Collection getParsers()
     {
         return _unresolvedParsers;
     }

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlCoreServicesProvider.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlCoreServicesProvider.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlCoreServicesProvider.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlCoreServicesProvider.java
Fri Dec 22 05:18:25 2006
@@ -1,8 +1,6 @@
 package org.apache.hivemind.impl;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/xml/definition/impl/XmlConfigurationPointDefinitionImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/xml/definition/impl/XmlConfigurationPointDefinitionImpl.java?view=diff&rev=489648&r1=489647&r2=489648
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/xml/definition/impl/XmlConfigurationPointDefinitionImpl.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/xml/definition/impl/XmlConfigurationPointDefinitionImpl.java
Fri Dec 22 05:18:25 2006
@@ -5,7 +5,6 @@
 import org.apache.hivemind.definition.Occurances;
 import org.apache.hivemind.definition.Visibility;
 import org.apache.hivemind.definition.impl.ConfigurationPointDefinitionImpl;
-import org.apache.hivemind.schema.Schema;
 
 /**
  * Specialization of {@link ConfigurationPointDefinitionImpl} for configuration points defined
in xml.
@@ -14,8 +13,6 @@
  */
 public class XmlConfigurationPointDefinitionImpl extends ConfigurationPointDefinitionImpl
 {
-    private Schema _contributionsSchema;
-    private String _contributionsSchemaId;
 
     public XmlConfigurationPointDefinitionImpl(ModuleDefinition module)
     {



Mime
View raw message