From 62bcc3a4118e0a073f70c38a597768250da0f67f Mon Sep 17 00:00:00 2001 From: stuartw Date: Thu, 30 Oct 2014 17:23:08 +0000 Subject: [PATCH] Add addIborSecurity from IborIndexConvention method --- .../initializer/ConventionMasterInitializer.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/projects/OG-Financial/src/main/java/com/opengamma/financial/convention/initializer/ConventionMasterInitializer.java b/projects/OG-Financial/src/main/java/com/opengamma/financial/convention/initializer/ConventionMasterInitializer.java index 15b4933eee4..bdf00730332 100644 --- a/projects/OG-Financial/src/main/java/com/opengamma/financial/convention/initializer/ConventionMasterInitializer.java +++ b/projects/OG-Financial/src/main/java/com/opengamma/financial/convention/initializer/ConventionMasterInitializer.java @@ -9,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.opengamma.financial.convention.IborIndexConvention; import com.opengamma.financial.convention.OvernightIndexConvention; import com.opengamma.financial.convention.VanillaIborLegConvention; import com.opengamma.financial.security.index.IborIndex; @@ -22,6 +23,7 @@ import com.opengamma.master.security.SecurityMaster; import com.opengamma.master.security.SecurityMasterUtils; import com.opengamma.util.ArgumentChecker; +import com.opengamma.util.time.Tenor; /** * A tool that allows a convention master to be initialized. @@ -104,7 +106,15 @@ protected void addSecurity(SecurityMaster securityMaster, ManageableSecurity sec protected void addIborSecurity(final SecurityMaster securityMaster, final VanillaIborLegConvention convention) { ArgumentChecker.notEmpty(convention.getExternalIdBundle(), "externalIdBundle"); - addSecurity(securityMaster, new IborIndex(convention.getName(), convention.getName(), convention.getResetTenor(), convention.getIborIndexConvention(), convention.getExternalIdBundle())); + addSecurity(securityMaster, + new IborIndex(convention.getName(), convention.getName(), convention.getResetTenor(), + convention.getIborIndexConvention(), convention.getExternalIdBundle())); + } + + protected void addIborSecurity(final SecurityMaster securityMaster, final IborIndexConvention convention, Tenor tenor) { + addSecurity(securityMaster, + new IborIndex(convention.getName(), convention.getName(), tenor, + convention.getExternalIdBundle().iterator().next(), convention.getExternalIdBundle())); } protected void addOvernightSecurity(final SecurityMaster securityMaster, final OvernightIndexConvention convention) {