raphael 2002/11/03 07:11:17
Modified: src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java
Log:
Fix some style issues
Revision Changes Path
1.33 +76 -76
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java
Index: CastorPsmlManagerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- CastorPsmlManagerService.java 3 Nov 2002 14:33:20 -0000 1.32
+++ CastorPsmlManagerService.java 3 Nov 2002 15:11:17 -0000 1.33
@@ -288,10 +288,10 @@
throw new IllegalArgumentException( message );
}
- if (Log.getLogger().isDebugEnabled())
- {
- Log.debug( "PSMLManager: asked for " + name );
- }
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug( "PSMLManager: asked for " + name );
+ }
PSMLDocument doc = null;
WeakReference ref = null;
@@ -340,17 +340,17 @@
try
{
- name = file.getCanonicalPath();
- }
- catch (IOException e)
- {
- Log.error("PSMLManager: unable to resolve file path for "+
file);
- }
-
- if (Log.getLogger().isDebugEnabled())
- {
- Log.debug("PSMLManager: calculated resource:" + path + ". Base: " +
base + " File: " + name);
- }
+ name = file.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ Log.error("PSMLManager: unable to resolve file path for "+ file);
+ }
+
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug("PSMLManager: calculated resource:" + path + ". Base: " +
base + " File: " + name);
+ }
PSMLDocument doc = null;
WeakReference ref = null;
@@ -386,8 +386,8 @@
{
if (Log.getLogger().isWarnEnabled())
{
- Log.warn( "PSMLManager: " + name + " not found, returning null
document" );
- }
+ Log.warn( "PSMLManager: " + name + " not found, returning null
document" );
+ }
return null;
}
@@ -541,12 +541,12 @@
try
{
- fullpath = file.getCanonicalPath();
- }
- catch (IOException e)
- {
- Log.error("PSMLManager: unable to resolve file path for "+
file);
- }
+ fullpath = file.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ Log.error("PSMLManager: unable to resolve file path for "+ file);
+ }
boolean ok = saveDocument(fullpath, doc);
@@ -646,8 +646,8 @@
File map = new File(mapFile);
if (Log.getLogger().isDebugEnabled())
{
- Log.debug("PSMLManager: Loading psml mapping file "+mapFile);
- }
+ Log.debug("PSMLManager: Loading psml mapping file "+mapFile);
+ }
if (map.exists() && map.isFile() && map.canRead())
{
try
@@ -827,20 +827,20 @@
if (Log.getLogger().isDebugEnabled())
{
- Log.debug("PSMLManager: Create document for profile " + profile +",
calculated path: " + path);
- }
+ Log.debug("PSMLManager: Create document for profile " + profile +",
calculated path: " + path);
+ }
File file = new File(base, path);
String name = null;
try
{
- name = file.getCanonicalPath();
- }
- catch (IOException e)
- {
- Log.error("PSMLManager: unable to resolve file path for "+
file);
- }
+ name = file.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ Log.error("PSMLManager: unable to resolve file path for "+ file);
+ }
PSMLDocument template = profile.getDocument();
PSMLDocument doc = new BasePSMLDocument( name, template.getPortlets() );
@@ -910,12 +910,12 @@
try
{
- name = file.getCanonicalPath();
- }
- catch (IOException e)
- {
- Log.error("PSMLManager: unable to resolve file path for "+
file);
- }
+ name = file.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ Log.error("PSMLManager: unable to resolve file path for "+ file);
+ }
synchronized (documents)
@@ -953,12 +953,12 @@
try
{
- name = file.getCanonicalPath();
- }
- catch (IOException e)
- {
- Log.error("PSMLManager: unable to resolve file path for "+
file);
- }
+ name = file.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ Log.error("PSMLManager: unable to resolve file path for "+ file);
+ }
synchronized (documents)
@@ -1009,12 +1009,12 @@
try
{
- name = file.getCanonicalPath();
- }
- catch (IOException e)
- {
- Log.error("PSMLManager: unable to resolve file path for "+
file);
- }
+ name = file.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ Log.error("PSMLManager: unable to resolve file path for "+ file);
+ }
synchronized (documents)
@@ -1064,12 +1064,12 @@
try
{
- name = file.getCanonicalPath();
- }
- catch (IOException e)
- {
- Log.error("PSMLManager: unable to resolve file path for "+
file);
- }
+ name = file.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ Log.error("PSMLManager: unable to resolve file path for "+ file);
+ }
synchronized (documents)
@@ -1251,16 +1251,16 @@
}
File base = this.rootDir;
File file = new File(base, path.toString());
- String absPath = null;
+ String absPath = null;
- try
- {
- absPath = file.getCanonicalPath();
- }
- catch (IOException e)
- {
- Log.error("PSMLManager: unable to resolve file path
for "+ file);
- }
+ try
+ {
+ absPath = file.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ Log.error("PSMLManager: unable to resolve file path for "+ file);
+ }
QueryState qs = new QueryState( QUERY_BY_ROLE,
profile,
@@ -1289,16 +1289,16 @@
}
File base = this.rootDir;
File file = new File(base, path.toString());
- String absPath = null;
+ String absPath = null;
- try
- {
- absPath = file.getCanonicalPath();
- }
- catch (IOException e)
- {
- Log.error("PSMLManager: unable to resolve file path
for "+ file);
- }
+ try
+ {
+ absPath = file.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ Log.error("PSMLManager: unable to resolve file path for "+ file);
+ }
QueryState qs = new QueryState( QUERY_BY_GROUP,
profile,
--
To unsubscribe, e-mail: <mailto:jetspeed-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@;jakarta.apache.org>
