Author: solomax
Date: Wed Aug 3 05:45:20 2016
New Revision: 1755020
URL: http://svn.apache.org/viewvc?rev=1755020&view=rev
Log:
[OPENMEETINGS-1442] remote keyboard should be fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1755020&r1=1755019&r2=1755020&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Wed Aug 3 05:45:20 2016
@@ -411,12 +411,20 @@ public class CoreScreenShare implements
return TRUE.equals(Boolean.valueOf("" + b));
}
- private static int getInt(Map<String, Object> returnMap, String key) {
- return
Integer.valueOf(returnMap.get(key).toString()).intValue();
+ private static String getString(Map<String, Object> map, String key) {
+ return String.valueOf(map.get(key));
+ }
+
+ private static Double getDouble(Map<String, Object> map, String key) {
+ return Double.valueOf(getString(map, key));
+ }
+
+ private static int getInt(Map<String, Object> map, String key) {
+ return getDouble(map, key).intValue();
}
- private static float getFloat(Map<String, Object> returnMap, String
key) {
- return
Float.valueOf(returnMap.get(key).toString()).floatValue();
+ private static float getFloat(Map<String, Object> map, String key) {
+ return getDouble(map, key).floatValue();
}
private Point getCoordinates(Map<String, Object> returnMap) {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1755020&r1=1755019&r2=1755020&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Wed Aug 3 05:45:20 2016
@@ -411,12 +411,20 @@ public class CoreScreenShare implements
return TRUE.equals(Boolean.valueOf("" + b));
}
- private static int getInt(Map<String, Object> returnMap, String key) {
- return
Integer.valueOf(returnMap.get(key).toString()).intValue();
+ private static String getString(Map<String, Object> map, String key) {
+ return String.valueOf(map.get(key));
+ }
+
+ private static Double getDouble(Map<String, Object> map, String key) {
+ return Double.valueOf(getString(map, key));
+ }
+
+ private static int getInt(Map<String, Object> map, String key) {
+ return getDouble(map, key).intValue();
}
- private static float getFloat(Map<String, Object> returnMap, String
key) {
- return
Float.valueOf(returnMap.get(key).toString()).floatValue();
+ private static float getFloat(Map<String, Object> map, String key) {
+ return getDouble(map, key).floatValue();
}
private Point getCoordinates(Map<String, Object> returnMap) {
Modified:
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1755020&r1=1755019&r2=1755020&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Wed Aug 3 05:45:20 2016
@@ -411,12 +411,20 @@ public class CoreScreenShare implements
return TRUE.equals(Boolean.valueOf("" + b));
}
- private static int getInt(Map<String, Object> returnMap, String key) {
- return
Integer.valueOf(returnMap.get(key).toString()).intValue();
+ private static String getString(Map<String, Object> map, String key) {
+ return String.valueOf(map.get(key));
+ }
+
+ private static Double getDouble(Map<String, Object> map, String key) {
+ return Double.valueOf(getString(map, key));
+ }
+
+ private static int getInt(Map<String, Object> map, String key) {
+ return getDouble(map, key).intValue();
}
- private static float getFloat(Map<String, Object> returnMap, String
key) {
- return
Float.valueOf(returnMap.get(key).toString()).floatValue();
+ private static float getFloat(Map<String, Object> map, String key) {
+ return getDouble(map, key).floatValue();
}
private Point getCoordinates(Map<String, Object> returnMap) {
