C#: Do not extend Element in ExternalArtifact.qll

hvitved · hvitved · commit 089ad75a7b04 · 2019-03-12T15:22:04.000+01:00
diff --git a/csharp/ql/src/external/ExternalArtifact.qll b/csharp/ql/src/external/ExternalArtifact.qll
@@ -1,6 +1,17 @@
 import csharp
 
-class ExternalDefect extends @externalDefect, Element {
+class ExternalElement extends @external_element {
+  /** Gets a textual representation of this element. */
+  string toString() { none() }
+
+  /** Gets the location of this element. */
+  Location getLocation() { none() }
+
+  /** Gets the file containing this element. */
+  File getFile() { result = getLocation().getFile() }
+}
+
+class ExternalDefect extends ExternalElement, @externalDefect {
   string getQueryPath() {
     exists(string path |
       externalDefects(this, path, _, _, _) and
@@ -19,7 +30,7 @@ class ExternalDefect extends @externalDefect, Element {
   }
 }
 
-class ExternalMetric extends @externalMetric, Element {
+class ExternalMetric extends ExternalElement, @externalMetric {
   string getQueryPath() { externalMetrics(this, result, _, _) }
 
   float getValue() { externalMetrics(this, _, _, result) }
@@ -29,7 +40,7 @@ class ExternalMetric extends @externalMetric, Element {
   override string toString() { result = getQueryPath() + ": " + getLocation() + " - " + getValue() }
 }
 
-class ExternalData extends @externalDataElement {
+class ExternalData extends ExternalElement, @externalDataElement {
   string getDataPath() { externalData(this, result, _, _) }
 
   string getQueryPath() { result = getDataPath().regexpReplaceAll("\\.[^.]*$", ".ql") }
@@ -44,7 +55,7 @@ class ExternalData extends @externalDataElement {
 
   date getFieldAsDate(int index) { result = getField(index).toDate() }
 
-  string toString() { result = getQueryPath() + ": " + buildTupleString(0) }
+  override string toString() { result = getQueryPath() + ": " + buildTupleString(0) }
 
   private string buildTupleString(int start) {
     start = getNumFields() - 1 and result = getField(start)
