paulsp 2002/11/16 19:05:41
Modified: src/java/org/apache/jetspeed/services/registry
CastorRegistryService.java
Log:
Format changes as directed by checkStyle.
No functional changes
Revision Changes Path
1.27 +24 -23
jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/CastorRegistryService.java
Index: CastorRegistryService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/CastorRegistryService.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- CastorRegistryService.java 9 Nov 2002 15:09:22 -0000 1.26
+++ CastorRegistryService.java 17 Nov 2002 03:05:41 -0000 1.27
@@ -59,7 +59,6 @@
import org.apache.jetspeed.om.registry.RegistryEntry;
import org.apache.jetspeed.om.registry.RegistryException;
import org.apache.jetspeed.om.registry.base.BaseRegistry;
-import org.apache.jetspeed.om.registry.base.BasePortletRegistry;
import org.apache.jetspeed.om.registry.base.LocalRegistry;
//turbine stuff
@@ -137,7 +136,7 @@
public static final String DEFAULT_MAPPING =
"${webappRoot}/WEB-INF/conf/mapping.xml";
/** controls amount of debug output, the bigger the more output will be
generated */
- public int verbose = DEFAULT_VERBOSE;
+ private int verbose = DEFAULT_VERBOSE;
/** regsitry type keyed list of entries */
private Hashtable registries = new Hashtable();
@@ -232,7 +231,7 @@
}
catch (NullPointerException e)
{
- Log.error("RegistryService: "+ regName + " registry is not known ");
+ Log.error("RegistryService: " + regName + " registry is not known ");
Log.error(e);
}
@@ -481,7 +480,7 @@
+ name
+ "Registry";
- registry = (Registry)Class.forName(registryClass).newInstance();
+ registry = (Registry)
Class.forName(registryClass).newInstance();
}
catch (Exception e)
{
@@ -529,7 +528,7 @@
try
{
Thread.sleep(500);
- if ((verbose>2) && Log.getLogger().isDebugEnabled())
+ if ((verbose > 2) && Log.getLogger().isDebugEnabled())
{
Log.debug("RegistryService: Waiting for init of Registry...");
}
@@ -583,7 +582,7 @@
*/
public Map getFragmentMap()
{
- return (Map)fragments.clone();
+ return (Map) fragments.clone();
}
/**
@@ -786,12 +785,12 @@
int count = 0;
int counDeleted = 0;
- LocalRegistry registry = (LocalRegistry)get(regName);
+ LocalRegistry registry = (LocalRegistry) get(regName);
Vector toDelete = new Vector();
Iterator i = registry.listEntryNames();
- while(i.hasNext())
+ while (i.hasNext())
{
toDelete.add(i.next());
}
@@ -812,7 +811,7 @@
if (!fragment.hasChanged())
{
- if ((verbose>2) && Log.getLogger().isDebugEnabled())
+ if ((verbose > 2) && Log.getLogger().isDebugEnabled())
{
Log.debug("RegistryService: Skipping fragment " + location);
}
@@ -820,9 +819,9 @@
//remove this fragment entries from the delete list
Vector entries = fragment.getEntries(regName);
i = entries.iterator();
- while(i.hasNext())
+ while (i.hasNext())
{
- toDelete.remove(((RegistryEntry)i.next()).getName());
+ toDelete.remove(((RegistryEntry) i.next()).getName());
}
continue;
@@ -847,16 +846,17 @@
{
if (registry.getEntry(entry.getName()).equals(entry))
{
- if ((verbose>2) && Log.getLogger().isDebugEnabled())
+ if ((verbose > 2) &&
Log.getLogger().isDebugEnabled())
{
Log.debug("RegistryService: No changes to entry
" + entry.getName());
}
}
else
{
- if ((verbose>1) && Log.getLogger().isDebugEnabled())
+ if ((verbose > 1) &&
Log.getLogger().isDebugEnabled())
{
- Log.debug("RegistryService: Updating entry " +
entry.getName() + " of class " + entry.getClass() + " to registry " + name);
+ Log.debug("RegistryService: Updating entry " +
entry.getName()
+ + " of class " + entry.getClass() + " to
registry " + name);
}
registry.setLocalEntry(entry);
@@ -872,9 +872,10 @@
this.entryIndex.put(entry.getName(), location);
++fragCount;
- if ((verbose>1) && Log.getLogger().isDebugEnabled())
+ if ((verbose > 1) && Log.getLogger().isDebugEnabled())
{
- Log.debug("RegistryService: Adding entry " +
entry.getName() + " of class " + entry.getClass() + " to registry " + name);
+ Log.debug("RegistryService: Adding entry " +
entry.getName() + " of class "
+ + entry.getClass() + " to registry " + name);
}
}
}
@@ -888,16 +889,16 @@
}
}
- count+=fragCount;
+ count += fragCount;
}
//now delete the entries not found in any fragment
i = toDelete.iterator();
- while(i.hasNext())
+ while (i.hasNext())
{
- String entryName = (String)i.next();
+ String entryName = (String) i.next();
- if ((verbose>1) && Log.getLogger().isDebugEnabled())
+ if ((verbose > 1) && Log.getLogger().isDebugEnabled())
{
Log.debug("RegistryService: removing entry " + entryName);
}
@@ -906,9 +907,9 @@
}
- if ((verbose>1) && Log.getLogger().isDebugEnabled())
+ if ((verbose > 1) && Log.getLogger().isDebugEnabled())
{
- Log.debug("RegistryService: Merged " + count + " entries and deleted "+
toDelete.size()+ " in " + name);
+ Log.debug("RegistryService: Merged " + count + " entries and deleted "
+ toDelete.size() + " in " + name);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
