Author: jdonnerstag
Date: Fri Jun 26 18:29:02 2009
New Revision: 788806
URL: http://svn.apache.org/viewvc?rev=788806&view=rev
Log:
fixed: Cryptic error "WicketMessage: Tag Expected" when wicket:panel tags are
missing
improved error message
Issue: WICKET-2342
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?rev=788806&r1=788805&r2=788806&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
Fri Jun 26 18:29:02 2009
@@ -636,7 +636,14 @@
setMarkupStream(associatedMarkupStream);
// Get open tag in associated markup of border component
- final ComponentTag associatedMarkupOpenTag =
associatedMarkupStream.getTag();
+ MarkupElement elem = associatedMarkupStream.get();
+ if ((elem instanceof ComponentTag) == false)
+ {
+ associatedMarkupStream.throwMarkupException("Expected
the open tag. " +
+ exceptionMessage);
+ }
+
+ ComponentTag associatedMarkupOpenTag = (ComponentTag)elem;
// Check for required open tag name
if (!((associatedMarkupOpenTag != null) &&
associatedMarkupOpenTag.isOpen() && (associatedMarkupOpenTag instanceof
WicketTag)))
