From 9e794d14d53f3acd1764e9a315a8ba16a7e08e6c Mon Sep 17 00:00:00 2001 From: sgutierrez Date: Mon, 28 Mar 2011 16:29:26 -0300 Subject: [PATCH 0001/1126] Agrego DAHDIShowChannels --- .../manager/AbstractManagerEventListener.java | 14 ++ .../action/DAHDIShowChannelsAction.java | 62 ++++++ .../event/DAHDIShowChannelsCompleteEvent.java | 92 ++++++++ .../manager/event/DAHDIShowChannelsEvent.java | 204 ++++++++++++++++++ .../manager/internal/EventBuilderImpl.java | 2 + 5 files changed, 374 insertions(+) create mode 100644 src/main/java/org/asteriskjava/manager/action/DAHDIShowChannelsAction.java create mode 100644 src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsCompleteEvent.java create mode 100644 src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsEvent.java diff --git a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java index 95fcac14b..c8528c31f 100644 --- a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java +++ b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java @@ -319,10 +319,16 @@ protected void handleEvent(ZapShowChannelsCompleteEvent event) { } + protected void handleEvent(DAHDIShowChannelsCompleteEvent event) + { + } protected void handleEvent(ZapShowChannelsEvent event) { } + protected void handleEvent(DAHDIShowChannelsEvent event) + { + } protected void handleEvent(CoreShowChannelEvent event) { } @@ -598,10 +604,18 @@ else if (event instanceof ZapShowChannelsCompleteEvent) { handleEvent((ZapShowChannelsCompleteEvent) event); } + else if (event instanceof DAHDIShowChannelsCompleteEvent) + { + handleEvent((ZapShowChannelsCompleteEvent) event); + } else if (event instanceof ZapShowChannelsEvent) { handleEvent((ZapShowChannelsEvent) event); } + else if (event instanceof DAHDIShowChannelsEvent) + { + handleEvent((ZapShowChannelsEvent) event); + } else if (event instanceof CoreShowChannelEvent) { handleEvent((CoreShowChannelEvent) event); diff --git a/src/main/java/org/asteriskjava/manager/action/DAHDIShowChannelsAction.java b/src/main/java/org/asteriskjava/manager/action/DAHDIShowChannelsAction.java new file mode 100644 index 000000000..7495b4969 --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/action/DAHDIShowChannelsAction.java @@ -0,0 +1,62 @@ +/* + * Copyright 2004-2006 Stefan Reuter + * + * Licensed 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.asteriskjava.manager.action; + +import org.asteriskjava.manager.event.DAHDIShowChannelsCompleteEvent; +import org.asteriskjava.manager.event.ResponseEvent; + +/** + * The DAHDIShowChannelsAction requests the state of all DAHDI channels.

+ * For each DAHDI channel aDAHDIShowChannelsEvent is generated. After all DAHDI + * channels have been listed a DAHDIShowChannelsCompleteEvent is generated. + * + * @see org.asteriskjava.manager.event.DAHDIShowChannelsEvent + * @see org.asteriskjava.manager.event.DAHDIShowChannelsCompleteEvent + * @author srt + * @version $Id$ + */ +public class DAHDIShowChannelsAction extends AbstractManagerAction + implements + EventGeneratingAction +{ + /** + * Serializable version identifier + */ + private static final long serialVersionUID = 8697000330085766825L; + + /** + * Creates a new DAHDIShowChannelsAction. + */ + public DAHDIShowChannelsAction() + { + + } + + /** + * Returns the name of this action, i.e. "DAHDIShowChannels". + */ + @Override + public String getAction() + { + return "DAHDIShowChannels"; + } + + public Class getActionCompleteEventClass() + { + return DAHDIShowChannelsCompleteEvent.class; + } +} diff --git a/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsCompleteEvent.java new file mode 100644 index 000000000..48a376595 --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsCompleteEvent.java @@ -0,0 +1,92 @@ +/* + * Copyright 2004-2006 Stefan Reuter + * + * Licensed 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.asteriskjava.manager.event; + +/** + * A DAHDIShowChannelsCompleteEvent is triggered after the state of all DAHDI channels has been reported + * in response to a DAHDIShowChannelsAction. + * + * @see org.asteriskjava.manager.action.DAHDIShowChannelsAction + * @see org.asteriskjava.manager.event.DAHDIShowChannelsEvent + * + * @author srt + * @version $Id$ + */ +public class DAHDIShowChannelsCompleteEvent extends ResponseEvent +{ + /** + * Serial version identifier + */ + private static final long serialVersionUID = 6323249250335885462L; + + private Integer listitems; + private String eventlist; + private Integer items; + + public Integer getItems() { + return items; + } + + public void setItems(Integer items) { + this.items = items; + } + + /** + * @param source + */ + public DAHDIShowChannelsCompleteEvent(Object source) + { + super(source); + } + + /** + * Returns if the status of the eventlist (should be Complete).

+ * + * @return the status of the list. + * @since 1.0.0 + */ + public String getEventlist() + { + return eventlist; + } + + public void setEventlist(String eventlist) + { + this.eventlist = eventlist; + } + + /** + * Returns the number of channels reported.

+ * + * @return the number of channels reported. + */ + public Integer getListitems() + { + return listitems; + } + + /** + * Sets the number of channels reported.

+ * + * @param items the number of channels reported. + */ + public void setListitems(Integer listitems) + { + this.listitems = listitems; + } + +} diff --git a/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsEvent.java b/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsEvent.java new file mode 100644 index 000000000..703ab6097 --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsEvent.java @@ -0,0 +1,204 @@ +/* + * Copyright 2004-2006 Stefan Reuter + * + * Licensed 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.asteriskjava.manager.event; + +/** + * A DAHDIShowChannelsEvent is triggered in response to a DAHDIShowChannelsAction and shows the state of + * a DAHDI channel. + * + * @see org.asteriskjava.manager.action.DAHDIShowChannelsAction + * + * @author srt + * @version $Id$ + */ +public class DAHDIShowChannelsEvent extends ResponseEvent +{ + /** + * Serial version identifier + */ + private static final long serialVersionUID = -3613642267527361400L; + private Integer dahdichannel; + private String signalling; + private String signallingcode; + private String context; + private Boolean dnd; + private String alarm; + private String uniqueid; + private String accountcode; + private String channel; + + public String getAccountcode() { + return accountcode; + } + + public void setAccountcode(String accountcode) { + this.accountcode = accountcode; + } + + public String getChannel() { + return channel; + } + + public void setChannel(String channel) { + this.channel = channel; + } + + public Integer getDahdichannel() { + return dahdichannel; + } + + public void setDahdichannel(Integer dahdichannel) { + this.dahdichannel = dahdichannel; + } + + public String getSignallingcode() { + return signallingcode; + } + + public void setSignallingcode(String signallingcode) { + this.signallingcode = signallingcode; + } + + public String getUniqueid() { + return uniqueid; + } + + public void setUniqueid(String uniqueid) { + this.uniqueid = uniqueid; + } + + + + + /** + * @param source + */ + public DAHDIShowChannelsEvent(Object source) + { + super(source); + } + + + /** + * Returns the signalling of this DAHDI channel.

+ * Possible values are: + *

+ */ + public String getSignalling() + { + return signalling; + } + + /** + * Sets the signalling of this DAHDI channel. + */ + public void setSignalling(String signalling) + { + this.signalling = signalling; + } + + + + /** + * Returns the context of this DAHDI channel as defined in chan_dahdi.conf. + */ + public String getContext() + { + return context; + } + + /** + * Sets the context of this DAHDI channel. + */ + public void setContext(String context) + { + this.context = context; + } + + /** + * Returns whether dnd (do not disturb) is enabled for this DAHDI channel. + * + * @return Boolean.TRUE if dnd is enabled, Boolean.FALSE if it is disabled, + * null if not set. + * @since 0.3 + */ + public Boolean getDnd() + { + return dnd; + } + + /** + * Sets whether dnd (do not disturb) is enabled for this DAHDI channel. + * + * @param dnd Boolean.TRUE if dnd is enabled, Boolean.FALSE if it is disabled. + * @since 0.3 + */ + public void setDnd(Boolean dnd) + { + this.dnd = dnd; + } + + /** + * Returns the alarm state of this DAHDI channel.

+ * This may be one of + *

+ */ + public String getAlarm() + { + return alarm; + } + + /** + * Sets the alarm state of this DAHDI channel. + */ + public void setAlarm(String alarm) + { + this.alarm = alarm; + } +} diff --git a/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java b/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java index 1320effc7..1146911eb 100644 --- a/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java +++ b/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java @@ -168,6 +168,8 @@ private void registerBuiltinEventClasses() registerEventClass(VoicemailUserEntryEvent.class); registerEventClass(ZapShowChannelsEvent.class); registerEventClass(ZapShowChannelsCompleteEvent.class); + registerEventClass(DAHDIShowChannelsEvent.class); + registerEventClass(DAHDIShowChannelsCompleteEvent.class); } public final void registerEventClass(Class clazz) throws IllegalArgumentException From ed077b1548fd9c1c13360de40dfa66a1e910b967 Mon Sep 17 00:00:00 2001 From: scgm11 Date: Mon, 26 Sep 2011 00:08:19 -0300 Subject: [PATCH 0002/1126] fixes capitalization and order --- .../manager/AbstractManagerEventListener.java | 12 +++---- .../action/DAHDIShowChannelsAction.java | 24 ++++++------- .../event/DAHDIShowChannelsCompleteEvent.java | 12 +++---- .../manager/event/DAHDIShowChannelsEvent.java | 34 +++++++++---------- .../manager/internal/EventBuilderImpl.java | 5 +-- 5 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java index c8528c31f..5257b5b6b 100644 --- a/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java +++ b/src/main/java/org/asteriskjava/manager/AbstractManagerEventListener.java @@ -319,14 +319,14 @@ protected void handleEvent(ZapShowChannelsCompleteEvent event) { } - protected void handleEvent(DAHDIShowChannelsCompleteEvent event) + protected void handleEvent(DahdiShowChannelsCompleteEvent event) { } protected void handleEvent(ZapShowChannelsEvent event) { } - protected void handleEvent(DAHDIShowChannelsEvent event) + protected void handleEvent(DahdiShowChannelsEvent event) { } protected void handleEvent(CoreShowChannelEvent event) @@ -604,17 +604,17 @@ else if (event instanceof ZapShowChannelsCompleteEvent) { handleEvent((ZapShowChannelsCompleteEvent) event); } - else if (event instanceof DAHDIShowChannelsCompleteEvent) + else if (event instanceof DahdiShowChannelsCompleteEvent) { - handleEvent((ZapShowChannelsCompleteEvent) event); + handleEvent((DahdiShowChannelsCompleteEvent) event); } else if (event instanceof ZapShowChannelsEvent) { handleEvent((ZapShowChannelsEvent) event); } - else if (event instanceof DAHDIShowChannelsEvent) + else if (event instanceof DahdiShowChannelsEvent) { - handleEvent((ZapShowChannelsEvent) event); + handleEvent((DahdiShowChannelsEvent) event); } else if (event instanceof CoreShowChannelEvent) { diff --git a/src/main/java/org/asteriskjava/manager/action/DAHDIShowChannelsAction.java b/src/main/java/org/asteriskjava/manager/action/DAHDIShowChannelsAction.java index 7495b4969..1d5b72785 100644 --- a/src/main/java/org/asteriskjava/manager/action/DAHDIShowChannelsAction.java +++ b/src/main/java/org/asteriskjava/manager/action/DAHDIShowChannelsAction.java @@ -16,20 +16,20 @@ */ package org.asteriskjava.manager.action; -import org.asteriskjava.manager.event.DAHDIShowChannelsCompleteEvent; +import org.asteriskjava.manager.event.DahdiShowChannelsCompleteEvent; import org.asteriskjava.manager.event.ResponseEvent; /** - * The DAHDIShowChannelsAction requests the state of all DAHDI channels.

- * For each DAHDI channel aDAHDIShowChannelsEvent is generated. After all DAHDI - * channels have been listed a DAHDIShowChannelsCompleteEvent is generated. + * The DahdiShowChannelsAction requests the state of all Dahdi channels.

+ * For each Dahdi channel aDahdiShowChannelsEvent is generated. After all Dahdi + * channels have been listed a DahdiShowChannelsCompleteEvent is generated. * - * @see org.asteriskjava.manager.event.DAHDIShowChannelsEvent - * @see org.asteriskjava.manager.event.DAHDIShowChannelsCompleteEvent + * @see org.asteriskjava.manager.event.DahdiShowChannelsEvent + * @see org.asteriskjava.manager.event.DahdiShowChannelsCompleteEvent * @author srt * @version $Id$ */ -public class DAHDIShowChannelsAction extends AbstractManagerAction +public class DahdiShowChannelsAction extends AbstractManagerAction implements EventGeneratingAction { @@ -39,24 +39,24 @@ public class DAHDIShowChannelsAction extends AbstractManagerAction private static final long serialVersionUID = 8697000330085766825L; /** - * Creates a new DAHDIShowChannelsAction. + * Creates a new DahdiShowChannelsAction. */ - public DAHDIShowChannelsAction() + public DahdiShowChannelsAction() { } /** - * Returns the name of this action, i.e. "DAHDIShowChannels". + * Returns the name of this action, i.e. "DahdiShowChannels". */ @Override public String getAction() { - return "DAHDIShowChannels"; + return "DahdiShowChannels"; } public Class getActionCompleteEventClass() { - return DAHDIShowChannelsCompleteEvent.class; + return DahdiShowChannelsCompleteEvent.class; } } diff --git a/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsCompleteEvent.java index 48a376595..595e9e9cb 100644 --- a/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsCompleteEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsCompleteEvent.java @@ -17,16 +17,16 @@ package org.asteriskjava.manager.event; /** - * A DAHDIShowChannelsCompleteEvent is triggered after the state of all DAHDI channels has been reported - * in response to a DAHDIShowChannelsAction. + * A DahdiShowChannelsCompleteEvent is triggered after the state of all Dahdi channels has been reported + * in response to a DahdiShowChannelsAction. * - * @see org.asteriskjava.manager.action.DAHDIShowChannelsAction - * @see org.asteriskjava.manager.event.DAHDIShowChannelsEvent + * @see org.asteriskjava.manager.action.DahdiShowChannelsAction + * @see org.asteriskjava.manager.event.DahdiShowChannelsEvent * * @author srt * @version $Id$ */ -public class DAHDIShowChannelsCompleteEvent extends ResponseEvent +public class DahdiShowChannelsCompleteEvent extends ResponseEvent { /** * Serial version identifier @@ -48,7 +48,7 @@ public void setItems(Integer items) { /** * @param source */ - public DAHDIShowChannelsCompleteEvent(Object source) + public DahdiShowChannelsCompleteEvent(Object source) { super(source); } diff --git a/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsEvent.java b/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsEvent.java index 703ab6097..d827b0541 100644 --- a/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsEvent.java +++ b/src/main/java/org/asteriskjava/manager/event/DAHDIShowChannelsEvent.java @@ -17,21 +17,21 @@ package org.asteriskjava.manager.event; /** - * A DAHDIShowChannelsEvent is triggered in response to a DAHDIShowChannelsAction and shows the state of - * a DAHDI channel. + * A DahdiShowChannelsEvent is triggered in response to a DahdiShowChannelsAction and shows the state of + * a Dahdi channel. * - * @see org.asteriskjava.manager.action.DAHDIShowChannelsAction + * @see org.asteriskjava.manager.action.DahdiShowChannelsAction * * @author srt * @version $Id$ */ -public class DAHDIShowChannelsEvent extends ResponseEvent +public class DahdiShowChannelsEvent extends ResponseEvent { /** * Serial version identifier */ private static final long serialVersionUID = -3613642267527361400L; - private Integer dahdichannel; + private Integer Dahdichannel; private String signalling; private String signallingcode; private String context; @@ -58,11 +58,11 @@ public void setChannel(String channel) { } public Integer getDahdichannel() { - return dahdichannel; + return Dahdichannel; } - public void setDahdichannel(Integer dahdichannel) { - this.dahdichannel = dahdichannel; + public void setDahdichannel(Integer Dahdichannel) { + this.Dahdichannel = Dahdichannel; } public String getSignallingcode() { @@ -87,14 +87,14 @@ public void setUniqueid(String uniqueid) { /** * @param source */ - public DAHDIShowChannelsEvent(Object source) + public DahdiShowChannelsEvent(Object source) { super(source); } /** - * Returns the signalling of this DAHDI channel.

+ * Returns the signalling of this Dahdi channel.

* Possible values are: *