Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1874 - in development/main/metro/meta/api/src: main/net/dpml/meta/info test/net/dpml/meta/info/test

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1874 - in development/main/metro/meta/api/src: main/net/dpml/meta/info test/net/dpml/meta/info/test
  • Date: Tue, 22 Feb 2005 18:47:51 +0100

Author: mcconnell
Date: Tue Feb 22 18:47:49 2005
New Revision: 1874

Modified:

development/main/metro/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/ContextDescriptor.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/DependencyDescriptor.java
development/main/metro/meta/api/src/main/net/dpml/meta/info/Descriptor.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/EntryDescriptor.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/ExtensionDescriptor.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/PermissionDescriptor.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/ReferenceDescriptor.java
development/main/metro/meta/api/src/main/net/dpml/meta/info/Service.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/StageDescriptor.java
development/main/metro/meta/api/src/main/net/dpml/meta/info/Type.java
development/main/metro/meta/api/src/main/net/dpml/meta/info/Version.java

development/main/metro/meta/api/src/test/net/dpml/meta/info/test/EntryDescriptorTestCase.java

development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ExtensionDescriptorTestCase.java

development/main/metro/meta/api/src/test/net/dpml/meta/info/test/InfoDescriptorTestCase.java

development/main/metro/meta/api/src/test/net/dpml/meta/info/test/PermissionDescriptorTestCase.java

development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ReferenceDescriptorTestCase.java

development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ServiceDescriptorTestCase.java

development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ServiceTestCase.java

development/main/metro/meta/api/src/test/net/dpml/meta/info/test/StageDescriptorTestCase.java
Log:
Remove NullArgumentException references from the API.

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.util.Properties;

-import net.dpml.lang.NullArgumentException;
-
/**
* A descriptor describing an Avalon Logger
* child instances that the component will create using the
@@ -54,15 +52,15 @@
* @param name the logging category name
* @param attributes a set of attributes associated with the declaration
*
- * @exception NullArgumentException if name argument is null
+ * @exception NullPointerException if name argument is null
*/
public CategoryDescriptor( final String name, final Properties
attributes )
- throws NullArgumentException
+ throws NullPointerException
{
super( attributes );
if( null == name )
{
- throw new NullArgumentException( "name" );
+ throw new NullPointerException( "name" );
}

m_name = name;

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/ContextDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/ContextDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/ContextDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -24,8 +24,6 @@
import java.util.List;
import java.util.Properties;

-import net.dpml.lang.NullArgumentException;
-
/**
* A descriptor describing the Context that the Component
* is passed to describe information about Runtime environment
@@ -107,18 +105,18 @@
* @param classname the classname of a castable interface
* @param entries the set of entries required within the context
* @param attributes supplimentary attributes associated with the context
- * @exception NullArgumentException if the entries argument is null
+ * @exception NullPointerException if the entries argument is null
*/
public ContextDescriptor( final String classname,
final EntryDescriptor[] entries,
final Properties attributes )
- throws NullArgumentException, IllegalArgumentException
+ throws NullPointerException, IllegalArgumentException
{
super( attributes );

if ( null == entries )
{
- throw new NullArgumentException( "entries" );
+ throw new NullPointerException( "entries" );
}

m_classname = classname;
@@ -161,11 +159,11 @@
* @exception NullArgumentException if the alias argument is null.
*/
public EntryDescriptor getEntry( final String alias )
- throws NullArgumentException
+ throws NullPointerException
{
if ( null == alias )
{
- throw new NullArgumentException( "alias" );
+ throw new NullPointerException( "alias" );
}

for ( int i = 0; i < m_entries.length; i++ )

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/DependencyDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/DependencyDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/DependencyDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.util.Properties;

-import net.dpml.lang.NullArgumentException;
-
/**
* A descriptor that describes dependency information for
* a particular Component. This class contains information
@@ -126,25 +124,25 @@
* @param optional TRUE if this depedency is optional
* @param attributes a set of attributes to associate with the dependency
* @param position constructor position
- * @exception NullArgumentException if the role argument or the service
argument is null.
+ * @exception NullPointerException if the role argument or the service
argument is null.
*/
public DependencyDescriptor( final String role,
final ReferenceDescriptor service,
final boolean optional,
final Properties attributes,
final int position )
- throws NullArgumentException
+ throws NullPointerException
{
super( attributes );

if ( null == role )
{
- throw new NullArgumentException( "role" );
+ throw new NullPointerException( "role" );
}

if ( null == service )
{
- throw new NullArgumentException( "service" );
+ throw new NullPointerException( "service" );
}

m_key = role;

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/Descriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/Descriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/Descriptor.java
Tue Feb 22 18:47:49 2005
@@ -23,8 +23,6 @@

import java.util.Properties;

-import net.dpml.lang.NullArgumentException;
-
/**
* This is the Abstract class for all feature feature descriptors.
*

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/EntryDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/EntryDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/EntryDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.io.Serializable;

-import net.dpml.lang.NullArgumentException;
-
/**
* A descriptor that describes a value that must be placed
* in components Context. It contains information about;
@@ -112,22 +110,22 @@
* @param optional TRUE if this is an optional entry
* @param isVolatile TRUE if the entry is is volatile
* @param alias an alternative key used by the component to reference
the key
- * @exception NullArgumentException if the key or type value are null
+ * @exception NullPointerException if the key or type value are null
*/
public EntryDescriptor( final String key,
final String classname,
final boolean optional,
final boolean isVolatile,
final String alias )
- throws NullArgumentException
+ throws NullPointerException
{
if ( null == key )
{
- throw new NullArgumentException( "key" );
+ throw new NullPointerException( "key" );
}
if ( null == classname )
{
- throw new NullArgumentException( "classname" );
+ throw new NullPointerException( "classname" );
}

m_key = key;

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/ExtensionDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/ExtensionDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/ExtensionDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.util.Properties;

-import net.dpml.lang.NullArgumentException;
-
/**
* A descriptor that describes a name and inteface of a lifecycle stage.
*
@@ -55,13 +53,13 @@
*/
public ExtensionDescriptor( final String urn,
final Properties attributes )
- throws NullArgumentException
+ throws NullPointerException
{
super( attributes );

if ( null == urn )
{
- throw new NullArgumentException( "urn" );
+ throw new NullPointerException( "urn" );
}

m_urn = urn;

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.util.Properties;

-import net.dpml.lang.NullArgumentException;
-
/**
* This class is used to provide explicit information to assembler
* and administrator about the Component. It includes information
@@ -139,7 +137,7 @@
final String schema,
final boolean flag,
final Properties attributes )
- throws IllegalArgumentException, NullArgumentException
+ throws IllegalArgumentException, NullPointerException
{
super( attributes );

@@ -147,7 +145,7 @@

if ( null == classname )
{
- throw new NullArgumentException( "classname" );
+ throw new NullPointerException( "classname" );
}

if ( classname.indexOf( "/" ) > -1 )

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/PermissionDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/PermissionDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/PermissionDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.io.Serializable;

-import net.dpml.lang.NullArgumentException;
-
/**
* A descriptor that describes a value that must be placed
* in components Context. It contains information about;
@@ -61,15 +59,15 @@
* @param classname the permission class name
* @param name the permission name
* @param actions the permission actions
- * @exception NullArgumentException if the classname argument is null.
+ * @exception NullPointerException if the classname argument is null.
*/
public PermissionDescriptor(
final String classname, final String name, final String[]
actions )
- throws NullArgumentException
+ throws NullPointerException
{
if ( null == classname )
{
- throw new NullArgumentException( "classname" );
+ throw new NullPointerException( "classname" );
}

m_classname = classname;

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/ReferenceDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/ReferenceDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/ReferenceDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.io.Serializable;

-import net.dpml.lang.NullArgumentException;
-
/**
* This reference defines the type of interface required
* by a component. The type corresponds to the class name of the
@@ -64,24 +62,24 @@
*
* @param classname the name of the service
* @param version the version of service
- * @exception NullArgumentException if the classname or version is null
+ * @exception NullPointerException if the classname or version is null
* @exception IllegalArgumentException if the classname string is invalid
*/
public ReferenceDescriptor( final String classname,
final Version version )
- throws NullArgumentException
+ throws NullPointerException
{
if ( null == classname )
{
- throw new NullArgumentException( "classname" );
+ throw new NullPointerException( "classname" );
}
if( classname.equals( "" ) )
{
- throw new NullArgumentException( "classname" );
+ throw new NullPointerException( "classname" );
}
if( classname.indexOf( "/" ) > -1 )
{
- throw new IllegalArgumentException( "classname" );
+ throw new NullPointerException( "classname" );
}

m_classname = classname;
@@ -182,11 +180,11 @@
}

private static final String parseClassname( final String type )
- throws NullArgumentException
+ throws NullPointerException
{
if( type == null )
{
- throw new NullArgumentException( "type" );
+ throw new NullPointerException( "type" );
}

int index = type.indexOf( ":" );
@@ -213,11 +211,11 @@
}

private static final int getColonIndex( final String type )
- throws NullArgumentException
+ throws NullPointerException
{
if ( null == type )
{
- throw new NullArgumentException( "type" );
+ throw new NullPointerException( "type" );
}

return Math.min( type.length(), Math.max( 0, type.indexOf( ":" ) ) );

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/Service.java
==============================================================================
--- development/main/metro/meta/api/src/main/net/dpml/meta/info/Service.java
(original)
+++ development/main/metro/meta/api/src/main/net/dpml/meta/info/Service.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.util.Properties;

-import net.dpml.lang.NullArgumentException;
-
/**
* This class contains the meta information about a particular
* service. It contains a set of attributes qualifying the service;
@@ -96,18 +94,18 @@
* @param reference the versioned classname
* @param entries the set of optional context entries
* @param attributes the set of attributes to assign to the descriptor
- * @exception NullArgumentException if the reference argument is null.
+ * @exception NullPointerException if the reference argument is null.
*/
public Service(
final ReferenceDescriptor reference,
final EntryDescriptor[] entries,
final Properties attributes )
- throws NullArgumentException
+ throws NullPointerException
{
super( attributes );
if ( reference == null )
{
- throw new NullArgumentException( "reference" );
+ throw new NullPointerException( "reference" );
}
m_reference = reference;
if ( entries == null )

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.util.Properties;

-import net.dpml.lang.NullArgumentException;
-
/**
* This descriptor defines the type of service offerend or required
* by a component. The type corresponds to the class name of the
@@ -87,13 +85,13 @@
*/
public ServiceDescriptor( final ReferenceDescriptor designator,
final Properties attributes )
- throws NullArgumentException
+ throws NullPointerException
{
super( attributes );

if ( null == designator )
{
- throw new NullArgumentException( "designator" );
+ throw new NullPointerException( "designator" );
}

m_designator = designator;

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/StageDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/StageDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/StageDescriptor.java
Tue Feb 22 18:47:49 2005
@@ -21,8 +21,6 @@

import java.util.Properties;

-import net.dpml.lang.NullArgumentException;
-
/**
* A descriptor that describes a name and inteface of a lifecycle stage.
*
@@ -52,17 +50,17 @@
* Constructor a stage descriptor with attributes.
* @param urn the stage identifier
* @param attributes a set of attribute values to associated with the
stage
- * @exception NullArgumentException if the reference argument is null
+ * @exception NullPointerException if the reference argument is null
*/
public StageDescriptor( final String urn,
final Properties attributes )
- throws NullArgumentException
+ throws NullPointerException
{
super( attributes );

if ( null == urn )
{
- throw new NullArgumentException( "urn" );
+ throw new NullPointerException( "urn" );
}
m_urn = urn;
}

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/Type.java
==============================================================================
--- development/main/metro/meta/api/src/main/net/dpml/meta/info/Type.java
(original)
+++ development/main/metro/meta/api/src/main/net/dpml/meta/info/Type.java
Tue Feb 22 18:47:49 2005
@@ -23,8 +23,6 @@

import net.dpml.configuration.Configuration;

-import net.dpml.lang.NullArgumentException;
-
import net.dpml.parameters.Parameters;

/**
@@ -189,7 +187,7 @@
* suppier resolution
* @param defaults the static configuration defaults
* @param params static parameter defaults
- * @exception NullArgumentException if the descriptor, loggers, context,
services,
+ * @exception NullPointerException if the descriptor, loggers, context,
services,
* dependencies, stages, or extensions argument is null
*/
public Type( final InfoDescriptor descriptor,
@@ -202,39 +200,39 @@
final ExtensionDescriptor[] extensions,
final Configuration defaults,
final Parameters params )
- throws NullArgumentException
+ throws NullPointerException
{
if ( null == descriptor )
{
- throw new NullArgumentException( "descriptor" );
+ throw new NullPointerException( "descriptor" );
}
if ( null == security )
{
- throw new NullArgumentException( "security" );
+ throw new NullPointerException( "security" );
}
if ( null == loggers )
{
- throw new NullArgumentException( "loggers" );
+ throw new NullPointerException( "loggers" );
}
if ( null == context )
{
- throw new NullArgumentException( "context" );
+ throw new NullPointerException( "context" );
}
if ( null == services )
{
- throw new NullArgumentException( "services" );
+ throw new NullPointerException( "services" );
}
if ( null == dependencies )
{
- throw new NullArgumentException( "dependencies" );
+ throw new NullPointerException( "dependencies" );
}
if ( null == stages )
{
- throw new NullArgumentException( "stages" );
+ throw new NullPointerException( "stages" );
}
if ( null == extensions )
{
- throw new NullArgumentException( "extensions" );
+ throw new NullPointerException( "extensions" );
}

m_descriptor = descriptor;

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/Version.java
==============================================================================
--- development/main/metro/meta/api/src/main/net/dpml/meta/info/Version.java
(original)
+++ development/main/metro/meta/api/src/main/net/dpml/meta/info/Version.java
Tue Feb 22 18:47:49 2005
@@ -20,8 +20,6 @@

import java.util.StringTokenizer;

-import net.dpml.lang.NullArgumentException;
-
/**
* This class is used to hold version information pertaining to a Component
or interface.
* <p />
@@ -70,14 +68,16 @@
* @return the new Version object
* @throws NumberFormatException if an error occurs
* @throws IllegalArgumentException if an error occurs
- * @throws NullArgumentException if the version argument is
<code>null</code>.
+ * @throws NullPointerException if the version argument is
<code>null</code>.
* @since 4.1
*/
public static Version getVersion( final String version )
- throws NumberFormatException, IllegalArgumentException,
NullArgumentException
+ throws NumberFormatException, IllegalArgumentException,
NullPointerException
{
if( version == null )
- throw new NullArgumentException( "version" );
+ {
+ throw new NullPointerException( "version" );
+ }

final StringTokenizer tokenizer = new StringTokenizer( version, "."
);
final String[] levels = new String[ tokenizer.countTokens() ];
@@ -297,14 +297,14 @@
* {@link Comparable} interface.
*
* @return number indicating relative value (-1, 0, 1)
- * @throws NullArgumentException if the argument is null.
+ * @throws NullPointerException if the argument is null.
*/
public int compareTo( Object o )
- throws NullArgumentException
+ throws NullPointerException
{
if( o == null )
{
- throw new NullArgumentException( "o" );
+ throw new NullPointerException ( "o" );
}

Version other = (Version)o;

Modified:
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/EntryDescriptorTestCase.java
==============================================================================
---
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/EntryDescriptorTestCase.java
(original)
+++
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/EntryDescriptorTestCase.java
Tue Feb 22 18:47:49 2005
@@ -28,8 +28,6 @@

import junit.framework.TestCase;

-import net.dpml.lang.NullArgumentException;
-
import net.dpml.meta.info.EntryDescriptor;

/**
@@ -68,9 +66,9 @@
try
{
new EntryDescriptor(null, m_type);
- fail("Did not throw expected NullArgumentException");
+ fail("Did not throw expected NullPointerException ");
}
- catch( NullArgumentException npe)
+ catch( NullPointerException npe)
{
// Success!!
}
@@ -78,9 +76,9 @@
try
{
new EntryDescriptor( m_key, null );
- fail( "Did not throw expected NullArgumentException" );
+ fail( "Did not throw expected NullPointerException" );
}
- catch ( NullArgumentException npe )
+ catch ( NullPointerException npe )
{
// Success!!
}

Modified:
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ExtensionDescriptorTestCase.java
==============================================================================
---
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ExtensionDescriptorTestCase.java
(original)
+++
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ExtensionDescriptorTestCase.java
Tue Feb 22 18:47:49 2005
@@ -19,8 +19,6 @@

package net.dpml.meta.info.test;

-import net.dpml.lang.NullArgumentException;
-
import net.dpml.meta.info.Descriptor;
import net.dpml.meta.info.ExtensionDescriptor;

@@ -62,9 +60,9 @@
try
{
new ExtensionDescriptor(null, getProperties());
- fail( "Did not throw the expected NullPointerException" );
+ fail( "Did not throw the expected NullPointerException " );
}
- catch( NullArgumentException npe)
+ catch( NullPointerException npe)
{
// Success!!
}

Modified:
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/InfoDescriptorTestCase.java
==============================================================================
---
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/InfoDescriptorTestCase.java
(original)
+++
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/InfoDescriptorTestCase.java
Tue Feb 22 18:47:49 2005
@@ -19,8 +19,6 @@

package net.dpml.meta.info.test;

-import net.dpml.lang.NullArgumentException;
-
import net.dpml.meta.info.Descriptor;
import net.dpml.meta.info.InfoDescriptor;
import net.dpml.meta.info.Version;
@@ -72,7 +70,7 @@
m_name, null, m_version, m_lifestyle, m_collection, m_schema,
m_native, getProperties() );
fail("Did not throw the proper NullPointerException");
}
- catch( NullArgumentException npe )
+ catch( NullPointerException npe )
{
// Success!
}

Modified:
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/PermissionDescriptorTestCase.java
==============================================================================
---
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/PermissionDescriptorTestCase.java
(original)
+++
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/PermissionDescriptorTestCase.java
Tue Feb 22 18:47:49 2005
@@ -30,8 +30,6 @@

import junit.framework.TestCase;

-import net.dpml.lang.NullArgumentException;
-
import net.dpml.meta.info.PermissionDescriptor;

/**
@@ -58,7 +56,7 @@
PermissionDescriptor d = new PermissionDescriptor( null, null,
null );
fail( "did not throw an npe:" + d );
}
- catch( NullArgumentException npe )
+ catch( NullPointerException npe )
{
// ok
}

Modified:
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ReferenceDescriptorTestCase.java
==============================================================================
---
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ReferenceDescriptorTestCase.java
(original)
+++
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ReferenceDescriptorTestCase.java
Tue Feb 22 18:47:49 2005
@@ -28,8 +28,6 @@

import junit.framework.TestCase;

-import net.dpml.lang.NullArgumentException;
-
import net.dpml.meta.info.ReferenceDescriptor;
import net.dpml.meta.info.Version;

@@ -57,7 +55,7 @@
new ReferenceDescriptor(null, m_version);
fail("Did not throw the expected NullPointerException");
}
- catch( NullArgumentException npe )
+ catch( NullPointerException npe )
{
// Success!
}
@@ -67,7 +65,7 @@
new ReferenceDescriptor( null );
fail( "Did not throw the expected NullPointerException" );
}
- catch( NullArgumentException npe )
+ catch( NullPointerException npe )
{
// Success!
}

Modified:
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ServiceDescriptorTestCase.java
==============================================================================
---
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ServiceDescriptorTestCase.java
(original)
+++
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ServiceDescriptorTestCase.java
Tue Feb 22 18:47:49 2005
@@ -19,8 +19,6 @@

package net.dpml.meta.info.test;

-import net.dpml.lang.NullArgumentException;
-
import net.dpml.meta.info.Descriptor;
import net.dpml.meta.info.ReferenceDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
@@ -59,7 +57,7 @@
new ServiceDescriptor( null, getProperties() );
fail( "Did not throw the expected NullPointerException" );
}
- catch( NullArgumentException npe )
+ catch( NullPointerException npe )
{
// Success!
}

Modified:
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ServiceTestCase.java
==============================================================================
---
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ServiceTestCase.java
(original)
+++
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/ServiceTestCase.java
Tue Feb 22 18:47:49 2005
@@ -19,8 +19,6 @@

package net.dpml.meta.info.test;

-import net.dpml.lang.NullArgumentException;
-
import net.dpml.meta.info.Descriptor;
import net.dpml.meta.info.Service;
import net.dpml.meta.info.ReferenceDescriptor;
@@ -63,7 +61,7 @@
new Service(null);
fail("Did not throw the expected NullPointerException");
}
- catch( NullArgumentException npe )
+ catch( NullPointerException npe )
{
// Success!
}

Modified:
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/StageDescriptorTestCase.java
==============================================================================
---
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/StageDescriptorTestCase.java
(original)
+++
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/StageDescriptorTestCase.java
Tue Feb 22 18:47:49 2005
@@ -19,8 +19,6 @@

package net.dpml.meta.info.test;

-import net.dpml.lang.NullArgumentException;
-
import net.dpml.meta.info.Descriptor;
import net.dpml.meta.info.StageDescriptor;

@@ -58,7 +56,7 @@
new StageDescriptor( null, getProperties() );
fail( "Did not throw the expected NullPointerException" );
}
- catch( NullArgumentException npe )
+ catch( NullPointerException npe )
{
// Success!
}



  • svn commit: r1874 - in development/main/metro/meta/api/src: main/net/dpml/meta/info test/net/dpml/meta/info/test, mcconnell, 02/22/2005

Archive powered by MHonArc 2.6.24.

Top of Page