ungeneralize type

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/OrgRoleBean.java

@@ -44,7 +44,7 @@ public class OrgRoleBean implements OrgRoleBeanLocal {
 	}
 	}
 
 
 	@Override
 	@Override
-	public ModelInterface find(Integer id) {
+	public OrgRole find(Integer id) {
 		return orgRoleFacade.find(id);
 		return orgRoleFacade.find(id);
 	}
 	}
 
 

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/OrgRoleBeanLocal.java

@@ -5,14 +5,13 @@ import java.util.List;
 import javax.ejb.Local;
 import javax.ejb.Local;
 
 
 import fi.insomnia.bortal.model.OrgRole;
 import fi.insomnia.bortal.model.OrgRole;
-import fi.insomnia.bortal.utilities.jpa.ModelInterface;
 
 
 @Local
 @Local
 public interface OrgRoleBeanLocal {
 public interface OrgRoleBeanLocal {
 
 
 	List<OrgRole> listOrgRoles();
 	List<OrgRole> listOrgRoles();
 
 
-	ModelInterface find(Integer id);
+	OrgRole find(Integer id);
 
 
 	List<OrgRole> getPossibleParents(OrgRole orgRole);
 	List<OrgRole> getPossibleParents(OrgRole orgRole);
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/OrgRoleConverter.java

@@ -5,18 +5,18 @@ import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 import javax.inject.Named;
 
 
 import fi.insomnia.bortal.beans.OrgRoleBeanLocal;
 import fi.insomnia.bortal.beans.OrgRoleBeanLocal;
-import fi.insomnia.bortal.utilities.jpa.ModelInterface;
+import fi.insomnia.bortal.model.OrgRole;
 import fi.insomnia.bortal.utilities.jsf.GenericIntegerEntityConverter;
 import fi.insomnia.bortal.utilities.jsf.GenericIntegerEntityConverter;
 
 
 @Named("orgRoleConverter")
 @Named("orgRoleConverter")
 @RequestScoped
 @RequestScoped
-public class OrgRoleConverter extends GenericIntegerEntityConverter {
+public class OrgRoleConverter extends GenericIntegerEntityConverter<OrgRole> {
 
 
 	@EJB
 	@EJB
 	private OrgRoleBeanLocal orgRoleBean;
 	private OrgRoleBeanLocal orgRoleBean;
 
 
 	@Override
 	@Override
-	protected ModelInterface find(Integer id) {
+	protected OrgRole find(Integer id) {
 		return orgRoleBean.find(id);
 		return orgRoleBean.find(id);
 	}
 	}