You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2007/10/03 18:56:01 UTC
svn commit: r581657 - in /wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/markup/html/link/
test/java/org/apache/wicket/markup/html/link/
Author: ivaynberg
Date: Wed Oct 3 09:56:01 2007
New Revision: 581657
URL: http://svn.apache.org/viewvc?rev=581657&view=rev
Log:
WICKET-1016: ExternalLink doesn't use model
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html (with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html (with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.html (with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.java (with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.html (with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java (with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java (with props)
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java?rev=581657&r1=581656&r2=581657&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java Wed Oct 3 09:56:01 2007
@@ -35,9 +35,6 @@
{
private static final long serialVersionUID = 1L;
- /** the href attribute. */
- private final IModel href;
-
/** this links' label. */
private final IModel label;
@@ -63,7 +60,7 @@
{
super(id);
- this.href = (href != null ? new Model(href) : null);
+ setModel(href != null ? new Model(href) : null);
this.label = (label != null ? new Model(label) : null);
}
@@ -94,7 +91,7 @@
{
super(id);
- this.href = wrap(href);
+ setModel(wrap(href));
this.label = wrap(label);
}
@@ -146,9 +143,9 @@
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
- if (href != null)
+ if (getModel() != null)
{
- Object hrefValue = href.getObject();
+ Object hrefValue = getModelObject();
if (hrefValue != null)
{
String url = hrefValue.toString();
@@ -251,13 +248,6 @@
return this;
}
- /**
- * @return href attribute
- */
- public IModel getHref()
- {
- return href;
- }
/**
* @return label attribute
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html?rev=581657&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html Wed Oct 3 09:56:01 2007
@@ -0,0 +1,8 @@
+<html xmlns:wicket>
+<head>
+<title>Mock Page</title>
+</head>
+<body>
+<a href="http://wicket.apache.org" wicket:id="myLink">myLink</a>
+</body>
+</html>
Propchange: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html?rev=581657&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html Wed Oct 3 09:56:01 2007
@@ -0,0 +1,8 @@
+<html xmlns:wicket>
+<head>
+<title>Mock Page</title>
+</head>
+<body>
+
+</body>
+</html>
Propchange: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.html?rev=581657&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.html (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.html Wed Oct 3 09:56:01 2007
@@ -0,0 +1,8 @@
+<html xmlns:wicket>
+<head>
+<title>Mock Page</title>
+</head>
+<body>
+<a wicket:id="myLink">myLink</a>
+</body>
+</html>
Propchange: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.java?rev=581657&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.java (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.java Wed Oct 3 09:56:01 2007
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.wicket.markup.html.link;
+
+import org.apache.wicket.markup.html.WebPage;
+
+public class ExternalLinkPage_1 extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public ExternalLinkPage_1()
+ {
+ add(new ExternalLink("myLink", "http://wicket.apache.org"));
+ }
+}
Propchange: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_1.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.html
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.html?rev=581657&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.html (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.html Wed Oct 3 09:56:01 2007
@@ -0,0 +1,8 @@
+<html xmlns:wicket>
+<head>
+<title>Mock Page</title>
+</head>
+<body>
+<a wicket:id="myLink">myLink</a>
+</body>
+</html>
Propchange: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java?rev=581657&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java Wed Oct 3 09:56:01 2007
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.wicket.markup.html.link;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.model.Model;
+
+public class ExternalLinkPage_2 extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public ExternalLinkPage_2()
+ {
+ add(new ExternalLink("myLink", new Model(null))
+ {
+ private static final long serialVersionUID = 1L;
+
+ public boolean isVisible()
+ {
+ return getModelObject() != null;
+ }
+ });
+ }
+}
Propchange: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPage_2.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java?rev=581657&view=auto
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java (added)
+++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java Wed Oct 3 09:56:01 2007
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.wicket.markup.html.link;
+
+import org.apache.wicket.WicketTestCase;
+
+/**
+ * Test ExternalLink (href="...")
+ *
+ * <a href="https://issues.apache.org/jira/browse/WICKET-1016"></<a>
+ */
+public class ExternalLinkTest extends WicketTestCase
+{
+ /**
+ * Create the test.
+ *
+ * @param name
+ * The test name
+ */
+ public ExternalLinkTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * @throws Exception
+ */
+ public void testRenderExternalLink_1() throws Exception
+ {
+ tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
+ executeTest(ExternalLinkPage_1.class, "ExternalLinkPageExpectedResult_1.html");
+ }
+
+ /**
+ * @throws Exception
+ */
+ public void testRenderExternalLink_2() throws Exception
+ {
+ tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
+ executeTest(ExternalLinkPage_2.class, "ExternalLinkPageExpectedResult_2.html");
+ }
+
+}
Propchange: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain