You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/09/16 17:13:07 UTC
svn commit: r1761063 - in /openmeetings/application:
branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/
branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/
trunk/ope...
Author: solomax
Date: Fri Sep 16 17:13:06 2016
New Revision: 1761063
URL: http://svn.apache.org/viewvc?rev=1761063&view=rev
Log:
[OPENMEETINGS-1468] additional fix for capital letters
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java?rev=1761063&r1=1761062&r2=1761063&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java Fri Sep 16 17:13:06 2016
@@ -20,6 +20,7 @@ package org.apache.openmeetings.screensh
import static java.lang.Boolean.TRUE;
import static java.lang.Character.toUpperCase;
+import static java.lang.Character.isUpperCase;
import static javax.swing.KeyStroke.getKeyStroke;
import static org.apache.openmeetings.screenshare.util.Util.getInt;
import static org.slf4j.LoggerFactory.getLogger;
@@ -90,7 +91,7 @@ public class OmKeyEvent {
public OmKeyEvent(Map<String, Object> obj) {
alt = TRUE.equals(obj.get("alt"));
ctrl = TRUE.equals(obj.get("ctrl"));
- shift = TRUE.equals(obj.get("shift"));
+ shift = TRUE.equals(obj.get("shift")) || isUpperCase(ch);
ch = (char)getInt(obj, "char");
key = inKey = getInt(obj, "key");
Integer _key = null;
@@ -151,7 +152,7 @@ public class OmKeyEvent {
} else {
if (UMLAUTS.contains(ch)) {
r.press(KeyEvent.VK_ALT, KeyEvent.VK_U);
- if (Character.isUpperCase(ch)) {
+ if (shift) {
list.add(KeyEvent.VK_SHIFT);
}
list.add(getVowel(ch));
Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java?rev=1761063&r1=1761062&r2=1761063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java Fri Sep 16 17:13:06 2016
@@ -20,6 +20,7 @@ package org.apache.openmeetings.screensh
import static java.lang.Boolean.TRUE;
import static java.lang.Character.toUpperCase;
+import static java.lang.Character.isUpperCase;
import static javax.swing.KeyStroke.getKeyStroke;
import static org.apache.openmeetings.screenshare.util.Util.getInt;
import static org.slf4j.LoggerFactory.getLogger;
@@ -90,7 +91,7 @@ public class OmKeyEvent {
public OmKeyEvent(Map<String, Object> obj) {
alt = TRUE.equals(obj.get("alt"));
ctrl = TRUE.equals(obj.get("ctrl"));
- shift = TRUE.equals(obj.get("shift"));
+ shift = TRUE.equals(obj.get("shift")) || isUpperCase(ch);
ch = (char)getInt(obj, "char");
key = inKey = getInt(obj, "key");
Integer _key = null;
@@ -151,7 +152,7 @@ public class OmKeyEvent {
} else {
if (UMLAUTS.contains(ch)) {
r.press(KeyEvent.VK_ALT, KeyEvent.VK_U);
- if (Character.isUpperCase(ch)) {
+ if (shift) {
list.add(KeyEvent.VK_SHIFT);
}
list.add(getVowel(ch));
Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java?rev=1761063&r1=1761062&r2=1761063&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java Fri Sep 16 17:13:06 2016
@@ -20,6 +20,7 @@ package org.apache.openmeetings.screensh
import static java.lang.Boolean.TRUE;
import static java.lang.Character.toUpperCase;
+import static java.lang.Character.isUpperCase;
import static javax.swing.KeyStroke.getKeyStroke;
import static org.apache.openmeetings.screenshare.util.Util.getInt;
import static org.slf4j.LoggerFactory.getLogger;
@@ -90,7 +91,7 @@ public class OmKeyEvent {
public OmKeyEvent(Map<String, Object> obj) {
alt = TRUE.equals(obj.get("alt"));
ctrl = TRUE.equals(obj.get("ctrl"));
- shift = TRUE.equals(obj.get("shift"));
+ shift = TRUE.equals(obj.get("shift")) || isUpperCase(ch);
ch = (char)getInt(obj, "char");
key = inKey = getInt(obj, "key");
Integer _key = null;
@@ -151,7 +152,7 @@ public class OmKeyEvent {
} else {
if (UMLAUTS.contains(ch)) {
r.press(KeyEvent.VK_ALT, KeyEvent.VK_U);
- if (Character.isUpperCase(ch)) {
+ if (shift) {
list.add(KeyEvent.VK_SHIFT);
}
list.add(getVowel(ch));