From: Jonathan O. <os...@us...> - 2010-08-31 22:51:52
|
Update of /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/services/asn/action/form In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27902/form Modified Files: AsnServiceForm.java Log Message: added ListStandards request Index: AsnServiceForm.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/services/asn/action/form/AsnServiceForm.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AsnServiceForm.java 20 Mar 2009 23:33:59 -0000 1.4 --- AsnServiceForm.java 31 Aug 2010 22:51:44 -0000 1.5 *************** *** 19,23 **** import org.dlese.dpc.standards.asn.AsnStandard; import org.dlese.dpc.services.asn.AsnServiceHelper; - import org.dlese.dpc.standards.asn.SearchConstraints; import org.apache.commons.logging.Log; --- 19,22 ---- *************** *** 52,56 **** private List standards = null; private AsnStandard standard = null; ! private SearchConstraints constraints = null; private String baseStd = null; AsnServiceHelper asnHelper = null; --- 51,55 ---- private List standards = null; private AsnStandard standard = null; ! private List standardsList = null; private String baseStd = null; AsnServiceHelper asnHelper = null; *************** *** 59,64 **** private static Log log = LogFactory.getLog(AsnServiceForm.class); - // Bean properties: - /** Constructor for the RepositoryForm object */ public AsnServiceForm() { } --- 58,61 ---- *************** *** 66,70 **** public void clear() { errorMsg = null; - constraints = null; standards = null; } --- 63,66 ---- *************** *** 82,93 **** } - public void setConstraints (SearchConstraints constraints) { - this.constraints = constraints; - } - - public SearchConstraints getSearchConstraints () { - return this.constraints; - } - public void setStandard (AsnStandard standard) { this.standard = standard; --- 78,81 ---- *************** *** 98,101 **** --- 86,97 ---- } + public void setStandardsList (List standardsList) { + this.standardsList = standardsList; + } + + public List getStandardsList () { + return (this.standardsList == null ? new ArrayList() : this.standardsList); + } + public String getStdId () { return this.stdId; *************** *** 112,116 **** public AsnStandard getStandardById () { if (stdId == null || asnHelper == null || this.standard == null) { ! log.error ("returning null"); return null; } --- 108,115 ---- public AsnStandard getStandardById () { if (stdId == null || asnHelper == null || this.standard == null) { ! if (stdId == null) log.error ("no stdId"); ! if (asnHelper == null) log.error ("no asnHelper"); ! if (standard == null) log.error ("no standard"); ! log.error ("getStandardById returning null"); return null; } |