Author: vhalbert(a)redhat.com Date: 2009-04-17 12:16:06 -0400 (Fri, 17 Apr 2009) New Revision: 793 Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java Log: Teiid - 323 - part of the refacturing of configuration cleanup Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-04-17 16:15:40 UTC (rev 792) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-04-17 16:16:06 UTC (rev 793) @@ -31,6 +31,7 @@ import java.util.Properties; import com.metamatrix.common.CommonPlugin; +import com.metamatrix.common.config.api.ComponentType; import com.metamatrix.common.config.api.ComponentTypeID; import com.metamatrix.common.config.api.Configuration; import com.metamatrix.common.config.api.ConfigurationID; @@ -288,25 +289,12 @@ * @throws ConfigurationException if an error occurred within or during communication with the Configuration Service. * @see com.metamatrix.common.api.ComponentType */ - public Collection getComponentTypes(boolean includeDeprecated) throws ConfigurationException { + public Collection<ComponentType> getComponentTypes(boolean includeDeprecated) throws ConfigurationException { return getReader().getConfigurationModel().getComponentTypes().values(); } + /** - * Returns a <code>Collection</code> of type <code>ProductType</code> that represents - * all the ComponentTypes defined. - * @return List of type <code>ProductType</code> - * @throws ConfigurationException if an error occurred within or during communication with the Configuration Service. - * @see #ProductType - */ - public Collection getProductTypes() throws ConfigurationException { - Collection c = new ArrayList(1); - return c; -// c.add(BasicProductType.PRODUCT_TYPE); -// return c; - } - - /** * Returns the Host based on the current running machine. * @return the full Host object * @throws ConfigurationException if an error occurred within or during