/*
 * $Id: DefaultButtonImageResourceFactory.java 1450 2005-03-24 21:11:02 +0000
 * (Thu, 24 Mar 2005) jonathanlocke $ $Revision$ $Date: 2005-03-24
 * 21:11:02 +0000 (Thu, 24 Mar 2005) $
 * 
 * ==============================================================================
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package wicket.markup.html.image.resource;

import java.util.Locale;

import wicket.IResourceFactory;
import wicket.Resource;
import wicket.WicketRuntimeException;
import wicket.util.parse.metapattern.Group;
import wicket.util.parse.metapattern.IntegerGroup;
import wicket.util.parse.metapattern.MetaPattern;
import wicket.util.parse.metapattern.OptionalMetaPattern;
import wicket.util.parse.metapattern.parsers.MetaPatternParser;

/**
 * A factory which creates default button images.
 * 
 * @author Jonathan Locke
 */
public class DefaultButtonImageResourceFactory implements IResourceFactory
{
	/**
	 * @see wicket.IResourceFactory#newResource(java.lang.String,
	 *      java.util.Locale, java.lang.String)
	 */
	public Resource newResource(final String specification, final Locale locale, final String style)
	{
		final Parser parser = new Parser(specification);
		if (parser.matches())
		{
			return new DefaultButtonImageResource(parser.getWidth(), parser.getHeight(), parser
					.getLabel());
		}
		else
		{
			throw new WicketRuntimeException(
					"DefaultButtonImageResourceFactory does not recognized the specification "
							+ specification);
		}
	}

	/**
	 * Parses image value specifications.
	 * 
	 * @author Jonathan Locke
	 */
	private static final class Parser extends MetaPatternParser
	{
		/** Group value. */
		private static final IntegerGroup width = new IntegerGroup();

		/** Group value. */
		private static final IntegerGroup height = new IntegerGroup();

		/** Label */
		private static final Group label = new Group(MetaPattern.ANYTHING);

		/** Meta pattern. */
		private static final MetaPattern pattern = new MetaPattern(new MetaPattern[] {
				new OptionalMetaPattern(new MetaPattern[] { width, MetaPattern.COMMA, height,
						MetaPattern.COLON }), label });

		/**
		 * Construct.
		 * 
		 * @param input
		 *            to parse
		 */
		public Parser(final CharSequence input)
		{
			super(pattern, input);
		}

		/**
		 * @return The label
		 */
		public String getLabel()
		{
			return label.get(matcher());
		}

		/**
		 * @return Any width
		 */
		public int getWidth()
		{
			return width.getInt(matcher(), -1);
		}

		/**
		 * @return Any height
		 */
		public int getHeight()
		{
			return width.getInt(matcher(), -1);
		}
	}
}

@@ -3051,37 +3051,38 @@
 )%0A%09%09%7B%0A%09%09%09return 
-width
+height
 .getInt(matcher(

fix for parse bug