--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java	Fri Apr 08 13:47:56 2011 +0200
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java	Mon Apr 11 10:37:24 2011 +0200
@@ -20,50 +20,10 @@
  */
 package com.sun.hotspot.c1x;
 
-import com.sun.cri.ci.*;
 import com.sun.cri.ri.*;
-
-public interface HotSpotTypeResolved extends RiType {
-
-    public int accessFlags();
-
-    public RiType arrayOf();
-
-    public RiType componentType();
-
-    public RiType uniqueConcreteSubtype();
-
-    public RiType exactType();
-
-    public CiConstant getEncoding(Representation r);
-
-    public CiKind getRepresentationKind(Representation r);
-
-    public boolean hasFinalizableSubclass();
+import com.sun.hotspot.c1x.server.*;
 
-    public boolean hasFinalizer();
-
-    public boolean hasSubclass();
-
-    public boolean isArrayClass();
-
-    public boolean isInitialized();
-
-    public boolean isInstance(Object obj);
-
-    public boolean isInstanceClass();
-
-    public boolean isInterface();
-
-    public boolean isResolved();
-
-    public boolean isSubtypeOf(RiType other);
-
-    public Class<?> javaClass();
-
-    public CiKind kind();
-
-    public RiMethod resolveMethodImpl(RiMethod method);
+public interface HotSpotTypeResolved extends RiType, Remote {
 
     public String toString();