Project

General

Profile

« Previous | Next » 

Revision 532683bd

Added by Patrick Plitzner almost 12 years ago

Merged latest trunk updates to branch

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/GrantedAuthorityImpl.java
25 25
@XmlRootElement(name = "Group")
26 26
@Entity
27 27
public class GrantedAuthorityImpl extends CdmBase implements GrantedAuthority {
28

  
28 29
    private static final long serialVersionUID = 2651969425860655040L;
29 30
    private static final Logger logger = Logger
30 31
            .getLogger(GrantedAuthority.class);
......
41 42
        return new GrantedAuthorityImpl();
42 43
    }
43 44

  
45
    /* (non-Javadoc)
46
     * @see org.springframework.security.core.GrantedAuthority#getAuthority()
47
     */
48
    @Override
44 49
    public String getAuthority() {
45 50
        return authority;
46 51
    }
......
49 54
        this.authority = authority;
50 55
    }
51 56

  
57
    /**
58
     * @param o
59
     * @return
60
     */
52 61
    public int compareTo(Object o) {
53 62
        if (o instanceof GrantedAuthority) {
54 63
            return this.authority.compareTo(((GrantedAuthority) o)
......
90 99
            return null;
91 100
        }
92 101
    }
93

  
94
    /**
95
     * The role prefix 'ROLE_' is defined in
96
     * the spring security <code>RoleVoter</code>
97
     *
98
     * @author a.kohlbecker
99
     * @date Oct 5, 2012
100
     *
101
     */
102
    public enum Role {
103

  
104
        ROLE_ADMIN,
105
        ROLE_USER_MANAGER
106

  
107
    }
108 102
}

Also available in: Unified diff