Changeset 1102 for trunk/src/org/expeditee/stats/SessionStats.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/stats/SessionStats.java (modified) (8 diffs)

trunk/src/org/expeditee/stats/SessionStats.java

@@ -19 +19 @@
 package org.expeditee.stats;
 
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
 import java.sql.Time;
 import java.util.ArrayList;
@@ -27 +25 @@
 import java.util.List;
 
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.gio.input.KBMInputEvent;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.TimeKeeper;
@@ -103 +101 @@
                 stats.append(getCharacterStats());
 
-                stats.append("Version: ").append(DisplayIO.TITLE);
+                stats.append("Version: ").append(DisplayController.TITLE);
 
                 return stats.toString();
@@ -159 +157 @@
                         chars += counts[i];
 
-                chars -= counts[KeyEvent.VK_BACK_SPACE];
-                chars -= counts[KeyEvent.VK_DELETE];
+                chars -= counts[Text.BACKSPACE_CHARACTER];
+                chars -= counts[Text.DELETE_CHARACTER];
 
                 int EOS = counts['.'] + counts[','] + counts['!'] + counts['?'];
@@ -177 +175 @@
                 appendStat(stats, "Escape", _EscapeCount);
                 appendStat(stats, "Backspace", _BackspaceCount);
-                appendStat(stats, "Left", _MouseCounters[MouseEvent.BUTTON1]);
-                appendStat(stats, "Middle", _MouseCounters[MouseEvent.BUTTON2]);
-                appendStat(stats, "Right", _MouseCounters[MouseEvent.BUTTON3]);
+                appendStat(stats, "Left", _MouseCounters[KBMInputEvent.MouseButton.LEFT.ordinal()]);
+                appendStat(stats, "Middle", _MouseCounters[KBMInputEvent.MouseButton.MIDDLE.ordinal()]);
+                appendStat(stats, "Right", _MouseCounters[KBMInputEvent.MouseButton.RIGHT.ordinal()]);
 
                 return stats.toString();
@@ -231 +229 @@
          *            ascii value for the typed character
          */
-        public static void TypedChar(int ch) {
-                if (ch == KeyEvent.VK_BACK_SPACE || ch == KeyEvent.VK_DELETE)
-                        _BackspaceCount++;
+        public static void TypedChar(int ch)
+        {
+                if (ch == ((int) Text.BACKSPACE_CHARACTER) || ch == ((int) Text.DELETE_CHARACTER)) _BackspaceCount++;
                 UserEvent();
                 _CharCounts[ch]++;
@@ -252 +250 @@
 
                 _FrameEvents.add(Formatter.getTimeWithMillis(elapsedTime) + " "
-                                + DisplayIO.getMouseX() + " " + FrameMouseActions.getY() + " "
+                                + DisplayController.getMouseX() + " " + DisplayController.getMouseY() + " "
                                 + description);
         }
@@ -278 +276 @@
         }
 
-        public static void MouseClicked(int button) {
+        public static void MouseClicked(KBMInputEvent.MouseButton button) {
                 UserEvent();
-                _MouseCounters[button]++;
+                _MouseCounters[button.ordinal()]++;
         }