mpoeschl 2003/06/27 15:09:39
Modified: src/java/org/apache/turbine/om/security SecurityObject.java
TurbineUser.java TurbineRole.java
Log:
style fixes
Revision Changes Path
1.6 +5 -3
jakarta-turbine-2/src/java/org/apache/turbine/om/security/SecurityObject.java
Index: SecurityObject.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/SecurityObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SecurityObject.java 8 Apr 2003 13:15:31 -0000 1.5
+++ SecurityObject.java 27 Jun 2003 22:09:38 -0000 1.6
@@ -207,9 +207,11 @@
*/
public int compareTo(Object obj)
{
- if(this.getClass() != obj.getClass())
+ if (this.getClass() != obj.getClass())
+ {
throw new ClassCastException();
- String name1 = ((SecurityObject)obj).getName();
+ }
+ String name1 = ((SecurityObject) obj).getName();
String name2 = this.getName();
return name2.compareTo(name1);
1.16 +11 -11
jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineUser.java
Index: TurbineUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineUser.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineUser.java 3 Jun 2003 13:41:26 -0000 1.15
+++ TurbineUser.java 27 Jun 2003 22:09:38 -0000 1.16
@@ -126,7 +126,7 @@
{
return ((Integer) getTemp(User.SESSION_ACCESS_COUNTER)).intValue();
}
- catch(Exception e)
+ catch (Exception e)
{
return 0;
}
@@ -143,7 +143,7 @@
{
return ((Integer) getPerm(User.ACCESS_COUNTER)).intValue();
}
- catch(Exception e)
+ catch (Exception e)
{
return 0;
}
@@ -168,7 +168,7 @@
*/
public java.util.Date getLastAccessDate()
{
- if(lastAccessDate == null)
+ if (lastAccessDate == null)
{
setLastAccessDate();
}
@@ -225,7 +225,7 @@
val = def;
}
}
- catch(Exception e)
+ catch (Exception e)
{
val = def;
}
@@ -279,7 +279,7 @@
}
}
- catch(Exception e)
+ catch (Exception e)
{
val = def;
}
@@ -313,7 +313,7 @@
tmp = null;
}
}
- catch(Exception e)
+ catch (Exception e)
{
}
return tmp;
@@ -330,10 +330,10 @@
try
{
tmp = (String) getPerm(User.LAST_NAME);
- if(tmp.length() == 0)
+ if (tmp.length() == 0)
tmp = null;
}
- catch(Exception e)
+ catch (Exception e)
{
}
return tmp;
@@ -600,7 +600,7 @@
public void setConfirmed(String value)
{
String val = "";
- if(value != null)
+ if (value != null)
{
val = value;
}
@@ -666,7 +666,7 @@
public void save()
throws Exception
{
- if(TurbineSecurity.accountExists(this))
+ if (TurbineSecurity.accountExists(this))
{
TurbineSecurity.saveUser(this);
}
1.6 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineRole.java
Index: TurbineRole.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineRole.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineRole.java 11 Apr 2003 11:39:09 -0000 1.5
+++ TurbineRole.java 27 Jun 2003 22:09:39 -0000 1.6
@@ -97,7 +97,7 @@
* Returns the set of Permissions associated with this Role.
*
* @return A PermissionSet.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public PermissionSet getPermissions()
throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
