svn commit: r1333793 - /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java

[solomax]

Author: solomax
Date: Fri May  4 07:50:34 2012
New Revision: 1333793

URL: http://svn.apache.org/viewvc?rev=1333793&view=rev
Log:
OPENMEETINGS-246 remote cursor position is sent as expected

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java

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=1333793&r1=1333792&r2=1333793&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
 Fri May  4 07:50:34 2012
@@ -399,7 +399,6 @@ public class CoreScreenShare {
                textWarningArea.setText(warning);
        }
 
-       @SuppressWarnings("unchecked")
        synchronized public void sendCursorStatus() {
                try {
 
@@ -419,13 +418,12 @@ public class CoreScreenShare {
                                                        
Math.round(((mouseP.getY() - VirtualScreenBean.vScreenSpinnerY) * scaleFactor)
                                                                        * 
Ampl_factor)).intValue();
 
-                       @SuppressWarnings("rawtypes")
-                       HashMap cursorPosition = new HashMap();
+                       HashMap<String, Object> cursorPosition = new 
HashMap<String, Object>();
                        cursorPosition.put("publicSID", this.publishName);
                        cursorPosition.put("cursor_x", x);
                        cursorPosition.put("cursor_y", y);
 
-                       if (instance.getConnection() != null && 
instance.getConnection().isConnected()) {
+                       if (instance.getConnection() != null) {
                                instance.invoke("setNewCursorPosition", new 
Object[] { cursorPosition }, instance);
                        }
 
@@ -448,11 +446,6 @@ public class CoreScreenShare {
                        map.put("screenX", VirtualScreenBean.vScreenSpinnerX);
                        map.put("screenY", VirtualScreenBean.vScreenSpinnerY);
 
-                       // int scaledWidth =
-                       // 
Float.valueOf(Math.round(VirtualScreenBean.vScreenSpinnerWidth*scaleFactor)).intValue();
-                       // int scaledHeight =
-                       // 
Float.valueOf(Math.round(VirtualScreenBean.vScreenSpinnerHeight*scaleFactor)).intValue();
-
                        int scaledWidth = Float.valueOf(
                                        
Math.round(VirtualScreenBean.vScreenResizeX * Ampl_factor))
                                        .intValue();