Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community
In directory james.mmbase.org:/tmp/cvs-serv18890/services/community
Modified Files:
ApplicationContextFactory.java CommunityServiceImpl.java
Log Message:
CMSC-899,Check and improve all lists according to guideline,delete tab character
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community
See also: http://www.mmbase.org/jira/browse/CMSC-899
Index: ApplicationContextFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/ApplicationContextFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ApplicationContextFactory.java 22 Sep 2008 11:28:30 -0000 1.2
+++ ApplicationContextFactory.java 23 Sep 2008 07:12:57 -0000 1.3
@@ -10,8 +10,7 @@
import org.springframework.web.context.support.WebApplicationContextUtils;
/**
- * This class should be used by non-spring-wired classes if they need
- * access to the application context
+ * This class should be used by non-spring-wired classes if they need access
to the application context
*/
public class ApplicationContextFactory implements ServletContextAware {
private static Log log = LogFactory.getLog(ApplicationContextFactory.class);
@@ -31,26 +30,24 @@
public static ApplicationContext getApplicationContext() {
if (initObj == null) {
throw new IllegalStateException("Application context not
initialized");
- }
- else if (initObj instanceof ServletContext) {
+ } else if (initObj instanceof ServletContext) {
ServletContext servletContext = (ServletContext) initObj;
return
WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
- }
- else if (initObj instanceof String) {
+ } else if (initObj instanceof String) {
if (context == null) {
String contextResourceLocation = (String) initObj;
context = new
ClassPathXmlApplicationContext(contextResourceLocation);
}
return context;
- }
- else {
+ } else {
throw new IllegalStateException("You must initialize the context with
a String");
}
}
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.springframework.web.context.ServletContextAwar
e#setServletContext(javax.servlet.ServletContext)
*/
public void setServletContext(ServletContext context) {
Index: CommunityServiceImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/CommunityServiceImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- CommunityServiceImpl.java 12 Apr 2008 14:26:34 -0000 1.12
+++ CommunityServiceImpl.java 23 Sep 2008 07:12:57 -0000 1.13
@@ -1,11 +1,10 @@
/*
-
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
-
-The license (Mozilla version 1.0) can be read at the MMBase site.
-See http://www.MMBase.org/license
-
+ *
+ * This software is OSI Certified Open Source Software. OSI Certified is a
certification mark of the Open Source
+ * Initiative.
+ *
+ * The license (Mozilla version 1.0) can be read at the MMBase site. See
http://www.MMBase.org/license
+ *
*/
package com.finalist.cmsc.services.community;
@@ -91,8 +90,8 @@
}
@Override
- public List<String> getAuthorities() {
- List<String> authorities = new ArrayList<String>();
+ public List < String > getAuthorities() {
+ List < String > authorities = new ArrayList < String >();
User principal = getPrincipal();
if (principal != null) {
GrantedAuthority[] grantedAuthorities = principal.getAuthorities();
@@ -123,16 +122,16 @@
return authentication != null ? (User) authentication.getPrincipal() :
null;
}
- public Map<Long, Map<String, String>> getPreferencesByModule(String module)
{
+ public Map < Long , Map < String , String >> getPreferencesByModule(String
module) {
return preferenceService.getPreferencesByModule(module);
}
- public Map<String, Map<String, String>> getPreferencesByUserId(String
userId) {
+ public Map < String , Map < String , String >>
getPreferencesByUserId(String userId) {
return preferenceService.getPreferencesByUserId(userId);
}
@Override
- public List<String> getPreferenceValues(String module, String userId,
String key) {
+ public List < String > getPreferenceValues(String module, String userId,
String key) {
return preferenceService.getPreferenceValues(module, userId, key);
}
@@ -151,7 +150,7 @@
* @deprecated please try to use another service
*/
@Override
- public void createPreference(String module, String userId, String key,
List<String> values) {
+ public void createPreference(String module, String userId, String key, List
< String > values) {
for (String value : values) {
preferenceService.createPreference(module, userId, key, value);
}
@@ -161,7 +160,8 @@
* @deprecated please try to use another service
*/
@Override
- public Map<String, Map<String, List<String>>> getPreferences(String module,
String userId, String key, String value) {
+ public Map < String , Map < String , List < String >>>
getPreferences(String module, String userId, String key,
+ String value) {
return null;
}
@@ -169,7 +169,7 @@
* @deprecated please try to use another service
*/
@Override
- public Map<String, Map<String, String>> getUserProperty(String userId) {
+ public Map < String , Map < String , String >> getUserProperty(String
userId) {
// return preferenceService.getPreferencesByUserId(userId);
return null;
}
@@ -195,7 +195,7 @@
Person example = new Person();
example.setEmail(email);
// Retrieve a list of persons that match this example
- List<Person> persons = personService.getPersons(example);
+ List < Person > persons = personService.getPersons(example);
for (Person person : persons) {
Authentication authentication =
authenticationService.getAuthenticationById(person.getAuthenticationId());
@@ -226,7 +226,7 @@
*/
@Override
public void removePreferences(String module, String userId, String key) {
- List<String> valueList = preferenceService.getPreferenceValues(module,
userId, key);
+ List < String > valueList =
preferenceService.getPreferenceValues(module, userId, key);
for (String value : valueList) {
preferenceService.deletePreference(module, userId, key, value);
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
