CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util ComponentInfoConverter.java,1.10,1.11 ComponentMetaDataConverter.java,1.9,1.10 ConfigUtil.java,1.6,1.7 ConfigurationBuilder.java,1.4,1.5 assembly_1_0.dtd,1.1,1.2
Peter Donald <pdonald-yCVjj/[email protected]> Wed, 3 Dec 2003 04:45:18 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util
In directory hogshead.codehaus.org:/tmp/cvs-serv21491/engine/src/java/org/jcontainer/loom/components/util
Modified Files:
ComponentInfoConverter.java ComponentMetaDataConverter.java
ConfigUtil.java ConfigurationBuilder.java assembly_1_0.dtd
Log Message:
Styled codebase
Index: ComponentInfoConverter.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ComponentInfoConverter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ComponentInfoConverter.java 3 Nov 2003 06:11:26 -0000 1.10
+++ ComponentInfoConverter.java 3 Dec 2003 10:44:42 -0000 1.11
@@ -35,7 +35,8 @@
public static BlockInfo toBlockInfo( final ComponentInfo component )
{
final BlockDescriptor descriptor = toBlockDescriptor( component );
- final ServiceDescriptor[] services = toPhoenixServices( component.getServices() );
+ final ServiceDescriptor[] services = toPhoenixServices(
+ component.getServices() );
final ServiceDescriptor[] mxServices = new ServiceDescriptor[ 0 ];
final DependencyDescriptor[] dependencys =
toPhoenixDependencys( component.getDependencies() );
@@ -60,7 +61,8 @@
{
serviceSet.add( toPhoenixService( services[ i ] ) );
}
- return (ServiceDescriptor[])serviceSet.toArray( new ServiceDescriptor[ serviceSet.size() ] );
+ return (ServiceDescriptor[])serviceSet.toArray(
+ new ServiceDescriptor[ serviceSet.size() ] );
}
/**
@@ -89,7 +91,8 @@
{
depends.add( toPhoenixDependency( dependencies[ i ] ) );
}
- return (DependencyDescriptor[])depends.toArray( new DependencyDescriptor[ depends.size() ] );
+ return (DependencyDescriptor[])depends.toArray(
+ new DependencyDescriptor[ depends.size() ] );
}
/**
@@ -112,7 +115,8 @@
* @param component the info
* @return the BlockDescriptor
*/
- private static BlockDescriptor toBlockDescriptor( final ComponentInfo component )
+ private static BlockDescriptor toBlockDescriptor(
+ final ComponentInfo component )
{
final SchemaDescriptor schema = component.getConfigurationSchema();
String schemaType = null;
Index: ComponentMetaDataConverter.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ComponentMetaDataConverter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ComponentMetaDataConverter.java 27 Nov 2003 09:05:31 -0000 1.9
+++ ComponentMetaDataConverter.java 3 Dec 2003 10:44:42 -0000 1.10
@@ -50,32 +50,38 @@
}
/**
- * Convert a set of {@link org.jcontainer.loom.components.util.profile.ComponentProfile} object
- * into a set of BlockMetaData objects.
+ * Convert a set of {@link org.jcontainer.loom.components.util.profile.ComponentProfile}
+ * object into a set of BlockMetaData objects.
*
- * @param components the {@link org.jcontainer.loom.components.util.profile.ComponentProfile} objects
+ * @param components the {@link org.jcontainer.loom.components.util.profile.ComponentProfile}
+ * objects
* @return the BlockMetaData objects
*/
- private static BlockMetaData[] toBlocks( final ComponentProfile[] components )
+ private static BlockMetaData[] toBlocks(
+ final ComponentProfile[] components )
{
final ArrayList listenerSet = new ArrayList();
for( int i = 0; i < components.length; i++ )
{
final ComponentProfile component = components[ i ];
final BlockMetaData block =
- toBlockMetaData( component.getTemplate(), component.getInfo() );
+ toBlockMetaData( component.getTemplate(),
+ component.getInfo() );
listenerSet.add( block );
}
- return (BlockMetaData[])listenerSet.toArray( new BlockMetaData[ listenerSet.size() ] );
+ return (BlockMetaData[])listenerSet.toArray(
+ new BlockMetaData[ listenerSet.size() ] );
}
/**
- * Convert a ComponentTemplate object into a {@link BlockListenerMetaData} object.
+ * Convert a ComponentTemplate object into a {@link BlockListenerMetaData}
+ * object.
*
* @param listeners the ComponentTemplate object
* @return the {@link BlockListenerMetaData} object
*/
- public static BlockListenerMetaData[] toBlockListeners( final ComponentTemplate[] listeners )
+ public static BlockListenerMetaData[] toBlockListeners(
+ final ComponentTemplate[] listeners )
{
final ArrayList listenerSet = new ArrayList();
for( int i = 0; i < listeners.length; i++ )
@@ -85,7 +91,8 @@
listeners[ i ].getImplementationKey() );
listenerSet.add( listener );
}
- return (BlockListenerMetaData[])listenerSet.toArray( new BlockListenerMetaData[ listenerSet.size() ] );
+ return (BlockListenerMetaData[])listenerSet.toArray(
+ new BlockListenerMetaData[ listenerSet.size() ] );
}
/**
@@ -94,8 +101,9 @@
* @param component the ComponentTemplate object
* @return the BlockMetaData object
*/
- public static BlockMetaData toBlockMetaData( final ComponentTemplate component,
- final ComponentInfo info )
+ public static BlockMetaData toBlockMetaData(
+ final ComponentTemplate component,
+ final ComponentInfo info )
{
final boolean disableProxy = component.isDisableProxy();
final DependencyMetaData[] dependencies =
@@ -125,6 +133,7 @@
dependencies[ i ].getKey() );
depends.add( dependency );
}
- return (DependencyMetaData[])depends.toArray( new DependencyMetaData[ depends.size() ] );
+ return (DependencyMetaData[])depends.toArray(
+ new DependencyMetaData[ depends.size() ] );
}
}
Index: ConfigUtil.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ConfigUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ConfigUtil.java 3 Dec 2003 09:11:21 -0000 1.6
+++ ConfigUtil.java 3 Dec 2003 10:44:42 -0000 1.7
@@ -8,10 +8,10 @@
package org.jcontainer.loom.components.util;
import java.util.Map;
+import org.codehaus.spice.configkit.PropertyExpander;
import org.jcontainer.dna.Configuration;
import org.jcontainer.dna.ConfigurationException;
import org.jcontainer.dna.impl.DefaultConfiguration;
-import org.codehaus.spice.configkit.PropertyExpander;
/**
* @author Peter Donald
Index: ConfigurationBuilder.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/ConfigurationBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ConfigurationBuilder.java 3 Dec 2003 03:37:57 -0000 1.4
+++ ConfigurationBuilder.java 3 Dec 2003 10:44:42 -0000 1.5
@@ -12,15 +12,15 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.avalon.framework.CascadingException;
-import org.jcontainer.dna.Configuration;
-import org.jcontainer.dna.Logger;
-import org.jcontainer.dna.impl.SAXConfigurationHandler;
import org.codehaus.spice.configkit.ConfigValidator;
import org.codehaus.spice.configkit.ConfigValidatorFactory;
import org.codehaus.spice.configkit.ResolverFactory;
import org.codehaus.spice.configkit.ValidateException;
import org.codehaus.spice.configkit.ValidationIssue;
import org.codehaus.spice.configkit.ValidationResult;
+import org.jcontainer.dna.Configuration;
+import org.jcontainer.dna.Logger;
+import org.jcontainer.dna.impl.SAXConfigurationHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
Index: assembly_1_0.dtd
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/util/assembly_1_0.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- assembly_1_0.dtd 16 Oct 2003 14:45:46 -0000 1.1
+++ assembly_1_0.dtd 3 Dec 2003 10:44:42 -0000 1.2
@@ -40,8 +40,8 @@
proxy TODO:description
-->
<!ELEMENT block (provide*,proxy?)>
- <!ATTLIST block class CDATA #REQUIRED>
- <!ATTLIST block name CDATA #REQUIRED>
+<!ATTLIST block class CDATA #REQUIRED>
+<!ATTLIST block name CDATA #REQUIRED>
<!--
The provide element declares that a specific service is provided to the block
@@ -52,9 +52,9 @@
alias the alias of the block when it is placed in a Map dependency (may not need to be specified).
-->
<!ELEMENT provide EMPTY>
- <!ATTLIST provide role CDATA #REQUIRED>
- <!ATTLIST provide name CDATA #REQUIRED>
- <!ATTLIST provide alias CDATA #IMPLIED>
+<!ATTLIST provide role CDATA #REQUIRED>
+<!ATTLIST provide name CDATA #REQUIRED>
+<!ATTLIST provide alias CDATA #IMPLIED>
<!--
This indicates whether the block should be proxied.
@@ -62,7 +62,7 @@
disable set this to true to disable proxying of the block implementation
-->
<!ELEMENT proxy EMPTY>
- <!ATTLIST proxy disable CDATA #REQUIRED>
+<!ATTLIST proxy disable CDATA #REQUIRED>
<!--
The block element declares a listener exists in the application.
@@ -72,8 +72,8 @@
class the class of the listener instance
-->
<!ELEMENT listener EMPTY>
- <!ATTLIST listener name CDATA #REQUIRED>
- <!ATTLIST listener class CDATA #REQUIRED>
+<!ATTLIST listener name CDATA #REQUIRED>
+<!ATTLIST listener class CDATA #REQUIRED>
<!--
NOTE: This form is DEPRECATED.
@@ -85,5 +85,5 @@
class the class of the listener instance
-->
<!ELEMENT block-listener EMPTY>
- <!ATTLIST block-listener name CDATA #REQUIRED>
- <!ATTLIST block-listener class CDATA #REQUIRED>
+<!ATTLIST block-listener name CDATA #REQUIRED>
+<!ATTLIST block-listener class CDATA #REQUIRED>