X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/e52624508f9cb5e9ea3f37dfba4f6082f763ee07..305e7252c6eb73a0a0f823fb6c3ea505d39f452e:/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java?ds=sidebyside

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java
index 698881f7ff..80202e8e5e 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java
@@ -29,6 +29,7 @@ import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.mapping.Map;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -42,6 +43,7 @@ import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.remote.editor.UUIDPropertyEditor;
 
 /**
@@ -133,7 +135,7 @@ public abstract class BaseController<T extends CdmBase, SERVICE extends IService
 		if(objectFromProperty != null){
 
 			if( Collection.class.isAssignableFrom(objectFromProperty.getClass())){
-				// Map types cannot be returend as list or in a pager!
+				// Map types cannot be returned as list or in a pager!
 				
 				Collection c = (Collection)objectFromProperty;
 				if(start != null){
@@ -143,6 +145,8 @@ public abstract class BaseController<T extends CdmBase, SERVICE extends IService
 					modelAndView.addObject(sub_c);
 					
 				} else {
+					//FIXME use real paging mechanism of according service class instead of subCollection()
+					//FIXME use BaseListController.normalizeAndValidatePagerParameters(pageNumber, pageSize, response);
 					pageSize = (pageSize == null ? DEFAULT_PAGE_SIZE : pageSize);
 					pageNumber = (pageNumber == null ? 0 : pageNumber);
 					start = pageNumber * pageSize;
@@ -294,13 +298,17 @@ public abstract class BaseController<T extends CdmBase, SERVICE extends IService
 		Object result = null; 
 		try {
 			PropertyDescriptor propertyDescriptor = PropertyUtils.getPropertyDescriptor(instance, baseName);
+			if(propertyDescriptor == null){
+				throw new NoSuchMethodException("No such method: " + instance.getClass().getSimpleName() + ".get" + baseName);
+			}
 			Method method = propertyDescriptor.getReadMethod();
 			
 			Class<?> returnType = method.getReturnType();
 			
 			if(CdmBase.class.isAssignableFrom(returnType) 
 					|| Collection.class.isAssignableFrom(returnType) 
-					|| Map.class.isAssignableFrom(returnType)){
+					|| Map.class.isAssignableFrom(returnType)
+					|| INomenclaturalReference.class.isAssignableFrom(returnType)){
 				
 				result = method.invoke(instance, (Object[])null);