Java: Replace @type with more specific types

Author: igfoo

java/ql/lib/config/semmlecode.dbscheme

@@ -393,7 +393,7 @@ typeVars(
   string nodeName: string ref,
   int pos: int ref,
   int kind: int ref, // deprecated
-  int parentid: @typeorcallable ref
+  int parentid: @classorinterfaceorcallable ref
 );
 
 wildcards(
@@ -414,7 +414,7 @@ typeBounds(
 typeArgs(
   int argumentid: @reftype ref,
   int pos: int ref,
-  int parentid: @typeorcallable ref
+  int parentid: @classorinterfaceorcallable ref
 );
 
 isParameterized(
@@ -487,7 +487,7 @@ hasModifier(
 
 imports(
   unique int id: @import,
-  int holder: @typeorpackage ref,
+  int holder: @classorinterfaceorpackage ref,
   string name: string ref,
   int kind: int ref
 );
@@ -857,10 +857,9 @@ javadocText(
 @javadocParent = @javadoc | @javadocTag;
 @javadocElement = @javadocTag | @javadocText;
 
-@typeorpackage = @type | @package;
-
-@typeorcallable = @type | @callable;
 @classorinterface = @interface | @class;
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
 @boundedtype = @typevariable | @wildcard;
 @reftype = @classorinterface | @array | @boundedtype;
 @classorarray = @class | @array;