You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2021/08/29 12:47:41 UTC
[groovy] branch GROOVY_3_0_X updated (11592d5 -> 7137705)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 11592d5 Tweak doco
new dfcee1b Tweak lexer frame: show token count in the token stream label
new 7137705 Tweak lexer frame: use monospaced font
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/apache/groovy/antlr/LexerFrame.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
[groovy] 02/02: Tweak lexer frame: use monospaced font
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 71377054f9e92655e6ee0320ccb38c21289ff272
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Aug 29 20:34:16 2021 +0800
Tweak lexer frame: use monospaced font
(cherry picked from commit d423fdb39f144445a4b74276b164a1b7d80df36b)
---
src/main/java/org/apache/groovy/antlr/LexerFrame.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/groovy/antlr/LexerFrame.java b/src/main/java/org/apache/groovy/antlr/LexerFrame.java
index 467cde9..08e647f 100644
--- a/src/main/java/org/apache/groovy/antlr/LexerFrame.java
+++ b/src/main/java/org/apache/groovy/antlr/LexerFrame.java
@@ -46,6 +46,7 @@ import javax.swing.border.Border;
import javax.swing.text.BadLocationException;
import java.awt.BorderLayout;
import java.awt.Dimension;
+import java.awt.Font;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -66,6 +67,7 @@ import java.util.Map;
public class LexerFrame extends JFrame implements ActionListener {
private static final long serialVersionUID = 2715693043143492893L;
private static final Class<GroovyLexer> TOKEN_TYPES_CLASS = GroovyLexer.class;
+ private static final Font MONOSPACED_FONT = new Font("Monospaced", Font.PLAIN, 12);
private final JSplitPane jSplitPane1 = new JSplitPane();
private final JScrollPane jScrollPane1 = new JScrollPane();
private final JScrollPane jScrollPane2 = new JScrollPane();
@@ -202,6 +204,7 @@ public class LexerFrame extends JFrame implements ActionListener {
while (true) {
token = lexer.nextToken();
JToggleButton tokenButton = new JToggleButton(tokens.get(token.getType()));
+ tokenButton.setFont(MONOSPACED_FONT);
bg.add(tokenButton);
tokenButton.addActionListener(this);
tokenButton.setToolTipText(token.getText());
@@ -253,7 +256,7 @@ public class LexerFrame extends JFrame implements ActionListener {
jSplitPane1.setOrientation(JSplitPane.VERTICAL_SPLIT);
tokenPane.setEditable(false);
tokenPane.setText("");
- scriptPane.setFont(new java.awt.Font("DialogInput", 0, 12));
+ scriptPane.setFont(MONOSPACED_FONT);
scriptPane.setEditable(false);
scriptPane.setMargin(new Insets(5, 5, 5, 5));
scriptPane.setText("");
[groovy] 01/02: Tweak lexer frame: show token count in the token
stream label
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit dfcee1be44809c0642691c8ed8c96239dca8bf66
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Aug 29 20:05:58 2021 +0800
Tweak lexer frame: show token count in the token stream label
(cherry picked from commit 8752c06505e19bfa94f865946cddf3bc22d65a0e)
---
src/main/java/org/apache/groovy/antlr/LexerFrame.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/groovy/antlr/LexerFrame.java b/src/main/java/org/apache/groovy/antlr/LexerFrame.java
index d7cacd2..467cde9 100644
--- a/src/main/java/org/apache/groovy/antlr/LexerFrame.java
+++ b/src/main/java/org/apache/groovy/antlr/LexerFrame.java
@@ -65,6 +65,7 @@ import java.util.Map;
*/
public class LexerFrame extends JFrame implements ActionListener {
private static final long serialVersionUID = 2715693043143492893L;
+ private static final Class<GroovyLexer> TOKEN_TYPES_CLASS = GroovyLexer.class;
private final JSplitPane jSplitPane1 = new JSplitPane();
private final JScrollPane jScrollPane1 = new JScrollPane();
private final JScrollPane jScrollPane2 = new JScrollPane();
@@ -72,8 +73,8 @@ public class LexerFrame extends JFrame implements ActionListener {
private final JButton jbutton = new JButton("open");
private final JPanel mainPanel = new JPanel(new BorderLayout());
private final JTextArea scriptPane = new JTextArea();
+ private final JLabel tokenStreamLabel = new JLabel(" Token Stream:");
private final Map<Integer, String> tokens = new HashMap<>();
- private static final Class<GroovyLexer> TOKEN_TYPES_CLASS = GroovyLexer.class;
/**
* Constructor used when invoking as a standalone application
@@ -197,6 +198,7 @@ public class LexerFrame extends JFrame implements ActionListener {
final ButtonGroup bg = new ButtonGroup();
Token token;
+ int tokenCnt = 0;
while (true) {
token = lexer.nextToken();
JToggleButton tokenButton = new JToggleButton(tokens.get(token.getType()));
@@ -211,11 +213,14 @@ public class LexerFrame extends JFrame implements ActionListener {
line = token.getLine();
}
insertComponent(tokenButton);
+ tokenCnt++;
if (eof().equals(token.getType())) {
break;
}
}
+ tokenStreamLabel.setText(" Token Stream(" + tokenCnt + "):");
+
tokenPane.setEditable(false);
tokenPane.setCaretPosition(0);
reader.close();
@@ -265,7 +270,7 @@ public class LexerFrame extends JFrame implements ActionListener {
jSplitPane1.add(jScrollPane2, JSplitPane.RIGHT);
jScrollPane2.getViewport().add(scriptPane, null);
- jScrollPane1.setColumnHeaderView(new JLabel(" Token Stream:"));
+ jScrollPane1.setColumnHeaderView(tokenStreamLabel);
jScrollPane2.setColumnHeaderView(new JLabel(" Input Script:"));
jSplitPane1.setResizeWeight(0.5);
}