[jetrix-cvs] jetrix/src/admin/WEB-INF/classes/net/jetrix/servlets ChannelAction.java,1.5,1.6

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/admin/WEB-INF/classes/net/jetrix/servlets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13938/src/admin/WEB-INF/classes/net/jetrix/servlets

Modified Files:
	ChannelAction.java 
Log Message:
Channels can now be created from the administration console

Index: ChannelAction.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/admin/WEB-INF/classes/net/jetrix/servlets/ChannelAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChannelAction.java	4 May 2005 08:57:41 -0000	1.5
--- ChannelAction.java	4 May 2005 10:29:52 -0000	1.6
***************
*** 24,27 ****
--- 24,28 ----
  import net.jetrix.Server;
  import net.jetrix.config.ChannelConfig;
+ import net.jetrix.config.Settings;
  
  import javax.servlet.ServletException;
***************
*** 39,66 ****
   * @version $Revision$, $Date$
   */
! public class ChannelAction extends HttpServlet {
! 
!     protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
  
          String name = request.getParameter("name");
  
!         Channel channel = ChannelManager.getInstance().getChannel(name);
!         ChannelConfig config = channel.getConfig();
  
!         String password = request.getParameter("password");
!         password = password == null ? null : password.trim();
!         password = "".equals(password) ? null : password;
  
!         config.setDescription(request.getParameter("description"));
!         config.setAccessLevel(Integer.parseInt(request.getParameter("accessLevel")));
!         config.setPassword(password);
!         config.setMaxPlayers(max(0, min(6, Integer.parseInt(request.getParameter("maxPlayers")))));
!         config.setMaxSpectators(max(0, Integer.parseInt(request.getParameter("maxSpectators"))));
!         config.setPersistent("true".equals(request.getParameter("persistent")));
!         config.setVisible("true".equals(request.getParameter("visible")));
!         config.setIdleAllowed("true".equals(request.getParameter("idle")));
!         config.setWinlistId(request.getParameter("winlist"));
!         config.setTopic(request.getParameter("topic"));
  
          response.sendRedirect("/channel.jsp?name=" + name);
  
--- 40,100 ----
   * @version $Revision$, $Date$
   */
! public class ChannelAction extends HttpServlet
! {
  
+     protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+     {
          String name = request.getParameter("name");
+         ChannelManager manager = ChannelManager.getInstance();
  
!         if ("new".equals(request.getParameter("action")))
!         {
!             // create a new channel
!             ChannelConfig config = new ChannelConfig();
!             config.setSettings(new Settings());
!             config.setDescription("");
  
!             // find a name for the channel
!             int i = 1;
!             while (name == null)
!             {
!                 if (manager.getChannel("tetrinet" + i) == null)
!                 {
!                     name = "tetrinet" + i;
!                 }
!                 else
!                 {
!                     i++;
!                 }
!             }
  
!             config.setName(name);
! 
!             // spawn the channel
!             manager.createChannel(config);
!         }
!         else
!         {
!             // update an existing channel
!             Channel channel = manager.getChannel(name);
!             ChannelConfig config = channel.getConfig();
  
+             String password = request.getParameter("password");
+             password = password == null ? null : password.trim();
+             password = "".equals(password) ? null : password;
+ 
+             config.setDescription(request.getParameter("description"));
+             config.setAccessLevel(Integer.parseInt(request.getParameter("accessLevel")));
+             config.setPassword(password);
+             config.setMaxPlayers(max(0, min(6, Integer.parseInt(request.getParameter("maxPlayers")))));
+             config.setMaxSpectators(max(0, Integer.parseInt(request.getParameter("maxSpectators"))));
+             config.setPersistent("true".equals(request.getParameter("persistent")));
+             config.setVisible("true".equals(request.getParameter("visible")));
+             config.setIdleAllowed("true".equals(request.getParameter("idle")));
+             config.setWinlistId(request.getParameter("winlist"));
+             config.setTopic(request.getParameter("topic"));
+         }
+ 
+         // redirect to the channel page
          response.sendRedirect("/channel.jsp?name=" + name);