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/07 18:04:56 UTC
svn commit: r472169 - in /beehive/trunk/controls:
src/runtime/org/apache/beehive/controls/runtime/generator/
test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/
test/src/junit-tests/org/apache/beehive/controls...
Author: cschoett
Date: Tue Nov 7 09:04:55 2006
New Revision: 472169
URL: http://svn.apache.org/viewvc?view=rev&rev=472169
Log:
Fix for BEEHIVE-1152, updated ControlBean velocity template to fix compilation error. Also added new drt test for this case.
Added:
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControl.java
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControlImpl.java
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControl.java
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControlImpl.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetOverloadTest.java
Modified:
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext1Bean.beaninfo
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext2Bean.beaninfo
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf1Bean.beaninfo
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf2Bean.beaninfo
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm?view=diff&rev=472169&r1=472168&r2=472169
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ControlBean.vm Tue Nov 7 09:04:55 2006
@@ -537,7 +537,7 @@
* Returns the array of registered listeners for ${eventSet.shortName} events on the bean, or
* an empty array if no listener has been registered
*/
- public synchronized $eventSet.formalClassName [] ${eventSet.getListenersMethod}()
+ public synchronized Object [] ${eventSet.getListenersMethod}()
{
$eventSet.notifierClass __bc_notifier = ($eventSet.notifierClass)getEventNotifier(${eventSet.className}.class);
$eventSet.formalClassName [] __bc_listeners = new ${eventSet.className}[__bc_notifier.getListenerCount()];
Added: 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=auto&rev=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControl.java (added)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControl.java Tue Nov 7 09:04:55 2006
@@ -0,0 +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();
+}
Added: 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=auto&rev=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControlImpl.java (added)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SubControlImpl.java Tue Nov 7 09:04:55 2006
@@ -0,0 +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");
+ }
+}
Added: 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=auto&rev=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControl.java (added)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControl.java Tue Nov 7 09:04:55 2006
@@ -0,0 +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();
+}
Added: 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=auto&rev=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControlImpl.java (added)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/eventsetInheritanceOverload/SuperControlImpl.java Tue Nov 7 09:04:55 2006
@@ -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.
+ *
+ * $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");
+ }
+}
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo?view=diff&rev=472169&r1=472168&r2=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/beaninfo/InfoTestBean.beaninfo Tue Nov 7 09:04:55 2006
@@ -136,7 +136,7 @@
public synchronized void org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.removeTestEventsListener(org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.beaninfo.InfoTest$TestEvents[] org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.getTestEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.beaninfo.InfoTestBean.getTestEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="InfoTest eventMethod1"
Added: 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=auto&rev=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetOverloadTest.java (added)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/event/EventSetOverloadTest.java Tue Nov 7 09:04:55 2006
@@ -0,0 +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;
+ }
+}
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext1Bean.beaninfo
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext1Bean.beaninfo?view=diff&rev=472169&r1=472168&r2=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext1Bean.beaninfo (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext1Bean.beaninfo Tue Nov 7 09:04:55 2006
@@ -290,7 +290,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf2Bean.removeIntf2NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2NewEvents[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"
@@ -377,7 +377,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Ext1Bean.removeExt1NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Ext1$Ext1NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Ext1$Ext1NewEvents[] org.apache.beehive.controls.test.controls.inherit.Ext1Bean.getExt1NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Ext1Bean.getExt1NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="ext1NewEvent1"
@@ -434,7 +434,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf1Bean.removeIntf1EventsListener(org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1Events[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="intf1Event1"
@@ -521,7 +521,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Ext1Bean.removeExt1EventsListener(org.apache.beehive.controls.test.controls.inherit.Ext1$Ext1Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Ext1$Ext1Events[] org.apache.beehive.controls.test.controls.inherit.Ext1Bean.getExt1EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Ext1Bean.getExt1EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"
@@ -698,7 +698,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf1Bean.removeIntf1NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1NewEvents[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="intf1NewEvent1"
@@ -755,7 +755,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf2Bean.removeIntf2EventsListener(org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2Events[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext2Bean.beaninfo
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext2Bean.beaninfo?view=diff&rev=472169&r1=472168&r2=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext2Bean.beaninfo (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Ext2Bean.beaninfo Tue Nov 7 09:04:55 2006
@@ -320,7 +320,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Ext2Bean.removeExt2SkipEventsListener(org.apache.beehive.controls.test.controls.inherit.Ext2$Ext2SkipEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Ext2$Ext2SkipEvents[] org.apache.beehive.controls.test.controls.inherit.Ext2Bean.getExt2SkipEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Ext2Bean.getExt2SkipEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"
@@ -497,7 +497,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Ext2Bean.removeExt2NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Ext2$Ext2NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Ext2$Ext2NewEvents[] org.apache.beehive.controls.test.controls.inherit.Ext2Bean.getExt2NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Ext2Bean.getExt2NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="ext2NewEvent1"
@@ -554,7 +554,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf2Bean.removeIntf2NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2NewEvents[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"
@@ -641,7 +641,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Ext1Bean.removeExt1NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Ext1$Ext1NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Ext1$Ext1NewEvents[] org.apache.beehive.controls.test.controls.inherit.Ext1Bean.getExt1NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Ext1Bean.getExt1NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="ext1NewEvent1"
@@ -698,7 +698,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf1Bean.removeIntf1EventsListener(org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1Events[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="intf1Event1"
@@ -785,7 +785,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Ext1Bean.removeExt1EventsListener(org.apache.beehive.controls.test.controls.inherit.Ext1$Ext1Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Ext1$Ext1Events[] org.apache.beehive.controls.test.controls.inherit.Ext1Bean.getExt1EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Ext1Bean.getExt1EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"
@@ -962,7 +962,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf1Bean.removeIntf1NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1NewEvents[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="intf1NewEvent1"
@@ -1019,7 +1019,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf2Bean.removeIntf2EventsListener(org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2Events[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"
@@ -1166,7 +1166,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Ext2Bean.removeExt2EventsListener(org.apache.beehive.controls.test.controls.inherit.Ext2$Ext2Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Ext2$Ext2Events[] org.apache.beehive.controls.test.controls.inherit.Ext2Bean.getExt2EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Ext2Bean.getExt2EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf1Bean.beaninfo
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf1Bean.beaninfo?view=diff&rev=472169&r1=472168&r2=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf1Bean.beaninfo (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf1Bean.beaninfo Tue Nov 7 09:04:55 2006
@@ -158,7 +158,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf1Bean.removeIntf1EventsListener(org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1Events[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="intf1Event1"
@@ -245,7 +245,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf1Bean.removeIntf1NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1NewEvents[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="intf1NewEvent1"
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf2Bean.beaninfo
URL: http://svn.apache.org/viewvc/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf2Bean.beaninfo?view=diff&rev=472169&r1=472168&r2=472169
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf2Bean.beaninfo (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/inherit/Intf2Bean.beaninfo Tue Nov 7 09:04:55 2006
@@ -260,7 +260,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf2Bean.removeIntf2NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2NewEvents[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"
@@ -347,7 +347,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf1Bean.removeIntf1EventsListener(org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1Events[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="intf1Event1"
@@ -434,7 +434,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf1Bean.removeIntf1NewEventsListener(org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1NewEvents)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf1$Intf1NewEvents[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1NewEventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf1Bean.getIntf1NewEventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="intf1NewEvent1"
@@ -491,7 +491,7 @@
public synchronized void org.apache.beehive.controls.test.controls.inherit.Intf2Bean.removeIntf2EventsListener(org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2Events)
</remove-listener-method>
<get-listener-method>
- public synchronized org.apache.beehive.controls.test.controls.inherit.Intf2$Intf2Events[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2EventsListeners()
+ public synchronized java.lang.Object[] org.apache.beehive.controls.test.controls.inherit.Intf2Bean.getIntf2EventsListeners()
</get-listener-method>
<listener-method-descriptors>
<method-descriptor name="addInEvent1"