You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2006/11/15 00:59:30 UTC
svn commit: r475067 [1/2] - in /beehive/trunk:
controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/
controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/
netui/test/src/junitTests...
Author: cschoett
Date: Tue Nov 14 15:59:29 2006
New Revision: 475067
URL: http://svn.apache.org/viewvc?view=rev&rev=475067
Log:
Set the svn property 'eol-style' to 'navtive' for these files, previously unspecified.
Modified:
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControl.java (contents, props changed)
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControlImpl.java (contents, props changed)
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControl.java (contents, props changed)
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControlImpl.java (contents, props changed)
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetOverloadTest.java (contents, props changed)
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PartialDataSetTest.java (contents, props changed)
beehive/trunk/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java (contents, props changed)
beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml (contents, props changed)
beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp (contents, props changed)
beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/misc/showAll.jsp (contents, props changed)
beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/ResultSetXMLStreamReader.java (contents, props changed)
beehive/trunk/system-controls/test/jdbc/controls/schemas/customer/XCustomer.xsd (contents, props changed)
beehive/trunk/system-controls/test/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/results/XmlBeanDocResultsTest.java (contents, props changed)
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControl.java?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControl.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControl.java Tue Nov 14 15:59:29 2006
@@ -1,40 +1,40 @@
-/*
- * 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.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.controls.eventsetInheritanceOverload;
-
-import org.apache.beehive.controls.api.bean.ControlInterface;
-import org.apache.beehive.controls.api.events.EventSet;
-
-/**
- * This control extends a control which has an event set with the same
- * name defined.
- */
-@ControlInterface
-public interface SubControl extends SuperControl
-{
- @EventSet
- public interface CtrlCallback {
- public void onSubEvent(String data);
- }
-
- public void fireSubEvent();
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.controls.eventsetInheritanceOverload;
+
+import org.apache.beehive.controls.api.bean.ControlInterface;
+import org.apache.beehive.controls.api.events.EventSet;
+
+/**
+ * This control extends a control which has an event set with the same
+ * name defined.
+ */
+@ControlInterface
+public interface SubControl extends SuperControl
+{
+ @EventSet
+ public interface CtrlCallback {
+ public void onSubEvent(String data);
+ }
+
+ public void fireSubEvent();
+}
Propchange: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControlImpl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControlImpl.java?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControlImpl.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControlImpl.java Tue Nov 14 15:59:29 2006
@@ -1,44 +1,44 @@
-/*
- * 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.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.controls.eventsetInheritanceOverload;
-
-import org.apache.beehive.controls.api.bean.ControlImplementation;
-import org.apache.beehive.controls.api.events.Client;
-
-/**
- * Implementation of a control which extends a control that has
- * an event set with the same name as this control.
- */
-@ControlImplementation(isTransient=true)
-public class SubControlImpl extends SuperControlImpl implements SubControl {
-
- @Client
- private SubControl.CtrlCallback client;
-
- public void fireSubEvent() {
- client.onSubEvent("SubControl");
- }
-
- public void fireSuperEvent() {
- client.onSubEvent("SubControl");
- }
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.controls.eventsetInheritanceOverload;
+
+import org.apache.beehive.controls.api.bean.ControlImplementation;
+import org.apache.beehive.controls.api.events.Client;
+
+/**
+ * Implementation of a control which extends a control that has
+ * an event set with the same name as this control.
+ */
+@ControlImplementation(isTransient=true)
+public class SubControlImpl extends SuperControlImpl implements SubControl {
+
+ @Client
+ private SubControl.CtrlCallback client;
+
+ public void fireSubEvent() {
+ client.onSubEvent("SubControl");
+ }
+
+ public void fireSuperEvent() {
+ client.onSubEvent("SubControl");
+ }
+}
Propchange: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControlImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControl.java?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControl.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControl.java Tue Nov 14 15:59:29 2006
@@ -1,40 +1,40 @@
-/*
- * 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.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.controls.eventsetInheritanceOverload;
-
-import org.apache.beehive.controls.api.bean.ControlInterface;
-import org.apache.beehive.controls.api.events.EventSet;
-
-/**
- * Base control interface which defines an event set with the same name
- * as an event set defined in a control which extends this one.
- */
-@ControlInterface
-public interface SuperControl {
-
- @EventSet()
- public interface CtrlCallback {
- void onSuperEvent(String data);
- }
-
- public void fireSuperEvent();
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.controls.eventsetInheritanceOverload;
+
+import org.apache.beehive.controls.api.bean.ControlInterface;
+import org.apache.beehive.controls.api.events.EventSet;
+
+/**
+ * Base control interface which defines an event set with the same name
+ * as an event set defined in a control which extends this one.
+ */
+@ControlInterface
+public interface SuperControl {
+
+ @EventSet()
+ public interface CtrlCallback {
+ void onSuperEvent(String data);
+ }
+
+ public void fireSuperEvent();
+}
Propchange: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControlImpl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControlImpl.java?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControlImpl.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControlImpl.java Tue Nov 14 15:59:29 2006
@@ -1,41 +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.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.controls.eventsetInheritanceOverload;
-
-import org.apache.beehive.controls.api.bean.ControlImplementation;
-import org.apache.beehive.controls.api.events.Client;
-
-/**
- * Control implementation for a control which defines an event set
- * with the same names as a control event set defined by a control
- * which extends this one.
- */
-@ControlImplementation(isTransient=true)
-public class SuperControlImpl implements SuperControl {
-
- @Client
- private SuperControl.CtrlCallback client;
-
- public void fireSuperEvent() {
- client.onSuperEvent("SuperControl");
- }
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.controls.eventsetInheritanceOverload;
+
+import org.apache.beehive.controls.api.bean.ControlImplementation;
+import org.apache.beehive.controls.api.events.Client;
+
+/**
+ * Control implementation for a control which defines an event set
+ * with the same names as a control event set defined by a control
+ * which extends this one.
+ */
+@ControlImplementation(isTransient=true)
+public class SuperControlImpl implements SuperControl {
+
+ @Client
+ private SuperControl.CtrlCallback client;
+
+ public void fireSuperEvent() {
+ client.onSuperEvent("SuperControl");
+ }
+}
Propchange: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControlImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetOverloadTest.java
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetOverloadTest.java?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetOverloadTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetOverloadTest.java Tue Nov 14 15:59:29 2006
@@ -1,98 +1,98 @@
-/*
- * 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.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.test.junit.event;
-
-import org.apache.beehive.controls.test.junit.ControlTestCase;
-import org.apache.beehive.controls.test.controls.eventsetInheritanceOverload.SubControl;
-import org.apache.beehive.controls.test.controls.eventsetInheritanceOverload.SuperControl;
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.events.EventHandler;
-
-/**
- * Test that if a control extends another control and both controls have defined
- * an event set with the same name, the expected behavior occures.
- */
-public class EventSetOverloadTest
- extends ControlTestCase {
-
- private static String subEventMsg;
- private static String superEventMsg;
-
- @Control
- private SuperControl _superControl;
-
- @Control
- private SubControl _subControl;
-
- public void setUp() throws Exception {
- super.setUp();
- subEventMsg = null;
- superEventMsg = null;
- }
-
- /**
- * Test that the super control's event set is working properly.
- */
- public void testSuperEventSet() {
- assertNotNull(_superControl);
- _superControl.fireSuperEvent();
- assertEquals(superEventMsg, "SuperControl");
- assertNull(subEventMsg);
- }
-
- /**
- * Test that the sub control's event set is working properly.
- */
- public void testSubEventSet() {
- assertNotNull(_subControl);
- _subControl.fireSubEvent();
- assertEquals(subEventMsg, "SubControl");
- assertNull(superEventMsg);
- }
-
- /**
- * Test that if the sub control overrides the event set method from the base control,
- * the overriden method takes precedence.
- */
- public void testSubSuperEventSet() {
- assertNotNull(_subControl);
- _subControl.fireSuperEvent();
- assertNull(superEventMsg);
- assertEquals(subEventMsg, "SubControl");
- }
-
- /**
- * EventHandler for the subControl.
- */
- @EventHandler(field = "_subControl", eventSet = SubControl.CtrlCallback.class, eventName = "onSubEvent")
- protected void onSubEvent(String data) {
- subEventMsg = data;
- }
-
- /**
- * EventHandler for the superControl.
- */
- @EventHandler(field = "_superControl", eventSet = SuperControl.CtrlCallback.class, eventName = "onSuperEvent")
- protected void onSuperEvent(String data) {
- superEventMsg = data;
- }
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.test.junit.event;
+
+import org.apache.beehive.controls.test.junit.ControlTestCase;
+import org.apache.beehive.controls.test.controls.eventsetInheritanceOverload.SubControl;
+import org.apache.beehive.controls.test.controls.eventsetInheritanceOverload.SuperControl;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.controls.api.events.EventHandler;
+
+/**
+ * Test that if a control extends another control and both controls have defined
+ * an event set with the same name, the expected behavior occures.
+ */
+public class EventSetOverloadTest
+ extends ControlTestCase {
+
+ private static String subEventMsg;
+ private static String superEventMsg;
+
+ @Control
+ private SuperControl _superControl;
+
+ @Control
+ private SubControl _subControl;
+
+ public void setUp() throws Exception {
+ super.setUp();
+ subEventMsg = null;
+ superEventMsg = null;
+ }
+
+ /**
+ * Test that the super control's event set is working properly.
+ */
+ public void testSuperEventSet() {
+ assertNotNull(_superControl);
+ _superControl.fireSuperEvent();
+ assertEquals(superEventMsg, "SuperControl");
+ assertNull(subEventMsg);
+ }
+
+ /**
+ * Test that the sub control's event set is working properly.
+ */
+ public void testSubEventSet() {
+ assertNotNull(_subControl);
+ _subControl.fireSubEvent();
+ assertEquals(subEventMsg, "SubControl");
+ assertNull(superEventMsg);
+ }
+
+ /**
+ * Test that if the sub control overrides the event set method from the base control,
+ * the overriden method takes precedence.
+ */
+ public void testSubSuperEventSet() {
+ assertNotNull(_subControl);
+ _subControl.fireSuperEvent();
+ assertNull(superEventMsg);
+ assertEquals(subEventMsg, "SubControl");
+ }
+
+ /**
+ * EventHandler for the subControl.
+ */
+ @EventHandler(field = "_subControl", eventSet = SubControl.CtrlCallback.class, eventName = "onSubEvent")
+ protected void onSubEvent(String data) {
+ subEventMsg = data;
+ }
+
+ /**
+ * EventHandler for the superControl.
+ */
+ @EventHandler(field = "_superControl", eventSet = SuperControl.CtrlCallback.class, eventName = "onSuperEvent")
+ protected void onSuperEvent(String data) {
+ superEventMsg = data;
+ }
+}
Propchange: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetOverloadTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PartialDataSetTest.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PartialDataSetTest.java?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PartialDataSetTest.java (original)
+++ beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PartialDataSetTest.java Tue Nov 14 15:59:29 2006
@@ -1,96 +1,96 @@
-/*
- * 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.
- *
- * $Header:$
- */
-package org.apache.beehive.netui.test.datagrid;
-
-import java.util.List;
-import java.util.AbstractList;
-
-import junit.framework.TestCase;
-import org.apache.beehive.netui.databinding.datagrid.runtime.util.PagedDataSet;
-
-public class PartialDataSetTest
- extends TestCase {
-
- public void testSplit() {
- List[] lists = getPartialDataSets();
- }
-
- public void testPartialDataSet() {
- List[] lists = getPartialDataSets();
-
- // initialize data set
- PagedDataSet pagedDataSet = new PagedDataSet("my.data", lists[1].iterator());
- pagedDataSet.setFirstRow(0);
- pagedDataSet.setPageSize(3);
- pagedDataSet.setSize(12);
- pagedDataSet.initialize();
-
- // assertions
- assertEquals(12, pagedDataSet.getSize());
- int index = 0;
- while(pagedDataSet.hasNext()) {
- Object current = pagedDataSet.next();
- assertEquals(index, pagedDataSet.getCurrentIndex());
- index++;
- }
- }
-
- private List[] getPartialDataSets() {
- List[] lists = split(DataGridTestUtil.getDataSet(), 3);
- assertEquals(4, lists.length);
- return lists;
- }
-
- private List[] split(List list, int maxSize) {
- List[] lists = new List[(int)Math.ceil(list.size()/3)];
- int start = 0;
- for(int i = 0; i < lists.length; i++, start+=maxSize) {
- lists[i] = new WindowList(list, start, maxSize);
- }
- return lists;
- }
-
- private static class WindowList
- extends AbstractList {
-
- private List _list;
- private int _start = 0;
- private int _end;
-
- public WindowList() {
- }
-
- public WindowList(List list, int start, int size) {
- _list = list;
- _start = start;
- _end = _start + size-1;
- }
-
- public Object get(int index) {
- index = _start + index;
- if(index >= _start && index <= _end)
- return _list.get(index);
- else throw new IndexOutOfBoundsException();
- }
-
- public int size() {
- return _end - _start + 1;
- }
- }
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.test.datagrid;
+
+import java.util.List;
+import java.util.AbstractList;
+
+import junit.framework.TestCase;
+import org.apache.beehive.netui.databinding.datagrid.runtime.util.PagedDataSet;
+
+public class PartialDataSetTest
+ extends TestCase {
+
+ public void testSplit() {
+ List[] lists = getPartialDataSets();
+ }
+
+ public void testPartialDataSet() {
+ List[] lists = getPartialDataSets();
+
+ // initialize data set
+ PagedDataSet pagedDataSet = new PagedDataSet("my.data", lists[1].iterator());
+ pagedDataSet.setFirstRow(0);
+ pagedDataSet.setPageSize(3);
+ pagedDataSet.setSize(12);
+ pagedDataSet.initialize();
+
+ // assertions
+ assertEquals(12, pagedDataSet.getSize());
+ int index = 0;
+ while(pagedDataSet.hasNext()) {
+ Object current = pagedDataSet.next();
+ assertEquals(index, pagedDataSet.getCurrentIndex());
+ index++;
+ }
+ }
+
+ private List[] getPartialDataSets() {
+ List[] lists = split(DataGridTestUtil.getDataSet(), 3);
+ assertEquals(4, lists.length);
+ return lists;
+ }
+
+ private List[] split(List list, int maxSize) {
+ List[] lists = new List[(int)Math.ceil(list.size()/3)];
+ int start = 0;
+ for(int i = 0; i < lists.length; i++, start+=maxSize) {
+ lists[i] = new WindowList(list, start, maxSize);
+ }
+ return lists;
+ }
+
+ private static class WindowList
+ extends AbstractList {
+
+ private List _list;
+ private int _start = 0;
+ private int _end;
+
+ public WindowList() {
+ }
+
+ public WindowList(List list, int start, int size) {
+ _list = list;
+ _start = start;
+ _end = _start + size-1;
+ }
+
+ public Object get(int index) {
+ index = _start + index;
+ if(index >= _start && index <= _end)
+ return _list.get(index);
+ else throw new IndexOutOfBoundsException();
+ }
+
+ public int size() {
+ return _end - _start + 1;
+ }
+ }
+}
Propchange: beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PartialDataSetTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java Tue Nov 14 15:59:29 2006
@@ -1,97 +1,97 @@
-/*
- * 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.
- *
- * $Header:$
- */
-package databinding.datagrid.j1120;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import java.util.List;
-import java.util.ArrayList;
-
-@Jpf.Controller(
- simpleActions={
- @Jpf.SimpleAction(name="begin", path="index.jsp")
- }
-)
-public class Controller
- extends PageFlowController
-{
- public Pet[] pets;
- public Pet[] getPets() { return pets; }
-
- /**
- * Method that is invoked when this controller instance is created.
- */
- protected void onCreate()
- {
- pets = new Pet[2];
- pets[0] = new Pet("1", "dog", "white", "10.00");
- pets[1] = new Pet("2", "dog", "purple", "10.00");
- }
-
- public class Pet {
- private String _petId;
- private String _name;
- private String _description;
- private String _price;
-
- public Pet(String id, String name, String desc, String price) {
- _petId = id;
- _name = name;
- _description = desc;
- _price = price;
- }
- public String getPetId() { return _petId; }
- public String getName() { return _name; }
- public String getDescription() { return _description; }
- public String getPrice() { return _price; }
- }
-
- protected void onDestroy(HttpSession session)
- {
- }
-
- @Jpf.Action(
- forwards={@Jpf.Forward(name="success", path="index.jsp")})
- public Forward submit() {
- Forward fwd = new Forward("success");
- return fwd;
- }
-
- @Jpf.Action(
- forwards={@Jpf.Forward(name="success", path="index.jsp")})
- public Forward save() {
- Forward fwd = new Forward("success");
- return fwd;
- }
-
- @Jpf.Action(
- forwards={@Jpf.Forward(name="success", path="index.jsp")})
- public Forward sortingAction() {
- Pet p = pets[0];
- pets[0] = pets[1];
- pets[1] = p;
- Forward fwd = new Forward("success");
- return fwd;
- }
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+package databinding.datagrid.j1120;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import java.util.List;
+import java.util.ArrayList;
+
+@Jpf.Controller(
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp")
+ }
+)
+public class Controller
+ extends PageFlowController
+{
+ public Pet[] pets;
+ public Pet[] getPets() { return pets; }
+
+ /**
+ * Method that is invoked when this controller instance is created.
+ */
+ protected void onCreate()
+ {
+ pets = new Pet[2];
+ pets[0] = new Pet("1", "dog", "white", "10.00");
+ pets[1] = new Pet("2", "dog", "purple", "10.00");
+ }
+
+ public class Pet {
+ private String _petId;
+ private String _name;
+ private String _description;
+ private String _price;
+
+ public Pet(String id, String name, String desc, String price) {
+ _petId = id;
+ _name = name;
+ _description = desc;
+ _price = price;
+ }
+ public String getPetId() { return _petId; }
+ public String getName() { return _name; }
+ public String getDescription() { return _description; }
+ public String getPrice() { return _price; }
+ }
+
+ protected void onDestroy(HttpSession session)
+ {
+ }
+
+ @Jpf.Action(
+ forwards={@Jpf.Forward(name="success", path="index.jsp")})
+ public Forward submit() {
+ Forward fwd = new Forward("success");
+ return fwd;
+ }
+
+ @Jpf.Action(
+ forwards={@Jpf.Forward(name="success", path="index.jsp")})
+ public Forward save() {
+ Forward fwd = new Forward("success");
+ return fwd;
+ }
+
+ @Jpf.Action(
+ forwards={@Jpf.Forward(name="success", path="index.jsp")})
+ public Forward sortingAction() {
+ Pet p = pets[0];
+ pets[0] = pets[1];
+ pets[1] = p;
+ Forward fwd = new Forward("success");
+ return fwd;
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml Tue Nov 14 15:59:29 2006
@@ -76,72 +76,72 @@
<![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
-
- <head>
- <title>Test for Jira-1120 Fix</title>
- <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
- </head>
- <body>
-
- <p>
- Click the save button, then click the sort column link.
- The sort column link should cause the column to be re-sorted.
- </p>
- <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
+
+ <head>
+ <title>Test for Jira-1120 Fix</title>
+ <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
+ </head>
+ <body>
+
+ <p>
+ Click the save button, then click the sort column link.
+ The sort column link should cause the column to be re-sorted.
+ </p>
+ <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
Page 1 of 1
<table class="datagrid">
-
-
-
-
+
-<tr class="datagrid-header">
+
+
+
+<tr class="datagrid-header">
<th class="datagrid-sortable datagrid">Pet ID <a href="/coreWeb/databinding/datagrid/j1120/sortingAction.do?netui_sort=petGrid%3Bpetid"><img src="/coreWeb/resources/beehive/version1/images/sortable.gif" border="false"></a></th>
-
-
+
+
<th class="datagrid">Name</th>
-
-
+
+
<th class="datagrid">Description</th>
-
-
+
+
<th class="datagrid">Price</th>
-
-
+
+
+
+</tr>
+
+
-</tr>
-
-
-
-
-<tr class="datagrid-even">
- <td class="datagrid"><span>1</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>white</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+
+<tr class="datagrid-even">
+ <td class="datagrid"><span>1</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>white</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
</tr>
-<tr class="datagrid-odd">
- <td class="datagrid"><span>2</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>purple</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+<tr class="datagrid-odd">
+ <td class="datagrid"><span>2</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>purple</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
-</tr>
+</tr>
</table>
-
- <input type="submit" name="actionOverride:save" value="save">
- </form>
- </body>
+
+ <input type="submit" name="actionOverride:save" value="save">
+ </form>
+ </body>
</html>]]>
</responseBody>
@@ -234,72 +234,72 @@
<![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
-
- <head>
- <title>Test for Jira-1120 Fix</title>
- <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
- </head>
- <body>
-
- <p>
- Click the save button, then click the sort column link.
- The sort column link should cause the column to be re-sorted.
- </p>
- <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
+
+ <head>
+ <title>Test for Jira-1120 Fix</title>
+ <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
+ </head>
+ <body>
+
+ <p>
+ Click the save button, then click the sort column link.
+ The sort column link should cause the column to be re-sorted.
+ </p>
+ <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
Page 1 of 1
<table class="datagrid">
-
-
-
-
+
+
-<tr class="datagrid-header">
+
+
+<tr class="datagrid-header">
<th class="datagrid-sortable datagrid">Pet ID <a href="/coreWeb/databinding/datagrid/j1120/sortingAction.do?netui_sort=petGrid%3Bpetid"><img src="/coreWeb/resources/beehive/version1/images/sortable.gif" border="false"></a></th>
-
-
+
+
<th class="datagrid">Name</th>
-
-
+
+
<th class="datagrid">Description</th>
-
-
+
+
<th class="datagrid">Price</th>
-
-
+
+
-</tr>
-
-
-
-
-<tr class="datagrid-even">
- <td class="datagrid"><span>1</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>white</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+</tr>
+
+
+
+
+<tr class="datagrid-even">
+ <td class="datagrid"><span>1</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>white</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
</tr>
-<tr class="datagrid-odd">
- <td class="datagrid"><span>2</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>purple</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+<tr class="datagrid-odd">
+ <td class="datagrid"><span>2</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>purple</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
-</tr>
+</tr>
</table>
-
- <input type="submit" name="actionOverride:save" value="save">
- </form>
- </body>
+
+ <input type="submit" name="actionOverride:save" value="save">
+ </form>
+ </body>
</html>]]>
</responseBody>
@@ -384,72 +384,72 @@
<![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
-
- <head>
- <title>Test for Jira-1120 Fix</title>
- <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
- </head>
- <body>
-
- <p>
- Click the save button, then click the sort column link.
- The sort column link should cause the column to be re-sorted.
- </p>
- <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
+
+ <head>
+ <title>Test for Jira-1120 Fix</title>
+ <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
+ </head>
+ <body>
+
+ <p>
+ Click the save button, then click the sort column link.
+ The sort column link should cause the column to be re-sorted.
+ </p>
+ <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
Page 1 of 1
<table class="datagrid">
-
-
-
-
+
+
+
+
-<tr class="datagrid-header">
+<tr class="datagrid-header">
<th class="datagrid-sorted datagrid-sortable datagrid">Pet ID <a href="/coreWeb/databinding/datagrid/j1120/sortingAction.do?netui_sort=petGrid%3B-petid"><img src="/coreWeb/resources/beehive/version1/images/sortdown.gif" border="false"></a></th>
-
-
+
+
<th class="datagrid">Name</th>
-
-
+
+
<th class="datagrid">Description</th>
-
-
+
+
<th class="datagrid">Price</th>
-
-
+
+
+
+</tr>
+
+
+
-</tr>
-
-
-
-
-<tr class="datagrid-even">
- <td class="datagrid"><span>2</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>purple</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+<tr class="datagrid-even">
+ <td class="datagrid"><span>2</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>purple</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
</tr>
-<tr class="datagrid-odd">
- <td class="datagrid"><span>1</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>white</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+<tr class="datagrid-odd">
+ <td class="datagrid"><span>1</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>white</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
-</tr>
+</tr>
</table>
-
- <input type="submit" name="actionOverride:save" value="save">
- </form>
- </body>
+
+ <input type="submit" name="actionOverride:save" value="save">
+ </form>
+ </body>
</html>]]>
</responseBody>
Propchange: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp Tue Nov 14 15:59:29 2006
@@ -1,56 +1,56 @@
-<%--
- 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.
-
- $Header:$
---%>
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
- <head>
- <title>Test for Jira-1120 Fix</title>
- <netui:base/>
- </head>
- <netui:body>
-
- <p>
- Click the save button, then click the sort column link.
- The sort column link should cause the column to be re-sorted.
- </p>
- <netui:form action="submit">
- <netui-data:dataGrid dataSource="pageFlow.pets" name="petGrid">
- <netui-data:header>
- <netui-data:headerCell sortAction="sortingAction"
- sortExpression="petid"
- headerText="Pet ID">
- Pet ID
- </netui-data:headerCell>
- <netui-data:headerCell headerText="Name"/>
- <netui-data:headerCell headerText="Description"/>
- <netui-data:headerCell headerText="Price"/>
- </netui-data:header>
- <netui-data:rows>
- <netui-data:spanCell value="${container.item.petId}"/>
- <netui-data:spanCell value="${container.item.name}"/>
- <netui-data:spanCell value="${container.item.description}"/>
- <netui-data:spanCell value="${container.item.price}"/>
- </netui-data:rows>
- </netui-data:dataGrid>
- <netui:button action="save" value="save"/>
- </netui:form>
- </netui:body>
-</netui:html>
+<%--
+ 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.
+
+ $Header:$
+--%>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+ <head>
+ <title>Test for Jira-1120 Fix</title>
+ <netui:base/>
+ </head>
+ <netui:body>
+
+ <p>
+ Click the save button, then click the sort column link.
+ The sort column link should cause the column to be re-sorted.
+ </p>
+ <netui:form action="submit">
+ <netui-data:dataGrid dataSource="pageFlow.pets" name="petGrid">
+ <netui-data:header>
+ <netui-data:headerCell sortAction="sortingAction"
+ sortExpression="petid"
+ headerText="Pet ID">
+ Pet ID
+ </netui-data:headerCell>
+ <netui-data:headerCell headerText="Name"/>
+ <netui-data:headerCell headerText="Description"/>
+ <netui-data:headerCell headerText="Price"/>
+ </netui-data:header>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.item.petId}"/>
+ <netui-data:spanCell value="${container.item.name}"/>
+ <netui-data:spanCell value="${container.item.description}"/>
+ <netui-data:spanCell value="${container.item.price}"/>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ <netui:button action="save" value="save"/>
+ </netui:form>
+ </netui:body>
+</netui:html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/misc/showAll.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/misc/showAll.jsp?view=diff&rev=475067&r1=475066&r2=475067
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/misc/showAll.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/misc/showAll.jsp Tue Nov 14 15:59:29 2006
@@ -1,33 +1,33 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<%@ taglib prefix="datagrid" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles" %>
-
-<netui-template:template templatePage="../site/template.jsp">
- <netui-template:setAttribute name="title" value="Data grid -- showAll rows"/>
- <netui-template:section name="body">
- <p>
- <datagrid:portfolioXmlBean/>
- <netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
- <netui-data:configurePager showAll="true"/>
- <netui-data:header>
- <netui-data:headerCell headerText="Symbol"/>
- <netui-data:headerCell headerText="Price"/>
- <netui-data:headerCell headerText="Web"/>
- </netui-data:header>
- <netui-data:rows>
- <netui-data:spanCell value="${container.item.symbol}"/>
- <netui-data:spanCell value="${container.item.price}"/>
- <netui-data:anchorCell href="${container.item.web}" value="${container.item.name}">
- <netui:parameter name="rowid" value="${container.index}"/>
- <netui:parameter name="symbol" value="${container.item.symbol}"/>
- </netui-data:anchorCell>
- </netui-data:rows>
- </netui-data:dataGrid>
- <br/>
- <netui:anchor href="showAll.jsp">Reset</netui:anchor>
- <br/>
- </p>
- </netui-template:section>
-</netui-template:template>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<%@ taglib prefix="datagrid" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles" %>
+
+<netui-template:template templatePage="../site/template.jsp">
+ <netui-template:setAttribute name="title" value="Data grid -- showAll rows"/>
+ <netui-template:section name="body">
+ <p>
+ <datagrid:portfolioXmlBean/>
+ <netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
+ <netui-data:configurePager showAll="true"/>
+ <netui-data:header>
+ <netui-data:headerCell headerText="Symbol"/>
+ <netui-data:headerCell headerText="Price"/>
+ <netui-data:headerCell headerText="Web"/>
+ </netui-data:header>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.item.symbol}"/>
+ <netui-data:spanCell value="${container.item.price}"/>
+ <netui-data:anchorCell href="${container.item.web}" value="${container.item.name}">
+ <netui:parameter name="rowid" value="${container.index}"/>
+ <netui:parameter name="symbol" value="${container.item.symbol}"/>
+ </netui-data:anchorCell>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ <br/>
+ <netui:anchor href="showAll.jsp">Reset</netui:anchor>
+ <br/>
+ </p>
+ </netui-template:section>
+</netui-template:template>
Propchange: beehive/trunk/netui/test/webapps/drt/web/databinding/datagrid/misc/showAll.jsp
------------------------------------------------------------------------------
svn:eol-style = native