notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1367 - in trunk/main: depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/impl transit/core/src/main/net/dpml/util

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1367 - in trunk/main: depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/impl transit/core/src/main/net/dpml/util
Date: Wed, 12 Apr 2006 01:42:21 +0200

Author: mcconnell
Date: 2006-04-12 01:41:42 +0200 (Wed, 12 Apr 2006)
New Revision: 1367

Modified:
trunk/main/depot/library/src/main/net/dpml/library/Filter.java
trunk/main/depot/library/src/main/net/dpml/library/Info.java
trunk/main/depot/library/src/main/net/dpml/library/Resource.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java

trunk/main/depot/library/src/main/net/dpml/library/info/FeatureFilterDirective.java

trunk/main/depot/library/src/main/net/dpml/library/info/FilterDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/InfoDirective.java

trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java

trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java

trunk/main/depot/library/src/main/net/dpml/library/info/SimpleFilterDirective.java

trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
trunk/main/transit/core/src/main/net/dpml/util/DOM3DocumentBuilder.java
trunk/main/transit/core/src/main/net/dpml/util/DecodingException.java
Log:
checkstyle clean-up

Modified: trunk/main/depot/library/src/main/net/dpml/library/Filter.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Filter.java
2006-04-11 23:23:40 UTC (rev 1366)
+++ trunk/main/depot/library/src/main/net/dpml/library/Filter.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -18,8 +18,6 @@

package net.dpml.library;

-import net.dpml.lang.AbstractDirective;
-
/**
* Interface implemented by content filters.
*

Modified: trunk/main/depot/library/src/main/net/dpml/library/Info.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Info.java
2006-04-11 23:23:40 UTC (rev 1366)
+++ trunk/main/depot/library/src/main/net/dpml/library/Info.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -18,14 +18,8 @@

package net.dpml.library;

-import java.util.Properties;
-
-import net.dpml.lang.AbstractDirective;
-
-import net.dpml.library.Info;
-
/**
- * interface implemented by info providers.
+ * Interface implemented by info handlers.
*
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@

Modified: trunk/main/depot/library/src/main/net/dpml/library/Resource.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Resource.java
2006-04-11 23:23:40 UTC (rev 1366)
+++ trunk/main/depot/library/src/main/net/dpml/library/Resource.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -24,7 +24,6 @@
import net.dpml.library.info.ResourceDirective.Classifier;

import net.dpml.transit.Artifact;
-import net.dpml.transit.Transit;
import net.dpml.lang.Category;

/**

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-04-11 23:23:40 UTC (rev 1366)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -27,7 +27,6 @@
import java.util.Hashtable;

import net.dpml.library.info.ImportDirective;
-import net.dpml.library.info.IncludeDirective;
import net.dpml.library.info.LibraryDirective;
import net.dpml.library.info.ModuleDirective;
import net.dpml.library.info.ResourceDirective;

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
2006-04-11 23:23:40 UTC (rev 1366)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -46,8 +46,6 @@
import net.dpml.lang.Part;

import net.dpml.util.DecodingException;
-
-import net.dpml.util.DecodingException;
import net.dpml.util.DOM3DocumentBuilder;
import net.dpml.util.ElementHelper;

@@ -324,37 +322,11 @@
}
else if( RESOURCE_ELEMENT_NAME.equals( elementName ) )
{
- try
- {
- return buildResourceDirective( element, offset );
- }
- catch( DecodingException e )
- {
- throw e;
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to build a resource
directive from an element.";
- throw new DecodingException( element, error, e );
- }
+ return buildResourceDirective( element, offset );
}
else if( PROJECT_ELEMENT_NAME.equals( elementName ) )
{
- try
- {
- return buildResourceDirective( element, offset );
- }
- catch( DecodingException e )
- {
- throw e;
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to build a project
directive from an element.";
- throw new DecodingException( element, error, e );
- }
+ return buildResourceDirective( element, offset );
}
else if( MODULE_ELEMENT_NAME.equals( elementName ) )
{
@@ -369,63 +341,27 @@
final String tag = child.getTagName();
if( MODULE_ELEMENT_NAME.equals( tag ) )
{
- try
- {
- ResourceDirective directive =
- buildResourceDirectiveFromElement( base,
child, null );
- list.add( directive );
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to build a
nested module directive from an element.";
- throw new DecodingException( child, error, e );
- }
+ ResourceDirective directive =
+ buildResourceDirectiveFromElement( base, child,
null );
+ list.add( directive );
}
else if( IMPORT_ELEMENT_NAME.equals( tag ) )
{
- try
- {
- ResourceDirective directive =
- buildResourceDirectiveFromElement( base,
child, null );
- list.add( directive );
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to build a a
nested import directive from an element.";
- throw new DecodingException( child, error, e );
- }
+ ResourceDirective directive =
+ buildResourceDirectiveFromElement( base, child,
null );
+ list.add( directive );
}
else if( PROJECT_ELEMENT_NAME.equals( tag ) )
{
- try
- {
- ResourceDirective directive =
- buildResourceDirective( child );
- list.add( directive );
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to build a a
nested project directive from an element.";
- throw new DecodingException( child, error, e );
- }
+ ResourceDirective directive =
+ buildResourceDirective( child );
+ list.add( directive );
}
else if( RESOURCE_ELEMENT_NAME.equals( tag ) )
{
- try
- {
- ResourceDirective directive =
- buildResourceDirective( child );
- list.add( directive );
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to build a a
nested resource directive from an element.";
- throw new DecodingException( child, error, e );
- }
+ ResourceDirective directive =
+ buildResourceDirective( child );
+ list.add( directive );
}
}
ResourceDirective[] resources = (ResourceDirective[])
list.toArray( new ResourceDirective[0] );

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/FeatureFilterDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/FeatureFilterDirective.java
2006-04-11 23:23:40 UTC (rev 1366)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/FeatureFilterDirective.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -72,6 +72,8 @@
* Return the filter value.
* @param resource the enclosing resource
* @return the resolved value
+ * @exception ResourceNotFoundException if the feature references a
+ * resource that is unknown
*/
public String getValue( Resource resource ) throws
ResourceNotFoundException
{

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/FilterDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/FilterDirective.java
2006-04-11 23:23:40 UTC (rev 1366)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/FilterDirective.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -18,8 +18,6 @@

package net.dpml.library.info;

-import java.util.Properties;
-
import net.dpml.lang.AbstractDirective;

import net.dpml.library.Filter;
@@ -58,6 +56,8 @@
* Return the filter value.
* @param resource the enclosing resource
* @return the resolved value
+ * @exception ResourceNotFoundException if the feature references a
+ * resource that is unknown
*/
public abstract String getValue( Resource resource ) throws
ResourceNotFoundException;

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/InfoDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/InfoDirective.java
2006-04-11 23:23:40 UTC (rev 1366)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/InfoDirective.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -18,8 +18,6 @@

package net.dpml.library.info;

-import java.util.Properties;
-
import net.dpml.lang.AbstractDirective;

import net.dpml.library.Info;

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-04-11 23:23:40 UTC (rev 1366)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -73,10 +73,12 @@
* @param version the resource version
* @param classifier LOCAL or EXTERNAL classifier
* @param basedir the project basedir
+ * @param info info descriptor
* @param types types produced by the resource
* @param dependencies resource dependencies
* @param resources resource included within the module
* @param properties suppliementary properties
+ * @param filters associated filters
*/
public ModuleDirective(
String name, String version, Classifier classifier, String basedir,

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-04-11 23:23:40 UTC (rev 1366)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -79,6 +79,7 @@
* @param version the resource version
* @param classifier LOCAL or EXTERNAL classifier
* @param basedir the project basedir
+ * @param info info descriptor
* @param types types produced by the resource
* @param dependencies resource dependencies
* @param properties suppliementary properties
@@ -97,6 +98,7 @@
* @param version the resource version
* @param classifier LOCAL or EXTERNAL classifier
* @param basedir the project basedir
+ * @param info info descriptor
* @param types types produced by the resource
* @param dependencies resource dependencies
* @param properties suppliementary properties

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/SimpleFilterDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/SimpleFilterDirective.java
2006-04-11 23:23:40 UTC (rev 1366)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/SimpleFilterDirective.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -21,8 +21,6 @@
import net.dpml.library.Resource;
import net.dpml.library.ResourceNotFoundException;

-import net.dpml.util.PropertyResolver;
-
/**
* Simple value filter.
*
@@ -48,6 +46,7 @@
* Return the filter value.
* @param resource the enclosing resource
* @return the resolved value
+ * @exception ResourceNotFoundException (never thrown)
*/
public String getValue( Resource resource ) throws
ResourceNotFoundException
{

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
2006-04-11 23:23:40 UTC (rev 1366)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -22,7 +22,6 @@
import java.net.URI;
import java.net.URL;
import java.util.Date;
-import java.util.Properties;
import java.util.Vector;

import net.dpml.library.Builder;

Modified:
trunk/main/transit/core/src/main/net/dpml/util/DOM3DocumentBuilder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/util/DOM3DocumentBuilder.java
2006-04-11 23:23:40 UTC (rev 1366)
+++ trunk/main/transit/core/src/main/net/dpml/util/DOM3DocumentBuilder.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -64,6 +64,7 @@

/**
* Creation of a new DOM3 document builder.
+ * @param logger the assigned logging channel
*/
public DOM3DocumentBuilder( Logger logger )
{
@@ -72,6 +73,7 @@

/**
* Creation of a new DOM3 document builder.
+ * @param logger the assigned logging channel
* @param map namespace to builder uri map
*/
public DOM3DocumentBuilder( Logger logger, Map map )

Modified:
trunk/main/transit/core/src/main/net/dpml/util/DecodingException.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/util/DecodingException.java
2006-04-11 23:23:40 UTC (rev 1366)
+++ trunk/main/transit/core/src/main/net/dpml/util/DecodingException.java
2006-04-11 23:41:42 UTC (rev 1367)
@@ -95,11 +95,22 @@
}
}

+ /**
+ * Static utility operation that returns a syring representation of a DOM
element.
+ * @param element the element to stringify
+ * @return the string value
+ */
public static String list( Element element )
{
return list( element, "" );
}

+ /**
+ * Static utility operation that returns a syring representation of a DOM
element.
+ * @param element the element to stringify
+ * @param pad padding offset
+ * @return the string value
+ */
public static String list( Element element, String pad )
{
StringBuffer buffer = new StringBuffer();

r1367 - in trunk/main: depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/impl transit/core/src/main/net/dpml/util, mcconnell at BerliOS, 04/11/2006