Mercurial > hg > graal-jvmci-8
changeset 18194:b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Thu, 30 Oct 2014 16:52:13 +0100 |
parents | 0a17944b7baf |
children | 62d3440228b8 |
files | graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java |
diffstat | 4 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java Thu Oct 30 16:43:16 2014 +0100 +++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java Thu Oct 30 16:52:13 2014 +0100 @@ -387,45 +387,45 @@ } @Test - public void getImplementorTest() { + public void getSingleImplementorTest() { ResolvedJavaType iNi = metaAccess.lookupJavaType(NoImplementor.class); - assertNull(iNi.getImplementor()); + assertNull(iNi.getSingleImplementor()); ResolvedJavaType iSi = metaAccess.lookupJavaType(SingleImplementorInterface.class); ResolvedJavaType cSi = metaAccess.lookupJavaType(SingleConcreteImplementor.class); - assertEquals(cSi, iSi.getImplementor()); + assertEquals(cSi, iSi.getSingleImplementor()); ResolvedJavaType iSai = metaAccess.lookupJavaType(SingleAbstractImplementorInterface.class); ResolvedJavaType aSai = metaAccess.lookupJavaType(SingleAbstractImplementor.class); - assertEquals(aSai, iSai.getImplementor()); + assertEquals(aSai, iSai.getSingleImplementor()); ResolvedJavaType iMi = metaAccess.lookupJavaType(MultiImplementorInterface.class); metaAccess.lookupJavaType(ConcreteImplementor1.class); metaAccess.lookupJavaType(ConcreteImplementor2.class); - assertEquals(iMi, iMi.getImplementor()); + assertEquals(iMi, iMi.getSingleImplementor()); ResolvedJavaType iMai = metaAccess.lookupJavaType(MultipleAbstractImplementorInterface.class); metaAccess.lookupJavaType(MultiAbstractImplementor1.class); metaAccess.lookupJavaType(MultiAbstractImplementor2.class); - assertEquals(iMai, iMai.getImplementor()); + assertEquals(iMai, iMai.getSingleImplementor()); ResolvedJavaType iSai2 = metaAccess.lookupJavaType(SingleAbstractImplementorInterface2.class); ResolvedJavaType aSai2 = metaAccess.lookupJavaType(SingleAbstractImplementor2.class); metaAccess.lookupJavaType(ConcreteTransitiveImplementor1.class); metaAccess.lookupJavaType(ConcreteTransitiveImplementor2.class); - assertEquals(aSai2, iSai2.getImplementor()); + assertEquals(aSai2, iSai2.getSingleImplementor()); } @Test(expected = GraalInternalError.class) - public void getImplementorTestClassReceiver() { + public void getSingleImplementorTestClassReceiver() { ResolvedJavaType base = metaAccess.lookupJavaType(Base.class); - base.getImplementor(); + base.getSingleImplementor(); } @Test(expected = GraalInternalError.class) - public void getImplementorTestPrimitiveReceiver() { + public void getSingleImplementorTestPrimitiveReceiver() { ResolvedJavaType primitive = metaAccess.lookupJavaType(int.class); - primitive.getImplementor(); + primitive.getSingleImplementor(); } @Test
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java Thu Oct 30 16:43:16 2014 +0100 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java Thu Oct 30 16:52:13 2014 +0100 @@ -179,13 +179,13 @@ ResolvedJavaType[] getInterfaces(); /** - * Gets the the single implementor of this type. Calling this method on a non-interface type - * causes an exception. + * Gets the single implementor of this type. Calling this method on a non-interface type causes + * an exception. * * @return {@code null} if there is no implementor, the implementor if there is only one, or * {@code this} if there are more than one. */ - ResolvedJavaType getImplementor(); + ResolvedJavaType getSingleImplementor(); /** * Walks the class hierarchy upwards and returns the least common class that is a superclass of
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java Thu Oct 30 16:43:16 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectType.java Thu Oct 30 16:52:13 2014 +0100 @@ -151,7 +151,7 @@ if (isArray()) { return getElementalType().isFinal() ? this : null; } else if (isInterface()) { - HotSpotResolvedObjectType type = getImplementor(); + HotSpotResolvedObjectType type = getSingleImplementor(); if (type == null) { return null; } @@ -221,7 +221,7 @@ } @Override - public HotSpotResolvedObjectType getImplementor() { + public HotSpotResolvedObjectType getSingleImplementor() { if (!isInterface()) { throw new GraalInternalError("Cannot call getImplementor() on a non-interface type: " + this); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java Thu Oct 30 16:43:16 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java Thu Oct 30 16:52:13 2014 +0100 @@ -104,7 +104,7 @@ } @Override - public ResolvedJavaType getImplementor() { + public ResolvedJavaType getSingleImplementor() { throw new GraalInternalError("Cannot call getImplementor() on a non-interface type: " + this); }