Author: tchemit Date: 2010-03-17 14:06:52 +0100 (Wed, 17 Mar 2010) New Revision: 1845 Log: fix signature of findAllUsages in DAO api Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-03-17 00:18:04 UTC (rev 1844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-03-17 13:06:52 UTC (rev 1845) @@ -396,7 +396,7 @@ operation = addOperation(result, "findAllUsages", - "Map<Class<?>, List<? extends TopiaEntity>>", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", ObjectModelModifier.PUBLIC); addParameter(operation, "E", "entity"); @@ -404,7 +404,7 @@ addAnnotation(result, operation,"Override"); setOperationBody(operation, "" /*{ - return new HashMap<Class<?>, List<? extends TopiaEntity>>(); + return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(); }*/ ); @@ -507,7 +507,7 @@ operation = addOperation(result, "findAllUsages", - "Map<Class<?>, List<? extends TopiaEntity>>", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", ObjectModelModifier.PUBLIC); addParameter(operation, "E", "entity"); @@ -517,8 +517,8 @@ buffer = new StringBuilder(300); buffer.append("" /*{ - Map<Class<?>,List<? extends TopiaEntity>> result; - result = new HashMap<Class<?>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); + Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> result; + result = new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); List<? extends TopiaEntity> list; }*/ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-17 00:18:04 UTC (rev 1844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-03-17 13:06:52 UTC (rev 1845) @@ -348,7 +348,7 @@ * @since 2.3.0 */ - Map<Class<?>, List<? extends TopiaEntity>> findAllUsages(Entity entity) + Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(Entity entity) throws TopiaException; /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-17 00:18:04 UTC (rev 1844) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-03-17 13:06:52 UTC (rev 1845) @@ -564,7 +564,7 @@ } @Override - public Map<Class<?>, List<? extends TopiaEntity>> findAllUsages(E e) + public Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E e) throws TopiaException { // must be implemented by specialized dao throw new UnsupportedOperationException();