More style-related cleanup.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5247 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2008-07-22 12:51:17 +00:00
parent 0aa0e48c28
commit 09f8a25876
29 changed files with 48 additions and 64 deletions
@@ -56,8 +56,7 @@ public class AdminDispatcher extends InvocationDispatcher<AdminMarshaller>
switch (methodId) {
case AdminMarshaller.GET_CONFIG_INFO:
((AdminProvider)provider).getConfigInfo(
source,
(AdminService.ConfigInfoListener)args[0]
source, (AdminService.ConfigInfoListener)args[0]
);
return;
@@ -115,6 +115,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry
return new DatabaseObjectRecord(path, object);
}
/** Stores settings in a database. */
protected class DatabaseObjectRecord extends ObjectRecord
{
public DatabaseObjectRecord (String path, DObject object)
@@ -134,7 +135,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry
_data = _repo.loadConfig(_node, _path);
} catch (PersistenceException pe) {
log.warning("Failed to load object configuration [path=" + _path + "].", pe);
_data = new HashMap<String,String>();
_data = new HashMap<String, String>();
}
super.init();
@@ -321,7 +322,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry
}
protected String _path;
protected HashMap<String,String> _data;
protected HashMap<String, String> _data;
}
protected ConfigRepository _repo;
@@ -59,6 +59,7 @@ public class PeeredDatabaseConfigRegistry extends DatabaseConfigRegistry
return new PeerDatabaseObjectRecord(path, object);
}
/** Stores settings in a database and broadcasts changes to peers. */
protected class PeerDatabaseObjectRecord extends DatabaseObjectRecord
implements PeerManager.StaleCacheObserver
{
@@ -71,8 +72,8 @@ public class PeeredDatabaseConfigRegistry extends DatabaseConfigRegistry
// from interface PeerManager.StaleCacheObserver
public void changedCacheData (Streamable data)
{
@SuppressWarnings("unchecked") StreamableTuple<String,Object> change =
(StreamableTuple<String,Object>)data;
@SuppressWarnings("unchecked") StreamableTuple<String, Object> change =
(StreamableTuple<String, Object>)data;
// note that we should ignore the attribute change event we're about to generate
// because it is not a real configuration change but rather a sync
@@ -112,7 +113,7 @@ public class PeeredDatabaseConfigRegistry extends DatabaseConfigRegistry
{
// broadcast to the other nodes that this value has changed
_peermgr.broadcastStaleCacheData(
PEER_CACHE_PREFIX + _path, new StreamableTuple<String,Object>(field, value));
PEER_CACHE_PREFIX + _path, new StreamableTuple<String, Object>(field, value));
}
protected ArrayList<String> _pendingSyncs = new ArrayList<String>();
@@ -48,7 +48,7 @@ public class ConfigRepository extends DepotRepository
*
* @return a map containing field/value pairs for all stored configuration data.
*/
public HashMap<String,String> loadConfig (String node, String object)
public HashMap<String, String> loadConfig (String node, String object)
throws PersistenceException
{
HashMap<String, String> data = new HashMap<String, String>();