Author: fdesbois Date: 2010-04-02 15:37:11 +0000 (Fri, 02 Apr 2010) New Revision: 413 Added: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/main/xmi/wao.zargo Log: Use last ServiceTransformer version : exception not generated, context still generated by InterfaceTransformer Added: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java 2010-04-02 15:37:11 UTC (rev 413) @@ -0,0 +1,39 @@ +package fr.ifremer.wao; + + + +public class WaoException extends RuntimeException { + + protected Object[] args; + /** + * WaoException : + * @param eee + * @param message + * @param args + */ + + public WaoException(Throwable eee, String message, Object... args) { + super(message, eee); + this.args = args; + } + + /** + * getArgs : + * @return Object[] + */ + + public Object[] getArgs() { + return args; + } + + /** + * hasArgs : + * @return boolean + */ + + public boolean hasArgs() { + return args.length > 0; + } + + +} //WaoException Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-02 09:47:50 UTC (rev 412) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-02 15:37:11 UTC (rev 413) @@ -25,7 +25,9 @@ import com.csvreader.CsvWriter; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; +import fr.ifremer.wao.WaoContextImplementor; import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.WaoUtils; import org.nuiton.topia.TopiaException; @@ -73,7 +75,35 @@ private static final Logger log = LoggerFactory.getLogger(ServiceBoatImpl.class); + private WaoContextImplementor context; + + public void setContext(WaoContextImplementor context) { + this.context = context; + } + @Override + protected void treateError(TopiaContext transaction, Exception eee, + String message, Object... args) throws WaoException { + context.treateError(transaction, eee, message, args); + } + + @Override + protected void treateError(Exception eee, String message, + Object... args) throws WaoException { + context.treateError(eee, message, args); + } + + @Override + protected void closeTransaction(TopiaContext transaction) { + context.closeTransaction(transaction); + } + + @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override public Map<Integer, Boat> executeGetBoatsByFilter(TopiaContext transaction, BoatFilter filter) throws TopiaException { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-02 09:47:50 UTC (rev 412) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-02 15:37:11 UTC (rev 413) @@ -23,10 +23,12 @@ import com.csvreader.CsvReader; import com.csvreader.CsvWriter; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.io.ImportHelper; import fr.ifremer.wao.io.ImportHelper.*; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; +import fr.ifremer.wao.WaoContextImplementor; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.bean.ContactState; import java.io.IOException; @@ -89,7 +91,35 @@ private static final Logger log = LoggerFactory.getLogger(ServiceContactImpl.class); + private WaoContextImplementor context; + + public void setContext(WaoContextImplementor context) { + this.context = context; + } + @Override + protected void treateError(TopiaContext transaction, Exception eee, + String message, Object... args) throws WaoException { + context.treateError(transaction, eee, message, args); + } + + @Override + protected void treateError(Exception eee, String message, + Object... args) throws WaoException { + context.treateError(eee, message, args); + } + + @Override + protected void closeTransaction(TopiaContext transaction) { + context.closeTransaction(transaction); + } + + @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override public Map<String, Contact> executeGetContacts(TopiaContext transaction, ContactFilter filter) throws TopiaException { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-02 09:47:50 UTC (rev 412) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-02 15:37:11 UTC (rev 413) @@ -21,7 +21,9 @@ package fr.ifremer.wao.service; +import fr.ifremer.wao.WaoContextImplementor; import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.entity.News; import fr.ifremer.wao.entity.NewsDAO; import java.util.List; @@ -47,7 +49,35 @@ private static final Logger logger = LoggerFactory.getLogger(ServiceNewsImpl.class); + private WaoContextImplementor context; + + public void setContext(WaoContextImplementor context) { + this.context = context; + } + @Override + protected void treateError(TopiaContext transaction, Exception eee, + String message, Object... args) throws WaoException { + context.treateError(transaction, eee, message, args); + } + + @Override + protected void treateError(Exception eee, String message, + Object... args) throws WaoException { + context.treateError(eee, message, args); + } + + @Override + protected void closeTransaction(TopiaContext transaction) { + context.closeTransaction(transaction); + } + + @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override public List<News> executeGetNews(TopiaContext transaction) throws TopiaException { NewsDAO dao = WaoDAOHelper.getNewsDAO(transaction); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-02 09:47:50 UTC (rev 412) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-02 15:37:11 UTC (rev 413) @@ -22,7 +22,9 @@ package fr.ifremer.wao.service; import com.csvreader.CsvReader; +import fr.ifremer.wao.WaoContextImplementor; import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.FishingZoneDAO; @@ -55,9 +57,38 @@ */ public class ServiceReferentialImpl extends ServiceReferentialAbstract { - private static final Logger log = LoggerFactory.getLogger(ServiceReferentialImpl.class); + private static final Logger log = + LoggerFactory.getLogger(ServiceReferentialImpl.class); + private WaoContextImplementor context; + + public void setContext(WaoContextImplementor context) { + this.context = context; + } + @Override + protected void treateError(TopiaContext transaction, Exception eee, + String message, Object... args) throws WaoException { + context.treateError(transaction, eee, message, args); + } + + @Override + protected void treateError(Exception eee, String message, + Object... args) throws WaoException { + context.treateError(eee, message, args); + } + + @Override + protected void closeTransaction(TopiaContext transaction) { + context.closeTransaction(transaction); + } + + @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override public List<String> executeGetFacades(TopiaContext transaction, SamplingFilter filter) throws TopiaException { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-02 09:47:50 UTC (rev 412) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-02 15:37:11 UTC (rev 413) @@ -26,7 +26,9 @@ import fr.ifremer.wao.io.ImportHelper; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; +import fr.ifremer.wao.WaoContextImplementor; import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.FacadeRowImpl; import fr.ifremer.wao.bean.ImportResults; @@ -78,8 +80,37 @@ */ public class ServiceSamplingImpl extends ServiceSamplingAbstract { - private static final Logger log = LoggerFactory.getLogger(ServiceSamplingImpl.class); + private static final Logger log = + LoggerFactory.getLogger(ServiceSamplingImpl.class); + private WaoContextImplementor context; + + public void setContext(WaoContextImplementor context) { + this.context = context; + } + + @Override + protected void treateError(TopiaContext transaction, Exception eee, + String message, Object... args) throws WaoException { + context.treateError(transaction, eee, message, args); + } + + @Override + protected void treateError(Exception eee, String message, + Object... args) throws WaoException { + context.treateError(eee, message, args); + } + + @Override + protected void closeTransaction(TopiaContext transaction) { + context.closeTransaction(transaction); + } + + @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + public ServiceSamplingImpl() { prepareBinderForProfession(); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-02 09:47:50 UTC (rev 412) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-02 15:37:11 UTC (rev 413) @@ -21,6 +21,7 @@ package fr.ifremer.wao.service; +import fr.ifremer.wao.WaoContextImplementor; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ContactAverageReactivityImpl; @@ -73,9 +74,38 @@ */ public class ServiceSynthesisImpl extends ServiceSynthesisAbstract { - private static final Logger log = LoggerFactory.getLogger(ServiceSynthesisImpl.class); + private static final Logger log = + LoggerFactory.getLogger(ServiceSynthesisImpl.class); + private WaoContextImplementor context; + + public void setContext(WaoContextImplementor context) { + this.context = context; + } + @Override + protected void treateError(TopiaContext transaction, Exception eee, + String message, Object... args) throws WaoException { + context.treateError(transaction, eee, message, args); + } + + @Override + protected void treateError(Exception eee, String message, + Object... args) throws WaoException { + context.treateError(eee, message, args); + } + + @Override + protected void closeTransaction(TopiaContext transaction) { + context.closeTransaction(transaction); + } + + @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override public List<SortedMap<Date, Integer>> executeGetDataSampling( TopiaContext transaction, SamplingFilter filter) throws TopiaException { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-02 09:47:50 UTC (rev 412) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-02 15:37:11 UTC (rev 413) @@ -23,7 +23,9 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; +import fr.ifremer.wao.WaoContextImplementor; import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; @@ -58,9 +60,38 @@ */ public class ServiceUserImpl extends ServiceUserAbstract { - private static final Logger log = LoggerFactory.getLogger(ServiceUserImpl.class); + private static final Logger log = + LoggerFactory.getLogger(ServiceUserImpl.class); + private WaoContextImplementor context; + + public void setContext(WaoContextImplementor context) { + this.context = context; + } + @Override + protected void treateError(TopiaContext transaction, Exception eee, + String message, Object... args) throws WaoException { + context.treateError(transaction, eee, message, args); + } + + @Override + protected void treateError(Exception eee, String message, + Object... args) throws WaoException { + context.treateError(eee, message, args); + } + + @Override + protected void closeTransaction(TopiaContext transaction) { + context.closeTransaction(transaction); + } + + @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override public WaoUser executeConnect(TopiaContext transaction, String login, String password) throws TopiaException, WaoBusinessException { Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-04-02 09:47:50 UTC (rev 412) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-04-02 15:37:11 UTC (rev 413) @@ -1,5 +1,6 @@ model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ model.tagvalue.java.lang.String=text +model.tagvalue.exceptionClass=fr.ifremer.wao.WaoException #fr.ifremer.wao.entity.Company.attribute.waoUser.tagvalue.lazy=false #fr.ifremer.wao.entity.Company.attribute.waoUser.tagvalue.orderBy=firstName,lastName Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)