Skip to content

Commit 8d37a08

Browse files
committed
Before MainFrameRoot removal
1 parent 372022c commit 8d37a08

File tree

2 files changed

+19
-38
lines changed

2 files changed

+19
-38
lines changed

src/main/java/visualComponents/Header/Title.java

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import javax.swing.JTextField;
44

55
import javax.swing.KeyStroke;
6+
import javax.swing.SwingConstants;
67
import javax.swing.event.DocumentEvent;
78
import javax.swing.event.DocumentListener;
89
import javax.swing.event.MouseInputAdapter;
910
import java.awt.event.FocusAdapter;
1011
import java.awt.event.FocusEvent;
11-
import java.awt.event.KeyAdapter;
1212
import javax.swing.AbstractAction;
1313
import java.awt.Color;
1414
import javax.swing.BorderFactory;
@@ -17,24 +17,23 @@
1717

1818
public class Title extends JTextField {
1919
boolean isEditable;
20-
HeaderComponent parent;
20+
HeaderComponent parentComponent;
2121
Cursor NORMAL_CURSOR = new Cursor(Cursor.DEFAULT_CURSOR);
2222
Cursor EDIT_CURSOR = new Cursor(Cursor.TEXT_CURSOR);
2323

24-
public Title(HeaderComponent parent) {
25-
this.parent = parent;
24+
public Title(HeaderComponent parentComponent) {
25+
this.parentComponent = parentComponent;
2626

27-
this.setHorizontalAlignment(JTextField.LEFT);
28-
this.setText(parent.connectedHeader.getTitle());
27+
this.setHorizontalAlignment(SwingConstants.LEFT);
28+
this.setText(parentComponent.connectedHeader.getTitle());
2929
this.setBorder(null);
3030
this.setMaximumSize(new Dimension(500, 16));
3131
this.setMinimumSize(new Dimension(500, 16));
3232
this.setPreferredSize(new Dimension(500, 16));
3333
this.setFocusable(false);
3434
this.setEditable(false);
3535
this.setCursor(this.NORMAL_CURSOR);
36-
this.setBackground(parent.backgroundColor);
37-
//setUpCharacterLimit(80);
36+
this.setBackground(parentComponent.backgroundColor);
3837
addFocusingFunction();
3938
setUpEditableFunction();
4039
setUpChangedFunction();
@@ -92,40 +91,21 @@ private void setUpChangedFunction() {
9291

9392
@Override
9493
public void insertUpdate(DocumentEvent e) {
95-
parent.connectedHeader.setTitle(getText());
94+
parentComponent.connectedHeader.setTitle(getText());
9695
}
9796

9897
@Override
9998
public void removeUpdate(DocumentEvent e) {
100-
parent.connectedHeader.setTitle(getText());
99+
parentComponent.connectedHeader.setTitle(getText());
101100
}
102101

103102
@Override
104103
public void changedUpdate(DocumentEvent e) {
105-
parent.connectedHeader.setTitle(getText());
104+
parentComponent.connectedHeader.setTitle(getText());
106105
}
107106

108107
});
109108
}
110-
111-
/**
112-
* Sets Up the character limit of the component to the in limit specified count.
113-
*
114-
* @param limit applied limit.
115-
*/
116-
private void setUpCharacterLimit(int limit) {
117-
this.addKeyListener(new KeyAdapter() {
118-
119-
@Override
120-
public void keyTyped(java.awt.event.KeyEvent e) {
121-
if (getText().length() > limit) {
122-
getToolkit().beep();
123-
e.consume();
124-
}
125-
}
126-
});
127-
}
128-
129109
/**
130110
* Changes the editablity
131111
*/
@@ -136,15 +116,15 @@ public void editAbleChange() {
136116
this.setEditable(false);
137117
this.isEditable = false;
138118
this.setFocusable(false);
139-
this.setBackground(parent.backgroundColor);
119+
this.setBackground(parentComponent.backgroundColor);
140120
this.setCursor(this.NORMAL_CURSOR);
141121
this.transferFocusBackward();
142122

143123
} else {
144124
// change to editable
145125
this.setEditable(true);
146126
this.isEditable = true;
147-
this.setBackground(parent.EDIT_COLOR);
127+
this.setBackground(HeaderComponent.EDIT_COLOR);
148128
this.setCursor(this.EDIT_CURSOR);
149129
this.setFocusable(true);
150130
this.requestFocus();

src/main/java/visualComponents/MainFrame.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import main.java.visualComponents.Actions.ToolBoxSaveFileAction;
2828
import main.java.visualComponents.Header.HeaderComponent;
2929
import main.java.visualComponents.ToolBox.ToolBoxComponent;
30+
import java.awt.event.InputEvent;
3031

3132
public class MainFrame {
3233

@@ -38,12 +39,12 @@ public class MainFrame {
3839
ToolBoxComponent toolboxComponent;
3940
JRadioButtonMenuItem showToolbarMenuItem;
4041
JScrollPane headerElementScroller;
41-
KeyStroke keyStrokeForNewFile = KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK);
42-
KeyStroke keyStrokeForToolbarVisibility = KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK);
43-
KeyStroke keyStrokeForMDExport = KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_DOWN_MASK);
44-
KeyStroke keyStrokeForSave = KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK);
45-
KeyStroke keyStrokeForOpen = KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_DOWN_MASK);
46-
KeyStroke keyStrokeForAddHeaderRoot = KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK);
42+
KeyStroke keyStrokeForNewFile = KeyStroke.getKeyStroke(KeyEvent.VK_N, InputEvent.CTRL_DOWN_MASK);
43+
KeyStroke keyStrokeForToolbarVisibility = KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_DOWN_MASK);
44+
KeyStroke keyStrokeForMDExport = KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK);
45+
KeyStroke keyStrokeForSave = KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK);
46+
KeyStroke keyStrokeForOpen = KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK);
47+
KeyStroke keyStrokeForAddHeaderRoot = KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_DOWN_MASK);
4748
JPanel headerContainer;
4849
JPanel columnContainer;
4950
JLabel topicLabel;

0 commit comments

Comments
 (0)