svn commit: r550547 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java

[eh...@apache.org]

Author: ehillenius
Date: Mon Jun 25 09:53:45 2007
New Revision: 550547

URL: http://svn.apache.org/viewvc?view=rev&rev=550547
Log:
rollback of WICKET-694. reading the markup attributes had some unfortunate consequences I didn't came across when I was testing :(

Modified:
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?view=diff&rev=550547&r1=550546&r2=550547
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java Mon Jun 25 09:53:45 2007
@@ -1208,12 +1208,16 @@
 								+ "this method (Component#getMarkupId)");
 			}
 			// try to read from markup
-			markupId = getMarkupAttributes().getString("id");
-			if (markupId == null)
-			{
-				// if not in the markup, generate one
-				markupId = getId() + page.getAutoIndex();
-			}
+			// TODO getting the id from markup doesn't work everywhere yet.
+			// unfortunately, we have to drop this until we have a good solution
+			// for issue http://issues.apache.org/jira/browse/WICKET-694
+			// markupId = getMarkupAttributes().getString("id");
+
+			// if (markupId == null)
+			// {
+			// if not in the markup, generate one
+			markupId = getId() + page.getAutoIndex();
+			// }
 			setMetaData(MARKUP_ID_KEY, markupId);
 		}
 		return markupId;