Updated Branches: refs/heads/markup-driven-component-tree fa68ce99a -> 24d0041d4
Markup driven tree - fix all unit tests Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/24d0041d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/24d0041d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/24d0041d Branch: refs/heads/markup-driven-component-tree Commit: 24d0041d444561bc4bfff601f9e8c8e3c5bcada2 Parents: fa68ce9 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Jan 23 17:48:35 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Jan 23 17:48:35 2014 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Auto.java | 19 +++++++ .../org/apache/wicket/ComponentTreeBuilder.java | 56 ++++++++++++++------ .../org/apache/wicket/markup/MarkupStream.java | 4 +- .../wicket/markupdriventree/BasePage.java | 16 ++++++ .../markupdriventree/BasePageWithPanel.java | 16 ++++++ .../markupdriventree/MarkupDrivenTreeTest.java | 16 ++++++ .../apache/wicket/markupdriventree/Page1.java | 16 ++++++ .../apache/wicket/markupdriventree/Page2.java | 16 ++++++ .../apache/wicket/markupdriventree/Page3.java | 16 ++++++ .../markupdriventree/PageWithAutoPanel.java | 16 ++++++ .../PageWithAutoPanelWithinEnclosure.java | 19 +++++-- .../PageWithManuallyAddedPanel.java | 17 +++++- .../markupdriventree/components/ComponentA.java | 19 +++++-- .../markupdriventree/components/ComponentB.java | 19 +++++-- .../markupdriventree/components/ComponentC.java | 19 +++++-- .../markupdriventree/components/PanelA.java | 19 +++++-- 16 files changed, 270 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/main/java/org/apache/wicket/Auto.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Auto.java b/wicket-core/src/main/java/org/apache/wicket/Auto.java index 3c3b6ab..7ffc3c6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Auto.java +++ b/wicket-core/src/main/java/org/apache/wicket/Auto.java @@ -1,12 +1,31 @@ +/* + * 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; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * */ @Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) public @interface Auto { String id() default ""; http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/main/java/org/apache/wicket/ComponentTreeBuilder.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ComponentTreeBuilder.java b/wicket-core/src/main/java/org/apache/wicket/ComponentTreeBuilder.java index 556581f..cf5136e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ComponentTreeBuilder.java +++ b/wicket-core/src/main/java/org/apache/wicket/ComponentTreeBuilder.java @@ -1,9 +1,26 @@ +/* + * 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; import java.lang.reflect.Field; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupFragment; +import org.apache.wicket.markup.MarkupNotFoundException; import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.markup.WicketTag; import org.apache.wicket.markup.resolver.ComponentResolvers; @@ -27,26 +44,29 @@ class ComponentTreeBuilder stream.next(); } - while (stream.skipUntil(ComponentTag.class)) + ComponentTag tag; + while ((tag = stream.nextOpenTag()) != null) { - ComponentTag tag = stream.getTag(); - - if (!tag.isAutoComponentTag() && (tag.isOpen() || tag.isOpenClose())) + if (!tag.isAutoComponentTag()) { String componentId = tag.getId(); if (tag instanceof WicketTag) { - Component component = ComponentResolvers.resolve(container, stream, tag, null); - if ((component != null) && (component.getParent() == null)) + WicketTag wicketTag = (WicketTag) tag; + if (wicketTag.isEnclosureTag()) { - if (component.getId().equals(tag.getId()) == false) + Component component = ComponentResolvers.resolve(container, stream, tag, null); + if ((component != null) && (component.getParent() == null)) { - // make sure we are able to get() the component during rendering - tag.setId(component.getId()); - tag.setModified(true); + if (component.getId().equals(tag.getId()) == false) + { + // make sure we are able to get() the component during rendering + tag.setId(component.getId()); + tag.setModified(true); + } + container.add(component); } - container.add(component); } } else @@ -68,12 +88,11 @@ class ComponentTreeBuilder throw new WicketRuntimeException(e); } } - - print(tag); +// print(tag); } } - if (tag.isOpen()) + if (tag.isOpen() && tag.hasNoCloseTag() == false) { stream.skipToMatchingCloseTag(tag); } @@ -97,7 +116,14 @@ class ComponentTreeBuilder IMarkupFragment markup = container.getAssociatedMarkup(); if (markup == null) { - markup = container.getMarkup(); + try + { + markup = container.getMarkup(); + } + catch (MarkupNotFoundException mnfx) + { + // + } } return markup; } http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java index 99a5165..7fcba90 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupStream.java @@ -307,7 +307,7 @@ public class MarkupStream * * @return The next markup element in the stream */ - public MarkupElement nextOpenTag() + public ComponentTag nextOpenTag() { while (next() != null) { @@ -317,7 +317,7 @@ public class MarkupStream ComponentTag tag = (ComponentTag)elem; if (tag.isOpen() || tag.isOpenClose()) { - return current = get(currentIndex); + return tag; } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePage.java index 9960f9a..a9349e8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePage.java @@ -1,3 +1,19 @@ +/* + * 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.markupdriventree; import org.apache.wicket.Auto; http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.java index 7f67322..c76a546 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.java @@ -1,3 +1,19 @@ +/* + * 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.markupdriventree; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java index 1a42cda..7244584 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java @@ -1,3 +1,19 @@ +/* + * 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.markupdriventree; import org.apache.wicket.Component; http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page1.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page1.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page1.java index 52e0ef2..e9c5e5d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page1.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page1.java @@ -1,3 +1,19 @@ +/* + * 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.markupdriventree; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page2.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page2.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page2.java index 7ea019d..d288e5b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page2.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page2.java @@ -1,3 +1,19 @@ +/* + * 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.markupdriventree; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page3.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page3.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page3.java index 3fcb006..abf3681 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page3.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/Page3.java @@ -1,3 +1,19 @@ +/* + * 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.markupdriventree; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanel.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanel.java index ad6ff89..8966388 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanel.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanel.java @@ -1,3 +1,19 @@ +/* + * 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.markupdriventree; import org.apache.wicket.Auto; http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanelWithinEnclosure.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanelWithinEnclosure.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanelWithinEnclosure.java index d9ebe99..34f1cab 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanelWithinEnclosure.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanelWithinEnclosure.java @@ -1,11 +1,24 @@ +/* + * 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.markupdriventree; import org.apache.wicket.Auto; import org.apache.wicket.markupdriventree.components.PanelA; -/** - * - */ public class PageWithAutoPanelWithinEnclosure extends BasePage { @Auto http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithManuallyAddedPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithManuallyAddedPanel.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithManuallyAddedPanel.java index 122ce26..96b5507 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithManuallyAddedPanel.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithManuallyAddedPanel.java @@ -1,6 +1,21 @@ +/* + * 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.markupdriventree; -import org.apache.wicket.Auto; import org.apache.wicket.markupdriventree.components.PanelA; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentA.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentA.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentA.java index 8c9e41f..a3cb6a3 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentA.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentA.java @@ -1,10 +1,23 @@ +/* + * 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.markupdriventree.components; import org.apache.wicket.markup.html.WebMarkupContainer; -/** - * - */ public class ComponentA extends WebMarkupContainer { public ComponentA(String id) http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentB.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentB.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentB.java index 3b7a835..03c0a23 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentB.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentB.java @@ -1,10 +1,23 @@ +/* + * 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.markupdriventree.components; import org.apache.wicket.markup.html.WebMarkupContainer; -/** - * - */ public class ComponentB extends WebMarkupContainer { public ComponentB(String id) http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentC.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentC.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentC.java index d565cc5..7fb39f0 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentC.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/ComponentC.java @@ -1,10 +1,23 @@ +/* + * 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.markupdriventree.components; import org.apache.wicket.markup.html.WebMarkupContainer; -/** - * - */ public class ComponentC extends WebMarkupContainer { public ComponentC(String id) http://git-wip-us.apache.org/repos/asf/wicket/blob/24d0041d/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/PanelA.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/PanelA.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/PanelA.java index e3c14a9..9130f36 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/PanelA.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/components/PanelA.java @@ -1,11 +1,24 @@ +/* + * 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.markupdriventree.components; import org.apache.wicket.Auto; import org.apache.wicket.markup.html.panel.Panel; -/** - * - */ public class PanelA extends Panel { @Auto
