[richfaces-svn-commits] JBoss Rich Faces SVN: r17840 - root/tests/metamer/trunk/src/main/java/org/richfaces/testapp.

Author: lfryc(a)redhat.com Date: 2010-07-10 15:19:42 -0400 (Sat, 10 Jul 2010) New Revision: 17840 Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplateNameConverter.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesListConverter.java Log: removed @Override from methods declared by interfaces Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplateNameConverter.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplateNameConverter.java 2010-07-10 19:14:38 UTC (rev 17839) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplateNameConverter.java 2010-07-10 19:19:42 UTC (rev 17840) @@ -30,7 +30,7 @@ /** * Converter used for view parameter "template". - * + * * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ @@ -40,7 +40,6 @@ /** * {@inheritDoc} */ - @Override public Object getAsObject(FacesContext context, UIComponent component, String value) { try { return Template.valueOf(value.toUpperCase()); @@ -52,16 +51,15 @@ /** * {@inheritDoc} */ - @Override public String getAsString(FacesContext context, UIComponent component, Object value) { if (value instanceof String) { return (String) value; } - + if (value instanceof Template) { return ((Template) value).toString(); } - + throw new FacesException("Cannot convert parameter \"" + value + "\" to the name of template."); } } Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java 2010-07-10 19:14:38 UTC (rev 17839) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesList.java 2010-07-10 19:19:42 UTC (rev 17840) @@ -47,7 +47,6 @@ templates.add(Template.PLAIN); } - @Override public boolean add(Template e) { if (e == Template.PLAIN) { return false; @@ -58,7 +57,6 @@ return true; } - @Override public void add(int index, Template element) { templates.add(index, element); @@ -70,87 +68,70 @@ } } - @Override public boolean addAll(Collection<? extends Template> c) { return templates.addAll(c); } - @Override public boolean addAll(int index, Collection<? extends Template> c) { return templates.addAll(index, c); } - @Override public void clear() { templates.clear(); } - @Override public boolean contains(Object o) { return templates.contains(o); } - @Override public boolean containsAll(Collection<?> c) { return templates.containsAll(c); } - @Override public Template get(int index) { return templates.get(index); } - @Override public int indexOf(Object o) { return templates.indexOf(o); } - @Override public boolean isEmpty() { return templates.isEmpty(); } - @Override public Iterator<Template> iterator() { return templates.iterator(); } - @Override public int lastIndexOf(Object o) { return templates.lastIndexOf(o); } - @Override public ListIterator<Template> listIterator() { return templates.listIterator(); } - @Override public ListIterator<Template> listIterator(int index) { return templates.listIterator(index); } - @Override public boolean remove(Object o) { return templates.remove(o); } - @Override public Template remove(int index) { return templates.remove(index); } - @Override public boolean removeAll(Collection<?> c) { return templates.removeAll(c); } - @Override public boolean retainAll(Collection<?> c) { return templates.retainAll(c); } - @Override public Template set(int index, Template element) { Template old = templates.set(index, element); @@ -168,27 +149,22 @@ return old; } - @Override public int size() { return templates.size(); } - @Override public List<Template> subList(int fromIndex, int toIndex) { return templates.subList(fromIndex, toIndex); } - @Override public Object[] toArray() { return templates.toArray(); } - @Override public <T> T[] toArray(T[] a) { return templates.toArray(a); } - @Override public String toString() { StringBuilder sb = new StringBuilder(); for (Template t : templates) { Modified: root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesListConverter.java =================================================================== --- root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesListConverter.java 2010-07-10 19:14:38 UTC (rev 17839) +++ root/tests/metamer/trunk/src/main/java/org/richfaces/testapp/TemplatesListConverter.java 2010-07-10 19:19:42 UTC (rev 17840) @@ -30,7 +30,7 @@ /** * Converter used for view parameter "template". - * + * * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ @@ -40,7 +40,6 @@ /** * {@inheritDoc} */ - @Override public Object getAsObject(FacesContext context, UIComponent component, String value) { try { TemplatesList list = new TemplatesList(); @@ -48,7 +47,7 @@ for (String template : value.split(",")) { list.add(Template.valueOf(template.toUpperCase())); } - + return list; } catch (IllegalArgumentException iae) { throw new FacesException("Cannot convert parameter \"" + value + "\" to the list of templates.", iae); @@ -58,16 +57,15 @@ /** * {@inheritDoc} */ - @Override public String getAsString(FacesContext context, UIComponent component, Object value) { if (value instanceof String) { return (String) value; } - + if (value instanceof TemplatesList) { return value.toString(); } - + throw new FacesException("Cannot convert parameter \"" + value + "\" to the list of templates."); } }