Print

---

Author: [log in to unmask]
Date: Mon Nov 10 19:08:12 2014
New Revision: 1499

Log:
Remove custom toString methods so that AbstractConditionsObject.toString is used instead.

Modified:
    java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtChannel.java
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtGain.java
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtShapeFitParameters.java
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java	Mon Nov 10 19:08:12 2014
@@ -278,12 +278,4 @@
         EcalChannel c = (EcalChannel) o;
         return c.getChannelId() == getChannelId() && c.getCrate() == getCrate() && c.getSlot() == getSlot() && c.getChannel() == getChannel() && c.getX() == getX() && c.getY() == getY();
     }
-
-    /**
-     * Implementation of string conversion.
-     * @return The string representation of this channel data.
-     */
-    public String toString() {
-        return "id: " + getChannelId() + ", crate: " + getCrate() + ", slot: " + getSlot() + ", channel: " + getChannel() + ", x: " + getX() + ", y: " + getY();
-    }
 }

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtChannel.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtChannel.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtChannel.java	Mon Nov 10 19:08:12 2014
@@ -53,14 +53,6 @@
     }
 
     /**
-     * Convert this object to a human readable string.
-     * @return This object as a string.
-     */
-    public String toString() {
-        return "channel_id: " + getChannelID() + ", feb_id: " + getFebID() + ", feb_hybrid_id: " + getFebHybridID() + ", channel: " + getChannel();
-    }
-
-    /**
      * Implementation of equals.
      * @return True if the object equals this one; false if not.
      */

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtGain.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtGain.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtGain.java	Mon Nov 10 19:08:12 2014
@@ -35,12 +35,4 @@
     double getOffset() {
         return getFieldValue(Double.class, "offset");
     }
-
-    /**
-     * Convert this object to a human-readable string.
-     * @return This object converted to a string.
-     */
-    public String toString() {
-        return "" + getGain() + '\t' + getOffset();
-    }
 }

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtShapeFitParameters.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtShapeFitParameters.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtShapeFitParameters.java	Mon Nov 10 19:08:12 2014
@@ -47,14 +47,6 @@
     }
 
     /**
-     * Convert this object to a human readable string.
-     * @return This object converted to a string.
-     */
-    public String toString() {
-        return "amp: " + getAmplitude() + ", t0: " + getT0() + ", tp: " + getTp();
-    }
-
-    /**
      * Convert this object to an array of doubles.
      * @return This object converted to an array of doubles.
      */

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java	Mon Nov 10 19:08:12 2014
@@ -43,14 +43,6 @@
     }
 
     /**
-     * Convert this object to a human readable string.
-     * @return This object as a string.
-     */
-    public String toString() {
-        return "channel_id: " + getChannelID() + ", fpga: " + getFpgaID() + ", hybrid: " + getHybridID() + ", channel: " + getChannel();
-    }
-
-    /**
      * Implementation of equals.
      * @return True if the object equals this one; false if not.
      */