|
From: Juergen H. <jho...@us...> - 2006-08-30 12:41:04
|
Update of /cvsroot/springframework/spring/test/org/springframework/beans/factory/xml In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18947/test/org/springframework/beans/factory/xml Modified Files: OverrideOneMethod.java Added Files: OverrideInterface.java Log Message: fixed method overrides check to accept methods declared on interfaces as well --- NEW FILE: OverrideInterface.java --- /* * Copyright 2002-2006 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.springframework.beans.factory.xml; import org.springframework.beans.TestBean; /** * @author Juergen Hoeller */ public interface OverrideInterface { TestBean getPrototypeDependency(); } Index: OverrideOneMethod.java =================================================================== RCS file: /cvsroot/springframework/spring/test/org/springframework/beans/factory/xml/OverrideOneMethod.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** OverrideOneMethod.java 16 Apr 2005 19:45:55 -0000 1.8 --- OverrideOneMethod.java 30 Aug 2006 12:40:58 -0000 1.9 *************** *** 1,4 **** /* ! * Copyright 2002-2005 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); --- 1,4 ---- /* ! * Copyright 2002-2006 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); *************** *** 22,35 **** * @author Rod Johnson */ ! public abstract class OverrideOneMethod extends MethodReplaceCandidate { ! ! public abstract TestBean getPrototypeDependency(); ! protected abstract TestBean protectedOverrideSingleton(); ! public TestBean invokesOverridenMethodOnSelf() { return getPrototypeDependency(); } ! public String echo(String echo) { return echo; --- 22,33 ---- * @author Rod Johnson */ ! public abstract class OverrideOneMethod extends MethodReplaceCandidate implements OverrideInterface { ! protected abstract TestBean protectedOverrideSingleton(); ! public TestBean invokesOverridenMethodOnSelf() { return getPrototypeDependency(); } ! public String echo(String echo) { return echo; |