Author: solomax
Date: Mon Apr 16 08:06:33 2012
New Revision: 1326530
URL: http://svn.apache.org/viewvc?rev=1326530&view=rev
Log:
OPENMEETINGS-162 Connection is now checked in ScreenSharing client to be closed
before sending message, code cleanup
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java?rev=1326530&r1=1326529&r2=1326530&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Naviglobal.java
Mon Apr 16 08:06:33 2012
@@ -19,12 +19,8 @@
package org.openmeetings.app.persistence.beans.basic;
import java.io.Serializable;
-import java.util.List;
import java.util.Date;
-
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-
-
+import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -36,10 +32,11 @@ import javax.persistence.JoinColumn;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
+
@Entity
@NamedQueries({
@NamedQuery(name="getNavigation",
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java?rev=1326530&r1=1326529&r2=1326530&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
Mon Apr 16 08:06:33 2012
@@ -423,8 +423,9 @@ public class CoreScreenShare {
cursorPosition.put("cursor_x", x);
cursorPosition.put("cursor_y", y);
- instance.invoke("setNewCursorPosition", new Object[] {
cursorPosition },
- instance);
+ if (instance.getConnection() != null &&
instance.getConnection().isConnected()) {
+ instance.invoke("setNewCursorPosition", new
Object[] { cursorPosition }, instance);
+ }
} catch (Exception err) {
System.out.println("captureScreenStart Exception: ");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java?rev=1326530&r1=1326529&r2=1326530&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
Mon Apr 16 08:06:33 2012
@@ -3,8 +3,10 @@ package org.openmeetings.screen.webstart
import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.messaging.IMessage;
import org.red5.server.net.rtmp.INetStreamEventHandler;
+import org.red5.server.net.rtmp.RTMPConnection;
public interface IScreenShare extends IPendingServiceCallback,
INetStreamEventHandler {
+ RTMPConnection getConnection();
void invoke(String method, Object[] params, IPendingServiceCallback
callback);
void connect(String server, int port, String application,
IPendingServiceCallback connectCallback);
void disconnect();
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java?rev=1326530&r1=1326529&r2=1326530&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
Mon Apr 16 08:06:33 2012
@@ -19,6 +19,7 @@
package org.openmeetings.test.navi;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
import java.util.List;
@@ -43,11 +44,13 @@ public class TestNavi extends AbstractOp
System.out.println("NaviGlobal size: " + ll.size());
for (Naviglobal navigl : ll) {
+ assertNotNull("Naviglobal retrieved should not be null",
navigl);
System.out.println("Naviglobal label: " +
navigl.getLabel().getValue());
+ assertNotNull("Naviglobal retrieved should have Navimain
entries", navigl.getMainnavi());
for (Navimain navim : navigl.getMainnavi()) {
- //System.out.println("-->" + navim.getLabel().getValue());
-
+ assertNotNull("Navimain retrieved should not be null", navim);
+ System.out.println("-->" + navim.getLabel().getValue());
}
}
