ti: allow extending DefaultMetaType

Author: panchenko

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/DefaultMetaType.java

@@ -13,27 +13,27 @@
 
 import org.eclipse.dltk.javascript.typeinfo.model.Type;
 
-public enum DefaultMetaType implements MetaType {
+public abstract class DefaultMetaType implements MetaType {
 
-	DEFAULT;
+	public static final MetaType DEFAULT = new Instance();
 
-	public String getId() {
-		return MetaType.class.getName() + "." + name();
+	static class Instance extends DefaultMetaType {
+		public String getId() {
+			return MetaType.class.getName() + ".DEFAULT";
+		}
 	}
 
 	public IRType toRType(ITypeSystem typeSystem, Type type) {
-		// TODO (alex) compatibility
-		for (IRTypeFactory factory : TypeInfoManager.getRTypeFactories()) {
-			final IRType runtimeType = factory.create(type);
-			if (runtimeType != null) {
-				return runtimeType;
-			}
-		}
 		return new RSimpleType(typeSystem, type);
 	}
 
 	public IRType toRType(ITypeSystem typeSystem, IRTypeDeclaration declaration) {
 		return new RSimpleType(typeSystem, declaration);
 	}
 
+	@Override
+	public String toString() {
+		return getId();
+	}
+
 }

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/IRTypeFactory.java

@@ -13,24 +13,13 @@
 
 import org.eclipse.dltk.annotations.ConfigurationElement;
 import org.eclipse.dltk.javascript.typeinfo.model.JSType;
-import org.eclipse.dltk.javascript.typeinfo.model.Type;
 
 /**
  * Factory to create runtime type instance for the specified model object
  */
 @ConfigurationElement("runtimeTypeFactory")
 public interface IRTypeFactory {
 
-	/**
-	 * Converts the specified {@link Type} to the corresponding {@link IRType}.
-	 * This method is deprecated, use {@link MetaType} instead.
-	 * 
-	 * @param type
-	 * @return
-	 */
-	@Deprecated
-	IRType create(Type type);
-
 	IRType create(ITypeSystem typeSystem, JSType type);
 
 }

plugins/org.eclipse.dltk.javascript.core/src/org/eclipse/dltk/javascript/typeinfo/MetaTypeFactory.java

@@ -11,6 +11,11 @@
  *******************************************************************************/
 package org.eclipse.dltk.javascript.typeinfo;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExecutableExtension;
@@ -63,13 +68,23 @@ public Object create() throws CoreException {
 		try {
 			final Class<?> clazz = bundle
 					.loadClass(className.substring(0, dot));
+			final String name = className.substring(dot + 1);
 			if (!clazz.isEnum()) {
-				throw new CoreException(new Status(IStatus.ERROR,
-						JavaScriptPlugin.PLUGIN_ID, 0, "Class "
-								+ clazz.getName() + " must be enum for "
-								+ getClass(), null));
+				final Field field = clazz.getDeclaredField(name);
+				if (isConstField(field)) {
+					try {
+						return field.get(null);
+					} catch (IllegalAccessException e) {
+						throw new CoreException(new Status(IStatus.ERROR,
+								JavaScriptPlugin.PLUGIN_ID, 0, "Error reading "
+										+ field, e));
+					}
+				} else {
+					throw new CoreException(new Status(IStatus.ERROR,
+							JavaScriptPlugin.PLUGIN_ID, 0, "Field " + field
+									+ " must be public static final", null));
+				}
 			}
-			final String name = className.substring(dot + 1);
 			final Enum<?>[] entries = (Enum<?>[]) clazz.getEnumConstants();
 			for (Enum<?> entry : entries) {
 				if (name.equals(entry.name())) {
@@ -81,14 +96,32 @@ public Object create() throws CoreException {
 							+ " for " + getClass(), null));
 		} catch (ClassNotFoundException e) {
 			// fall-through and try the whole string
+		} catch (NoSuchFieldException e1) {
+			// fall-through and try the whole string
 		}
 		try {
 			final Class<?> clazz = bundle.loadClass(className);
 			if (!clazz.isEnum()) {
-				throw new CoreException(new Status(IStatus.ERROR,
-						JavaScriptPlugin.PLUGIN_ID, 0, "Class "
-								+ clazz.getName() + " must be enum for "
-								+ getClass(), null));
+				final List<Field> fields = new ArrayList<Field>();
+				for (Field field : clazz.getDeclaredFields()) {
+					if (isConstField(field)) {
+						fields.add(field);
+					}
+				}
+				if (fields.size() != 1) {
+					throw new CoreException(new Status(IStatus.ERROR,
+							JavaScriptPlugin.PLUGIN_ID, 0,
+							"Single public static final field expected in "
+									+ clazz.getName() + " for " + getClass(),
+							null));
+				}
+				try {
+					return fields.get(0).get(null);
+				} catch (IllegalAccessException e) {
+					throw new CoreException(new Status(IStatus.ERROR,
+							JavaScriptPlugin.PLUGIN_ID, 0, "Error reading "
+									+ fields.get(0), e));
+				}
 			}
 			final Object[] entries = clazz.getEnumConstants();
 			if (entries.length != 1) {
@@ -104,4 +137,9 @@ public Object create() throws CoreException {
 							+ " not found for " + getClass(), e));
 		}
 	}
+
+	private boolean isConstField(Field field) {
+		return (field.getModifiers() & (Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL)) == (Modifier.PUBLIC
+				| Modifier.STATIC | Modifier.FINAL);
+	}
 }

tests/org.eclipse.dltk.javascript.core.tests/src/org/eclipse/dltk/javascript/core/tests/typeinfo/MetaTypes.java

@@ -12,29 +12,21 @@
 package org.eclipse.dltk.javascript.core.tests.typeinfo;
 
 import org.eclipse.dltk.javascript.typeinfo.DefaultMetaType;
-import org.eclipse.dltk.javascript.typeinfo.IRType;
-import org.eclipse.dltk.javascript.typeinfo.IRTypeDeclaration;
-import org.eclipse.dltk.javascript.typeinfo.ITypeSystem;
-import org.eclipse.dltk.javascript.typeinfo.MetaType;
-import org.eclipse.dltk.javascript.typeinfo.model.Type;
 
-public enum MetaTypes implements MetaType {
+public abstract class MetaTypes extends DefaultMetaType {
 
-	ONE, TWO;
+	public static final MetaTypes ONE = new MetaTypes() {
+		@Override
+		public String getId() {
+			return MetaTypes.class.getName() + ".ONE";
+		}
+	};
 
-	@Override
-	public String getId() {
-		return getClass().getName() + "." + name();
-	}
-
-	@Override
-	public IRType toRType(ITypeSystem typeSystem, Type type) {
-		return DefaultMetaType.DEFAULT.toRType(typeSystem, type);
-	}
-
-	@Override
-	public IRType toRType(ITypeSystem typeSystem, IRTypeDeclaration declaration) {
-		return DefaultMetaType.DEFAULT.toRType(typeSystem, declaration);
-	}
+	public static final MetaTypes TWO = new MetaTypes() {
+		@Override
+		public String getId() {
+			return MetaTypes.class.getName() + ".TWO";
+		}
+	};
 
 }

tests/org.eclipse.dltk.javascript.core.tests/src/org/eclipse/dltk/javascript/core/tests/typeinfo/TestMetaType.java

@@ -12,29 +12,17 @@
 package org.eclipse.dltk.javascript.core.tests.typeinfo;
 
 import org.eclipse.dltk.javascript.typeinfo.DefaultMetaType;
-import org.eclipse.dltk.javascript.typeinfo.IRType;
-import org.eclipse.dltk.javascript.typeinfo.IRTypeDeclaration;
-import org.eclipse.dltk.javascript.typeinfo.ITypeSystem;
-import org.eclipse.dltk.javascript.typeinfo.MetaType;
-import org.eclipse.dltk.javascript.typeinfo.model.Type;
 
-public enum TestMetaType implements MetaType {
+public class TestMetaType extends DefaultMetaType {
 
-	INSTANCE;
+	public static final TestMetaType INSTANCE = new TestMetaType();
 
-	@Override
-	public String getId() {
-		return getClass().getName() + "." + name();
-	}
-
-	@Override
-	public IRType toRType(ITypeSystem typeSystem, Type type) {
-		return DefaultMetaType.DEFAULT.toRType(typeSystem, type);
+	private TestMetaType() {
 	}
 
 	@Override
-	public IRType toRType(ITypeSystem typeSystem, IRTypeDeclaration declaration) {
-		return DefaultMetaType.DEFAULT.toRType(typeSystem, declaration);
+	public String getId() {
+		return TestMetaType.class.getName() + ".INSTANCE";
 	}
 
 }