Skip to content

Commit 6399950

Browse files
parrtparrt
committed
rm indent console.
1 parent b472dd1 commit 6399950

3 files changed

Lines changed: 3 additions & 39 deletions

File tree

‎java/src/org/antlr/codebuff/gui/BuffScope.form‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -147,29 +147,6 @@
147147
</scrollpane>
148148
</children>
149149
</grid>
150-
<grid id="feb7c" binding="indentTab" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
151-
<margin top="0" left="0" bottom="0" right="0"/>
152-
<constraints>
153-
<tabbedpane title="Indentation"/>
154-
</constraints>
155-
<properties/>
156-
<border type="none"/>
157-
<children>
158-
<scrollpane id="280ca">
159-
<constraints>
160-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
161-
</constraints>
162-
<properties/>
163-
<border type="none"/>
164-
<children>
165-
<component id="72048" class="javax.swing.JTextArea" binding="indentConsole">
166-
<constraints/>
167-
<properties/>
168-
</component>
169-
</children>
170-
</scrollpane>
171-
</children>
172-
</grid>
173150
<grid id="883ac" binding="injectWSTab" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
174151
<margin top="0" left="0" bottom="0" right="0"/>
175152
<constraints>

‎java/src/org/antlr/codebuff/gui/BuffScope.java‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ public class BuffScope {
1414
public JTabbedPane analysisTabbedPane;
1515
public JPanel injectNLTab;
1616
public JPanel alignTab;
17-
public JTextArea indentConsole;
1817
public JTextArea injectWSConsole;
19-
public JPanel indentTab;
2018
public JPanel injectWSTab;
2119

2220
public JTextArea getInjectNLConsole() {
@@ -109,21 +107,14 @@ private void createUIComponents() {
109107
alignTab.add(scrollPane4, new com.intellij.uiDesigner.core.GridConstraints(0, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_BOTH, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK|com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK|com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
110108
alignConsole = new JTextArea();
111109
scrollPane4.setViewportView(alignConsole);
112-
indentTab = new JPanel();
113-
indentTab.setLayout(new com.intellij.uiDesigner.core.GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
114-
analysisTabbedPane.addTab("Indentation", indentTab);
115-
final JScrollPane scrollPane5 = new JScrollPane();
116-
indentTab.add(scrollPane5, new com.intellij.uiDesigner.core.GridConstraints(0, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_BOTH, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK|com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK|com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
117-
indentConsole = new JTextArea();
118-
scrollPane5.setViewportView(indentConsole);
119110
injectWSTab = new JPanel();
120111
injectWSTab.setLayout(new com.intellij.uiDesigner.core.GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
121112
analysisTabbedPane.addTab("Inject whitespace", injectWSTab);
122-
final JScrollPane scrollPane6 = new JScrollPane();
123-
injectWSTab.add(scrollPane6, new com.intellij.uiDesigner.core.GridConstraints(0, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_BOTH, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK|com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK|com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
113+
final JScrollPane scrollPane5 = new JScrollPane();
114+
injectWSTab.add(scrollPane5, new com.intellij.uiDesigner.core.GridConstraints(0, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_BOTH, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK|com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK|com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
124115
injectWSConsole = new JTextArea();
125116
injectWSConsole.setEditable(false);
126-
scrollPane6.setViewportView(injectWSConsole);
117+
scrollPane5.setViewportView(injectWSConsole);
127118
}
128119

129120
/**

‎java/src/org/antlr/codebuff/gui/GUIController.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ public void show() throws Exception {
6767
scope.injectNLConsole.setFont(docFont);
6868
scope.alignConsole.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
6969
scope.alignConsole.setFont(docFont);
70-
scope.indentConsole.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
71-
scope.indentConsole.setFont(docFont);
7270
scope.injectWSConsole.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
7371
scope.injectWSConsole.setFont(docFont);
7472

@@ -116,11 +114,9 @@ public void caretUpdate(CaretEvent e) {
116114
}
117115
scope.injectNLConsole.setText(analysis!=null ? analysis.newline : "");
118116
scope.alignConsole.setText(analysis!=null ? analysis.align : "");
119-
scope.indentConsole.setText("not used");
120117
scope.injectWSConsole.setText(analysis!=null ? analysis.ws : "");
121118
scope.injectNLConsole.setCaretPosition(0);
122119
scope.alignConsole.setCaretPosition(0);
123-
scope.indentConsole.setCaretPosition(0);
124120
scope.injectWSConsole.setCaretPosition(0);
125121
}
126122
catch (Exception ex) {

0 commit comments

Comments
 (0)