From: Jonathan O. <os...@us...> - 2009-01-23 23:07:03
|
Update of /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/action In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3041 Modified Files: AbstractSchemEditAction.java DCSSchemEditAction.java Log Message: Added support for new standards suggestion framework Index: DCSSchemEditAction.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/action/DCSSchemEditAction.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** DCSSchemEditAction.java 22 Jul 2008 19:19:48 -0000 1.37 --- DCSSchemEditAction.java 23 Jan 2009 23:06:58 -0000 1.38 *************** *** 1,18 **** /** ! * Copyright 2002, 2003 DLESE Program Center/University Corporation for Atmospheric Research (UCAR), P.O. Box ! * 3000, Boulder, CO 80307, su...@dl....<p> * * This file is part of the DLESE Tools Project.<p> * ! * The DLESE Tools Project is free software; you can redistribute it and/or modify it under the terms of the ! * GNU General Public License as published by the Free Software Foundation; either version 2 of the License, ! * or (at your option) any later version.<p> * [...1426 lines suppressed...] ! *@param s The String to print. */ protected void prtln(String s) { if (debug) { ! SchemEditUtils.prtln(s, "DCSSchemEditAction"); } } + + /** + * Description of the Method + * + *@param s Description of the Parameter + */ + protected void prtlnErr(String s) { + SchemEditUtils.prtln(s, "DCSSchemEditAction"); + } + } Index: AbstractSchemEditAction.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/action/AbstractSchemEditAction.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** AbstractSchemEditAction.java 11 Nov 2008 23:38:54 -0000 1.48 --- AbstractSchemEditAction.java 23 Jan 2009 23:06:58 -0000 1.49 *************** *** 85,89 **** /** ! * Gets the xmlFormat attribute of the AbstractSchemEditAction object * * @return The xmlFormat value --- 85,90 ---- /** ! * Gets the xmlFormat attribute of the AbstractSchemEditAction object, which identifies the ! MetaDataFramework of the record being edited. * * @return The xmlFormat value *************** *** 93,97 **** /** ! * Gets the metaDataFramework attribute of the AbstractSchemEditAction object * * @return The metaDataFramework value --- 94,98 ---- /** ! * Gets the metaDataFramework attribute of the record being edited. * * @return The metaDataFramework value *************** *** 182,193 **** String recId = request.getParameter("recId"); ! // show request params excluding collapse bean and form input SchemEditUtils.showRequestParameters(request, new String[]{"(", "_^_"}); ! // show request params except those controlling the collapse state of nodes ! // SchemEditUtils.showRequestParameters(request, new String[]{"_slash_"}); ! ! // show all request params except collapseBean stuff ! // SchemEditUtils.showRequestParameters(request, new String[]{"_^_"}); // ----- framework-dependent ------------- --- 183,192 ---- String recId = request.getParameter("recId"); ! // show request params excluding collapse info and form input SchemEditUtils.showRequestParameters(request, new String[]{"(", "_^_"}); ! // show request params including form input ! // SchemEditUtils.showRequestParameters(request, new String[]{"_^_"}); // excluding collapse info ! // ----- framework-dependent ------------- *************** *** 200,203 **** --- 199,203 ---- // from the editor. in this case, just go to the home page if (this.getXmlFormat() == null) { + prtln ("xmlFormat is NULL: bailing!"); return mapping.findForward("browse.home"); } *************** *** 599,603 **** boolean docIsDirty = !currentContent.equals(sef.getSavedContent()); ! // debugging if (false && docIsDirty) { DocContentMap.cmpMaps(currentContent, sef.getSavedContent()); --- 599,603 ---- boolean docIsDirty = !currentContent.equals(sef.getSavedContent()); ! // debugging - show diff - DISABLED if (false && docIsDirty) { DocContentMap.cmpMaps(currentContent, sef.getSavedContent()); *************** *** 707,712 **** throws ServletException { - prtln("handleMissingLockException ()"); - String command = request.getParameter("command"); ActionErrors errors = new ActionErrors(); --- 707,710 ---- *************** *** 910,921 **** /** ! * Handle the case where the request does not contain a command. * ! * @param mapping Description of the Parameter ! * @param form Description of the Parameter ! * @param request Description of the Parameter ! * @param response Description of the Parameter * @return Description of the Return Value ! * @exception ServletException Description of the Exception */ protected abstract ActionForward handleMissingCommand( --- 908,920 ---- /** ! * Handle the case where the request contains a command that is not processed by ! this Class by calling the "handleMissingCommand" method of a subclass. * ! * @param mapping the ActionMapping ! * @param form the ActionForm ! * @param request the Request ! * @param response the Response * @return Description of the Return Value ! * @exception ServletException If the subclass does not handle the command */ protected abstract ActionForward handleMissingCommand( *************** *** 928,937 **** /** ! * Description of the Method * ! * @param mapping Description of the Parameter ! * @param form Description of the Parameter ! * @param request Description of the Parameter ! * @param response Description of the Parameter * @return Description of the Return Value * @exception ServletException Description of the Exception --- 927,936 ---- /** ! * Loads a record into the MetaDataEditor * ! * @param mapping the ActionMapping ! * @param form the ActionForm ! * @param request the Request ! * @param response the Response * @return Description of the Return Value * @exception ServletException Description of the Exception *************** *** 945,954 **** /** ! * NOT YET DOCUMENTED * ! * @param mapping NOT YET DOCUMENTED ! * @param form NOT YET DOCUMENTED ! * @param request NOT YET DOCUMENTED ! * @param response NOT YET DOCUMENTED * @return NOT YET DOCUMENTED * @exception ServletException NOT YET DOCUMENTED --- 944,953 ---- /** ! * Cancels editing of current metadata record. * ! * @param mapping the ActionMapping ! * @param form the ActionForm ! * @param request the Request ! * @param response the Response * @return NOT YET DOCUMENTED * @exception ServletException NOT YET DOCUMENTED *************** *** 964,971 **** * Description of the Method * ! * @param mapping Description of the Parameter ! * @param form Description of the Parameter ! * @param request Description of the Parameter ! * @param response Description of the Parameter * @return Description of the Return Value * @exception ServletException Description of the Exception --- 963,970 ---- * Description of the Method * ! * @param mapping the ActionMapping ! * @param form the ActionForm ! * @param request the Request ! * @param response the Response * @return Description of the Return Value * @exception ServletException Description of the Exception *************** *** 982,989 **** * Description of the Method * ! * @param mapping Description of the Parameter ! * @param form Description of the Parameter ! * @param request Description of the Parameter ! * @param response Description of the Parameter * @param validator Description of the Parameter * @return Description of the Return Value --- 981,988 ---- * Description of the Method * ! * @param mapping the ActionMapping ! * @param form the ActionForm ! * @param request the Request ! * @param response the Response * @param validator Description of the Parameter * @return Description of the Return Value |