You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/05/26 16:42:22 UTC
svn commit: r778724 - in /myfaces/tobago/trunk:
example/addressbook-old/src/main/java/org/apache/myfaces/tobago/example/addressbook/
example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/
example/addressbook/lib/src/main/j...
Author: lofwyr
Date: Tue May 26 14:42:21 2009
New Revision: 778724
URL: http://svn.apache.org/viewvc?rev=778724&view=rev
Log:
* remove AddressDaoException
* checkstyle
Removed:
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDaoException.java
Modified:
myfaces/tobago/trunk/example/addressbook-old/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java
myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
Modified: myfaces/tobago/trunk/example/addressbook-old/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook-old/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java?rev=778724&r1=778723&r2=778724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook-old/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java (original)
+++ myfaces/tobago/trunk/example/addressbook-old/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java Tue May 26 14:42:21 2009
@@ -26,13 +26,13 @@
public interface AddressDao {
- Address updateAddress(Address address) throws AddressDaoException;
+ Address updateAddress(Address address);
- List<Address> findAddresses(String filter) throws AddressDaoException;
+ List<Address> findAddresses(String filter);
- List<Address> findAddresses(String filter, String column, boolean order) throws AddressDaoException;
+ List<Address> findAddresses(String filter, String column, boolean order);
- void removeAddress(Address address) throws AddressDaoException;
+ void removeAddress(Address address);
Address getAddress(Integer id);
}
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java?rev=778724&r1=778723&r2=778724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDao.java Tue May 26 14:42:21 2009
@@ -26,13 +26,13 @@
public interface AddressDao {
- Address updateAddress(Address address) throws AddressDaoException;
+ Address updateAddress(Address address);
- List<Address> findAddresses(String filter) throws AddressDaoException;
+ List<Address> findAddresses(String filter);
- List<Address> findAddresses(String filter, String column, boolean order) throws AddressDaoException;
+ List<Address> findAddresses(String filter, String column, boolean order);
- void removeAddress(Address address) throws AddressDaoException;
+ void removeAddress(Address address);
Address getAddress(Integer id);
}
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java?rev=778724&r1=778723&r2=778724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/JpaAddressDao.java Tue May 26 14:42:21 2009
@@ -39,7 +39,7 @@
@PersistenceContext(unitName = "addressBook")
private EntityManager entityManager;
- public Address updateAddress(Address address) throws AddressDaoException {
+ public Address updateAddress(Address address) {
if (address.getId() == null) {
entityManager.persist(address);
} else {
@@ -52,13 +52,13 @@
return address;
}
@Transactional(readOnly = true)
- public List<Address> findAddresses(String filter) throws AddressDaoException {
+ public List<Address> findAddresses(String filter) {
return findAddresses(filter, null, true);
}
@Transactional(readOnly = true)
@SuppressWarnings("unchecked")
- public List<Address> findAddresses(String filter, String column, boolean order) throws AddressDaoException {
+ public List<Address> findAddresses(String filter, String column, boolean order) {
StringBuilder builder = new StringBuilder();
builder.append("select a from Address a");
if (filter != null) {
@@ -80,7 +80,7 @@
return query.getResultList();
}
- public void removeAddress(Address address) throws AddressDaoException {
+ public void removeAddress(Address address) {
address = getAddress(address.getId());
entityManager.remove(address);
}
Modified: myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java?rev=778724&r1=778723&r2=778724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java (original)
+++ myfaces/tobago/trunk/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java Tue May 26 14:42:21 2009
@@ -33,7 +33,6 @@
import org.apache.myfaces.tobago.event.SortActionEvent;
import org.apache.myfaces.tobago.example.addressbook.Address;
import org.apache.myfaces.tobago.example.addressbook.AddressDao;
-import org.apache.myfaces.tobago.example.addressbook.AddressDaoException;
import org.apache.myfaces.tobago.example.addressbook.Picture;
import org.apache.myfaces.tobago.model.SheetState;
import org.springframework.context.annotation.Scope;
@@ -95,7 +94,7 @@
private boolean renderFileUploadPopup;
@PostConstruct
- public void init() throws AddressDaoException {
+ public void init() {
FacesContext facesContext = FacesContext.getCurrentInstance();
Application application = facesContext.getApplication();
language = application.getDefaultLocale();
@@ -116,21 +115,21 @@
currentAddressList = addressDao.findAddresses(searchCriterion);
}
- public void setAddressDao(AddressDao addressDao) throws AddressDaoException {
+ public void setAddressDao(AddressDao addressDao) {
this.addressDao = addressDao;
}
- public void sheetSorter(ActionEvent event) throws AddressDaoException {
+ public void sheetSorter(ActionEvent event) {
if (event instanceof SortActionEvent) {
SortActionEvent sortEvent = (SortActionEvent) event;
UIColumn column = (UIColumn) sortEvent.getColumn();
- SheetState sheetState = ((UIData)sortEvent.getSheet()).getSheetState(FacesContext.getCurrentInstance());
+ SheetState sheetState = ((UIData) sortEvent.getSheet()).getSheetState(FacesContext.getCurrentInstance());
currentAddressList = addressDao.findAddresses(searchCriterion, column.getId(), sheetState.isAscending());
}
}
- public String search() throws AddressDaoException {
+ public String search() {
currentAddressList = addressDao.findAddresses(searchCriterion);
return OUTCOME_LIST;
}
@@ -148,7 +147,7 @@
return OUTCOME_EDITOR;
}
- public String addDummyAddresses() throws IOException, AddressDaoException {
+ public String addDummyAddresses() throws IOException {
for (int i=0; i<100; ++i) {
currentAddress = RandomAddressGenerator.generateAddress();
store();
@@ -168,7 +167,7 @@
return OUTCOME_EDITOR;
}
- public String deleteAddresses() throws AddressDaoException {
+ public String deleteAddresses() {
List<Integer> selection = selectedAddresses.getSelectedRows();
if (selection.size() < 1) {
FacesMessage error = new FacesMessage("Please select at least one address.");
@@ -185,7 +184,7 @@
return OUTCOME_LIST;
}
- public String store() throws AddressDaoException {
+ public String store() {
LOG.debug("action: storeAddress");
currentAddress = addressDao.updateAddress(currentAddress);
selectedAddresses.resetSelected();
@@ -193,7 +192,7 @@
return OUTCOME_LIST;
}
- public String cancel() throws AddressDaoException {
+ public String cancel() {
currentAddressList = addressDao.findAddresses(searchCriterion);
return OUTCOME_LIST;
}
Modified: myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml?rev=778724&r1=778723&r2=778724&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml (original)
+++ myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml Tue May 26 14:42:21 2009
@@ -448,7 +448,7 @@
code fragment show the method bound to the delete button and describes
how to access the selected rows:</para>
- <programlisting role="JAVA">public String deleteAddresses() throws AddressDaoException {
+ <programlisting role="JAVA">public String deleteAddresses() {
List<Integer> selection = selectedAddresses.getSelectedRows();
if (selection.size() < 1) {
FacesMessage error