Commit bcd1ad51 authored by Matt Tucker's avatar Matt Tucker Committed by matt

Removed references to internal plugin manager.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@959 b35dd754-fafc-0310-a699-88a17e54d16e
parent 96fb02c6
...@@ -138,7 +138,12 @@ public class BroadcastPlugin implements Plugin, Component { ...@@ -138,7 +138,12 @@ public class BroadcastPlugin implements Plugin, Component {
error.setSubject("Error sending broadcast message"); error.setSubject("Error sending broadcast message");
error.setBody("Not allowed to send a broadcast message to " + error.setBody("Not allowed to send a broadcast message to " +
message.getTo()); message.getTo());
InternalComponentManager.getInstance().sendPacket(this, error); try {
componentManager.sendPacket(this, error);
}
catch (Exception e) {
componentManager.getLog().error(e);
}
return; return;
} }
} }
...@@ -161,7 +166,12 @@ public class BroadcastPlugin implements Plugin, Component { ...@@ -161,7 +166,12 @@ public class BroadcastPlugin implements Plugin, Component {
Message newMessage = message.createCopy(); Message newMessage = message.createCopy();
JID userJID = XMPPServer.getInstance().createJID(user, null); JID userJID = XMPPServer.getInstance().createJID(user, null);
newMessage.setTo(userJID); newMessage.setTo(userJID);
InternalComponentManager.getInstance().sendPacket(this, newMessage); try {
componentManager.sendPacket(this, newMessage);
}
catch (Exception e) {
componentManager.getLog().error(e);
}
} }
} }
else { else {
...@@ -175,7 +185,12 @@ public class BroadcastPlugin implements Plugin, Component { ...@@ -175,7 +185,12 @@ public class BroadcastPlugin implements Plugin, Component {
error.setSubject("Error sending broadcast message"); error.setSubject("Error sending broadcast message");
error.setBody("Not allowed to send a broadcast message to " + error.setBody("Not allowed to send a broadcast message to " +
message.getTo()); message.getTo());
InternalComponentManager.getInstance().sendPacket(this, error); try {
componentManager.sendPacket(this, error);
}
catch (Exception e) {
componentManager.getLog().error(e);
}
} }
} }
catch (GroupNotFoundException gnfe) { catch (GroupNotFoundException gnfe) {
...@@ -189,7 +204,12 @@ public class BroadcastPlugin implements Plugin, Component { ...@@ -189,7 +204,12 @@ public class BroadcastPlugin implements Plugin, Component {
error.setSubject("Error sending broadcast message"); error.setSubject("Error sending broadcast message");
error.setBody("Address not valid: " + error.setBody("Address not valid: " +
message.getTo()); message.getTo());
InternalComponentManager.getInstance().sendPacket(this, error); try {
componentManager.sendPacket(this, error);
}
catch (Exception e) {
componentManager.getLog().error(e);
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment