Changeset 294 for ether_megapoli/trunk
- Timestamp:
- 12/09/11 16:16:40 (13 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 1 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/common/implementation/com/ether/WebHelper.java
r275 r294 1 1 package com.ether; 2 2 3 import com.ether.EtherException.EtherCode;4 3 import org.apache.commons.logging.Log; 5 4 import org.apache.commons.logging.LogFactory; … … 50 49 51 50 public static void displayAjaxError( @NotNull final HttpServletResponse response, @Nullable final String methodName ) 52 throws EtherException51 throws FormattedException 53 52 { 54 53 try … … 64 63 catch( IOException e ) 65 64 { 66 throw new EtherException( EtherCode.IO_EXCEPTION_ERROR_TO_GET_OUTPUTSTREAM, e );65 throw new FormattedException( FormattedException.FormattedExceptionCode.IO_EXCEPTION_ERROR_TO_GET_OUTPUTSTREAM, e ); 67 66 } 68 67 } -
ether_megapoli/trunk/common/interface/com/ether/FormattedException.java
r286 r294 86 86 } 87 87 88 public static enum FormattedExceptionCode 89 implements Code 90 { 91 IO_EXCEPTION_ERROR_TO_GET_OUTPUTSTREAM, 92 } 93 94 88 95 public static String DEFAULT_MESSAGE = "no message"; 89 96 public static String DEFAULT_THROWABLE = null; -
ether_megapoli/trunk/service/test/com/ether/SGTTest.java
r191 r294 488 488 @ParamName(ParameterConstants.PARAMETER_DATE_BEGIN) final String dateBegin, 489 489 @ParamName(ParameterConstants.PARAMETER_DATE_END) final String dateEnd ) 490 throws ServiceException, EtherException,ParseException490 throws ServiceException, ParseException 491 491 { 492 492 // final String pofBegin = "2009-07-13 13:00"; -
ether_megapoli/trunk/web/resources/css/megapoli.css
r278 r294 289 289 } 290 290 291 .smallRoundTable { 292 -moz-border-radius: 4px; 293 -webkit-border-radius: 4px; 294 border: 1px solid; 295 } 296 291 297 .divMenu_arrow, .divMenu_arrow.deployed { 292 298 height: 13px; -
ether_megapoli/trunk/web/resources/jsp/credits_en.jsp
r261 r294 2 2 3 3 <BR/> 4 TODO : A traduire si contenu OK5 4 <div class="containerSlideContent2"> 6 <div class="title2"> Site webMegapoli</div>7 Le design de ce site a été conçu et réalisé par le CGTD ETHERParis.5 <div class="title2">Web site Megapoli</div> 6 This web site design was created by the CGTD Ether Paris. 8 7 <BR/><BR/> 9 <div class="title2"> Crédits photos</div>10 Les images utilisées pour la réalisation de ce site web Megapoli proviennent, pour la plupart, de la photothÚque du CNRS et du fond de ETHER.<BR/>11 Elles sont la propriété du CNRS et de ETHER. Toute copie, totale ou partielle, ne peut se faire sans leur accord.8 <div class="title2">Images credits</div> 9 Images used for this Megapoli web site mostly belong to the CNRS and ETHER pictures library.<BR/> 10 They are properties to CNRS and ETHER. Any copies, complete or partial, can not be done without their consent. 12 11 </div> -
ether_megapoli/trunk/web/src/com/ether/ControllerEther.java
r284 r294 44 44 @Nullable 45 45 protected ModelAndView handleRequestInternal( @NotNull final HttpServletRequest request, @NotNull final HttpServletResponse response ) 46 throws WebException , EtherException46 throws WebException 47 47 { 48 48 try … … 74 74 { 75 75 throw new WebException( WebException.WebCode.ERROR_NO_REQUEST_HANDLING_METHOD, e ); 76 } 77 catch( FormattedException e ) 78 { 79 throw new WebException( WebException.WebCode.ERROR_DISPLAY_AJAX, e ); 76 80 } 77 81 } -
ether_megapoli/trunk/web/src/com/ether/ControllerVisualization.java
r285 r294 46 46 // Default view if methodName is unknown 47 47 public ModelAndView home( final HttpServletRequest request, final HttpServletResponse response ) 48 throws EtherException48 throws ServiceException 49 49 { 50 50 return new ModelAndView( "index" ); … … 87 87 @ControllerMethod(jsonResult = true) 88 88 public JSONObject searchParametersByPlateform( @Mandatory @ParamName(ParameterConstants.PARAMETER_ID) final Integer plateformId ) 89 throws ServiceException , EtherException89 throws ServiceException 90 90 { 91 91 final List<Parametre> fullParametersByPlateform = getEtherService().getParametersByPlateformId( plateformId ); -
ether_megapoli/trunk/web/src/com/ether/WebException.java
r286 r294 45 45 ERROR_EMAIL_CANNOT_BE_SEND, 46 46 ERROR_ENCRYPT_PASSWORD, 47 ERROR_NON_ACCESS_TO_BO_AUTHORIZED 47 ERROR_NON_ACCESS_TO_BO_AUTHORIZED, 48 ERROR_DISPLAY_AJAX 48 49 } 49 50 -
ether_megapoli/trunk/web/visualization/visu.jsp
r270 r294 88 88 89 89 <div class="textExamples"><bean:message key="data.visualization.general.example.2D"/></div> 90 <table class=" roundTable" border="1">90 <table class="smallRoundTable" border="1"> 91 91 <tr> 92 92 <td>
Note: See TracChangeset
for help on using the changeset viewer.