[CVS spice] Corrected DNA DefaultConfiguration constructor.
mauro-yCVjj/[email protected] 20 Jun 2004 13:37:27 -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">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">1.4 -> 1.5</td></tr>
<tr class="alt"><td><tt>instrument/<a href="#file2">DNAInstrumentManager.java</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">1.4 -> 1.5</td></tr>
<tr><td></td><td align="right" id="added">+7</td><td align="right" id="removed">-5</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Corrected DNA DefaultConfiguration constructor.
Added separate catch block for IllegalArgumentException.
</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.4 -> 1.5</small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- ConfigurationAlchemist.java 20 Jun 2004 12:48:45 -0000 1.4
+++ ConfigurationAlchemist.java 20 Jun 2004 13:37:27 -0000 1.5
@@ -15,7 +15,7 @@
</small></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.4 $ $Date: 2004/06/20 12:48:45 $
</pre><pre class="diff" id="added">+ * @version $Revision: 1.5 $ $Date: 2004/06/20 13:37:27 $
</pre><pre class="diff" id="context"> */
public class ConfigurationAlchemist
{
</pre><pre class="diff"><small id="info">@@ -30,7 +30,7 @@
</small></pre><pre class="diff" id="context"> if ( null == configuration ) {
throw new NullPointerException( "configuration" );
}
</pre><pre class="diff" id="removed">- return new DefaultConfiguration( configuration.getName(), <span id="removedchars">"", configuration.getLocation()</span> );
</pre><pre class="diff" id="added">+ return new DefaultConfiguration( configuration.getName(), <span id="addedchars">configuration.getLocation(), ""</span> );
</pre><pre class="diff" id="context"> }
/**
</pre></div>
<hr /><a name="file2" /><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.4 -> 1.5</small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- DNAInstrumentManager.java 20 Jun 2004 12:48:45 -0000 1.4
+++ DNAInstrumentManager.java 20 Jun 2004 13:37:27 -0000 1.5
@@ -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.4 $ $Date: 2004/06/20 12:48:45 $
</pre><pre class="diff" id="added">+ * @version $Revision: 1.5 $ $Date: 2004/06/20 13:37:27 $
</pre><pre class="diff" id="context"> */
public class DNAInstrumentManager implements InstrumentManager, LogEnabled,
Configurable, Active {
</pre><pre class="diff"><small id="info">@@ -54,7 +54,7 @@
</small></pre><pre class="diff" id="context"> LoggerAlchemist.toAvalonLogEnabled( _manager ).enableLogging(
LoggerAlchemist.toAvalonLogger( logger ) );
} catch ( IllegalArgumentException e ) {
</pre><pre class="diff" id="removed">- // The manager is not Avalon LogEnabled <span id="removedchars"> </span>
</pre><pre class="diff" id="added">+ // The manager is not Avalon LogEnabled
</pre><pre class="diff" id="context"> }
}
</pre><pre class="diff"><small id="info">@@ -67,7 +67,9 @@
</small></pre><pre class="diff" id="context"> ConfigurationAlchemist.toAvalonConfigurable( _manager )
.configure( ConfigurationAlchemist
.toAvalonConfiguration( configuration ) );
</pre><pre class="diff" id="removed">- } catch ( Exception e ) {
</pre><pre class="diff" id="added">+ } catch ( <span id="addedchars">IllegalArgument</span>Exception e ) {
+ // The manager is not Avalon Configurable
+ } catch ( org.apache.avalon.framework.configuration.ConfigurationException e ) {
</pre><pre class="diff" id="context"> throw new ConfigurationException( e.getMessage(), e );
}
}
</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>