Skip to content

Commit 888e3d9

Browse files
ritzalamritzalam
committed
- cleanup
1 parent 9749a80 commit 888e3d9

File tree

2 files changed

+117
-120
lines changed
  • bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard
  • bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/services

2 files changed

+117
-120
lines changed

‎bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,14 @@ public void addAnnotation(Annotation annotation) {
9292
}
9393

9494
public List<Annotation> getAnnotations(String presentationID, Integer pageNumber) {
95-
System.out.println("Getting annotations history for " + presentationID + " page " + pageNumber);
9695
Presentation p = getPresentation(presentationID);
9796
if (p != null) {
98-
System.out.println("Presentation " + presentationID + " found.");
9997
Page pg = p.getPage(pageNumber.intValue());
10098
if (pg != null) {
101-
System.out.println("Page found with " + pg.getAnnotations().size() + " annotations.");
10299
return pg.getAnnotations();
103100
}
104101
}
105-
System.out.println("No annotations");
102+
106103
return new ArrayList<Annotation>();
107104
}
108105

‎bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/services/MessageReceiver.as

Lines changed: 116 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,126 @@
11
package org.bigbluebutton.modules.whiteboard.services
22
{
3-
import org.bigbluebutton.common.LogUtil;
4-
import org.bigbluebutton.core.BBB;
5-
import org.bigbluebutton.main.model.users.IMessageListener;
6-
import org.bigbluebutton.modules.whiteboard.business.shapes.DrawObject;
7-
import org.bigbluebutton.modules.whiteboard.business.shapes.TextObject;
8-
import org.bigbluebutton.modules.whiteboard.models.Annotation;
9-
import org.bigbluebutton.modules.whiteboard.models.WhiteboardModel;
3+
import org.bigbluebutton.common.LogUtil;
4+
import org.bigbluebutton.core.BBB;
5+
import org.bigbluebutton.main.model.users.IMessageListener;
6+
import org.bigbluebutton.modules.whiteboard.business.shapes.DrawObject;
7+
import org.bigbluebutton.modules.whiteboard.business.shapes.TextObject;
8+
import org.bigbluebutton.modules.whiteboard.models.Annotation;
9+
import org.bigbluebutton.modules.whiteboard.models.WhiteboardModel;
1010

11-
public class MessageReceiver implements IMessageListener
12-
{
11+
public class MessageReceiver implements IMessageListener
12+
{
1313
/* Injected by Mate */
14-
public var whiteboardModel:WhiteboardModel;
15-
16-
public function MessageReceiver() {
17-
BBB.initConnectionManager().addMessageListener(this);
18-
}
19-
20-
public function onMessage(messageName:String, message:Object):void {
21-
// LogUtil.debug("WB: received message " + messageName);
22-
23-
switch (messageName) {
24-
case "WhiteboardRequestAnnotationHistoryReply":
25-
handleRequestAnnotationHistoryReply(message);
26-
break;
27-
case "WhiteboardIsWhiteboardEnabledReply":
28-
handleIsWhiteboardEnabledReply(message);
29-
break;
30-
case "WhiteboardEnableWhiteboardCommand":
31-
handleEnableWhiteboardCommand(message);
32-
break;
33-
case "WhiteboardNewAnnotationCommand":
34-
handleNewAnnotationCommand(message);
35-
break;
36-
case "WhiteboardClearCommand":
37-
handleClearCommand(message);
38-
break;
39-
case "WhiteboardUndoCommand":
40-
handleUndoCommand(message);
41-
break;
42-
case "WhiteboardChangePageCommand":
43-
handleChangePageCommand(message);
44-
break;
45-
case "WhiteboardChangePresentationCommand":
46-
handleChangePresentationCommand(message);
47-
break;
48-
default:
49-
LogUtil.warn("Cannot handle message [" + messageName + "]");
50-
}
51-
}
14+
public var whiteboardModel:WhiteboardModel;
15+
16+
public function MessageReceiver() {
17+
BBB.initConnectionManager().addMessageListener(this);
18+
}
5219

53-
private function handleChangePresentationCommand(message:Object):void {
54-
// LogUtil.debug("Handle Whiteboard Change Presentation Command [ " + message.presentationID + ", " + message.numberOfPages + "]");
55-
whiteboardModel.changePresentation(message.presentationID, message.numberOfPages);
56-
}
57-
58-
private function handleChangePageCommand(message:Object):void {
59-
// LogUtil.debug("Handle Whiteboard Change Page Command [ " + message.pageNum + ", " + message.numAnnotations + "]");
60-
whiteboardModel.changePage(message.pageNum, message.numAnnotations);
61-
}
62-
63-
private function handleClearCommand(message:Object):void {
64-
// LogUtil.debug("Handle Whiteboard Clear Command ");
65-
whiteboardModel.clear();
66-
}
67-
68-
private function handleUndoCommand(message:Object):void {
69-
// LogUtil.debug("Handle Whiteboard Undo Command ");
70-
whiteboardModel.undo();
71-
// dispatcher.dispatchEvent(new WhiteboardUpdate(WhiteboardUpdate.SHAPE_UNDONE));
72-
}
73-
74-
private function handleEnableWhiteboardCommand(message:Object):void {
75-
//if (result as Boolean) modifyEnabledCallback(true);
76-
// LogUtil.debug("Handle Whiteboard Enabled Command " + message.enabled);
77-
whiteboardModel.enable(message.enabled);
78-
}
79-
80-
private function handleNewAnnotationCommand(message:Object):void {
81-
LogUtil.debug("Handle new annotation[" + message.type + ", " + message.id + ", " + message.status + "]");
82-
if (message.type == undefined || message.type == null || message.type == "") return;
83-
if (message.id == undefined || message.id == null || message.id == "") return;
84-
if (message.status == undefined || message.status == null || message.status == "") return;
20+
public function onMessage(messageName:String, message:Object):void {
21+
// LogUtil.debug("WB: received message " + messageName);
22+
23+
switch (messageName) {
24+
case "WhiteboardRequestAnnotationHistoryReply":
25+
handleRequestAnnotationHistoryReply(message);
26+
break;
27+
case "WhiteboardIsWhiteboardEnabledReply":
28+
handleIsWhiteboardEnabledReply(message);
29+
break;
30+
case "WhiteboardEnableWhiteboardCommand":
31+
handleEnableWhiteboardCommand(message);
32+
break;
33+
case "WhiteboardNewAnnotationCommand":
34+
handleNewAnnotationCommand(message);
35+
break;
36+
case "WhiteboardClearCommand":
37+
handleClearCommand(message);
38+
break;
39+
case "WhiteboardUndoCommand":
40+
handleUndoCommand(message);
41+
break;
42+
case "WhiteboardChangePageCommand":
43+
handleChangePageCommand(message);
44+
break;
45+
case "WhiteboardChangePresentationCommand":
46+
handleChangePresentationCommand(message);
47+
break;
48+
default:
49+
LogUtil.warn("Cannot handle message [" + messageName + "]");
50+
}
51+
}
52+
53+
private function handleChangePresentationCommand(message:Object):void {
54+
// LogUtil.debug("Handle Whiteboard Change Presentation Command [ " + message.presentationID + ", " + message.numberOfPages + "]");
55+
whiteboardModel.changePresentation(message.presentationID, message.numberOfPages);
56+
}
57+
58+
private function handleChangePageCommand(message:Object):void {
59+
// LogUtil.debug("Handle Whiteboard Change Page Command [ " + message.pageNum + ", " + message.numAnnotations + "]");
60+
whiteboardModel.changePage(message.pageNum, message.numAnnotations);
61+
}
62+
63+
private function handleClearCommand(message:Object):void {
64+
// LogUtil.debug("Handle Whiteboard Clear Command ");
65+
whiteboardModel.clear();
66+
}
67+
68+
private function handleUndoCommand(message:Object):void {
69+
// LogUtil.debug("Handle Whiteboard Undo Command ");
70+
whiteboardModel.undo();
71+
// dispatcher.dispatchEvent(new WhiteboardUpdate(WhiteboardUpdate.SHAPE_UNDONE));
72+
}
73+
74+
private function handleEnableWhiteboardCommand(message:Object):void {
75+
//if (result as Boolean) modifyEnabledCallback(true);
76+
// LogUtil.debug("Handle Whiteboard Enabled Command " + message.enabled);
77+
whiteboardModel.enable(message.enabled);
78+
}
79+
80+
private function handleNewAnnotationCommand(message:Object):void {
81+
// LogUtil.debug("Handle new annotation[" + message.type + ", " + message.id + ", " + message.status + "]");
82+
if (message.type == undefined || message.type == null || message.type == "") return;
83+
if (message.id == undefined || message.id == null || message.id == "") return;
84+
if (message.status == undefined || message.status == null || message.status == "") return;
8585

86-
var annotation:Annotation = new Annotation(message.id, message.type, message);
87-
annotation.status = message.status;
88-
whiteboardModel.addAnnotation(annotation);
89-
}
90-
91-
private function handleIsWhiteboardEnabledReply(message:Object):void {
92-
//if (result as Boolean) modifyEnabledCallback(true);
93-
LogUtil.debug("Whiteboard Enabled? " + message.enabled);
94-
}
95-
96-
private function handleRequestAnnotationHistoryReply(message:Object):void {
97-
LogUtil.debug("handleRequestAnnotationHistoryReply: Annotation history for [" + message.presentationID + "," + message.pageNumber + "]");
86+
var annotation:Annotation = new Annotation(message.id, message.type, message);
87+
annotation.status = message.status;
88+
whiteboardModel.addAnnotation(annotation);
89+
}
90+
91+
private function handleIsWhiteboardEnabledReply(message:Object):void {
92+
//if (result as Boolean) modifyEnabledCallback(true);
93+
LogUtil.debug("Whiteboard Enabled? " + message.enabled);
94+
}
95+
96+
private function handleRequestAnnotationHistoryReply(message:Object):void {
97+
//LogUtil.debug("handleRequestAnnotationHistoryReply: Annotation history for [" + message.presentationID + "," + message.pageNumber + "]");
9898

99-
if (message.count == 0) {
100-
LogUtil.debug("handleRequestAnnotationHistoryReply: No annotations.");
101-
} else {
102-
LogUtil.debug("handleRequestAnnotationHistoryReply: Number of annotations in history = " + message.count);
103-
var annotations:Array = message.annotations as Array;
104-
var tempAnnotations:Array = new Array();
105-
106-
for (var i:int = 0; i < message.count; i++) {
107-
var an:Object = annotations[i] as Object;
108-
109-
if (an.type == undefined || an.type == null || an.type == "") return;
110-
if (an.id == undefined || an.id == null || an.id == "") return;
111-
if (an.status == undefined || an.status == null || an.status == "") return;
112-
113-
LogUtil.debug("handleRequestAnnotationHistoryReply: annotation id=" + an.id);
99+
if (message.count == 0) {
100+
LogUtil.debug("handleRequestAnnotationHistoryReply: No annotations.");
101+
} else {
102+
LogUtil.debug("handleRequestAnnotationHistoryReply: Number of annotations in history = " + message.count);
103+
var annotations:Array = message.annotations as Array;
104+
var tempAnnotations:Array = new Array();
105+
106+
for (var i:int = 0; i < message.count; i++) {
107+
var an:Object = annotations[i] as Object;
108+
109+
if (an.type == undefined || an.type == null || an.type == "") return;
110+
if (an.id == undefined || an.id == null || an.id == "") return;
111+
if (an.status == undefined || an.status == null || an.status == "") return;
112+
113+
//LogUtil.debug("handleRequestAnnotationHistoryReply: annotation id=" + an.id);
114114

115-
var annotation:Annotation = new Annotation(an.id, an.type, an);
116-
annotation.status = an.status;
117-
tempAnnotations.push(annotation);
118-
}
115+
var annotation:Annotation = new Annotation(an.id, an.type, an);
116+
annotation.status = an.status;
117+
tempAnnotations.push(annotation);
118+
}
119119

120-
if (tempAnnotations.length > 0) {
121-
whiteboardModel.addAnnotationFromHistory(message.presentationID, message.pageNumber, tempAnnotations);
122-
}
123-
}
124-
}
125-
}
120+
if (tempAnnotations.length > 0) {
121+
whiteboardModel.addAnnotationFromHistory(message.presentationID, message.pageNumber, tempAnnotations);
122+
}
123+
}
124+
}
125+
}
126126
}

0 commit comments

Comments
 (0)