Commit adfcda29 authored by Bill Lynch's avatar Bill Lynch Committed by bill

Fixed compile errors


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@168 b35dd754-fafc-0310-a699-88a17e54d16e
parent fb7c63ac
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
java.util.*, java.util.*,
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
org.jivesoftware.messenger.chat.HistoryStrategy, org.jivesoftware.messenger.muc.HistoryStrategy"
org.jivesoftware.messenger.chat.ChatServer"
%> %>
<!-- Define Administration Bean --> <!-- Define Administration Bean -->
...@@ -40,8 +39,8 @@ ...@@ -40,8 +39,8 @@
int numMessages = ParamUtils.getIntParameter(request,"numMessages",0); int numMessages = ParamUtils.getIntParameter(request,"numMessages",0);
// Get an audit manager: // Get an audit manager:
ChatServer chatServer = (ChatServer)admin.getServiceLookup().lookup(ChatServer.class); // ChatServer chatServer = (ChatServer)admin.getServiceLookup().lookup(ChatServer.class);
HistoryStrategy historyStrat = chatServer.getHistoryStrategy(); // HistoryStrategy historyStrat = chatServer.getHistoryStrategy();
Map errors = new HashMap(); Map errors = new HashMap();
if (update) { if (update) {
...@@ -55,14 +54,14 @@ ...@@ -55,14 +54,14 @@
} }
if (errors.size() == 0) { if (errors.size() == 0) {
if (policy == ALL) { if (policy == ALL) {
historyStrat.setType(HistoryStrategy.Type.all); // historyStrat.setType(HistoryStrategy.Type.all);
} }
else if (policy == NONE) { else if (policy == NONE) {
historyStrat.setType(HistoryStrategy.Type.none); // historyStrat.setType(HistoryStrategy.Type.none);
} }
else if (policy == NUMBER) { else if (policy == NUMBER) {
historyStrat.setType(HistoryStrategy.Type.number); // historyStrat.setType(HistoryStrategy.Type.number);
historyStrat.setMaxNumber(numMessages); // historyStrat.setMaxNumber(numMessages);
} }
// All done, redirect // All done, redirect
%> %>
...@@ -75,16 +74,16 @@ ...@@ -75,16 +74,16 @@
// Set page vars // Set page vars
if (errors.size() == 0) { if (errors.size() == 0) {
if (historyStrat.getType() == HistoryStrategy.Type.all) { // if (historyStrat.getType() == HistoryStrategy.Type.all) {
policy = ALL; // policy = ALL;
} // }
else if (historyStrat.getType() == HistoryStrategy.Type.none) { // else if (historyStrat.getType() == HistoryStrategy.Type.none) {
policy = NONE; // policy = NONE;
} // }
else if (historyStrat.getType() == HistoryStrategy.Type.number) { // else if (historyStrat.getType() == HistoryStrategy.Type.number) {
policy = NUMBER; // policy = NUMBER;
} // }
numMessages = historyStrat.getMaxNumber(); // numMessages = historyStrat.getMaxNumber();
} }
%> %>
<form action="chatroom-history-settings.jsp"> <form action="chatroom-history-settings.jsp">
......
<%@ taglib uri="core" prefix="c" %>
<%@ taglib uri="fmt" prefix="fmt" %>
<%-- <%--
- $RCSfile$ - $RCSfile$
- $Revision$ - $Revision$
- $Date$ - $Date$
--%> --%>
<%@ taglib uri="core" prefix="c" %>
<%@ taglib uri="fmt" prefix="fmt" %>
<%@ page import="org.jivesoftware.util.*, <%@ page import="org.jivesoftware.util.*,
java.util.HashMap, java.util.HashMap,
java.util.Map, java.util.Map,
org.jivesoftware.messenger.*, org.jivesoftware.messenger.*,
org.jivesoftware.messenger.user.*, org.jivesoftware.messenger.user.*,
java.util.*, java.util.*,
java.text.*, java.text.*"
org.jivesoftware.messenger.chat.*"
%> %>
<%@ include file="global.jsp" %> <%@ include file="global.jsp" %>
<!-- Define Administration Bean --> <!-- Define Administration Bean -->
...@@ -60,12 +60,4 @@ ...@@ -60,12 +60,4 @@
</table> </table>
</div> </div>
<%@ include file="bottom.jsp" %>
\ No newline at end of file
<%@ include file="bottom.jsp" %>
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