Author: glandais Date: 2008-02-04 13:56:01 +0000 (Mon, 04 Feb 2008) New Revision: 619 Modified: trunk/simexplorer-is-web/pom.xml trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml Log: SetterGetter annotation when possible Modified: trunk/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is-web/pom.xml 2008-02-04 13:55:08 UTC (rev 618) +++ trunk/simexplorer-is-web/pom.xml 2008-02-04 13:56:01 UTC (rev 619) @@ -91,6 +91,11 @@ <version>5.0.9</version> </dependency> <dependency> + <groupId>de.hsofttec.t5components</groupId> + <artifactId>t5components</artifactId> + <version>0.5.6</version> + </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jbossall-client</artifactId> <version>4.2.2.GA</version> Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-02-04 13:55:08 UTC (rev 618) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-02-04 13:56:01 UTC (rev 619) @@ -33,6 +33,8 @@ import org.apache.tapestry.services.PersistentLocale; import org.apache.tapestry.services.RequestGlobals; +import de.hsofttec.t5components.annotations.SetterGetter; + import fr.cemagref.simexplorer.is.ui.web.pages.ElementList; /** @@ -56,7 +58,8 @@ @Component private TextField searchField; - private String searchText; + @SetterGetter + private String _searchText; @Component private Form form; @@ -102,7 +105,7 @@ } Object onSuccess() { - elementList.searchQuery(searchText); + elementList.searchQuery(_searchText); // form.recordError(searchField, "Invalid request."); // return null; return elementList; @@ -119,14 +122,6 @@ return elementList; } - public String getSearchText() { - return searchText; - } - - public void setSearchText(String searchText) { - this.searchText = searchText; - } - public String getLoginName() { return elementList.getUserLogged().getLogin(); } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-02-04 13:55:08 UTC (rev 618) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-02-04 13:56:01 UTC (rev 619) @@ -22,45 +22,33 @@ import com.healthmarketscience.rmiio.RemoteInputStreamServer; import com.healthmarketscience.rmiio.SimpleRemoteInputStream; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; import fr.cemagref.simexplorer.is.ui.web.services.RemoteStorageService; public class ElementImport extends UserPage { - private UploadedFile fileEA; - private UploadedFile fileLib; + @SetterGetter + private UploadedFile _fileEA; - public UploadedFile getFileEA() { - return fileEA; - } + @SetterGetter + private UploadedFile _fileLib; - public void setFileEA(UploadedFile fileEA) { - this.fileEA = fileEA; - } - - public UploadedFile getFileLib() { - return fileLib; - } - - public void setFileLib(UploadedFile fileLib) { - this.fileLib = fileLib; - } - public void onSuccess() { - if (fileEA != null) { + if (_fileEA != null) { RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( - fileEA.getStream()); + _fileEA.getStream()); try { RemoteStorageService.getStorageService().saveElement( getToken(), zipRemoteStream.export()); } catch (Exception e) { - throw new SimExplorerWebException(); + throw new SimExplorerWebException(e); } } - if (fileLib != null) { + if (_fileLib != null) { RemoteInputStreamServer zipRemoteStream = new SimpleRemoteInputStream( - fileLib.getStream()); + _fileLib.getStream()); try { RemoteStorageService.getStorageService().saveElement( getToken(), zipRemoteStream.export()); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-04 13:55:08 UTC (rev 618) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-04 13:56:01 UTC (rev 619) @@ -29,6 +29,7 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.ui.web.grid.ElementDataSource; import fr.cemagref.simexplorer.is.ui.web.pages.security.UserPage; @@ -47,7 +48,8 @@ @Persist private ElementDataSource elementDataSource; - private MetaData element; + @SetterGetter + private MetaData _element; @InjectPage private ElementDetail elementDetail; @@ -92,16 +94,8 @@ return elementDataSource; } - public MetaData getElement() { - return element; - } - - public void setElement(MetaData element) { - this.element = element; - } - public String getDetailElementContext() { - String result = element.getUuid() + "," + element.getVersion(); + String result = _element.getUuid() + "," + _element.getVersion(); return result; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-02-04 13:55:08 UTC (rev 618) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-02-04 13:56:01 UTC (rev 619) @@ -26,21 +26,29 @@ import org.apache.tapestry.ioc.services.ExceptionInfo; import org.apache.tapestry.services.ExceptionReporter; +import de.hsofttec.t5components.annotations.SetterGetter; + import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; public class ExceptionReport implements ExceptionReporter { - private boolean unknown; + @SetterGetter(onlyGetter = true) + private boolean _unknown; private SimExplorerWebException exception; - private List<ExceptionInfo> stack; - private ExceptionInfo info; + @SetterGetter(onlyGetter = true) + private List<ExceptionInfo> _stack; - private String propertyName; + @SetterGetter + private ExceptionInfo _info; - private String frame; + @SetterGetter + private String _propertyName; + @SetterGetter + private String _frame; + @Inject private ExceptionAnalyzer analyzer; @@ -51,16 +59,16 @@ public void reportException(Throwable exception) { SimExplorerWebException simException = getException(exception); if (simException != null) { - unknown = false; + _unknown = false; this.exception = simException; - unknown = true; + _unknown = true; ExceptionAnalysis analysis = analyzer.analyze(exception); - stack = analysis.getExceptionInfos(); + _stack = analysis.getExceptionInfos(); } else { - unknown = true; + _unknown = true; ExceptionAnalysis analysis = analyzer.analyze(exception); - stack = analysis.getExceptionInfos(); + _stack = analysis.getExceptionInfos(); } } @@ -76,7 +84,7 @@ } public String getErrorMessage() { - if (!unknown) { + if (!_unknown) { return exception.getMessage(); } else { return ""; @@ -85,44 +93,12 @@ public boolean getShowPropertyList() { // True if either is non-empty - return !(info.getPropertyNames().isEmpty() && info.getStackTrace() + return !(_info.getPropertyNames().isEmpty() && _info.getStackTrace() .isEmpty()); } public Object getPropertyValue() { - return info.getProperty(propertyName); + return _info.getProperty(_propertyName); } - public List<ExceptionInfo> getStack() { - return stack; - } - - public ExceptionInfo getInfo() { - return info; - } - - public void setInfo(ExceptionInfo info) { - this.info = info; - } - - public String getPropertyName() { - return propertyName; - } - - public void setPropertyName(String propertyName) { - this.propertyName = propertyName; - } - - public boolean isUnknown() { - return unknown; - } - - public String getFrame() { - return frame; - } - - public void setFrame(String frame) { - this.frame = frame; - } - } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-02-04 13:55:08 UTC (rev 618) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-02-04 13:56:01 UTC (rev 619) @@ -27,6 +27,8 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; + import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; @@ -38,7 +40,8 @@ @Retain private BeanModel model; - private Group group; + @SetterGetter + private Group _group; @Inject private BeanModelSource beanModelSource; @@ -107,14 +110,6 @@ return groupEdit; } - public Group getGroup() { - return group; - } - - public void setGroup(Group group) { - this.group = group; - } - public BeanModel getModel() { return model; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-02-04 13:55:08 UTC (rev 618) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-02-04 13:56:01 UTC (rev 619) @@ -30,6 +30,8 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; + import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; @@ -61,7 +63,8 @@ @Inject private ComponentResources resources; - private Group group; + @SetterGetter + private Group _group; public String getWindowTitle() { return ""; @@ -186,12 +189,4 @@ return groupModel; } - public Group getGroup() { - return group; - } - - public void setGroup(Group group) { - this.group = group; - } - } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-02-04 13:55:08 UTC (rev 618) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-02-04 13:56:01 UTC (rev 619) @@ -27,6 +27,8 @@ import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.services.BeanModelSource; +import de.hsofttec.t5components.annotations.SetterGetter; + import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; @@ -38,7 +40,8 @@ @Retain private BeanModel model; - private User user; + @SetterGetter + private User _user; @Inject private BeanModelSource beanModelSource; @@ -52,7 +55,7 @@ public String getWindowTitle() { return ""; } - + void pageLoaded() { model = beanModelSource.create(User.class, true, resources); List<String> wantedProperties = new ArrayList<String>(); @@ -103,14 +106,6 @@ return userEdit; } - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - public UserEdit getUserEdit() { return userEdit; } Modified: trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml 2008-02-04 13:55:08 UTC (rev 618) +++ trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml 2008-02-04 13:56:01 UTC (rev 619) @@ -4,36 +4,40 @@ ${errormessage} <t:if test="unknown"> + + <h1>${message:unknowException}</h1> - <h1>Unknown Exception</h1> - - <div class="t-exception-report" id="errordetail"> - <ul> - <t:loop source="stack" value="info"> - <li><span class="t-exception-class-name">${info.className}</span> + <p>${message:errorMessage}</p> - <t:if test="info.message"> - <div class="t-exception-message">${info.message}</div> - </t:if> <t:if test="showPropertyList"> - <dl> - <t:loop source="info.propertyNames" value="propertyName"> - <dt>${propertyName}</dt> - <dd><t:renderobject object="propertyValue" /></dd> - </t:loop> - <t:if test="info.stackTrace"> - <dt>Stack trace</dt> - <dd> - <ul class="t-stack-trace"> - <t:loop source="info.stackTrace" value="frame"> - <li>${frame}</li> - </t:loop> - </ul> - </dd> - </t:if> - </dl> - </t:if></li> - </t:loop> - </ul> + <div t:type="t5components/SlidingPanel" closed="true" subject="${message:exceptionDetails}"> + <div class="t-exception-report" id="errordetail"> + <ul> + <t:loop source="stack" value="info"> + <li><span class="t-exception-class-name">${info.className}</span> + + <t:if test="info.message"> + <div class="t-exception-message">${info.message}</div> + </t:if> <t:if test="showPropertyList"> + <dl> + <t:loop source="info.propertyNames" value="propertyName"> + <dt>${propertyName}</dt> + <dd><t:renderobject object="propertyValue" /></dd> + </t:loop> + <t:if test="info.stackTrace"> + <dt>Stack trace</dt> + <dd> + <ul class="t-stack-trace"> + <t:loop source="info.stackTrace" value="frame"> + <li>${frame}</li> + </t:loop> + </ul> + </dd> + </t:if> + </dl> + </t:if></li> + </t:loop> + </ul> + </div> </div> </t:if>