diff --git a/.classpath b/.classpath
index cd29d98..da74edc 100644
--- a/.classpath
+++ b/.classpath
@@ -2,11 +2,6 @@
-
-
-
-
-
@@ -32,5 +27,8 @@
+
+
+
diff --git a/src/com/knotrenderer/model/BezierCurve.java b/src/com/knotrenderer/model/BezierCurve.java
index 5fbbc67..b90e314 100644
--- a/src/com/knotrenderer/model/BezierCurve.java
+++ b/src/com/knotrenderer/model/BezierCurve.java
@@ -30,7 +30,7 @@ private void generateBezierCoefficients()
{
PVector vector = controlPoints[k].copy();
coefficients[k] = vector.mult((float) MathUtil.binomialCoefficientAsDouble(controlPoints.length-1, k));
- System.out.println(coefficients[k]);
+// System.out.println(coefficients[k]);
}
}
diff --git a/src/com/knotrenderer/view/KnotRenderer.java b/src/com/knotrenderer/view/KnotRenderer.java
index 0dacb01..997bc53 100644
--- a/src/com/knotrenderer/view/KnotRenderer.java
+++ b/src/com/knotrenderer/view/KnotRenderer.java
@@ -52,7 +52,9 @@ public void setup()
// Curve curve = CurveLoader.loadCurveFromFile("D:/Peter/College_Grad_School/Independent_Study_Spring_2016_Cont/Knot-Renderer-Processing/Testing_Files/TJP-4th-C1-high-precision.curve");
// Curve curve = CurveLoader.loadCurveFromFile("D:/Peter/College_Grad_School/Independent_Study_Spring_2016_Cont/Knot-Renderer-Processing/Testing_Files/TJP-4_1_stick-unknot-halved-3.curve");
- Curve curve = CurveLoader.loadCurveFromFile("D:/Peter/College_Grad_School/Independent_Study_Spring_2016_Cont/Knot-Renderer-Processing/Testing_Files/test.curve");
+// Curve curve = CurveLoader.loadCurveFromFile("D:/Peter/College_Grad_School/Independent_Study_Spring_2016_Cont/Knot-Renderer-Processing/Testing_Files/test.curve");
+ Curve curve = CurveLoader.loadCurveFromFile("D:/Peter/College_Grad_School/Independent_Study_Spring_2016_Cont/Knot-Renderer-Processing/Testing_Files/TJP-C2.curve");
+
// Curve curve = CurveLoader.loadCurveFromFile("/Users/peterzaffetti/UC/Knot-Renderer-Processing/Testing_Files/TJP-4_1_stick-unknot.curve");
// Curve curve = CurveLoader.loadCurveFromFile("/Users/peterzaffetti/UC/Knot-Renderer-Processing/Testing_Files/test.curve");
diff --git a/src/com/knotrenderer/web/PointGeneratorServlet.java b/src/com/knotrenderer/web/PointGeneratorServlet.java
index 4546df6..238a90a 100644
--- a/src/com/knotrenderer/web/PointGeneratorServlet.java
+++ b/src/com/knotrenderer/web/PointGeneratorServlet.java
@@ -1,16 +1,27 @@
package com.knotrenderer.web;
+import java.io.File;
import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import javax.servlet.annotation.MultipartConfig;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+
/**
* Servlet implementation class PointGeneratorServlet
*/
@WebServlet("/PointGeneratorServlet")
+@MultipartConfig
public class PointGeneratorServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -27,7 +38,10 @@ public PointGeneratorServlet() {
*/
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
// TODO Auto-generated method stub
- response.getWriter().append("Served at: ").append(request.getContextPath());
+ boolean isMultiPart = ServletFileUpload.isMultipartContent(request);
+ String isMultiPartString = isMultiPart ? "True" : "False";
+ response.getWriter().append("Serving Ice Cream at: ").append(isMultiPartString);
+ System.out.println("GET was called");
}
/**
@@ -35,7 +49,35 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
*/
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
// TODO Auto-generated method stub
- doGet(request, response);
+// doGet(request, response);
+ boolean isMultipart = ServletFileUpload.isMultipartContent(request);
+ if(isMultipart)
+ {
+ System.out.println("Received a Multipart request");
+ DiskFileItemFactory factory = new DiskFileItemFactory();
+
+ // Configure a repository (to ensure a secure temp location is used)
+ ServletContext servletContext = this.getServletConfig().getServletContext();
+ File repository = (File) servletContext.getAttribute("javax.servlet.context.tempdir");
+ factory.setRepository(repository);
+
+ // Create a new file upload handler
+ ServletFileUpload upload = new ServletFileUpload(factory);
+
+ List items = null;
+ // Parse the request
+ try {
+ items = upload.parseRequest(request);
+ } catch (FileUploadException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ System.out.println("Multipart items: " + items);
+
+ }
+ System.out.println("POST was called");
+ request.getParameterMap();
+ doGet(request,response);
}
}