moved to aspectj5rt

diff --git a/runtime/src/org/aspectj/lang/Aspects.java b/runtime/src/org/aspectj/lang/Aspects.java
deleted file mode 100644 (file)
index f3e04e8..0000000
--- a/runtime/src/org/aspectj/lang/Aspects.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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:
- * initial implementation              Alexandre Vasseur
- *******************************************************************************/
-package org.aspectj.lang;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Handles generic aspectOf method when those are not available in the aspects but added later on
- * thru load time weaving.
- * <p/>
- * Aspects.aspectOf(..) is doing reflective calls to the aspect aspectOf, so for better performance
- * consider using ajc compilation of the aspects and using them as a binary dependancies in your project.
- *
- * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
- */
-public class Aspects {
-
-    private final static Class[] EMPTY_CLASS_ARRAY = new Class[0];
-    private final static Class[] PEROBJECT_CLASS_ARRAY = new Class[]{Object.class};
-    private final static Class[] PERTYPEWITHIN_CLASS_ARRAY = new Class[]{Class.class};
-    private final static Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-    private final static String ASPECTOF = "aspectOf";
-    private final static String HASASPECT = "hasAspect";
-
-    /**
-     * Returns the singleton aspect or the percflow / percflowbelow associated with the current thread
-     *
-     * @param aspectClass
-     * @return
-     * @throws NoAspectBoundException if no such aspect
-     */
-    public static Object aspectOf(Class aspectClass) throws NoAspectBoundException {
-        try {
-            return getSingletonOrThreadAspectOf(aspectClass).invoke(null, EMPTY_OBJECT_ARRAY);
-        } catch (InvocationTargetException e) {
-               //FIXME asc Highly temporary change to see what the build makes of it - dont use 1.4 APIs
-            throw new NoAspectBoundException(aspectClass.getName(), e);//e.getCause());
-        } catch (Exception e) {
-            throw new NoAspectBoundException(aspectClass.getName(), e);
-        }
-    }
-
-    /**
-     * Returns the perthis / pertarget aspect
-     * @param aspectClass
-     * @param perObject
-     * @return
-     * @throws NoAspectBoundException if no such aspect, or no aspect bound
-     */
-    public static Object aspectOf(Class aspectClass, Object perObject) throws NoAspectBoundException {
-        try {
-            return getPerObjectAspectOf(aspectClass).invoke(null, new Object[]{perObject});
-        } catch (InvocationTargetException e) {
-               //FIXME asc Highly temporary change to see what the build makes of it - dont use 1.4 APIs
-            throw new NoAspectBoundException(aspectClass.getName(), e);//e.getCause());
-        } catch (Exception e) {
-            throw new NoAspectBoundException(aspectClass.getName(), e);
-        }
-    }
-
-    /**
-     * Returns the pertypewithin aspect
-     * @param aspectClass
-     * @param perTypeWithin class
-     * @return
-     * @throws NoAspectBoundException if no such aspect, or no aspect bound
-     */
-    public static Object aspectOf(Class aspectClass, Class perTypeWithin) throws NoAspectBoundException {
-        try {
-            return getPerTypeWithinAspectOf(aspectClass).invoke(null, new Object[]{perTypeWithin});
-        } catch (InvocationTargetException e) {
-//             FIXME asc Highly temporary change to see what the build makes of it - dont use 1.4 APIs
-            throw new NoAspectBoundException(aspectClass.getName(), e);//e.getCause());
-        } catch (Exception e) {
-            throw new NoAspectBoundException(aspectClass.getName(), e);
-        }
-    }
-
-    /**
-     * Returns true if singleton aspect or percflow / percflowbelow aspect is bound
-     *
-     * @param aspectClass
-     * @return
-     * @throws NoAspectBoundException if not bound
-     */
-    public static boolean hasAspect(Class aspectClass) throws NoAspectBoundException {
-        try {
-            return ((Boolean)getSingletonOrThreadHasAspect(aspectClass).invoke(null, EMPTY_OBJECT_ARRAY)).booleanValue();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Returns true if the perthis / pertarget aspect is bound
-     * @param aspectClass
-     * @param perObject
-     * @return
-     * @throws NoAspectBoundException if not bound
-     */
-    public static boolean hasAspect(Class aspectClass, Object perObject) throws NoAspectBoundException {
-        try {
-            return ((Boolean)getPerObjectHasAspect(aspectClass).invoke(null, new Object[]{perObject})).booleanValue();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Returns true if the pertypewithin aspect is bound
-     * @param aspectClass
-     * @param perTypeWithin class
-     * @return
-     * @throws NoAspectBoundException if not bound
-     */
-    public static boolean hasAspect(Class aspectClass, Class perTypeWithin) throws NoAspectBoundException {
-        try {
-            return ((Boolean)getPerTypeWithinHasAspect(aspectClass).invoke(null, new Object[]{perTypeWithin})).booleanValue();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    // -- aspectOf
-
-    private static Method getSingletonOrThreadAspectOf(Class aspectClass) throws NoSuchMethodException {
-        Method method = aspectClass.getDeclaredMethod(ASPECTOF, EMPTY_CLASS_ARRAY);
-        return checkAspectOf(method, aspectClass);
-    }
-
-    private static Method getPerObjectAspectOf(Class aspectClass) throws NoSuchMethodException {
-        Method method = aspectClass.getDeclaredMethod(ASPECTOF, PEROBJECT_CLASS_ARRAY);
-        return checkAspectOf(method, aspectClass);
-    }
-
-    private static Method getPerTypeWithinAspectOf(Class aspectClass) throws NoSuchMethodException {
-        Method method = aspectClass.getDeclaredMethod(ASPECTOF, PERTYPEWITHIN_CLASS_ARRAY);
-        return checkAspectOf(method, aspectClass);
-    }
-
-    private static Method checkAspectOf(Method method, Class aspectClass) throws NoSuchMethodException {
-        method.setAccessible(true);
-        if (!method.isAccessible()
-            || !Modifier.isPublic(method.getModifiers())
-            || !Modifier.isStatic(method.getModifiers())) {            
-            throw new NoSuchMethodException(aspectClass.getName() + ".aspectOf(..) is not accessible public static");
-        }
-        return method;
-    }
-
-    // -- hasAspect
-
-    private static Method getSingletonOrThreadHasAspect(Class aspectClass) throws NoSuchMethodException {
-        Method method = aspectClass.getDeclaredMethod(HASASPECT, EMPTY_CLASS_ARRAY);
-        return checkHasAspect(method, aspectClass);
-    }
-
-    private static Method getPerObjectHasAspect(Class aspectClass) throws NoSuchMethodException {
-        Method method = aspectClass.getDeclaredMethod(HASASPECT, PEROBJECT_CLASS_ARRAY);
-        return checkHasAspect(method, aspectClass);
-    }
-
-    private static Method getPerTypeWithinHasAspect(Class aspectClass) throws NoSuchMethodException {
-        Method method = aspectClass.getDeclaredMethod(HASASPECT, PERTYPEWITHIN_CLASS_ARRAY);
-        return checkHasAspect(method, aspectClass);
-    }
-
-    private static Method checkHasAspect(Method method, Class aspectClass) throws NoSuchMethodException {
-        method.setAccessible(true);
-        if (!method.isAccessible()
-            || !Modifier.isPublic(method.getModifiers())
-            || !Modifier.isStatic(method.getModifiers())) {
-            throw new NoSuchMethodException(aspectClass.getName() + ".hasAspect(..) is not accessible public static");
-        }
-        return method;
-    }
-}