/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5846

add boolean return to indicate whether or not a property was modified

     	 * @param propertyName
     	 *            the name of the property to be checked and set
     	 */
     	public static void checkAndSetProperty(HttpServletRequest request, String propertyName)
     	public static boolean checkAndSetProperty(HttpServletRequest request, String propertyName)
     			throws GeneralPropertyException {
     		properties.checkAndSetProperty(request, propertyName);
     		return properties.checkAndSetProperty(request, propertyName);
+    	}
     	/**

     	 * @param propertyName
     	 *            the name of the property to be checked and set
     	 */
     	public void checkAndSetProperty(HttpServletRequest request, String propertyName)
     	public boolean checkAndSetProperty(HttpServletRequest request, String propertyName)
     			throws GeneralPropertyException {
     		boolean changed = false;
     		String value = getProperty(propertyName);
     		String newValue = request.getParameter(propertyName);
     		if (newValue != null && !newValue.trim().equals(value)) {
     			setPropertyNoPersist(propertyName, newValue.trim());
     			changed = true;
+    		}
     		return changed;
+    	}
     	public SortedProperties getMainBackupProperties() {

     	 * @param propertyName
     	 *            the name of the property to be checked and set
     	 */
     	public void checkAndSetProperty(HttpServletRequest request, String propertyName)
     	public boolean checkAndSetProperty(HttpServletRequest request, String propertyName)
     			throws GeneralPropertyException {
     		boolean changed = false;
     		String value = getProperty(propertyName);
     		String newValue = request.getParameter(propertyName);
     		if (newValue != null && !newValue.trim().equals(value)) {
     			setPropertyNoPersist(propertyName, newValue.trim());
     			changed = true;
+    		}
     		return changed;
+    	}
+    }

     	public void persistProperties() throws GeneralPropertyException;
     	public void checkAndSetProperty(HttpServletRequest request, String propertyName) throws GeneralPropertyException;
     	public boolean checkAndSetProperty(HttpServletRequest request, String propertyName) throws GeneralPropertyException;
     	public SortedProperties getMainBackupProperties() throws GeneralPropertyException;

Also available in: Unified diff