even better extractor!

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@1158 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Jan 31, 2012 · f0b8fd4 · f0b8fd4
1 parent 9be4191
commit f0b8fd4
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/topics/extraction/java/slps/java2bgf/Tool.java b/topics/extraction/java/slps/java2bgf/Tool.java
@@ -110,8 +110,10 @@ public static void main(String[] args) throws Exception {
 				Collection<Feature> fs = new LinkedList<Feature>();
 				for (Field f : clss.getFields())
 				{
-					if (f.getType()==LinkedList.class || f.getType()==List.class)
+					if (List.class.isAssignableFrom(f.getType()))
+					{
 						fs.add(new Feature(f.getName(),f.getType(),(Class<?>)((ParameterizedType)f.getGenericType()).getActualTypeArguments()[0]));
+					}
 					else
 						fs.add(new Feature(f.getName(),f.getType()));
 				}
@@ -120,7 +122,12 @@ public static void main(String[] args) throws Exception {
 					&&	m.getParameterTypes().length == 0
 					&&  m.getName().length() > 3
 					&&  m.getName().startsWith("get"))
-					fs.add(new Feature(m.getName().substring(3),m.getReturnType()));
+					{
+						if (List.class.isAssignableFrom(m.getReturnType()))
+							fs.add(new Feature(m.getName().substring(3),m.getReturnType(),(Class<?>)((ParameterizedType)m.getGenericReturnType()).getActualTypeArguments()[0]));
+						else
+							fs.add(new Feature(m.getName().substring(3),m.getReturnType()));
+					}
 
 				for (Feature f : fs) {
 					Element selectable = doc.createElement("selectable");