Index: topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java:1.19 topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java:1.20 --- topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java:1.19 Fri Dec 7 16:25:54 2007 +++ topia2/src/java/org/codelutin/topia/generator/DAOAbstractGenerator.java Thu Dec 13 16:49:53 2007 @@ -24,9 +24,9 @@ * Created: 12 déc. 2005 * * @author Arnaud Thimel -* @version $Revision: 1.19 $ +* @version $Revision: 1.20 $ * -* Mise a jour: $Date: 2007-12-07 16:25:54 $ +* Mise a jour: $Date: 2007-12-13 16:49:53 $ * par : $Author: ruchaud $ */ @@ -35,7 +35,9 @@ import java.io.File; import java.io.IOException; import java.io.Writer; +import java.security.Permission; import java.util.Iterator; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -271,8 +273,8 @@ * @param daoClass delegation du getRequestPermission * @return la liste des permissions *) - private List getRequestPermission(String topiaId, int actions, String query, Class daoClass) throws TopiaException { - TopiaContextImplementor context = getParentDAO().getContext(); + protected List getRequestPermission(String topiaId, int actions, String query, Class daoClass) throws TopiaException { + TopiaContextImplementor context = getContext(); List result = context.find(query, "id", topiaId); List resultPermissions = new ArrayList(); @@ -282,15 +284,13 @@ if(permissions != null) { resultPermissions.addAll(permissions); } else { - TaasAuthorizationImpl authorization = new TaasAuthorizationImpl(topiaIdPermission, actions); - TaasPermission permission = new TaasPermission(authorization); + TaasPermission permission = new TaasPermission(topiaIdPermission, actions); resultPermissions.add(permission); } } return resultPermissions; } - -}*/ +}*/ } /*{ } //<%=clazz.getName()%>DAOAbstract @@ -323,7 +323,10 @@ query = "select at.topiaId from " + className + " at inner join at." + attributeName + " cl where cl.topiaId = :id"; daoClass = className; } -/*{ resultPermissions.addAll(getRequestPermission(topiaId, <%=actions%>, "<%=query%>", <%=daoClass%>.class)); +/*{ resultPermissions.addAll(getRequestPermission(topiaId, + <%=actions%>, + "<%=query%>", + <%=daoClass%>.class)); }*/ } } else {