[CVS spice] Added checks for NPEs.
mauro-yCVjj/[email protected] 19 Jun 2004 17:51:35 -0000
| Newsgroups | gmane.comp.java.spice.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>spice/components/alchemist/src/java/org/codehaus/spice/alchemist</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt>configuration/<a href="#file1">ConfigurationAlchemist.java</a></tt></td><td align="right" id="added">+10</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">1.2 -> 1.3</td></tr>
<tr class="alt"><td><tt> /<a href="#file2"><span id="removed">AvalonConfiguration.java</span></a></tt></td><td></td><td align="right" id="removed">-295</td><td nowrap="nowrap">1.1 removed</td></tr>
<tr><td><tt> /<a href="#file3"><span id="removed">DNAConfiguration.java</span></a></tt></td><td></td><td align="right" id="removed">-299</td><td nowrap="nowrap">1.1 removed</td></tr>
<tr class="alt"><td><tt>instrument/<a href="#file4">DNAInstrumentManager.java</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">1.2 -> 1.3</td></tr>
<tr><td></td><td align="right" id="added">+15</td><td align="right" id="removed">-598</td><td></td></tr>
</table>
<small id="info">2 removed + 2 modified, total 4 files</small><br />
<pre class="comment">
Added checks for NPEs.
Replaced Configuration facades with a straightforward
instantiation of the appropriate DefaultConfiguration.
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">spice/components/alchemist/src/java/org/codehaus/spice/alchemist/configuration<br /></span>
<div class="fileheader"><big><b>ConfigurationAlchemist.java</b></big> <small id="info">1.2 -> 1.3</small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- ConfigurationAlchemist.java 17 Jun 2004 22:27:22 -0000 1.2
+++ ConfigurationAlchemist.java 19 Jun 2004 17:51:35 -0000 1.3
@@ -8,12 +8,13 @@
</small></pre><pre class="diff" id="context"> package org.codehaus.spice.alchemist.configuration;
import org.codehaus.dna.Configuration;
</pre><pre class="diff" id="added">+import org.codehaus.dna.impl.DefaultConfiguration;
</pre><pre class="diff" id="context">
/**
* Utility class containing methods to transform Configuration objects.
*
* @author Mauro Talevi
</pre><pre class="diff" id="removed">- * @version $Revision: 1.2 $ $Date: 2004/06/17 22:27:22 $
</pre><pre class="diff" id="added">+ * @version $Revision: 1.3 $ $Date: 2004/06/19 17:51:35 $
</pre><pre class="diff" id="context"> */
public class ConfigurationAlchemist
{
</pre><pre class="diff"><small id="info">@@ -25,7 +26,10 @@
</small></pre><pre class="diff" id="context"> */
public static Configuration toDNAConfiguration( final org.apache.avalon.framework.configuration.Configuration configuration )
{
</pre><pre class="diff" id="removed">- return new DNAConfiguration( configuration );
</pre><pre class="diff" id="added">+ if ( null == configuration ) {
+ throw new NullPointerException( "configuration" );
+ }
+ return new DefaultConfiguration( configuration.getName(), "", configuration.getLocation() );
</pre><pre class="diff" id="context"> }
/**
</pre><pre class="diff"><small id="info">@@ -36,7 +40,10 @@
</small></pre><pre class="diff" id="context"> */
public static org.apache.avalon.framework.configuration.Configuration toAvalonConfiguration( final Configuration configuration )
{
</pre><pre class="diff" id="removed">- return new AvalonConfiguration( configuration );
</pre><pre class="diff" id="added">+ if ( null == configuration ) {
+ throw new NullPointerException( "configuration" );
+ }
+ return new org.apache.avalon.framework.configuration.DefaultConfiguration( configuration.getName(), configuration.getLocation() );
</pre><pre class="diff" id="context"> }
/**
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname" id="removed">spice/components/alchemist/src/java/org/codehaus/spice/alchemist/configuration<br /></span>
<div class="fileheader" id="removed"><big><b>AvalonConfiguration.java</b></big> <small id="info">removed after 1.1</small></div>
<pre class="diff"><small id="info">diff -N AvalonConfiguration.java
--- AvalonConfiguration.java 13 Jun 2004 13:35:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,295 +0,0 @@
</small></pre><pre class="diff" id="removed">-/*
- * Copyright (C) The Spice Group. All rights reserved. This software is
- * published under the terms of the Spice Software License version 1.1, a copy
- * of which has been included with this distribution in the LICENSE.txt file.
- */
-package org.codehaus.spice.alchemist.configuration;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-
-/**
- * Avalon Configuration facade implementation for the DNA Configuration.
- *
- * @author Mauro Talevi
- * @version $Revision: 1.1 $ $Date: 2004/06/13 13:35:14 $
- */
-public class AvalonConfiguration implements Configuration {
-
- /**
- * The DNA Configuration.
- */
- private final org.codehaus.dna.Configuration _configuration;
-
- /**
- * Create an instance of configuration facade.
- *
- * @param configuration
- */
- public AvalonConfiguration(
- final org.codehaus.dna.Configuration configuration ) {
- _configuration = configuration;
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getName()
- */
- public String getName() {
- return _configuration.getName();
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getLocation()
- */
- public String getLocation() {
- return _configuration.getLocation();
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getNamespace()
- */
- public String getNamespace() throws ConfigurationException {
- throw new ConfigurationException("Method not supported by "+_configuration.getClass().getName());
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getChild(java.lang.String)
- */
- public Configuration getChild( String arg0 ) {
- return new AvalonConfiguration( _configuration.getChild( arg0 ) );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getChild(java.lang.String,
- * boolean)
- */
- public Configuration getChild( String arg0, boolean arg1 ) {
- return new AvalonConfiguration( _configuration.getChild( arg0, arg1 ) );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getChildren()
- */
- public Configuration[] getChildren() {
- final DefaultConfiguration result = new DefaultConfiguration(
- _configuration.getName(), _configuration.getLocation() );
- final org.codehaus.dna.Configuration[] children = _configuration
- .getChildren();
- for ( int i = 0; i < children.length; i++ ) {
- final Configuration child = new AvalonConfiguration( children[i] );
- result.addChild( child );
- }
- return result.getChildren();
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getChildren(java.lang.String)
- */
- public Configuration[] getChildren( String arg0 ) {
- final DefaultConfiguration result = new DefaultConfiguration(
- _configuration.getName(), _configuration.getLocation() );
- final org.codehaus.dna.Configuration[] children = _configuration
- .getChildren( arg0 );
- for ( int i = 0; i < children.length; i++ ) {
- final Configuration child = new AvalonConfiguration( children[i] );
- result.addChild( child );
- }
- return result.getChildren();
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttributeNames()
- */
- public String[] getAttributeNames() {
- return _configuration.getAttributeNames();
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttribute(java.lang.String)
- */
- public String getAttribute( String arg0 ) throws ConfigurationException {
- try {
- return _configuration.getAttribute( arg0 );
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsInteger(java.lang.String)
- */
- public int getAttributeAsInteger( String arg0 )
- throws ConfigurationException {
- try {
- return _configuration.getAttributeAsInteger( arg0 );
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsLong(java.lang.String)
- */
- public long getAttributeAsLong( String arg0 ) throws ConfigurationException {
- try {
- return _configuration.getAttributeAsLong( arg0 );
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsFloat(java.lang.String)
- */
- public float getAttributeAsFloat( String arg0 )
- throws ConfigurationException {
- try {
- return _configuration.getAttributeAsFloat( arg0 );
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsBoolean(java.lang.String)
- */
- public boolean getAttributeAsBoolean( String arg0 )
- throws ConfigurationException {
- try {
- return _configuration.getAttributeAsBoolean( arg0 );
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValue()
- */
- public String getValue() throws ConfigurationException {
- try {
- return _configuration.getValue();
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValueAsInteger()
- */
- public int getValueAsInteger() throws ConfigurationException {
- try {
- return _configuration.getValueAsInteger();
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValueAsFloat()
- */
- public float getValueAsFloat() throws ConfigurationException {
- try {
- return _configuration.getValueAsFloat();
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValueAsBoolean()
- */
- public boolean getValueAsBoolean() throws ConfigurationException {
- try {
- return _configuration.getValueAsBoolean();
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValueAsLong()
- */
- public long getValueAsLong() throws ConfigurationException {
- try {
- return _configuration.getValueAsLong();
- } catch ( org.codehaus.dna.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage() );
- }
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValue(java.lang.String)
- */
- public String getValue( String arg0 ) {
- return _configuration.getValue( arg0 );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValueAsInteger(int)
- */
- public int getValueAsInteger( int arg0 ) {
- return _configuration.getValueAsInteger( arg0 );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValueAsLong(long)
- */
- public long getValueAsLong( long arg0 ) {
- return _configuration.getValueAsLong( arg0 );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValueAsFloat(float)
- */
- public float getValueAsFloat( float arg0 ) {
- return _configuration.getValueAsFloat( arg0 );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getValueAsBoolean(boolean)
- */
- public boolean getValueAsBoolean( boolean arg0 ) {
- return _configuration.getValueAsBoolean( arg0 );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttribute(java.lang.String,
- * java.lang.String)
- */
- public String getAttribute( String arg0, String arg1 ) {
- return _configuration.getAttribute( arg0, arg1 );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsInteger(java.lang.String,
- * int)
- */
- public int getAttributeAsInteger( String arg0, int arg1 ) {
- return _configuration.getAttributeAsInteger( arg0, arg1 );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsLong(java.lang.String,
- * long)
- */
- public long getAttributeAsLong( String arg0, long arg1 ) {
- return _configuration.getAttributeAsLong( arg0, arg1 );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsFloat(java.lang.String,
- * float)
- */
- public float getAttributeAsFloat( String arg0, float arg1 ) {
- return _configuration.getAttributeAsFloat( arg0, arg1 );
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsBoolean(java.lang.String,
- * boolean)
- */
- public boolean getAttributeAsBoolean( String arg0, boolean arg1 ) {
- return _configuration.getAttributeAsBoolean( arg0, arg1 );
- }
-}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname" id="removed">spice/components/alchemist/src/java/org/codehaus/spice/alchemist/configuration<br /></span>
<div class="fileheader" id="removed"><big><b>DNAConfiguration.java</b></big> <small id="info">removed after 1.1</small></div>
<pre class="diff"><small id="info">diff -N DNAConfiguration.java
--- DNAConfiguration.java 13 Jun 2004 13:35:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,299 +0,0 @@
</small></pre><pre class="diff" id="removed">-/*
- * Copyright (C) The Spice Group. All rights reserved. This software is
- * published under the terms of the Spice Software License version 1.1, a copy
- * of which has been included with this distribution in the LICENSE.txt file.
- */
-package org.codehaus.spice.alchemist.configuration;
-
-import org.codehaus.dna.Configuration;
-import org.codehaus.dna.ConfigurationException;
-import org.codehaus.dna.impl.DefaultConfiguration;
-
-
-/**
- * DNA Configuration facade implementation for the Avalon Configuration.
- *
- * @author Mauro Talevi
- * @version $Revision: 1.1 $ $Date: 2004/06/13 13:35:14 $
- */
-public class DNAConfiguration implements Configuration {
-
- /** String used for default values */
- private static final String EMPTY = "";
-
- /**
- * The Avalon Configuration.
- */
- private final org.apache.avalon.framework.configuration.Configuration _configuration;
-
- /**
- * Create an instance of configuration facade.
- *
- * @param configuration
- */
- public DNAConfiguration(
- final org.apache.avalon.framework.configuration.Configuration configuration ) {
- _configuration = configuration;
- }
-
- /**
- * @see org.apache.avalon.framework.configuration.Configuration#getName()
- */
- public String getName() {
- return _configuration.getName();
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getLocation()
- */
- public String getLocation() {
- return _configuration.getLocation();
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getPath()
- */
- public String getPath() {
- return EMPTY;
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getChild(java.lang.String)
- */
- public Configuration getChild( String arg0 ) {
- return new DNAConfiguration( _configuration.getChild( arg0 ) );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getChild(java.lang.String,
- * boolean)
- */
- public Configuration getChild( String arg0, boolean arg1 ) {
- return new DNAConfiguration( _configuration.getChild( arg0, arg1 ) );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getChildren()
- */
- public Configuration[] getChildren() {
- final DefaultConfiguration result = new DefaultConfiguration(
- _configuration.getName(), _configuration.getLocation(), EMPTY );
- final org.apache.avalon.framework.configuration.Configuration[] children = _configuration
- .getChildren();
- for ( int i = 0; i < children.length; i++ ) {
- final Configuration child = new DNAConfiguration( children[i] );
- result.addChild( child );
- }
- return result.getChildren();
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getChildren(java.lang.String)
- */
- public Configuration[] getChildren( String arg0 ) {
- final DefaultConfiguration result = new DefaultConfiguration(
- _configuration.getName(), _configuration.getLocation(), EMPTY );
- final org.apache.avalon.framework.configuration.Configuration[] children = _configuration
- .getChildren( arg0 );
- for ( int i = 0; i < children.length; i++ ) {
- final Configuration child = new DNAConfiguration( children[i] );
- result.addChild( child );
- }
- return result.getChildren();
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttributeNames()
- */
- public String[] getAttributeNames() {
- return _configuration.getAttributeNames();
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttribute(java.lang.String)
- */
- public String getAttribute( String arg0 ) throws ConfigurationException {
- try {
- return _configuration.getAttribute( arg0 );
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e );
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttributeAsInteger(java.lang.String)
- */
- public int getAttributeAsInteger( String arg0 )
- throws ConfigurationException {
- try {
- return _configuration.getAttributeAsInteger( arg0 );
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e );
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttributeAsLong(java.lang.String)
- */
- public long getAttributeAsLong( String arg0 ) throws ConfigurationException {
- try {
- return _configuration.getAttributeAsLong( arg0 );
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e );
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttributeAsFloat(java.lang.String)
- */
- public float getAttributeAsFloat( String arg0 )
- throws ConfigurationException {
- try {
- return _configuration.getAttributeAsFloat( arg0 );
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e);
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttributeAsBoolean(java.lang.String)
- */
- public boolean getAttributeAsBoolean( String arg0 )
- throws ConfigurationException {
- try {
- return _configuration.getAttributeAsBoolean( arg0 );
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e);
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValue()
- */
- public String getValue() throws ConfigurationException {
- try {
- return _configuration.getValue();
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e);
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValueAsInteger()
- */
- public int getValueAsInteger() throws ConfigurationException {
- try {
- return _configuration.getValueAsInteger();
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e);
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValueAsFloat()
- */
- public float getValueAsFloat() throws ConfigurationException {
- try {
- return _configuration.getValueAsFloat();
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e);
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValueAsBoolean()
- */
- public boolean getValueAsBoolean() throws ConfigurationException {
- try {
- return _configuration.getValueAsBoolean();
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e);
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValueAsLong()
- */
- public long getValueAsLong() throws ConfigurationException {
- try {
- return _configuration.getValueAsLong();
- } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
- throw new ConfigurationException( e.getMessage(), e);
- }
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValue(java.lang.String)
- */
- public String getValue( String arg0 ) {
- return _configuration.getValue( arg0 );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValueAsInteger(int)
- */
- public int getValueAsInteger( int arg0 ) {
- return _configuration.getValueAsInteger( arg0 );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValueAsLong(long)
- */
- public long getValueAsLong( long arg0 ) {
- return _configuration.getValueAsLong( arg0 );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValueAsFloat(float)
- */
- public float getValueAsFloat( float arg0 ) {
- return _configuration.getValueAsFloat( arg0 );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getValueAsBoolean(boolean)
- */
- public boolean getValueAsBoolean( boolean arg0 ) {
- return _configuration.getValueAsBoolean( arg0 );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttribute(java.lang.String,
- * java.lang.String)
- */
- public String getAttribute( String arg0, String arg1 ) {
- return _configuration.getAttribute( arg0, arg1 );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttributeAsInteger(java.lang.String,
- * int)
- */
- public int getAttributeAsInteger( String arg0, int arg1 ) {
- return _configuration.getAttributeAsInteger( arg0, arg1 );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttributeAsLong(java.lang.String,
- * long)
- */
- public long getAttributeAsLong( String arg0, long arg1 ) {
- return _configuration.getAttributeAsLong( arg0, arg1 );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttributeAsFloat(java.lang.String,
- * float)
- */
- public float getAttributeAsFloat( String arg0, float arg1 ) {
- return _configuration.getAttributeAsFloat( arg0, arg1 );
- }
-
- /**
- * @see org.codehaus.dna.Configuration#getAttributeAsBoolean(java.lang.String,
- * boolean)
- */
- public boolean getAttributeAsBoolean( String arg0, boolean arg1 ) {
- return _configuration.getAttributeAsBoolean( arg0, arg1 );
- }
-}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">spice/components/alchemist/src/java/org/codehaus/spice/alchemist/instrument<br /></span>
<div class="fileheader"><big><b>DNAInstrumentManager.java</b></big> <small id="info">1.2 -> 1.3</small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- DNAInstrumentManager.java 17 Jun 2004 22:26:53 -0000 1.2
+++ DNAInstrumentManager.java 19 Jun 2004 17:51:35 -0000 1.3
@@ -25,7 +25,7 @@
</small></pre><pre class="diff" id="context"> *
* @author Johan Sjoberg
* @author Mauro Talevi
</pre><pre class="diff" id="removed">- * @version $Revision: 1.2 $ $Date: 2004/06/17 22:26:53 $
</pre><pre class="diff" id="added">+ * @version $Revision: 1.3 $ $Date: 2004/06/19 17:51:35 $
</pre><pre class="diff" id="context"> */
public class DNAInstrumentManager implements InstrumentManager, LogEnabled,
Configurable, Active {
</pre><pre class="diff"><small id="info">@@ -39,6 +39,10 @@
</small></pre><pre class="diff" id="context"> * @param manager the Excalibur InstrumentManager
*/
public DNAInstrumentManager( final InstrumentManager manager ) {
</pre><pre class="diff" id="added">+ if( null == manager )
+ {
+ throw new NullPointerException( "manager" );
+ }
</pre><pre class="diff" id="context"> _manager = manager;
}
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.8</small></center>
</body></html>