svn commit: r1078724 - /lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Identity.java
[email protected] Mon, 07 Mar 2011 09:48:00 -0000
| Newsgroups | gmane.comp.cms.lenya.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: andreas
Date: Mon Mar 7 09:47:59 2011
New Revision: 1078724
URL: http://svn.apache.org/viewvc?rev=1078724&view=rev
Log:
[minor change] code formatting
Modified:
lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Identity.java
Modified: lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Identity.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Identity.java?rev=1078724&r1=1078723&r2=1078724&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Identity.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Identity.java Mon Mar 7 09:47:59 2011
@@ -37,24 +37,22 @@ import org.apache.cocoon.environment.Ses
* Identity object. Used to store the authenticated accreditables in the session.
*/
public class Identity implements Identifiable, Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Set identifiables = new HashSet();
+
+ public static Identity ANONYMOUS = new Identity();
+
/**
- *
- */
- private static final long serialVersionUID = 1L;
- private Set identifiables = new HashSet();
-
- public static Identity ANONYMOUS = new Identity();
-
- /**
- * C'tor.
- * Adds World identifiable by default.
- */
- public Identity() {
+ * C'tor. Adds World identifiable by default.
+ */
+ public Identity() {
addIdentifiable(World.getInstance());
- }
+ }
/**
- * In the case of Tomcat the object will be serialized to TOMCAT/work/Standalone/localhost/lenya/SESSIONS.ser
+ * In the case of Tomcat the object will be serialized to
+ * TOMCAT/work/Standalone/localhost/lenya/SESSIONS.ser
* @param out OutputStream to hold the serialized identity
* @throws IOException
*/
@@ -64,7 +62,8 @@ public class Identity implements Identif
}
/**
- * In case of Tomcat the object will be restored from TOMCAT/work/Standalone/localhost/lenya/SESSIONS.ser
+ * In case of Tomcat the object will be restored from
+ * TOMCAT/work/Standalone/localhost/lenya/SESSIONS.ser
* @param in InputStream that holds the serialized identity
* @throws IOException
* @throws ClassNotFoundException
@@ -79,7 +78,8 @@ public class Identity implements Identif
* @return An array of identifiables.
*/
public Identifiable[] getIdentifiables() {
- return (Identifiable[]) this.identifiables.toArray(new Identifiable[this.identifiables.size()]);
+ return (Identifiable[]) this.identifiables.toArray(new Identifiable[this.identifiables
+ .size()]);
}
/**
@@ -135,8 +135,7 @@ public class Identity implements Identif
User user = getUser();
if (user == null) {
return true;
- }
- else {
+ } else {
String thisId = user.getAccreditableManager().getId();
String otherId = manager.getId();
return thisId.equals(otherId);