Skip to content

Commit 7f6ffac

Browse files
committed
most warnings away
1 parent bf97d94 commit 7f6ffac

File tree

3 files changed

+11
-48
lines changed

3 files changed

+11
-48
lines changed

src/main/java/visualComponents/MainFrame.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.awt.BorderLayout;
55
import javax.swing.BoxLayout;
66
import javax.swing.ImageIcon;
7+
import javax.swing.JComponent;
78
import javax.swing.JFrame;
89
import javax.swing.JLabel;
910
import javax.swing.JMenuItem;
@@ -200,7 +201,7 @@ private void setUpToolBoxActions() {
200201
// Export OpenFile Action
201202
String actionMapNewFile = "newFile";
202203
newFileAction = new ToolBoxNewFileAction(this, "New File", keyStrokeForNewFile);
203-
masterContainer.getInputMap(masterContainer.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForNewFile, actionMapNewFile);
204+
masterContainer.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForNewFile, actionMapNewFile);
204205
masterContainer.getActionMap().put(actionMapNewFile, newFileAction);
205206
//// Add Contextmenu option
206207
JMenuItem newFileItem = new JMenuItem();
@@ -210,7 +211,7 @@ private void setUpToolBoxActions() {
210211
// Export OpenFile Action
211212
String actionMapKeyOpen = "openFile";
212213
openFileAction = new ToolBoxOpenFileAction(this, "Open File", keyStrokeForOpen);
213-
masterContainer.getInputMap(masterContainer.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForOpen, actionMapKeyOpen);
214+
masterContainer.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForOpen, actionMapKeyOpen);
214215
masterContainer.getActionMap().put(actionMapKeyOpen, openFileAction);
215216
//// Add Contextmenu option
216217
JMenuItem openFileItem = new JMenuItem();
@@ -220,7 +221,7 @@ private void setUpToolBoxActions() {
220221
// Save FileAction
221222
String actionMapKeySaveFile = "saveFile";
222223
saveFileAction = new ToolBoxSaveFileAction(this, "Save", keyStrokeForSave);
223-
masterContainer.getInputMap(masterContainer.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForSave, actionMapKeySaveFile);
224+
masterContainer.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForSave, actionMapKeySaveFile);
224225
masterContainer.getActionMap().put(actionMapKeySaveFile, saveFileAction);
225226
//// Add Contextmenu option
226227
JMenuItem saveFileItem = new JMenuItem();
@@ -231,7 +232,7 @@ private void setUpToolBoxActions() {
231232
String actionMapKeyAddHeaderRoot = "addHeaderToRoot";
232233
addHeaderAction = new ToolBoxAddHeaderToRootAction(this, headerElementContainer, "Add to first level",
233234
keyStrokeForAddHeaderRoot);
234-
masterContainer.getInputMap(masterContainer.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForAddHeaderRoot,
235+
masterContainer.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForAddHeaderRoot,
235236
actionMapKeyAddHeaderRoot);
236237
masterContainer.getActionMap().put(actionMapKeyAddHeaderRoot, addHeaderAction);
237238
//// Add Contextmenu option
@@ -244,7 +245,7 @@ private void setUpToolBoxActions() {
244245
// Export MD Action
245246
String actionMapKeyExportMD = "exportToMarkdown";
246247
exportAction = new ToolBoxExportMDAction(this, "Export to Markdown", keyStrokeForMDExport);
247-
masterContainer.getInputMap(masterContainer.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForMDExport,
248+
masterContainer.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForMDExport,
248249
actionMapKeyExportMD);
249250
masterContainer.getActionMap().put(actionMapKeyExportMD, exportAction);
250251
//// Add Contextmenu option
@@ -269,7 +270,7 @@ public void setUpShowHideAction() {
269270
//// Show Hide Toolbar
270271
ShowHideToolBarAction showHideAction = new ShowHideToolBarAction(toolboxComponent, showToolbarMenuItem,
271272
"Show Toolbox", keyStrokeForToolbarVisibility);
272-
masterContainer.getInputMap(masterContainer.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForToolbarVisibility,
273+
masterContainer.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(keyStrokeForToolbarVisibility,
273274
"show or Hide Toolbox");
274275
masterContainer.getActionMap().put("show or Hide Toolbox", showHideAction);
275276
showToolbarMenuItem.setAction(showHideAction);
Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,15 @@
11
package main.java.visualComponents.ToolBox;
22
import java.awt.Color;
3-
4-
import javax.swing.JButton;
53
import javax.swing.JPanel;
64
import java.awt.BorderLayout;
75
import java.awt.Dimension;
8-
import javax.swing.JTextField;
9-
import java.awt.event.ActionListener;
10-
import java.awt.event.ActionEvent;
116

127
public class InnerContainer extends JPanel{
13-
private JTextField FileNameTextField;
14-
private Button addButton;
15-
private final Dimension MINIMUM_SIZE = new Dimension(10, 40);
16-
private final Dimension BUTTON_PREFFERED_SIZE = new Dimension(150, 22);
17-
18-
19-
public InnerContainer(Color backgroundColor, Color foregroundColor){
8+
private final Dimension MINIMUM_SIZE = new Dimension(10, 40);
209

10+
public InnerContainer(Color backgroundColor){
2111
this.setBackground(backgroundColor);
2212
this.setMinimumSize(MINIMUM_SIZE);
2313
this.setLayout(new BorderLayout());
24-
// initComponents(backgroundColor, foregroundColor);
25-
}
26-
27-
private void initComponents(Color backgroundColor, Color foregroundColor){
28-
FileNameTextField = new JTextField();
29-
30-
FileNameTextField.setText("Project Name");
31-
FileNameTextField.setPreferredSize(BUTTON_PREFFERED_SIZE);
32-
FileNameTextField.setBackground(backgroundColor);
33-
FileNameTextField.setForeground(foregroundColor);
34-
35-
this.add(FileNameTextField, BorderLayout.CENTER);
36-
37-
FileNameTextField.addActionListener(new ActionListener() {
38-
public void actionPerformed(ActionEvent evt) {
39-
FileNameTextFieldActionPerformed(evt);
40-
}
41-
});
42-
43-
}
44-
45-
private void FileNameTextFieldActionPerformed(ActionEvent evt) {
46-
// TODO add your handling code here:
47-
}
48-
49-
50-
51-
14+
}
5215
}

src/main/java/visualComponents/ToolBox/ToolBoxComponent.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
public class ToolBoxComponent extends JPanel{
1717

1818
private static final Color BACKGROUND_COLOR = new Color(165, 165, 165);
19-
private static final Color FOREGROUND_COLOR = new Color(255 , 255, 255);
2019
private static final Dimension MAXIMUM_SIZE = (new Dimension(32767, 60));
2120
private static final Dimension MINIMUM_SIZE = (new Dimension(100, 10));
2221
private static final Dimension PREFERRED_SIZE= (new Dimension(636, 60));
@@ -49,7 +48,7 @@ private void initComponents() {
4948
JButton newFileButton = new Button(leftTooltipContainer);
5049
JButton openFileButton = new Button( leftTooltipContainer);
5150
JButton saveFileButton = new Button(leftTooltipContainer);
52-
JPanel middleTooltipContainer = new InnerContainer(BACKGROUND_COLOR, FOREGROUND_COLOR);
51+
JPanel middleTooltipContainer = new InnerContainer(BACKGROUND_COLOR);
5352
JPanel rightTooltipContainer = new OuterContainer(BACKGROUND_COLOR);
5453
JButton addHeaderButton = new Button(middleTooltipContainer);
5554
JButton exportMDButton = new Button( rightTooltipContainer);

0 commit comments

Comments
 (0)