Projects >> GroupOne >>2f80867719589d3a3f807d1c6c6930969c585019

Chunk
Conflicting content 
	 */
<<<<<<< HEAD
package groupone;


import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class SelectBrowseCatalog
 */
@WebServlet("/BrowsePage")
public class BrowsePage extends HttpServlet {
	private static final long serialVersionUID = 1L;
	private static ArrayList coupons;
       
    /**
     * @see HttpServlet#HttpServlet()
     */
    public BrowsePage() {
        super();
        // TODO Auto-generated constructor stub
    }

	/**
	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
	}

	/**
	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
		String catalogBtn = request.getParameter("catalogBtn");
		
		filterCoupon(catalogBtn);
		request.setAttribute("coupons", coupons);
		request.setAttribute("catalog", catalogBtn);
		request.getRequestDispatcher("/page_selectCoupon.jsp").forward(request, response);
	}
	
	public void filterCoupon(String name) {
		ArrayList allCoupons = DBOperation.getCouponList();
		ArrayList filtered = new ArrayList();
		
		for(Coupon c : allCoupons) {
			if(c.getCategory().equalsIgnoreCase(name))
				filtered.add(c);
		}
		
		//for testing, don't change! =D
		coupons = allCoupons;			
	}		

}
=======
package groupone;


import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class SelectBrowseCatalog
 */
@WebServlet("/BrowsePage")
public class BrowsePage extends HttpServlet {
	private static final long serialVersionUID = 1L;
	private static ArrayList coupons;
       
    /**
     * @see HttpServlet#HttpServlet()
     */
    public BrowsePage() {
        super();
        // TODO Auto-generated constructor stub
    }

	/**
	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
	}

	/**
	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
		String catalogBtn = request.getParameter("catalogBtn");
		
		filterCoupon(catalogBtn);
		request.setAttribute("coupons", coupons);
		request.setAttribute("catalog", catalogBtn);
		request.getRequestDispatcher("/page_selectCoupon.jsp").forward(request, response);
	}
	
	public void filterCoupon(String name) {
		ArrayList allCoupons = DBOperation.getCouponList();
		ArrayList filtered = new ArrayList();
		
		for(Coupon c : allCoupons) {
			if(c.getCategory().equalsIgnoreCase(name) && Integer.parseInt(c.getQuantity()) > 0)
				filtered.add(c);
		}
		
		//for testing, don't change! =D
		coupons = allCoupons;			
	}		

}
>>>>>>> ec711932a1ddd3ad42f4e0fec339d3d5c3f17878
Solution content 
package groupone;


import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class SelectBrowseCatalog
 */
@WebServlet("/BrowsePage")
public class BrowsePage extends HttpServlet {
	private static final long serialVersionUID = 1L;
	private static ArrayList coupons;
       
    /**
     * @see HttpServlet#HttpServlet()
     */
    public BrowsePage() {
        super();
        // TODO Auto-generated constructor stub
    }

	/**
	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
	}

	/**
	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
		String catalogBtn = request.getParameter("catalogBtn");
		
		filterCoupon(catalogBtn);
		request.setAttribute("coupons", coupons);
		request.setAttribute("catalog", catalogBtn);
		request.getRequestDispatcher("/page_selectCoupon.jsp").forward(request, response);
	}
	
	public void filterCoupon(String name) {
		ArrayList allCoupons = DBOperation.getCouponList();
		ArrayList filtered = new ArrayList();
		
		for(Coupon c : allCoupons) {
			if(c.getCategory().equalsIgnoreCase(name) && Integer.parseInt(c.getQuantity()) > 0)
				filtered.add(c);
		}
		
		//for testing, don't change! =D
		coupons = allCoupons;			
	}		

}
File
BrowsePage.java
Developer's decision
Version 2
Kind of conflict
Annotation
Class declaration
Comment
Import
Package declaration
Chunk
Conflicting content 
<<<<<<< HEAD
package groupone;

import java.io.IOException;
import java.util.ArrayList;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class CheckOut
 */
@WebServlet("/CheckOut")
public class CheckOut extends HttpServlet {
	private static final long serialVersionUID = 1L;
       
    /**
     * @see HttpServlet#HttpServlet()
     */
    public CheckOut() {
        super();
        // TODO Auto-generated constructor stub
    }

	/**
	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
	}

	/**
	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
		/*
		String[] textFields = request.getParameterValues("textField");		
		for(String s: textFields) {
			if(s.isEmpty()) {
				request.setAttribute("errorMsg", "Cannot leave blank information");
				request.getRequestDispatcher("/.jsp").forward(request, response);
			}
		}
		*/
		ArrayList coupons = (ArrayList)request.getAttribute("coupons");
		System.out.println(coupons);
		request.getRequestDispatcher("/page_invoice.jsp").forward(request, response);
	}

}
=======
package groupone;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class CheckOut
 */
@WebServlet("/CheckOut")
public class CheckOut extends HttpServlet {
	private static final long serialVersionUID = 1L;
       
    /**
     * @see HttpServlet#HttpServlet()
     */
    public CheckOut() {
        super();
        // TODO Auto-generated constructor stub
    }

	/**
	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
	}

	/**
	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
		/*
		String[] textFields = request.getParameterValues("textField");		
		for(String s: textFields) {
			if(s.isEmpty()) {
				request.setAttribute("errorMsg", "Cannot leave blank information");
				request.getRequestDispatcher("/.jsp").forward(request, response);
			}
		}
		*/
		String userEmail = request.getSession().getAttribute("userEmail").toString();
		String objectId = request.getParameter("objectId");
		String[] couponIds = (String[])request.getSession().getAttribute(objectId);
		
		DBOperation.updateCoupon(couponIds);
		
		request.getRequestDispatcher("/page_invoice.jsp").forward(request, response);
	}

}
>>>>>>> ec711932a1ddd3ad42f4e0fec339d3d5c3f17878
Solution content 
package groupone;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class CheckOut
 */
@WebServlet("/CheckOut")
public class CheckOut extends HttpServlet {
	private static final long serialVersionUID = 1L;
       
    /**
     * @see HttpServlet#HttpServlet()
     */
    public CheckOut() {
        super();
        // TODO Auto-generated constructor stub
    }

	/**
	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
	}

	/**
	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
		/*
		String[] textFields = request.getParameterValues("textField");		
		for(String s: textFields) {
			if(s.isEmpty()) {
				request.setAttribute("errorMsg", "Cannot leave blank information");
				request.getRequestDispatcher("/.jsp").forward(request, response);
			}
		}
		*/
		String userEmail = request.getSession().getAttribute("userEmail").toString();
		String objectId = request.getParameter("objectId");
		String[] couponIds = (String[])request.getSession().getAttribute(objectId);
		
		DBOperation.updateCoupon(couponIds);
		
		request.getRequestDispatcher("/page_invoice.jsp").forward(request, response);
	}

}
File
CheckOut.java
Developer's decision
Version 2
Kind of conflict
Annotation
Class declaration
Comment
Import
Package declaration
Chunk
Conflicting content 
<<<<<<< HEAD
package groupone;

import java.io.IOException;
import java.util.ArrayList;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class CouponSelect
 */
@WebServlet("/SelectCoupon")
public class SelectCoupon extends HttpServlet {
	private static final long serialVersionUID = 1L;
       
    /**
     * @see HttpServlet#HttpServlet()
     */
    public SelectCoupon() {
        super();
        // TODO Auto-generated constructor stub
    }

	/**
	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
	}

	/**
	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
		String[] couponIds = request.getParameterValues("checkBox");
		String gift = request.getParameter("gift");
		
		if(couponIds != null) {
			ArrayList coupons = DBOperation.searchCoupon(couponIds);
			request.setAttribute("coupons", coupons);
			request.setAttribute("gift", gift);
			request.getRequestDispatcher("/page_checkOut.jsp").forward(request, response);
		}
		else {
			//request.getRequestDispatcher("/page_selectCoupon.jsp").forward(request, response);
		}
	}

}
=======
package groupone;

import java.io.IOException;
import java.util.ArrayList;
import java.util.UUID;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class CouponSelect
 */
@WebServlet("/SelectCoupon")
public class SelectCoupon extends HttpServlet {
	private static final long serialVersionUID = 1L;
       
    /**
     * @see HttpServlet#HttpServlet()
     */
    public SelectCoupon() {
        super();
        // TODO Auto-generated constructor stub
    }

	/**
	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
	}

	/**
	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
		String[] couponIds = request.getParameterValues("checkBox");
		String gift = request.getParameter("gift");
		
		if(couponIds != null) {
			ArrayList coupons = DBOperation.searchCoupon(couponIds);
			String objectId = UUID.randomUUID().toString();
			
			request.getSession().setAttribute(objectId, couponIds);
			request.setAttribute("objectId", objectId);
			request.setAttribute("coupons", coupons);
			request.setAttribute("gift", gift);
			request.getRequestDispatcher("/page_checkOut.jsp").forward(request, response);
		}
		else {
			//request.getRequestDispatcher("/page_selectCoupon.jsp").forward(request, response);
		}
	}

}
>>>>>>> ec711932a1ddd3ad42f4e0fec339d3d5c3f17878
Solution content 
package groupone;

import java.io.IOException;
import java.util.ArrayList;
import java.util.UUID;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class CouponSelect
 */
@WebServlet("/SelectCoupon")
public class SelectCoupon extends HttpServlet {
	private static final long serialVersionUID = 1L;
       
    /**
     * @see HttpServlet#HttpServlet()
     */
    public SelectCoupon() {
        super();
        // TODO Auto-generated constructor stub
    }

	/**
	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
	}

	/**
	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
	 */
	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
		// TODO Auto-generated method stub
		String[] couponIds = request.getParameterValues("checkBox");
		String gift = request.getParameter("gift");
		
		if(couponIds != null) {
			ArrayList coupons = DBOperation.searchCoupon(couponIds);
			String objectId = UUID.randomUUID().toString();
			
			request.getSession().setAttribute(objectId, couponIds);
			request.setAttribute("objectId", objectId);
			request.setAttribute("coupons", coupons);
			request.setAttribute("gift", gift);
			request.getRequestDispatcher("/page_checkOut.jsp").forward(request, response);
		}
		else {
			//request.getRequestDispatcher("/page_selectCoupon.jsp").forward(request, response);
		}
	}

}
File
SelectCoupon.java
Developer's decision
Version 2
Kind of conflict
Annotation
Class declaration
Comment
Import
Package declaration