Author: [log in to unmask]
Date: Mon Apr 27 18:26:27 2015
New Revision: 2836
Log:
Use object types instead of primitives in method return signatures because this is what the database expects.
Modified:
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannel.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalCalibration.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalGain.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalLed.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalLedCalibration.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalTimeShift.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtChannel.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtT0Shift.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtAlignmentConstant.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannel.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtCalibration.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtChannel.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtGain.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtShapeFitParameters.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtT0Shift.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtDaqMapping.java
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtT0Shift.java
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannel.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannel.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalBadChannel.java Mon Apr 27 18:26:27 2015
@@ -62,7 +62,7 @@
* @return the ECAL channel ID
*/
@Field(names = {"ecal_channel_id"})
- public int getChannelId() {
+ public Integer getChannelId() {
return getFieldValue("ecal_channel_id");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalCalibration.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalCalibration.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalCalibration.java Mon Apr 27 18:26:27 2015
@@ -85,7 +85,7 @@
* @return the ECAL channel ID
*/
@Field(names = {"ecal_channel_id"})
- public int getChannelId() {
+ public Integer getChannelId() {
return getFieldValue("ecal_channel_id");
}
@@ -95,7 +95,7 @@
* @return the gain value
*/
@Field(names = {"pedestal"})
- public double getPedestal() {
+ public Double getPedestal() {
return getFieldValue("pedestal");
}
@@ -105,7 +105,7 @@
* @return the noise value
*/
@Field(names = {"noise"})
- public double getNoise() {
+ public Double getNoise() {
return getFieldValue("noise");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java Mon Apr 27 18:26:27 2015
@@ -430,7 +430,7 @@
* @return the channel number
*/
@Field(names = {"channel"})
- public int getChannel() {
+ public Integer getChannel() {
return getFieldValue("channel");
}
@@ -440,7 +440,7 @@
* @return the ID of the channel
*/
@Field(names = {"channel_id"})
- public int getChannelId() {
+ public Integer getChannelId() {
return getFieldValue("channel_id");
}
@@ -450,7 +450,7 @@
* @return the crate number
*/
@Field(names = {"crate"})
- public int getCrate() {
+ public Integer getCrate() {
return getFieldValue("crate");
}
@@ -460,7 +460,7 @@
* @return the slot number
*/
@Field(names = {"slot"})
- public int getSlot() {
+ public Integer getSlot() {
return getFieldValue("slot");
}
@@ -470,7 +470,7 @@
* @return the x value
*/
@Field(names = {"x"})
- public int getX() {
+ public Integer getX() {
return getFieldValue("x");
}
@@ -480,7 +480,7 @@
* @return the y value
*/
@Field(names = {"y"})
- public int getY() {
+ public Integer getY() {
return getFieldValue("y");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalGain.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalGain.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalGain.java Mon Apr 27 18:26:27 2015
@@ -65,7 +65,7 @@
* @return the gain value
*/
@Field(names = {"gain"})
- public double getGain() {
+ public Double getGain() {
return getFieldValue("gain");
}
@@ -75,7 +75,7 @@
* @return the ECal channel ID
*/
@Field(names = {"ecal_channel_id"})
- public int getChannelId() {
+ public Integer getChannelId() {
return getFieldValue("ecal_channel_id");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalLed.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalLed.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalLed.java Mon Apr 27 18:26:27 2015
@@ -65,7 +65,7 @@
* @return the ECAL channel ID
*/
@Field(names = {"ecal_channel_id"})
- public int getEcalChannelId() {
+ public Integer getEcalChannelId() {
return getFieldValue("ecal_channel_id");
}
@@ -75,7 +75,7 @@
* @return the crate number
*/
@Field(names = {"crate"})
- public int getCrateNumber() {
+ public Integer getCrateNumber() {
return getFieldValue("crate");
}
@@ -85,7 +85,7 @@
* @return the LED number
*/
@Field(names = {"number"})
- public int getLedNumber() {
+ public Integer getLedNumber() {
return getFieldValue("number");
}
@@ -95,7 +95,7 @@
* @return the time delay
*/
@Field(names = {"time_delay"})
- public double getTimeDelay() {
+ public Double getTimeDelay() {
return getFieldValue("time_delay");
}
@@ -105,7 +105,7 @@
* @return the amplitude high setting
*/
@Field(names = {"amplitude_high"})
- public double getAmplitudeHigh() {
+ public Double getAmplitudeHigh() {
return getFieldValue("amplitude_high");
}
@@ -115,7 +115,7 @@
* @return the amplitude low setting
*/
@Field(names = {"amplitude_low"})
- public double getAmplitudeLow() {
+ public Double getAmplitudeLow() {
return getFieldValue("amplitude_low");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalLedCalibration.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalLedCalibration.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalLedCalibration.java Mon Apr 27 18:26:27 2015
@@ -48,7 +48,7 @@
* @return The ECAL channel ID.
*/
@Field(names = { "ecal_channel_id" })
- public int getEcalChannelId() {
+ public Integer getEcalChannelId() {
return getFieldValue("ecal_channel_id");
}
@@ -58,7 +58,7 @@
* @return the average LED response
*/
@Field(names = { "led_response" })
- public double getLedResponse() {
+ public Double getLedResponse() {
return getFieldValue("led_response");
}
@@ -68,7 +68,7 @@
* @return the RMS of the LED response
*/
@Field(names = { "rms" })
- public int getRms() {
+ public Integer getRms() {
return getFieldValue("rms");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalTimeShift.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalTimeShift.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalTimeShift.java Mon Apr 27 18:26:27 2015
@@ -64,7 +64,7 @@
* @return the ECAL channel ID
*/
@Field(names = {"ecal_channel_id"})
- public int getChannelId() {
+ public Integer getChannelId() {
return getFieldValue("ecal_channel_id");
}
@@ -74,7 +74,7 @@
* @return the time shift in nanoseconds
*/
@Field(names = {"time_shift"})
- public double getTimeShift() {
+ public Double getTimeShift() {
return getFieldValue("time_shift");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtChannel.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtChannel.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtChannel.java Mon Apr 27 18:26:27 2015
@@ -96,7 +96,7 @@
* @return the SVT channel ID
*/
@Field(names = {"channel_id"})
- public final int getChannelID() {
+ public final Integer getChannelID() {
return getFieldValue("channel_id");
}
@@ -106,7 +106,7 @@
* @return the channel number
*/
@Field(names = {"channel"})
- public final int getChannel() {
+ public final Integer getChannel() {
return getFieldValue("channel");
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtT0Shift.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtT0Shift.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/AbstractSvtT0Shift.java Mon Apr 27 18:26:27 2015
@@ -37,7 +37,7 @@
* @return the t0 shift
*/
@Field(names = {"t0_shift"})
- public final double getT0Shift() {
+ public final Double getT0Shift() {
return getFieldValue("t0_shift");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtAlignmentConstant.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtAlignmentConstant.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtAlignmentConstant.java Mon Apr 27 18:26:27 2015
@@ -223,7 +223,7 @@
* @return the alignment constant's value as a double
*/
@Field(names = { "value" })
- public double getValue() {
+ public Double getValue() {
return getFieldValue("value");
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannel.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannel.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtBadChannel.java Mon Apr 27 18:26:27 2015
@@ -30,7 +30,7 @@
* @return the channel ID
*/
@Field(names = {"svt_channel_id"})
- public int getChannelId() {
+ public Integer getChannelId() {
return getFieldValue("svt_channel_id");
}
@@ -39,7 +39,7 @@
* @return a note about the bad channel
*/
@Field(names = {"notes"})
- public int getNote() {
+ public Integer getNote() {
return getFieldValue("notes");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtCalibration.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtCalibration.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtCalibration.java Mon Apr 27 18:26:27 2015
@@ -47,7 +47,7 @@
* @return The channel ID
*/
@Field(names = {"svt_channel_id"})
- public int getChannelID() {
+ public Integer getChannelID() {
return getFieldValue("svt_channel_id");
}
@@ -58,7 +58,7 @@
* @return the noise value
*/
@Field(names = {"noise_0", "noise_1", "noise_2", "noise_3", "noise_4", "noise_5"})
- public double getNoise(final int sample) {
+ public Double getNoise(final int sample) {
if (sample < 0 || sample > MAX_NUMBER_OF_SAMPLES) {
throw new IllegalArgumentException("Sample number is not within range.");
}
@@ -72,7 +72,7 @@
* @return The pedestal value.
*/
@Field(names = {"pedestal_0", "pedestal_1", "pedestal_2", "pedestal_3", "pedestal_4", "pedestal_5"})
- public double getPedestal(final int sample) {
+ public Double getPedestal(final int sample) {
if (sample < 0 || sample > MAX_NUMBER_OF_SAMPLES) {
throw new IllegalArgumentException("Sample number is not within range.");
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtChannel.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtChannel.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtChannel.java Mon Apr 27 18:26:27 2015
@@ -125,7 +125,7 @@
* @return The FEB ID.
*/
@Field(names = {"feb_id"})
- public int getFebID() {
+ public Integer getFebID() {
return getFieldValue("feb_id");
}
@@ -135,7 +135,7 @@
* @return The FEB hybrid ID.
*/
@Field(names = {"feb_hybrid_id"})
- public int getFebHybridID() {
+ public Integer getFebHybridID() {
return getFieldValue("feb_hybrid_id");
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java Mon Apr 27 18:26:27 2015
@@ -119,9 +119,7 @@
calibrations.setTableMetaData(tableMetaData);
// Set the collection ID.
- final int collectionID = DatabaseConditionsManager.getInstance().addCollection(
- SvtConditionsLoader.CALIBRATIONS_TABLE_NAME,
- "added with SvtConditionsLoader by " + System.getProperty("user.name"), null);
+ final int collectionID = DatabaseConditionsManager.getInstance().getCollectionId(calibrations, null);
calibrations.setCollectionId(collectionID);
logger.info("Using collection ID " + collectionID);
@@ -159,9 +157,7 @@
daqMapping.setTableMetaData(tableMetaData);
// Set the collection ID
- int collectionID = DatabaseConditionsManager.getInstance().addCollection(
- SvtConditionsLoader.DAQ_MAP_TABLE_NAME,
- "added with SvtConditionsLoader by " + System.getProperty("user.name"), null);
+ int collectionID = DatabaseConditionsManager.getInstance().getCollectionId(daqMapping, null);
daqMapping.setCollectionId(collectionID);
logger.info("Using collection ID " + collectionID);
@@ -186,9 +182,7 @@
svtChannels.setTableMetaData(tableMetaData);
// Set the collection ID
- collectionID = DatabaseConditionsManager.getInstance().addCollection(
- SvtConditionsLoader.SVT_CHANNELS_TABLE_NAME,
- "added with SvtConditionsLoader by " + System.getProperty("user.name"), null);
+ collectionID = DatabaseConditionsManager.getInstance().getCollectionId(svtChannels, null);
svtChannels.setCollectionId(collectionID);
logger.info("Using collection ID " + collectionID);
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtDaqMapping.java Mon Apr 27 18:26:27 2015
@@ -137,7 +137,7 @@
* @return the FEB Hybrid ID
*/
@Field(names = {"feb_hybrid_id"})
- public final int getFebHybridID() {
+ public final Integer getFebHybridID() {
return getFieldValue("feb_hybrid_id");
}
@@ -147,7 +147,7 @@
* @return the FEB ID
*/
@Field(names = {"feb_id"})
- public final int getFebID() {
+ public final Integer getFebID() {
return getFieldValue("feb_id");
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtGain.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtGain.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtGain.java Mon Apr 27 18:26:27 2015
@@ -29,7 +29,7 @@
* @return The channel ID.
*/
@Field(names = { "svt_channel_id" })
- public int getChannelID() {
+ public Integer getChannelID() {
return getFieldValue(Integer.class, "svt_channel_id");
}
@@ -39,7 +39,7 @@
* @return The gain value.
*/
@Field(names = { "gain" })
- public double getGain() {
+ public Double getGain() {
return getFieldValue(Double.class, "gain");
}
@@ -49,7 +49,7 @@
* @return The offset value.
*/
@Field(names = { "offset" })
- public double getOffset() {
+ public Double getOffset() {
return getFieldValue(Double.class, "offset");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtShapeFitParameters.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtShapeFitParameters.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtShapeFitParameters.java Mon Apr 27 18:26:27 2015
@@ -36,7 +36,7 @@
* @return The amplitude.
*/
@Field(names = {"amplitude"})
- public double getAmplitude() {
+ public Double getAmplitude() {
return getFieldValue(Double.class, "amplitude");
}
@@ -46,7 +46,7 @@
* @return The SVT channel ID.
*/
@Field(names = {"svt_channel_id"})
- public int getChannelID() {
+ public Integer getChannelID() {
return getFieldValue(Integer.class, "svt_channel_id");
}
@@ -56,7 +56,7 @@
* @return t0
*/
@Field(names = {"t0"})
- public double getT0() {
+ public Double getT0() {
return getFieldValue(Double.class, "t0");
}
@@ -66,7 +66,7 @@
* @return the shaping time parameter
*/
@Field(names = {"tp"})
- public double getTp() {
+ public Double getTp() {
return getFieldValue(Double.class, "tp");
}
@@ -76,7 +76,7 @@
* @return the second shaping time parameter
*/
@Field(names = {"tp2"})
- public double getTp2() {
+ public Double getTp2() {
return getFieldValue(Double.class, "tp2");
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtT0Shift.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtT0Shift.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/SvtT0Shift.java Mon Apr 27 18:26:27 2015
@@ -48,7 +48,7 @@
* @return the FEB ID
*/
@Field(names = {"feb_id"})
- public int getFebID() {
+ public Integer getFebID() {
return getFieldValue("feb_id");
}
@@ -58,7 +58,7 @@
* @return the FEB hybrid ID
*/
@Field(names = {"feb_hybrid_id"})
- public int getFebHybridID() {
+ public Integer getFebHybridID() {
return getFieldValue("feb_hybrid_id");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtChannel.java Mon Apr 27 18:26:27 2015
@@ -52,7 +52,7 @@
* @return the FPGA ID
*/
@Field(names = {"fpga"})
- public int getFpgaID() {
+ public Integer getFpgaID() {
return getFieldValue("fpga");
}
@@ -62,7 +62,7 @@
* @return the hybrid ID
*/
@Field(names = {"hybrid"})
- public int getHybridID() {
+ public Integer getHybridID() {
return getFieldValue("hybrid");
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtDaqMapping.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtDaqMapping.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtDaqMapping.java Mon Apr 27 18:26:27 2015
@@ -105,7 +105,7 @@
* @return the FPGA ID
*/
@Field(names = {"fpga"})
- public int getFpgaID() {
+ public Integer getFpgaID() {
return getFieldValue("fpga");
}
@@ -115,7 +115,7 @@
* @return the Hybrid ID
*/
@Field(names = {"hybrid"})
- public int getHybridID() {
+ public Integer getHybridID() {
return getFieldValue("hybrid");
}
}
Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtT0Shift.java
=============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtT0Shift.java (original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtT0Shift.java Mon Apr 27 18:26:27 2015
@@ -47,7 +47,7 @@
* @return the FPGA ID
*/
@Field(names = {"fpga"})
- public int getFpgaID() {
+ public Integer getFpgaID() {
return getFieldValue("fpga");
}
@@ -57,7 +57,7 @@
* @return the hybrid ID
*/
@Field(names = {"hybrid"})
- public int getHybridID() {
+ public Integer getHybridID() {
return getFieldValue("hybrid");
}
}
