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 08:30:23 UTC
svn commit: r1761009 - 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 08:30:23 2016
New Revision: 1761009
URL: http://svn.apache.org/viewvc?rev=1761009&view=rev
Log:
[OPENMEETINGS-1468] runtime error was fixed
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=1761009&r1=1761008&r2=1761009&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 08:30:23 2016
@@ -19,13 +19,14 @@
package org.apache.openmeetings.screenshare.job;
import static java.lang.Boolean.TRUE;
+import static java.lang.Character.toUpperCase;
+import static javax.swing.KeyStroke.getKeyStroke;
import static org.apache.openmeetings.screenshare.util.Util.getInt;
import static org.slf4j.LoggerFactory.getLogger;
-import static javax.swing.KeyStroke.getKeyStroke;
-import static java.lang.Character.toUpperCase;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -44,9 +45,9 @@ public class OmKeyEvent {
private static final Logger log = getLogger(OmKeyEvent.class);
private static final Map<Integer, Integer> KEY_MAP = new HashMap<>();
private static final Map<Character, Integer> CHAR_MAP = new HashMap<>();
- private static final Stream<Character> UMLAUT_STREAM = Stream.of('ß', 'ö', 'Ö', 'ä', 'Ä', 'ü', 'Ü');
- private static final Set<Character> UMLAUTS = Collections.unmodifiableSet(UMLAUT_STREAM.collect(Collectors.toSet()));
- private static final Set<Character> UNPRINTABLE = Collections.unmodifiableSet(Stream.concat(UMLAUT_STREAM, Stream.of('§')).collect(Collectors.toSet()));
+ private static final List<Character> _UMLAUTS = Arrays.asList('ß', 'ö', 'Ö', 'ä', 'Ä', 'ü', 'Ü');
+ private static final Set<Character> UMLAUTS = Collections.unmodifiableSet(_UMLAUTS.stream().collect(Collectors.toSet()));
+ private static final Set<Character> UNPRINTABLE = Collections.unmodifiableSet(Stream.concat(_UMLAUTS.stream(), Stream.of('§')).collect(Collectors.toSet()));
static {
KEY_MAP.put(13, KeyEvent.VK_ENTER);
KEY_MAP.put(16, 0);
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=1761009&r1=1761008&r2=1761009&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 08:30:23 2016
@@ -19,13 +19,14 @@
package org.apache.openmeetings.screenshare.job;
import static java.lang.Boolean.TRUE;
+import static java.lang.Character.toUpperCase;
+import static javax.swing.KeyStroke.getKeyStroke;
import static org.apache.openmeetings.screenshare.util.Util.getInt;
import static org.slf4j.LoggerFactory.getLogger;
-import static javax.swing.KeyStroke.getKeyStroke;
-import static java.lang.Character.toUpperCase;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -44,9 +45,9 @@ public class OmKeyEvent {
private static final Logger log = getLogger(OmKeyEvent.class);
private static final Map<Integer, Integer> KEY_MAP = new HashMap<>();
private static final Map<Character, Integer> CHAR_MAP = new HashMap<>();
- private static final Stream<Character> UMLAUT_STREAM = Stream.of('ß', 'ö', 'Ö', 'ä', 'Ä', 'ü', 'Ü');
- private static final Set<Character> UMLAUTS = Collections.unmodifiableSet(UMLAUT_STREAM.collect(Collectors.toSet()));
- private static final Set<Character> UNPRINTABLE = Collections.unmodifiableSet(Stream.concat(UMLAUT_STREAM, Stream.of('§')).collect(Collectors.toSet()));
+ private static final List<Character> _UMLAUTS = Arrays.asList('ß', 'ö', 'Ö', 'ä', 'Ä', 'ü', 'Ü');
+ private static final Set<Character> UMLAUTS = Collections.unmodifiableSet(_UMLAUTS.stream().collect(Collectors.toSet()));
+ private static final Set<Character> UNPRINTABLE = Collections.unmodifiableSet(Stream.concat(_UMLAUTS.stream(), Stream.of('§')).collect(Collectors.toSet()));
static {
KEY_MAP.put(13, KeyEvent.VK_ENTER);
KEY_MAP.put(16, 0);
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=1761009&r1=1761008&r2=1761009&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 08:30:23 2016
@@ -19,13 +19,14 @@
package org.apache.openmeetings.screenshare.job;
import static java.lang.Boolean.TRUE;
+import static java.lang.Character.toUpperCase;
+import static javax.swing.KeyStroke.getKeyStroke;
import static org.apache.openmeetings.screenshare.util.Util.getInt;
import static org.slf4j.LoggerFactory.getLogger;
-import static javax.swing.KeyStroke.getKeyStroke;
-import static java.lang.Character.toUpperCase;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -44,9 +45,9 @@ public class OmKeyEvent {
private static final Logger log = getLogger(OmKeyEvent.class);
private static final Map<Integer, Integer> KEY_MAP = new HashMap<>();
private static final Map<Character, Integer> CHAR_MAP = new HashMap<>();
- private static final Stream<Character> UMLAUT_STREAM = Stream.of('ß', 'ö', 'Ö', 'ä', 'Ä', 'ü', 'Ü');
- private static final Set<Character> UMLAUTS = Collections.unmodifiableSet(UMLAUT_STREAM.collect(Collectors.toSet()));
- private static final Set<Character> UNPRINTABLE = Collections.unmodifiableSet(Stream.concat(UMLAUT_STREAM, Stream.of('§')).collect(Collectors.toSet()));
+ private static final List<Character> _UMLAUTS = Arrays.asList('ß', 'ö', 'Ö', 'ä', 'Ä', 'ü', 'Ü');
+ private static final Set<Character> UMLAUTS = Collections.unmodifiableSet(_UMLAUTS.stream().collect(Collectors.toSet()));
+ private static final Set<Character> UNPRINTABLE = Collections.unmodifiableSet(Stream.concat(_UMLAUTS.stream(), Stream.of('§')).collect(Collectors.toSet()));
static {
KEY_MAP.put(13, KeyEvent.VK_ENTER);
KEY_MAP.put(16, 0);