[CVS spice] Sort modifiers correctly
pdonald-yCVjj/[email protected] 12 Jul 2004 00:29:11 -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/salt/src/java/org/codehaus/spice/salt/i18n</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">ResourceManager.java</a></tt></td><td align="right" id="added">+9</td><td align="right" id="removed">-11</td><td nowrap="nowrap" align="center">1.2 -> 1.3</td></tr>
</table>
<pre class="comment">
Sort modifiers correctly
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">spice/components/salt/src/java/org/codehaus/spice/salt/i18n<br /></span>
<div class="fileheader"><big><b>ResourceManager.java</b></big> <small id="info">1.2 -> 1.3</small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- ResourceManager.java 11 Jul 2004 23:52:32 -0000 1.2
+++ ResourceManager.java 12 Jul 2004 00:29:11 -0000 1.3
@@ -17,7 +17,6 @@
</small></pre><pre class="diff" id="context"> *
* @author Peter Donald
* @author Eung-ju Park
</pre><pre class="diff" id="removed">- * @version $Revision: 1.2 $ $Date: 2004/07/11 23:52:32 $
</pre><pre class="diff" id="context"> */
public class ResourceManager
{
</pre><pre class="diff"><small id="info">@@ -27,14 +26,13 @@
</small></pre><pre class="diff" id="context"> private static final String POSTFIX = "Resources";
/** Permission needed to clear complete cache. */
</pre><pre class="diff" id="removed">- private static final RuntimePermission CLEAR_CACHE_PERMISSION = new RuntimePermission(
- "i18n.clearCompleteCache" );
</pre><pre class="diff" id="added">+ private static final RuntimePermission CLEAR_CACHE_PERMISSION = new RuntimePermission( "i18n.clearCompleteCache" );
</pre><pre class="diff" id="context">
/**
* Map of ClassLoaders onto Secondary Map. Secondary map will map basename
* to a Resources object.
*/
</pre><pre class="diff" id="removed">- private <span id="removedchars">final static</span> Map c_resources = new WeakHashMap();
</pre><pre class="diff" id="added">+ private <span id="addedchars">static final</span> Map c_resources = new WeakHashMap();
</pre><pre class="diff" id="context">
/**
* Clear the cache of all resources currently loaded into the system. This
</pre><pre class="diff"><small id="info">@@ -49,7 +47,7 @@
</small></pre><pre class="diff" id="context"> * @throws SecurityException if the caller does not have permission to clear
* cache
*/
</pre><pre class="diff" id="removed">- public synchronized static final void clearResourceCache()
</pre><pre class="diff" id="added">+ public static final synchronized void clearResourceCache()
</pre><pre class="diff" id="context"> throws SecurityException
{
final SecurityManager sm = System.getSecurityManager();
</pre><pre class="diff"><small id="info">@@ -67,7 +65,7 @@
</small></pre><pre class="diff" id="context"> * @param basename the basename
* @return the Resources
*/
</pre><pre class="diff" id="removed">- public <span id="removedchars">final static</span> Resources getBaseResources( final String basename,
</pre><pre class="diff" id="added">+ public <span id="addedchars">static final</span> Resources getBaseResources( final String basename,
</pre><pre class="diff" id="context"> final ClassLoader classLoader )
{
Resources resources = getCachedResource( basename, classLoader );
</pre><pre class="diff"><small id="info">@@ -87,7 +85,7 @@
</small></pre><pre class="diff" id="context"> * @param resource the base location
* @return the Resources
*/
</pre><pre class="diff" id="removed">- public <span id="removedchars">final static</span> Resources getResources( final String resource,
</pre><pre class="diff" id="added">+ public <span id="addedchars">static final</span> Resources getResources( final String resource,
</pre><pre class="diff" id="context"> final ClassLoader classLoader )
{
return getBaseResources( resource + POSTFIX, classLoader );
</pre><pre class="diff"><small id="info">@@ -100,7 +98,7 @@
</small></pre><pre class="diff" id="context"> * @param clazz the Class
* @return the Resources
*/
</pre><pre class="diff" id="removed">- public <span id="removedchars">final static</span> Resources getPackageResources( final Class clazz )
</pre><pre class="diff" id="added">+ public <span id="addedchars">static final</span> Resources getPackageResources( final Class clazz )
</pre><pre class="diff" id="context"> {
final String name = clazz.getName();
final int index = name.lastIndexOf( "." );
</pre><pre class="diff"><small id="info">@@ -124,7 +122,7 @@
</small></pre><pre class="diff" id="context"> * @param clazz the Class
* @return the Resources
*/
</pre><pre class="diff" id="removed">- public <span id="removedchars">final static</span> Resources getClassResources( final Class clazz )
</pre><pre class="diff" id="added">+ public <span id="addedchars">static final</span> Resources getClassResources( final Class clazz )
</pre><pre class="diff" id="context"> {
final String resource = clazz.getName() + POSTFIX;
return getBaseResources( resource, clazz.getClassLoader() );
</pre><pre class="diff"><small id="info">@@ -136,7 +134,7 @@
</small></pre><pre class="diff" id="context"> * @param baseName the resource key
* @param resources the resources object
*/
</pre><pre class="diff" id="removed">- private s<span id="removedchars">ynchronized static final</span> void putCachedResource( final String baseName,
</pre><pre class="diff" id="added">+ private s<span id="addedchars">tatic final synchronized</span> void putCachedResource( final String baseName,
</pre><pre class="diff" id="context"> final ClassLoader classLoader,
final Resources resources )
{
</pre><pre class="diff"><small id="info">@@ -155,7 +153,7 @@
</small></pre><pre class="diff" id="context"> * @param baseName the resource key
* @return resources the resources object
*/
</pre><pre class="diff" id="removed">- private s<span id="removedchars">ynchronized static final</span> Resources getCachedResource( final String baseName,
</pre><pre class="diff" id="added">+ private s<span id="addedchars">tatic final synchronized</span> Resources getCachedResource( final String baseName,
</pre><pre class="diff" id="context"> final ClassLoader classLoader )
{
Map map = (Map) c_resources.get( classLoader );
</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>