C#/Java: Address review comments.

Author: michaelnebel

csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll

@@ -41,15 +41,6 @@ private module Printing implements PrintingSig {
 
 module ModelPrinting = PrintingImpl<Printing>;
 
-/**
- * Gets the underlying type of the content `c`.
- */
-private Type getUnderlyingContentType(DataFlow::Content c) {
-  result = getUnderlyingContentTypeSpecific(c) or
-  result = c.(DataFlow::FieldContent).getField().getType() or
-  result = c.(DataFlow::SyntheticFieldContent).getField().getType()
-}
-
 /**
  * Holds if `c` is a relevant content kind, where the underlying type is relevant.
  */

csharp/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll

@@ -173,7 +173,12 @@ predicate isRelevantType(CS::Type t) {
   not irrelevantCollectionType(t)
 }
 
-CS::Type getUnderlyingContentTypeSpecific(DataFlow::Content c) {
+/**
+ * Gets the underlying type of the content `c`.
+ */
+CS::Type getUnderlyingContentType(DataFlow::Content c) {
+  result = c.(DataFlow::FieldContent).getField().getType() or
+  result = c.(DataFlow::SyntheticFieldContent).getField().getType() or
   result = c.(DataFlow::PropertyContent).getProperty().getType()
 }
 

java/ql/src/utils/modelgenerator/internal/CaptureModels.qll

@@ -41,15 +41,6 @@ private module Printing implements PrintingSig {
 
 module ModelPrinting = PrintingImpl<Printing>;
 
-/**
- * Gets the underlying type of the content `c`.
- */
-private Type getUnderlyingContentType(DataFlow::Content c) {
-  result = getUnderlyingContentTypeSpecific(c) or
-  result = c.(DataFlow::FieldContent).getField().getType() or
-  result = c.(DataFlow::SyntheticFieldContent).getField().getType()
-}
-
 /**
  * Holds if `c` is a relevant content kind, where the underlying type is relevant.
  */

java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll

@@ -186,7 +186,13 @@ predicate isRelevantType(J::Type t) {
   )
 }
 
-J::Type getUnderlyingContentTypeSpecific(DataFlow::Content c) { none() }
+/**
+ * Gets the underlying type of the content `c`.
+ */
+J::Type getUnderlyingContentType(DataFlow::Content c) {
+  result = c.(DataFlow::FieldContent).getField().getType() or
+  result = c.(DataFlow::SyntheticFieldContent).getField().getType()
+}
 
 /**
  * Gets the MaD string representation of the qualifier.