svn commit: r471444 - in /incubator/wicket/trunk/wicket/src/main/java/wicket/markup: parser/filter/WicketMessageTagHandler.java parser/filter/WicketTagIdentifier.java parser/onLoadListener/WicketMessageLoadListener.java resolver/WicketMessageResolver.java

[jd...@apache.org]

Author: jdonnerstag
Date: Sun Nov  5 07:33:42 2006
New Revision: 471444

URL: http://svn.apache.org/viewvc?view=rev&rev=471444
Log:
cleaned up the markup load listener code

Added:
    incubator/wicket/trunk/wicket/src/main/java/wicket/markup/resolver/WicketMessageResolver.java
      - copied unchanged from r471395, incubator/wicket/trunk/wicket/src/main/java/wicket/markup/resolver/WicketMessageResolver.java
Removed:
    incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/onLoadListener/WicketMessageLoadListener.java
Modified:
    incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketMessageTagHandler.java
    incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketTagIdentifier.java

Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketMessageTagHandler.java?view=diff&rev=471444&r1=471443&r2=471444
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketMessageTagHandler.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketMessageTagHandler.java Sun Nov  5 07:33:42 2006
@@ -51,9 +51,6 @@
 	/** singleton instance of {@link AttributeLocalizer} */
 	public static final IBehavior ATTRIBUTE_LOCALIZER = new AttributeLocalizer();
 
-	/** Per markup file, a unique index */
-	private int index;
-	
 	/**
 	 * Construct.
 	 */
@@ -87,7 +84,7 @@
 				// if this is a raw tag we need to set the id to something so
 				// that wicket will not merge this as raw markup and instead
 				// pass it on to a resolver
-				tag.setId(WICKET_MESSAGE_CONTAINER_ID + index++);
+				tag.setId(WICKET_MESSAGE_CONTAINER_ID);
 				
 				// There is no point attaching the attributelocalizer to this
 				// tag because it will be represented by an auto component and

Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketTagIdentifier.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketTagIdentifier.java?view=diff&rev=471444&r1=471443&r2=471444
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketTagIdentifier.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/filter/WicketTagIdentifier.java Sun Nov  5 07:33:42 2006
@@ -51,18 +51,16 @@
 
 	static
 	{
-		// register wicket:head, wicket:message, ...
+		// register wicket:head
 		registerTagWhichRequiresUniqueId("head");
-		registerTagWhichRequiresUniqueId("message");
-		registerTagWhichRequiresUniqueId("link");
 	}
-
+	
 	/** The current markup needed to get the markups namespace */
 	private final IMarkup markup;
 
 	/** auto increment to create unique ids */
 	private int index;
-
+	
 	/**
 	 * Construct.
 	 * 
@@ -73,7 +71,7 @@
 	{
 		this.markup = markup;
 	}
-
+	
 	/**
 	 * Get the next tag from the next MarkupFilter in the chain and search for
 	 * Wicket specific tags.
@@ -115,7 +113,7 @@
 			}
 			tag.setId(id);
 
-			if (isReqisteredForUniqueId(tag) == false)
+			if (wellKnownTagNames.contains(xmlTag.getName()) == false)
 			{
 				throw new ParseException("Unkown tag name with Wicket namespace: '"
 						+ xmlTag.getName()
@@ -162,16 +160,5 @@
 	public final static void registerTagWhichRequiresUniqueId(final String tag)
 	{
 		requiresUniqueId.add(tag);
-	}
-
-	/**
-	 * 
-	 * @param tag
-	 *            The tag to valid
-	 * @return True, if tag id should be unique
-	 */
-	public final static boolean isReqisteredForUniqueId(final ComponentTag tag)
-	{
-		return wellKnownTagNames.contains(tag.getName());
 	}
 }