From: Juergen H. <jho...@us...> - 2008-10-16 17:25:36
|
Update of /cvsroot/springframework/spring/tiger/src/org/springframework/ui In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13816/tiger/src/org/springframework/ui Modified Files: ExtendedModelMap.java Log Message: added @Override annotations Index: ExtendedModelMap.java =================================================================== RCS file: /cvsroot/springframework/spring/tiger/src/org/springframework/ui/ExtendedModelMap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExtendedModelMap.java 2 Dec 2007 00:37:18 -0000 1.1 --- ExtendedModelMap.java 16 Oct 2008 17:25:25 -0000 1.2 *************** *** 1,4 **** /* ! * Copyright 2002-2007 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); --- 1,4 ---- /* ! * Copyright 2002-2008 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); *************** *** 27,32 **** --- 27,34 ---- * @since 2.5.1 */ + @SuppressWarnings("serial") public class ExtendedModelMap extends ModelMap implements Model { + @Override public ExtendedModelMap addAttribute(String attributeName, Object attributeValue) { super.addAttribute(attributeName, attributeValue); *************** *** 34,37 **** --- 36,40 ---- } + @Override public ExtendedModelMap addAttribute(Object attributeValue) { super.addAttribute(attributeValue); *************** *** 39,47 **** } ! public ExtendedModelMap addAllAttributes(Collection attributeValues) { super.addAllAttributes(attributeValues); return this; } public ExtendedModelMap addAllAttributes(Map<String, ?> attributes) { super.addAllAttributes(attributes); --- 42,52 ---- } ! @Override ! public ExtendedModelMap addAllAttributes(Collection<?> attributeValues) { super.addAllAttributes(attributeValues); return this; } + @Override public ExtendedModelMap addAllAttributes(Map<String, ?> attributes) { super.addAllAttributes(attributes); *************** *** 49,52 **** --- 54,58 ---- } + @Override public ExtendedModelMap mergeAttributes(Map<String, ?> attributes) { super.mergeAttributes(attributes); *************** *** 58,61 **** return this; } - } --- 64,66 ---- |