From 88184157c5d5931d646d2fb110a5064ed79ca965 Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 25 Jan 2025 02:10:25 +0100 Subject: [PATCH] Removed column tracking event noise --- .../java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java | 2 -- .../org/x4o/fc18/zion7/FourCornerZionStenoLexerFire.java | 6 ------ .../java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDict.java | 1 + .../src/test/java/org/x4o/fc18/zion7/TestFireWalker.java | 7 ------- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java index 04d5918..48ae33b 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java @@ -207,7 +207,6 @@ public class FourCornerZionStenoLexer { } inputIndex++; currCol++; - fireSignals.fireStateColumn(currCol); return true; } @@ -691,7 +690,6 @@ public class FourCornerZionStenoLexer { lexer.currLine++; lexer.currCol = 0; lexer.fireSignals.fireStateLine(lexer.currLine); - lexer.fireSignals.fireStateColumn(lexer.currCol); lexer.handler.strobeWord(FourCornerDotCake.FC_F4TTY0001_NL, 0); // new line return true; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerFire.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerFire.java index cb6ea6d..028d6df 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerFire.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerFire.java @@ -30,8 +30,6 @@ public interface FourCornerZionStenoLexerFire { void fireStateLine(int line); - void fireStateColumn(int column); - void fireStateScannerMatch(int blockStart, int blockStop, int matchPoint, int idxFirst, int idxLast); void fireStateNCR1632BankSparkler(boolean magic); @@ -44,10 +42,6 @@ public interface FourCornerZionStenoLexerFire { default void fireStateLine(int line) { } - @Override - default void fireStateColumn(int column) { - } - @Override default void fireStateScannerMatch(int blockStart, int blockStop, int matchPoint, int idxFirst, int idxLast) { } diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDict.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDict.java index cbfdcf2..5833b6c 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDict.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDict.java @@ -124,6 +124,7 @@ public class KanjiDict { mean = mean.split("&")[0]; mean = mean.split("/")[0]; mean = mean.trim(); + mean = mean.toLowerCase(); for (String rm : new String[] {"*","."}) { if (mean.contains(rm)) { mean = ""; diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/TestFireWalker.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/TestFireWalker.java index da6299c..c2663f0 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/TestFireWalker.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/TestFireWalker.java @@ -31,7 +31,6 @@ package org.x4o.fc18.zion7; public class TestFireWalker implements FourCornerZionStenoLexerFire.Adapter { int currentLine; - int currentColumn; int scanBlockStart; int scanBlockStop; int scanMatchPoint; @@ -44,7 +43,6 @@ public class TestFireWalker implements FourCornerZionStenoLexerFire.Adapter { public void reset() { currentLine = 0; - currentColumn = 0; scanBlockStart = 0; scanMatchPoint = 0; scanMatchPoint = 0; @@ -57,11 +55,6 @@ public class TestFireWalker implements FourCornerZionStenoLexerFire.Adapter { currentLine = line; } - @Override - public void fireStateColumn(int column) { - currentColumn = column; - } - @Override public void fireStateScannerMatch(int blockStart, int blockStop, int matchPoint, int idxFirst, int idxLast) { scanBlockStart = blockStart;