notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1473 - in trunk/main: depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/info depot/tools/builder/src/main/net/dpml/tools/tasks metro/runtime/src/test/net/dpml/metro/builder planet/process/info/src/main/net/dpml/lang/info planet/process/info/src/test/net/dpml/lang/info
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1473 - in trunk/main: depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/info depot/tools/builder/src/main/net/dpml/tools/tasks metro/runtime/src/test/net/dpml/metro/builder planet/process/info/src/main/net/dpml/lang/info planet/process/info/src/test/net/dpml/lang/info
- Date: Mon, 29 May 2006 17:41:48 +0200
Author: mcconnell
Date: 2006-05-29 17:41:46 +0200 (Mon, 29 May 2006)
New Revision: 1473
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuildListener.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/BuilderDirective.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/ListenerDirective.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/BuildTask.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PackageTask.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/TestTask.java
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/SymbolicTestCase.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/CollectionDirective.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ConsumptionDirective.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/DataDirective.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/DirectoryDirective.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/InfoDirective.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/InputDirective.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ProcessDirective.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ProductDirective.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/WorkspaceDecoder.java
trunk/main/planet/process/info/src/main/net/dpml/lang/info/WorkspaceDirective.java
trunk/main/planet/process/info/src/test/net/dpml/lang/info/ProcessXsdTestCase.java
trunk/main/planet/process/info/src/test/net/dpml/lang/info/WorkspaceTestCase.java
Log:
checkstyle cleanup
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -23,11 +23,9 @@
import java.net.URL;
import java.net.URI;
import java.util.Date;
-import java.util.Arrays;
import net.dpml.lang.Plugin;
import net.dpml.lang.Part;
-import net.dpml.lang.UnknownKeyException;
import net.dpml.library.info.Scope;
import net.dpml.library.Library;
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuildListener.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuildListener.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuildListener.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -24,7 +24,6 @@
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.Target;
import org.apache.tools.ant.Project;
/**
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/BuilderDirective.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/BuilderDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/BuilderDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -19,8 +19,6 @@
package net.dpml.tools.info;
import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Properties;
import net.dpml.library.info.AbstractDirective;
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/ListenerDirective.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/ListenerDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/ListenerDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -20,7 +20,6 @@
import java.net.URI;
import java.util.Properties;
-import java.util.Arrays;
import net.dpml.library.info.AbstractDirective;
@@ -142,11 +141,11 @@
* greater than <code>0</code> if the argument is a
* <code>ListenerDirective</code> numerically less than this
* <code>ListenerDirective</code>.
- * @exception <code>ClassCastException</code> if the argument is not an
+ * @exception ClassCastException if the argument is not an
* <code>ListenerDirective</code>.
* @see java.lang.Comparable
*/
- public int compareTo( Object other )
+ public int compareTo( Object other ) throws ClassCastException
{
ListenerDirective directive = (ListenerDirective) other;
Integer p1 = new Integer( m_priority );
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/BuildTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/BuildTask.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/BuildTask.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -28,7 +28,6 @@
import net.dpml.tools.Context;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.types.Path;
/**
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PackageTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PackageTask.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PackageTask.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -21,16 +21,11 @@
import java.io.File;
import net.dpml.library.Resource;
-import net.dpml.library.Type;
-import net.dpml.library.info.Scope;
-import net.dpml.library.info.JarTypeDirective;
import net.dpml.tools.Context;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
-import org.apache.tools.ant.types.Path;
/**
* Cleanup of generated target directory.
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/TestTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/TestTask.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/TestTask.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -20,16 +20,11 @@
import java.io.File;
-import net.dpml.library.Resource;
-import net.dpml.library.Type;
import net.dpml.library.info.Scope;
-import net.dpml.library.info.JarTypeDirective;
import net.dpml.tools.Context;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.types.Path;
/**
Modified:
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/SymbolicTestCase.java
===================================================================
---
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/SymbolicTestCase.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/SymbolicTestCase.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -22,7 +22,6 @@
import java.net.URI;
import net.dpml.component.Directive;
-import net.dpml.lang.Value;
import net.dpml.metro.info.PartReference;
import net.dpml.metro.data.ContextDirective;
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/CollectionDirective.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/CollectionDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/CollectionDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -21,7 +21,8 @@
import java.util.Arrays;
/**
- * The DirectoryProductDirective class describes a working directory.
+ * The CollectionDirective class describes a collection of include and
exclude
+ * names.
*
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
@@ -32,6 +33,14 @@
private final String[] m_includes;
private final String[] m_excludes;
+ /**
+ * Creation of a new collection directive.
+ * @param name the collection name
+ * @param info information about the collection
+ * @param criteria collection criteria
+ * @param includes the set of include names
+ * @param excludes the set of exclude names
+ */
public CollectionDirective(
final String name, final InfoDirective info, CollectionCriteria
criteria,
String[] includes, String[] excludes )
@@ -57,7 +66,7 @@
}
/**
- * Get the selection criteria.
+ * Get the collection criteria.
* @return the criteria value
*/
public CollectionCriteria getCollectionCriteria()
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ConsumptionDirective.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ConsumptionDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ConsumptionDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -33,6 +33,11 @@
private final InputDirective[] m_input;
private final Policy m_policy;
+ /**
+ * Creation of a new comsumption directive.
+ * @param input the set of input process names
+ * @param policy the consumption policy
+ */
public ConsumptionDirective( InputDirective[] input, Policy policy )
{
if( null == input )
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/DataDirective.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/DataDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/DataDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -18,10 +18,6 @@
package net.dpml.lang.info;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Properties;
-
import net.dpml.lang.AbstractDirective;
/**
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/DirectoryDirective.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/DirectoryDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/DirectoryDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -28,6 +28,12 @@
{
private final String m_path;
+ /**
+ * Creation of a new directory directive.
+ * @param name the directory name
+ * @param info infomation about the directory
+ * @param path the directory path
+ */
public DirectoryDirective( final String name, final InfoDirective info,
String path )
{
super( name, info );
@@ -41,8 +47,8 @@
}
/**
- * Get the product name.
- * @return the product name.
+ * Get the directory path.
+ * @return the path
*/
public String getPath()
{
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/InfoDirective.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/InfoDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/InfoDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -18,10 +18,6 @@
package net.dpml.lang.info;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Properties;
-
import net.dpml.lang.AbstractDirective;
/**
@@ -35,6 +31,11 @@
private final String m_title;
private final String m_description;
+ /**
+ * Creation of a new info directive.
+ * @param title the title
+ * @param description the description
+ */
public InfoDirective( final String title, final String description )
{
m_title = title;
@@ -42,8 +43,8 @@
}
/**
- * Get the product name.
- * @return the product name.
+ * Get the title.
+ * @return the name.
*/
public String getTitle()
{
@@ -51,8 +52,8 @@
}
/**
- * Get the product description.
- * @return the product description.
+ * Get the description.
+ * @return the description.
*/
public String getDescription()
{
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/InputDirective.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/InputDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/InputDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -19,8 +19,6 @@
package net.dpml.lang.info;
import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Properties;
import net.dpml.lang.AbstractDirective;
@@ -38,12 +36,25 @@
private final String[] m_excludes;
private final boolean m_filtering;
+ /**
+ * Creation of a new input directive.
+ * @param id the input id
+ * @param policy the input policy
+ */
public InputDirective(
final String id, final Policy policy )
{
this( id, policy, false, new String[0], new String[0] );
}
+ /**
+ * Creation of a new input directive.
+ * @param id the input id
+ * @param policy the input policy
+ * @param filtering the filterining flag
+ * @param includes the set of include names
+ * @param excludes the set of exclude names
+ */
public InputDirective(
final String id, final Policy policy, boolean filtering,
final String[] includes, final String[] excludes )
@@ -76,8 +87,8 @@
}
/**
- * Get the id of the consumed product.
- * @return the product id
+ * Get the input id.
+ * @return the id
*/
public String getID()
{
@@ -85,7 +96,7 @@
}
/**
- * Get the policy associated within the consumption input.
+ * Get the policy associated within the input.
* @return the input policy
*/
public Policy getPolicy()
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ProcessDirective.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ProcessDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ProcessDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -19,8 +19,6 @@
package net.dpml.lang.info;
import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Properties;
import net.dpml.lang.AbstractDirective;
@@ -44,6 +42,17 @@
private final String[] m_validators;
private final DataDirective m_data;
+ /**
+ * Creation of a new process directive.
+ * @param name the process name
+ * @param classname the processor classname
+ * @param implicit the implicit flag
+ * @param production the output type
+ * @param dependencies the set of dependent processor names
+ * @param inputs the set of input resources
+ * @param validators the set of validation processes
+ * @param data the processor data
+ */
public ProcessDirective(
final String name, final String classname, boolean implicit, String
production,
final String[] dependencies, InputDirective[] inputs, String[]
validators,
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ProductDirective.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ProductDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/ProductDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -18,10 +18,6 @@
package net.dpml.lang.info;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Properties;
-
import net.dpml.lang.AbstractDirective;
/**
@@ -35,6 +31,11 @@
private final String m_name;
private final InfoDirective m_info;
+ /**
+ * Creation of a new product directive.
+ * @param name the process name
+ * @param info product info
+ */
public ProductDirective( final String name, final InfoDirective info )
{
if( null == name )
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/WorkspaceDecoder.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/WorkspaceDecoder.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/WorkspaceDecoder.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -22,10 +22,6 @@
import java.io.File;
import java.io.IOException;
import java.io.FileNotFoundException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Properties;
import net.dpml.lang.DuplicateKeyException;
@@ -35,7 +31,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Document;
-import org.w3c.dom.TypeInfo;
/**
* Utility class supporting workspace decoding.
Modified:
trunk/main/planet/process/info/src/main/net/dpml/lang/info/WorkspaceDirective.java
===================================================================
---
trunk/main/planet/process/info/src/main/net/dpml/lang/info/WorkspaceDirective.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/main/net/dpml/lang/info/WorkspaceDirective.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -22,7 +22,6 @@
import java.util.Map;
import java.util.Hashtable;
-import net.dpml.lang.AbstractDirective;
import net.dpml.lang.UnknownKeyException;
import net.dpml.lang.DuplicateKeyException;
@@ -38,6 +37,14 @@
private final transient Map m_map = new Hashtable();
+ /**
+ * Creation of a new workspace directive.
+ * @param name the workspace name
+ * @param info workspace info
+ * @param path directory path
+ * @param products array of products within the workspace
+ * @exception DuplicateKeyException if one or more duplicate product keys
are supplied
+ */
public WorkspaceDirective(
final String name, InfoDirective info, final String path, final
ProductDirective[] products )
throws DuplicateKeyException
@@ -74,7 +81,8 @@
/**
* Get a named product from the layout.
- * @return the named product.
+ * @param name the product name
+ * @return the named product
* @exception UnknownKeyException if the requested name is unknown
*/
public ProductDirective getProductDirective( String name ) throws
UnknownKeyException
Modified:
trunk/main/planet/process/info/src/test/net/dpml/lang/info/ProcessXsdTestCase.java
===================================================================
---
trunk/main/planet/process/info/src/test/net/dpml/lang/info/ProcessXsdTestCase.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/test/net/dpml/lang/info/ProcessXsdTestCase.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -48,6 +48,10 @@
private Map m_products;
private Map m_processes;
+ /**
+ * Testcase setup.
+ * @exception Exception if an error occursduring testcase setup
+ */
public void setUp() throws Exception
{
// get the sample xml file to parse
@@ -60,9 +64,6 @@
File basedir = new File( System.getProperty( "project.basedir" ) );
File target = new File( basedir, "target" );
- //File deliverables = new File( target, "deliverables" );
- //File xsds = new File( deliverables, "xsds" );
- //String version = System.getProperty( "project.version" );
File xsd = new File( target, "process.xsd" );
System.setProperty( XSD_URI, xsd.toURI().toString() );
@@ -112,6 +113,10 @@
}
}
+ /**
+ * Test parsing of the sample file.
+ * @exception Exception if an error occurs during test execution
+ */
public void testSampleParse() throws Exception
{
String[] keys = (String[]) m_processes.keySet().toArray( new
String[0] );
Modified:
trunk/main/planet/process/info/src/test/net/dpml/lang/info/WorkspaceTestCase.java
===================================================================
---
trunk/main/planet/process/info/src/test/net/dpml/lang/info/WorkspaceTestCase.java
2006-05-29 14:06:07 UTC (rev 1472)
+++
trunk/main/planet/process/info/src/test/net/dpml/lang/info/WorkspaceTestCase.java
2006-05-29 15:41:46 UTC (rev 1473)
@@ -19,19 +19,11 @@
package net.dpml.lang.info;
import java.io.File;
-import java.net.URI;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
import net.dpml.util.DOM3DocumentBuilder;
-import net.dpml.util.ElementHelper;
-import net.dpml.util.DecodingException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.TypeInfo;
import junit.framework.TestCase;
@@ -46,6 +38,10 @@
private WorkspaceDirective m_workspace;
+ /**
+ * Testcase setup.
+ * @exception Exception if an error occursduring testcase setup
+ */
public void setUp() throws Exception
{
// get the sample xml file to parse
@@ -75,6 +71,10 @@
m_workspace = decoder.build( doc );
}
+ /**
+ * Test worksace creation.
+ * @exception Exception if an error occurs during test execution
+ */
public void testWorkspace() throws Exception
{
System.out.println( "# WORKSPACE " + m_workspace.getName() );
@@ -96,6 +96,10 @@
assertEquals( "count", 7, products.length );
}
+ /**
+ * Test worksace lookup.
+ * @exception Exception if an error occurs during test execution
+ */
public void testLookup() throws Exception
{
System.out.println( "# LOOKUP " + m_workspace.getName() );
- r1473 - in trunk/main: depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/info depot/tools/builder/src/main/net/dpml/tools/tasks metro/runtime/src/test/net/dpml/metro/builder planet/process/info/src/main/net/dpml/lang/info planet/process/info/src/test/net/dpml/lang/info, mcconnell at BerliOS, 05/29/2006
Archive powered by MHonArc 2.6.24.