Adding unit testing for all of the CSG configurations that need to be

pruned from the serialized objects,a nd syncing the history on the way
back out.

Author: madhephaestus

src/main/java/eu/mihosoft/vrl/v3d/CSG.java

@@ -264,7 +264,7 @@ public CSG setTemporaryColor(Color color) {
 	 * @param manipulator the manipulator
 	 * @return the affine
 	 */
-	public CSG setManipulator(Affine manipulator) {
+	public CSG setManipulator(javafx.scene.transform.Affine manipulator) {
 		if (manipulator == null)
 			return this;
 		Affine old = manipulator;
@@ -2498,15 +2498,15 @@ public CSG setManufacturing(PrepForManufacturing manufactuing) {
 		return this;
 	}
 
-	@Deprecated
-	public PrepForManufacturing getManufactuing() {
-		return getManufacturing();
-	}
+//	@Deprecated
+//	public PrepForManufacturing getManufactuing() {
+//		return getManufacturing();
+//	}
 
-	@Deprecated
-	public CSG setManufactuing(PrepForManufacturing manufactuing) {
-		return setManufacturing(manufactuing);
-	}
+//	@Deprecated
+//	public CSG setManufactuing(PrepForManufacturing manufactuing) {
+//		return setManufacturing(manufactuing);
+//	}
 
 	public CSG setParameter(Parameter w, IParametric function) {
 		if (w == null)

src/main/java/eu/mihosoft/vrl/v3d/CSGClient.java

@@ -131,13 +131,18 @@ private ArrayList<CSG> performOperation(List<CSG> csgList, CSGRemoteOperation op
 			ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
 			System.out.println("Running Operation on server: " + hostname + " " + operation);
 			// Create and send request
-			ArrayList<PropertyStorage> store  =new ArrayList<PropertyStorage>();
+			
+			ArrayList <CSG> toSend  =  new ArrayList<CSG>();
 			for(CSG c:csgList) {
-				store.add(c.getStorage());
-				// Do not attempt to send properties because they may contain lambda functions that can not serialize
-				c.setStorage(new PropertyStorage());
+				CSG tmp = c.clone();
+				tmp.setStorage(new PropertyStorage());
+				tmp.setManipulator(null);
+				tmp.setManufacturing(null);
+				tmp.getMapOfparametrics().clear();
+				tmp.setRegenerate(null);
+				toSend.add(tmp);
 			}
-			CSGRequest request = new CSGRequest(csgList, operation);
+			CSGRequest request = new CSGRequest(toSend, operation);
 			if (key != null)
 				request.setAPIKEY(key);
 			oos.writeObject(request);
@@ -152,8 +157,8 @@ private ArrayList<CSG> performOperation(List<CSG> csgList, CSGRemoteOperation op
 			// Return results as ArrayList
 			back = new ArrayList<>(response.getCsgList());
 			for(CSG c:back) {
-				for(PropertyStorage s:store) {
-					c.getStorage().syncProperties(s);// Keep the Lambdas in the memory space where they came from
+				for(CSG s:csgList) {
+					c.historySync(s);
 				}
 			}
 		} catch (Throwable t) {

src/test/java/eu/mihosoft/vrl/v3d/ServerClientTest.java

@@ -8,6 +8,8 @@
 
 import org.junit.Test;
 
+import eu.mihosoft.vrl.v3d.parametrics.LengthParameter;
+
 public class ServerClientTest {
 
 	@Test
@@ -42,6 +44,17 @@ public void test() throws Exception {
 
 			CSG a = new Cube(20).toCSG();
 			a.getBounds();
+			a.setManipulator(new javafx.scene.transform.Affine());
+			a.setManufacturing(new PrepForManufacturing() {
+				@Override
+				public CSG prep(CSG incoming) {
+					// TODO Auto-generated method stub
+					return incoming;
+				}
+			});
+			LengthParameter param = new LengthParameter("parameter", (double) 35, new ArrayList<Double>());
+			a.setParameter(param);
+			
 			CSG b = new Cube(20, 30, 5).toCSG();
 			b.getBounds();
 			CSG c = new Cube(10, 10, 10).toCSG();
@@ -54,6 +67,7 @@ public void test() throws Exception {
 		} catch (Exception e) {
 			System.err.println("Communication error: " + e.getMessage());
 			e.printStackTrace();
+			fail();
 		}
 
 		server.stop();