Skip to content

Commit 75c8421

Browse files
PiaFlessnerPiaFlessner
committed
renaming
1 parent 7f6ffac commit 75c8421

21 files changed

+104
-98
lines changed

‎src/App.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
import javax.swing.*;
3-
import main.java.visualComponents.MainFrame;
3+
4+
import main.java.visual_components.MainFrame;
45

56

67
public class App {

src/main/java/backendData/Direction.java renamed to src/main/java/backend_data/Direction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main.java.backendData;
1+
package main.java.backend_data;
22

33
public enum Direction {
44
UP,

src/main/java/backendData/Header.java renamed to src/main/java/backend_data/Header.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package main.java.backendData;
1+
package main.java.backend_data;
22
import java.io.Serializable;
33
import java.util.HashMap;
44
import java.util.LinkedList;
55
import java.util.List;
66
import java.util.logging.Logger;
77

88
public class Header implements Serializable{
9-
109
private static final long serialVersionUID = 1L;
1110
private String title;
1211
private String text;
@@ -17,7 +16,7 @@ public class Header implements Serializable{
1716
private final boolean isRoot;
1817
private static final String DISPLAYDIVIDER = ".";
1918
private transient Logger log = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
20-
public static Header ROOT;
19+
private static Header root;
2120
//Saving for reload components
2221
private boolean showSubHeader;
2322
private boolean showText;
@@ -34,6 +33,14 @@ public Header(String title, int ownNr, Header parentElement, boolean isRoot) {
3433
}
3534

3635

36+
public static void setRoot(Header root){
37+
Header.root = root;
38+
}
39+
40+
public static Header getRoot(){
41+
return Header.root;
42+
}
43+
3744
public String getTitle() {
3845
return title;
3946
}
@@ -330,7 +337,7 @@ public Tuple(int index){
330337
*/
331338
public int getTotalSubTreeCount() {
332339
int elementCounter = 0;
333-
if (this.subheaders.size() == 0)
340+
if (this.isEmpty())
334341
return elementCounter;
335342
else {
336343
elementCounter = elementCounter + this.subheaders.size();

src/main/java/backendData/HeaderConverter.java renamed to src/main/java/backend_data/HeaderConverter.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main.java.backendData;
1+
package main.java.backend_data;
22

33
import java.io.File;
44
import java.io.FileWriter;
@@ -7,8 +7,8 @@
77

88
public class HeaderConverter {
99

10-
public static String HEADERSYMBOL = "#";
11-
public static String SPACESYMBOL = " ";
10+
public static final String HEADERSYMBOL = "#";
11+
public static final String SPACESYMBOL = " ";
1212

1313
/**
1414
* converts the content of a header into a MD String representation recursevly.
@@ -91,11 +91,8 @@ public boolean saveMD(Header header, int depht, String target) {
9191
*/
9292
private boolean createFile(String target) {
9393
File newFile = new File(target);
94-
newFile.setExecutable(false);
9594
try {
96-
if (newFile.exists())
97-
return true;
98-
if (newFile.createNewFile())
95+
if (newFile.exists() || newFile.createNewFile())
9996
return true;
10097
return false;
10198
} catch (IOException e) {
@@ -113,7 +110,7 @@ private boolean createFile(String target) {
113110
* @return is everyting was ok.
114111
*/
115112
private boolean saveHeaderInFile(Header header, String target, int depht) {
116-
try {
113+
try{
117114
FileWriter writer = new FileWriter(target);
118115
writer.write(this.convertHeaderToMD(header, depht));
119116
writer.close();

src/main/java/visualComponents/MainFrame.java renamed to src/main/java/visual_components/MainFrame.java

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main.java.visualComponents;
1+
package main.java.visual_components;
22

33
import java.io.File;
44
import java.awt.BorderLayout;
@@ -19,15 +19,16 @@
1919
import java.awt.Dimension;
2020
import java.awt.FlowLayout;
2121
import java.awt.Color;
22-
import main.java.backendData.Header;
23-
import main.java.visualComponents.Actions.ShowHideToolBarAction;
24-
import main.java.visualComponents.Actions.ToolBoxAddHeaderToRootAction;
25-
import main.java.visualComponents.Actions.ToolBoxExportMDAction;
26-
import main.java.visualComponents.Actions.ToolBoxNewFileAction;
27-
import main.java.visualComponents.Actions.ToolBoxOpenFileAction;
28-
import main.java.visualComponents.Actions.ToolBoxSaveFileAction;
29-
import main.java.visualComponents.Header.HeaderComponent;
30-
import main.java.visualComponents.ToolBox.ToolBoxComponent;
22+
import main.java.backend_data.Header;
23+
import main.java.visual_components.actions.ShowHideToolBarAction;
24+
import main.java.visual_components.actions.ToolBoxAddHeaderToRootAction;
25+
import main.java.visual_components.actions.ToolBoxExportMDAction;
26+
import main.java.visual_components.actions.ToolBoxNewFileAction;
27+
import main.java.visual_components.actions.ToolBoxOpenFileAction;
28+
import main.java.visual_components.actions.ToolBoxSaveFileAction;
29+
import main.java.visual_components.header.HeaderComponent;
30+
import main.java.visual_components.toolbox.ToolBoxComponent;
31+
3132
import java.awt.event.InputEvent;
3233

3334
public class MainFrame {
@@ -52,7 +53,7 @@ public class MainFrame {
5253
JMenuItem addNewHeaderItem;
5354
public static final Color WINDOW_BACKGROUND_COLOR = new Color(255, 255, 255);
5455
public static final Color BUTTON_BACKGROUND_COLOR = new Color(165, 165, 165);
55-
final String ICONPATH = "src" + File.separator + "main" + File.separator + "resources" + File.separator
56+
static final String ICONPATH = "src" + File.separator + "main" + File.separator + "resources" + File.separator
5657
+ "appIcon.png";
5758

5859
ToolBoxNewFileAction newFileAction;
@@ -62,12 +63,12 @@ public class MainFrame {
6263
ToolBoxExportMDAction exportAction;
6364

6465
public MainFrame() {
65-
Header.ROOT = headerRoot;
66+
Header.setRoot(headerRoot);
6667
initComponents();
6768
}
6869

6970
public void setRoot(Header root) {
70-
Header.ROOT = root;
71+
Header.setRoot(root);
7172
this.headerRoot = root;
7273

7374
HeaderComponent.reloadComponents();
@@ -87,13 +88,10 @@ private void initComponents() {
8788
// Set System L&F
8889
UIManager.setLookAndFeel(
8990
UIManager.getSystemLookAndFeelClassName());
90-
} catch (UnsupportedLookAndFeelException e) {
91-
java.util.logging.Logger.getLogger(MainFrame.class.getName()).log(java.util.logging.Level.SEVERE, null, e);
92-
} catch (ClassNotFoundException e) {
93-
java.util.logging.Logger.getLogger(MainFrame.class.getName()).log(java.util.logging.Level.SEVERE, null, e);
94-
} catch (InstantiationException e) {
95-
java.util.logging.Logger.getLogger(MainFrame.class.getName()).log(java.util.logging.Level.SEVERE, null, e);
96-
} catch (IllegalAccessException e) {
91+
} catch (UnsupportedLookAndFeelException |
92+
ClassNotFoundException |
93+
InstantiationException |
94+
IllegalAccessException e) {
9795
java.util.logging.Logger.getLogger(MainFrame.class.getName()).log(java.util.logging.Level.SEVERE, null, e);
9896
}
9997

src/main/java/visualComponents/Actions/ShowHideToolBarAction.java renamed to src/main/java/visual_components/actions/ShowHideToolBarAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package main.java.visualComponents.Actions;
1+
package main.java.visual_components.actions;
22

33
import java.awt.event.ActionEvent;
44
import javax.swing.AbstractAction;
55
import javax.swing.JRadioButtonMenuItem;
66
import javax.swing.KeyStroke;
77

8-
import main.java.visualComponents.ToolBox.ToolBoxComponent;
8+
import main.java.visual_components.toolbox.ToolBoxComponent;
99

1010
public class ShowHideToolBarAction extends AbstractAction{
1111

src/main/java/visualComponents/Actions/ToolBoxAddHeaderToRootAction.java renamed to src/main/java/visual_components/actions/ToolBoxAddHeaderToRootAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package main.java.visualComponents.Actions;
1+
package main.java.visual_components.actions;
22
import java.awt.event.ActionEvent;
33
import javax.swing.AbstractAction;
44
import javax.swing.JPanel;
55
import javax.swing.KeyStroke;
6-
import main.java.backendData.Header;
7-
import main.java.visualComponents.MainFrame;
8-
import main.java.visualComponents.Header.HeaderComponent;
6+
import main.java.backend_data.Header;
7+
import main.java.visual_components.MainFrame;
8+
import main.java.visual_components.header.HeaderComponent;
99

1010
public class ToolBoxAddHeaderToRootAction extends AbstractAction{
1111
MainFrame mainFrame;

src/main/java/visualComponents/Actions/ToolBoxExportMDAction.java renamed to src/main/java/visual_components/actions/ToolBoxExportMDAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package main.java.visualComponents.Actions;
1+
package main.java.visual_components.actions;
22
import java.awt.event.ActionEvent;
33
import java.io.File;
44
import javax.swing.AbstractAction;
55
import javax.swing.JFileChooser;
66
import javax.swing.JOptionPane;
77
import javax.swing.KeyStroke;
8-
import main.java.backendData.HeaderConverter;
9-
import main.java.visualComponents.MainFrame;
8+
import main.java.backend_data.HeaderConverter;
9+
import main.java.visual_components.MainFrame;
1010

1111
public class ToolBoxExportMDAction extends AbstractAction {
1212

src/main/java/visualComponents/Actions/ToolBoxNewFileAction.java renamed to src/main/java/visual_components/actions/ToolBoxNewFileAction.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package main.java.visualComponents.Actions;
1+
package main.java.visual_components.actions;
22

33
import java.awt.event.ActionEvent;
44

55
import javax.swing.AbstractAction;
66
import javax.swing.JOptionPane;
77
import javax.swing.KeyStroke;
8-
import main.java.backendData.Header;
9-
import main.java.visualComponents.MainFrame;
8+
import main.java.backend_data.Header;
9+
import main.java.visual_components.MainFrame;
1010

1111
public class ToolBoxNewFileAction extends AbstractAction{
1212
MainFrame mainFrame;
@@ -28,11 +28,6 @@ public void actionPerformed(ActionEvent e) {
2828
Header headerRoot = new Header("Root", 0, null, true);
2929
mainFrame.setRoot(headerRoot);
3030
}
31-
//No
32-
else{
33-
return;
34-
}
35-
3631
}
3732

3833
}

src/main/java/visualComponents/Actions/ToolBoxOpenFileAction.java renamed to src/main/java/visual_components/actions/ToolBoxOpenFileAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main.java.visualComponents.Actions;
1+
package main.java.visual_components.actions;
22

33
import java.awt.event.ActionEvent;
44
import java.io.File;
@@ -12,8 +12,8 @@
1212
import javax.swing.JOptionPane;
1313
import javax.swing.KeyStroke;
1414

15-
import main.java.backendData.Header;
16-
import main.java.visualComponents.MainFrame;
15+
import main.java.backend_data.Header;
16+
import main.java.visual_components.MainFrame;
1717

1818
public class ToolBoxOpenFileAction extends AbstractAction {
1919

0 commit comments

Comments
 (0)