Author: vhalbert(a)redhat.com Date: 2009-04-12 16:09:44 -0400 (Sun, 12 Apr 2009) New Revision: 759 Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/util/ConfigurationImportExportUtility.java Log: Teiid 323 - refactured, removing duplicate methods Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/util/ConfigurationImportExportUtility.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/util/ConfigurationImportExportUtility.java 2009-04-12 20:08:18 UTC (rev 758) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/util/ConfigurationImportExportUtility.java 2009-04-12 20:09:44 UTC (rev 759) @@ -93,7 +93,7 @@ * that cannot be resolved to other configuration objects in the passed in * Collection */ - public void exportConfiguration(OutputStream stream, Collection configurationObjects, Properties props)throws IOException, ConfigObjectsNotResolvableException; + public void exportConfiguration(OutputStream stream, Collection<?> configurationObjects, Properties props)throws IOException, ConfigObjectsNotResolvableException; @@ -128,7 +128,7 @@ * the representation of the configuration element as it exists in the * InputStream resource, usually some type of formatting problem. */ - public Collection importConfigurationObjects(InputStream stream, ConfigurationObjectEditor editor, String newName)throws IOException, ConfigObjectsNotResolvableException, InvalidConfigurationElementException; + public Collection<?> importConfigurationObjects(InputStream stream, ConfigurationObjectEditor editor, String newName)throws IOException, ConfigObjectsNotResolvableException, InvalidConfigurationElementException; /** * <p>This method will be used to import a ComponentType Object from given a @@ -168,7 +168,7 @@ * the representation of the configuration element as it exists in the * DirectoryEntry resource, usually some type of formatting problem. */ - public Collection importComponentTypes(InputStream stream, + public Collection<?> importComponentTypes(InputStream stream, ConfigurationObjectEditor editor) throws IOException, InvalidConfigurationElementException; @@ -268,30 +268,6 @@ public void exportConnectorBindings(OutputStream stream, ConnectorBinding[] bindings, ComponentType[] types, Properties props) throws IOException, ConfigObjectsNotResolvableException ; /** - * <p>This method will be used to import a Connector ComponentType Object from given a - * InputStream .</p> - * - * <p>This method also allows you to rename the imported ComponentType object - * possibly to avoid name conflicts with other objects already in the server.</p> - * - * <p>If the name parameter submitted is null, the name of the configuration - * object as it exists in the InputStream will be used.</p> - * - * @param editor the ConfigurationObjectEditor to use to create the Configuration - * objects in the InputStream resource. - * @param stream the input stream to read the configuration object - * representation from - * @return the configuration object that was represented as data in the - * InputStream resource - * @param name the name for the ComponentType object to be created. - * @throws IOException if there is an error reading from the InputStream - * @throws InvalidConfigurationElementException if there is a problem with - * the representation of the configuration element as it exists in the - * InputStream resource, usually some type of formatting problem. - */ - public ComponentType importConnector(InputStream stream, ConfigurationObjectEditor editor, String newName)throws IOException, InvalidConfigurationElementException; - - /** * <p>This method will be used to import a group of Connector Bindings * Objects given a ImputStream. If the ImputStream resource does not contain enough * data to recombine a complete Connector, then a ConfigurationObjectsNotResolvableException @@ -321,7 +297,7 @@ * the representation of the configuration element as it exists in the * InputStream resource, usually some type of formatting problem. */ - public Collection importConnectorBindings(InputStream stream, ConfigurationObjectEditor editor)throws IOException, ConfigObjectsNotResolvableException, InvalidConfigurationElementException; + public Collection<ConnectorBinding> importConnectorBindings(InputStream stream, ConfigurationObjectEditor editor)throws IOException, ConfigObjectsNotResolvableException, InvalidConfigurationElementException; /**