From 834577ad971a2ad56335b4b83501c6af71ea945b Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Thu, 21 Sep 2017 10:59:44 -0700 Subject: polish --- .../org/aspectj/weaver/reflect/ReflectionWorldTest.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/weaver5/java5-testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java b/weaver5/java5-testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java index 2310ad0a9..6c65c1e64 100644 --- a/weaver5/java5-testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java +++ b/weaver5/java5-testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java @@ -1,38 +1,32 @@ /* ******************************************************************* - * Copyright (c) 2005 Contributors. + * Copyright (c) 2005,2017 Contributors. * All rights reserved. * This program and the accompanying materials are made available * under the terms of the Eclipse Public License v1.0 * which accompanies this distribution and is available at * http://eclipse.org/legal/epl-v10.html - * - * Contributors: - * Adrian Colyer Initial implementation * ******************************************************************/ package org.aspectj.weaver.reflect; import java.lang.reflect.Method; import java.lang.reflect.Type; -<<<<<<< HEAD import java.util.List; import org.aspectj.weaver.ResolvedType; import org.aspectj.weaver.UnresolvedType; import org.aspectj.weaver.World; -import org.aspectj.weaver.patterns.ConcreteCflowPointcut; -======= import org.aspectj.bridge.IMessageHandler; import org.aspectj.weaver.ReferenceType; import org.aspectj.weaver.ResolvedMember; -import org.aspectj.weaver.ResolvedType; -import org.aspectj.weaver.UnresolvedType; -import org.aspectj.weaver.World; import org.aspectj.weaver.bcel.BcelWorld; import junit.framework.TestCase; ->>>>>>> master +/** + * @author Andy Clement + * @author Adrian Colyer + */ public class ReflectionWorldTest extends TestCase { public void testDelegateCreation() { -- cgit v1.2.3