- record text annotations properly

Author: ritzalam

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddTextWhiteboardRecordEvent.java

@@ -19,32 +19,37 @@
  */
 package org.bigbluebutton.conference.service.recorder.whiteboard;
 
-public class AddTextWhiteboardRecordEvent extends
-		AbstractWhiteboardRecordEvent {
+import java.util.ArrayList;
+import java.util.Map;
+
+public class AddTextWhiteboardRecordEvent extends AbstractWhiteboardRecordEvent {
 
 	public AddTextWhiteboardRecordEvent() {
 		super();
 		setEvent("AddTextEvent");
 	}
 
-	public void setDataPoints(String points) {
-		eventMap.put("dataPoints", points);
-	}
-	
-	public void setText(String text) {
-		eventMap.put("text", text);
-	}
-	
-	public void setTextColor(int textColor) {
-		eventMap.put("textColor", Integer.toString(textColor));
-	}
-	
-	public void setBGColor(int bgColor) {
-		eventMap.put("bgColor", Integer.toString(bgColor));
+	public void addAnnotation(Map<String, Object> annotation) {
+		for (Map.Entry<String, Object> entry : annotation.entrySet()) {
+		    String key = entry.getKey();
+		    		    
+		    if (key.equals("points")) {
+		    	ArrayList<Double> value = (ArrayList<Double>)entry.getValue();
+		    	eventMap.put("dataPoints", pointsToString(value));
+		    } else {
+		    	Object value = entry.getValue();
+		    	eventMap.put(key, value.toString());
+		    }
+		}
 	}
 
-	public void setBGColorVisible(boolean bgColorVis) {
-		eventMap.put("bgColorVisible", Boolean.toString(bgColorVis));
+	private String pointsToString(ArrayList<Double> points){
+    	String datapoints = "";
+    	for (Double i : points) {
+    		datapoints += i + ",";
+    	}
+    	// Trim the trailing comma
+    	return datapoints.substring(0, datapoints.length() - 1);
 	}
 
 }

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/ModifyTextWhiteboardRecordEvent.java

@@ -19,35 +19,37 @@
  */
 package org.bigbluebutton.conference.service.recorder.whiteboard;
 
+import java.util.ArrayList;
+import java.util.Map;
+
 public class ModifyTextWhiteboardRecordEvent  extends
 				AbstractWhiteboardRecordEvent {
 
 		public ModifyTextWhiteboardRecordEvent() {
 			super();
-			setEvent("ModifyT=TextEvent");
-		}
-		
-		public void setDataPoints(String points) {
-			eventMap.put("dataPoints", points);
-		}
-		
-		public void setText(String text) {
-			eventMap.put("text", text);
-		}
-		
-		public void setTextColor(int textColor) {
-			eventMap.put("textColor", Integer.toString(textColor));
-		}
-		
-		public void setBGColor(int bgColor) {
-			eventMap.put("bgColor", Integer.toString(bgColor));
+			setEvent("ModifyTextEvent");
 		}
 
-		public void setBGColorVisible(boolean bgColorVis) {
-			eventMap.put("bgColorVisible", Boolean.toString(bgColorVis));
+		public void addAnnotation(Map<String, Object> annotation) {
+			for (Map.Entry<String, Object> entry : annotation.entrySet()) {
+			    String key = entry.getKey();
+			    		    
+			    if (key.equals("points")) {
+			    	ArrayList<Double> value = (ArrayList<Double>)entry.getValue();
+			    	eventMap.put("dataPoints", pointsToString(value));
+			    } else {
+			    	Object value = entry.getValue();
+			    	eventMap.put(key, value.toString());
+			    }
+			}
 		}
 
-		public void setModifyingID(String id) {
-			eventMap.put("modifiedID", id);
+		private String pointsToString(ArrayList<Double> points){
+	    	String datapoints = "";
+	    	for (Double i : points) {
+	    		datapoints += i + ",";
+	    	}
+	    	// Trim the trailing comma
+	    	return datapoints.substring(0, datapoints.length() - 1);
 		}
 }

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java

@@ -52,11 +52,7 @@ public void addText(Annotation text, Presentation presentation) {
 		event.setTimestamp(System.currentTimeMillis());
 		event.setPresentation(presentation.getName());
 		event.setPageNumber(presentation.getActivePage().getPageIndex());
-//		event.setText(text.getText());
-//		event.setTextColor(text.getTextColor());
-//		event.setBGColor(text.getBgColor());
-//		event.setBGColorVisible(text.getBgColorVisible());
-//		event.setDataPoints(text.getLocation());
+		event.addAnnotation(text.getAnnotation());
 		recorder.record(session, event);	
 	}
 
@@ -102,25 +98,15 @@ public void modifyText(Annotation text, Presentation presentation) {
 		event.setTimestamp(System.currentTimeMillis());
 		event.setPresentation(presentation.getName());
 		event.setPageNumber(presentation.getActivePage().getPageIndex());
-//		event.setText(text.getText());
-//		event.setTextColor(text.getTextColor());
-//		event.setBGColor(text.getBgColor());
-//		event.setBGColorVisible(text.getBgColorVisible());
-//		event.setDataPoints(text.getLocation());
-//		event.setModifyingID(text.getID());
+		event.addAnnotation(text.getAnnotation());
 		recorder.record(session, event);	
 	}
 
 	@Override
 	public void undoShape(Presentation presentation) {
-		// TODO Auto-generated method stub
-		
+		UndoShapeWhiteboardRecordEvent event = new UndoShapeWhiteboardRecordEvent();
+		event.setMeetingId(session);
+		event.setTimestamp(System.currentTimeMillis());
+		recorder.record(session, event);
 	}
-
-//	@Override
-//	public void addShape(ShapeGraphic shape, Presentation presentation) {
-		// TODO Auto-generated method stub
-//		
-//	}
-
 }