v0.2.54..v0.2.55 changeset OverwriteTagMerger.h - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/schema/OverwriteTagMerger.h b/hoot-core/src/main/cpp/hoot/core/schema/OverwriteTagMerger.h
index 57fba4c..b56bf60 100644
--- a/hoot-core/src/main/cpp/hoot/core/schema/OverwriteTagMerger.h
+++ b/hoot-core/src/main/cpp/hoot/core/schema/OverwriteTagMerger.h
@@ -22,14 +22,13 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #ifndef OVERWRITETAGMERGER_H
 #define OVERWRITETAGMERGER_H
 
 // Hoot
 #include <hoot/core/schema/TagMerger.h>
-#include <hoot/core/util/Configurable.h>
 
 namespace hoot
 {
@@ -38,7 +37,7 @@ namespace hoot
  * Combine all names in a fashion where no unique names will be lost and then favor t1 tags over
  * t2 tags. See TagComparator::overwriteMerge.
  */
-class OverwriteTagMerger : public TagMerger, public Configurable
+class OverwriteTagMerger : public TagMerger
 {
 public:
 
@@ -55,6 +54,7 @@ public:
 
   // leave empty to avoid duplicate tag mergers displayed by the info command
   virtual QString getDescription() const { return ""; }
+  virtual QString getClassName() const { return ""; }
 
   virtual void setConfiguration(const Settings& conf);
 
@@ -81,7 +81,9 @@ public:
   OverwriteTag2Merger() : OverwriteTagMerger(false) {}
 
   virtual QString getDescription() const
-  { return "Overwrites tags in the secondary feature with tags from the reference feature"; }
+  {  return "Overwrites conflicting tags with those from the reference feature"; }
+
+  virtual QString getClassName() const { return QString::fromStdString(className()); }
 };
 
 /**
@@ -96,9 +98,11 @@ public:
   OverwriteTag1Merger() : OverwriteTagMerger(true) {}
 
   virtual QString getDescription() const
-  { return "Overwrites tags in the reference feature with tags from the secondary feature"; }
+  {  return "Overwrites conflicting tags with those from the secondary feature"; }
+
+  virtual QString getClassName() const { return QString::fromStdString(className()); }
 };
 
 }
 
-#endif // AVERAGETAGMERGER_H
+#endif // OVERWRITETAGMERGER_H