You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by ah...@apache.org on 2007/01/27 20:52:57 UTC
svn commit: r500601 - in /hivemind/hivemind2/trunk:
annotations/src/java/org/apache/hivemind/annotations/internal/
framework/src/java/org/apache/hivemind/definition/
framework/src/java/org/apache/hivemind/definition/impl/
framework/src/java/org/apache/...
Author: ahuegen
Date: Sat Jan 27 11:52:56 2007
New Revision: 500601
URL: http://svn.apache.org/viewvc?view=rev&rev=500601
Log:
fullyQualifiedId renamed to qualifiedId
Modified:
hivemind/hivemind2/trunk/annotations/src/java/org/apache/hivemind/annotations/internal/RegistryImpl.java
hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/DefinitionMessages.java
hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java
hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ExtensionPointDefinitionImpl.java
hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java
hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/impl/ImplMessages.java
Modified: hivemind/hivemind2/trunk/annotations/src/java/org/apache/hivemind/annotations/internal/RegistryImpl.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/annotations/src/java/org/apache/hivemind/annotations/internal/RegistryImpl.java?view=diff&rev=500601&r1=500600&r2=500601
==============================================================================
--- hivemind/hivemind2/trunk/annotations/src/java/org/apache/hivemind/annotations/internal/RegistryImpl.java (original)
+++ hivemind/hivemind2/trunk/annotations/src/java/org/apache/hivemind/annotations/internal/RegistryImpl.java Sat Jan 27 11:52:56 2007
@@ -20,11 +20,11 @@
public <T> T getConfiguration(String configurationId, Class<T> configurationType)
{
- String fullyQualifiedConfigurationId = IdUtils.qualify(
+ String qualifiedConfigurationId = IdUtils.qualify(
_callingModule.getModuleId(),
configurationId);
Object configuration = _delegate.getConfiguration(
- fullyQualifiedConfigurationId,
+ qualifiedConfigurationId,
_callingModule);
return (T) configuration;
}
@@ -38,18 +38,18 @@
public Object getConfiguration(String configurationId)
{
- String fullyQualifiedConfigurationId = IdUtils.qualify(
+ String qualifiedConfigurationId = IdUtils.qualify(
_callingModule.getModuleId(),
configurationId);
- return _delegate.getConfiguration(fullyQualifiedConfigurationId, _callingModule);
+ return _delegate.getConfiguration(qualifiedConfigurationId, _callingModule);
}
public <T> T getService(String serviceId, Class<T> serviceInterface)
{
- String fullyQualifiedServiceId = IdUtils.qualify(
+ String qualifiedServiceId = IdUtils.qualify(
_callingModule.getModuleId(),
serviceId);
- Object service = _delegate.getService(fullyQualifiedServiceId, serviceInterface, _callingModule);
+ Object service = _delegate.getService(qualifiedServiceId, serviceInterface, _callingModule);
return (T) service;
}
Modified: hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/DefinitionMessages.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/DefinitionMessages.java?view=diff&rev=500601&r1=500600&r2=500601
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/DefinitionMessages.java (original)
+++ hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/DefinitionMessages.java Sat Jan 27 11:52:56 2007
@@ -38,7 +38,7 @@
{
return _formatter.format(
"wrong-number-of-contributions",
- point.getFullyQualifiedId(),
+ point.getQualifiedId(),
contributionCount(actualCount),
occurances(expectation));
}
@@ -87,13 +87,13 @@
{
return _formatter.format(
"configuration-point-not-visible",
- point.getFullyQualifiedId(),
+ point.getQualifiedId(),
contributingModule.getId());
}
public static String duplicateParserInputFormat(String inputFormat, ConfigurationPointDefinition cp)
{
- return _formatter.format("duplicate-parser-inputformat", inputFormat, cp.getFullyQualifiedId());
+ return _formatter.format("duplicate-parser-inputformat", inputFormat, cp.getQualifiedId());
}
@@ -101,7 +101,7 @@
{
return _formatter.format(
"service-point-not-visible",
- point.getFullyQualifiedId(),
+ point.getQualifiedId(),
contributingModule.getId());
}
Modified: hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java?view=diff&rev=500601&r1=500600&r2=500601
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java (original)
+++ hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ExtensionPointDefinition.java Sat Jan 27 11:52:56 2007
@@ -9,7 +9,7 @@
*/
public String getModuleId();
- public String getFullyQualifiedId();
+ public String getQualifiedId();
public String getId();
Modified: hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java?view=diff&rev=500601&r1=500600&r2=500601
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java (original)
+++ hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/ModuleDefinitionHelper.java Sat Jan 27 11:52:56 2007
@@ -79,11 +79,11 @@
return result;
}
- public ContributionDefinition addContributionDefinition(String fullyQualifiedConfigurationPointId,
+ public ContributionDefinition addContributionDefinition(String qualifiedConfigurationPointId,
Contribution contributionConstructor)
{
ContributionDefinitionImpl result = new ContributionDefinitionImpl(_module, _module.getLocation(), contributionConstructor, false);
- _module.addContribution(fullyQualifiedConfigurationPointId, result);
+ _module.addContribution(qualifiedConfigurationPointId, result);
return result;
}
Modified: hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ExtensionPointDefinitionImpl.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ExtensionPointDefinitionImpl.java?view=diff&rev=500601&r1=500600&r2=500601
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ExtensionPointDefinitionImpl.java (original)
+++ hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ExtensionPointDefinitionImpl.java Sat Jan 27 11:52:56 2007
@@ -31,7 +31,7 @@
}
/**
- * @see org.apache.hivemind.definition.ExtensionPointDefinitionIF#getModuleId()
+ * @see org.apache.hivemind.definition.ExtensionPointDefinition#getModuleId()
*/
public String getModuleId()
{
@@ -44,15 +44,15 @@
}
/**
- * @see org.apache.hivemind.definition.ExtensionPointDefinitionIF#getFullyQualifiedId()
+ * @see org.apache.hivemind.definition.ExtensionPointDefinition#getQualifiedId()
*/
- public String getFullyQualifiedId()
+ public String getQualifiedId()
{
return getModuleId() + "." + _id;
}
/**
- * @see org.apache.hivemind.definition.ExtensionPointDefinitionIF#getId()
+ * @see org.apache.hivemind.definition.ExtensionPointDefinition#getId()
*/
public String getId()
{
@@ -60,7 +60,7 @@
}
/**
- * @see org.apache.hivemind.definition.ExtensionPointDefinitionIF#setId(java.lang.String)
+ * @see org.apache.hivemind.definition.ExtensionPointDefinition#setId(java.lang.String)
*/
public void setId(String id)
{
@@ -68,7 +68,7 @@
}
/**
- * @see org.apache.hivemind.definition.ExtensionPointDefinitionIF#getLocation()
+ * @see org.apache.hivemind.definition.ExtensionPointDefinition#getLocation()
*/
public Location getLocation()
{
@@ -76,7 +76,7 @@
}
/**
- * @see org.apache.hivemind.definition.ExtensionPointDefinitionIF#setLocation(org.apache.hivemind.Location)
+ * @see org.apache.hivemind.definition.ExtensionPointDefinition#setLocation(org.apache.hivemind.Location)
*/
public void setLocation(Location location)
{
@@ -84,7 +84,7 @@
}
/**
- * @see org.apache.hivemind.definition.ExtensionPointDefinitionIF#getVisibility()
+ * @see org.apache.hivemind.definition.ExtensionPointDefinition#getVisibility()
*/
public Visibility getVisibility()
{
@@ -92,7 +92,7 @@
}
/**
- * @see org.apache.hivemind.definition.ExtensionPointDefinitionIF#setVisibility(org.apache.hivemind.definition.Visibility)
+ * @see org.apache.hivemind.definition.ExtensionPointDefinition#setVisibility(org.apache.hivemind.definition.Visibility)
*/
public void setVisibility(Visibility visibility)
{
Modified: hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java?view=diff&rev=500601&r1=500600&r2=500601
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java (original)
+++ hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/definition/impl/ModuleDefinitionImpl.java Sat Jan 27 11:52:56 2007
@@ -133,7 +133,7 @@
public void addServicePoint(ServicePointDefinition servicePoint)
{
if (_servicePoints.containsKey(servicePoint.getId())) {
- throw new ApplicationRuntimeException(DefinitionMessages.duplicateServicePointId(servicePoint.getFullyQualifiedId(),
+ throw new ApplicationRuntimeException(DefinitionMessages.duplicateServicePointId(servicePoint.getQualifiedId(),
this));
}
_servicePoints.put(servicePoint.getId(), servicePoint);
Modified: hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/impl/ImplMessages.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/impl/ImplMessages.java?view=diff&rev=500601&r1=500600&r2=500601
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/impl/ImplMessages.java (original)
+++ hivemind/hivemind2/trunk/framework/src/java/org/apache/hivemind/impl/ImplMessages.java Sat Jan 27 11:52:56 2007
@@ -252,6 +252,6 @@
public static String servicePointDefinitionWithoutImplementation(ServicePointDefinition sd)
{
- return _formatter.format("servicepointdefinition-without-implementation", sd.getFullyQualifiedId());
+ return _formatter.format("servicepointdefinition-without-implementation", sd.getQualifiedId());
}
}