Clean up

Author: BenHerbst

src/main/java/org/ainm/controllers/MainController.java

@@ -48,19 +48,19 @@
 public class MainController {
 
     List<String> registered_projects = new ArrayList<>();
-    String current_project_path = "";
+    String currentProjectPath = "";
 
     @FXML
-    private Button date_button;
+    private Button dateButton;
 
     @FXML
-    private Button time_button;
+    private Button timeButton;
 
     @FXML
     private TreeView<File> file_explorer;
 
     @FXML
-    private TabPane tab_pane;
+    private TabPane tabPane;
 
     @FXML
     private Menu RegisteredProjectsListMenu;
@@ -100,7 +100,7 @@ public void run() {
         });
     }
 
-    void add_subdirs(String directory, TreeItem<File> treeItem) throws IOException {
+    void addSubdirs(String directory, TreeItem<File> treeItem) throws IOException {
         // List all sub dirs
         File[] directories = new File(directory).listFiles(File::isDirectory);
         for (File dir : directories) {
@@ -119,7 +119,7 @@ void add_subdirs(String directory, TreeItem<File> treeItem) throws IOException {
         }
     }
 
-    void open_registered_project(String directory) {
+    void openRegisteredProject(String directory) {
         current_project_path = directory;
         Path rootFile = Paths.get(directory);
         TreeItem<File> rootItem = new TreeItem<>(new File(directory));
@@ -134,7 +134,7 @@ void open_registered_project(String directory) {
     }
 
     @FXML
-    void add_project(ActionEvent event) {
+    void addProject(ActionEvent event) {
         // Register a new project and open it
         DirectoryChooser chooser = new DirectoryChooser();
         File project = chooser.showDialog(null);
@@ -144,7 +144,7 @@ void add_project(ActionEvent event) {
         projectMenuItem.setText(Paths.get(project.toString()).getFileName().toString());
         projectMenuItem.setOnAction(e -> {
             // Set open action to open the project, when clicked
-            open_registered_project(project.toString());
+            openRegisteredProject(project.toString());
         });
         RegisteredProjectsListMenu.getItems().add(projectMenuItem);
         open_registered_project(project.toString());
@@ -157,7 +157,7 @@ void add_project(ActionEvent event) {
     }
 
     @FXML
-    void delete_current_project(ActionEvent event) {
+    void deleteCurrentProject(ActionEvent event) {
         // Remove the current project from the registered list
         registered_projects.remove(current_project_path);
         createProjectList();
@@ -186,70 +186,70 @@ void createProjectList() {
     }
 
     @FXML
-    void close_current_project(ActionEvent event) {
+    void closeCurrentProject(ActionEvent event) {
         close_project();
     }
 
-    void close_project() {
+    void closeProject() {
         // Close the file explorer
-        file_explorer.setRoot(null);
-        current_project_path = "";
+        fileExplorer.setRoot(null);
+        currentProjectPath = "";
     }
 
     @FXML
-    void open_new_window(ActionEvent event) {
+    void openNewWindow(ActionEvent event) {
         try {
             // Open a new window in same process
             Parent root = FXMLLoader.load(getClass().getResource("/fxml/MainView.fxml"));
             Scene scene = new Scene(root, 640, 480);
             Stage stage = new Stage();
             stage.setScene(scene);
-            stage.setTitle("Ainm - 0.01 / Todolist");
+            stage.setTitle("Idaes - 0.8 - Alpha");
             stage.show();
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
     @FXML
-    void show_github_site(ActionEvent event) throws IOException, URISyntaxException {
+    void showGithubSite(ActionEvent event) throws IOException, URISyntaxException {
         // Shows the github side of the project in the current standard browser
         if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
             Desktop.getDesktop().browse(new URI("https://github.com/BenHerbst/ainm"));
         }
     }
 
     @FXML
-    void close_current_window(ActionEvent event) {
+    void closeCurrentWindow(ActionEvent event) {
         // Close the current stage
-        date_button.getScene().getWindow().hide();
+        dateButton.getScene().getWindow().hide();
     }
 
     @FXML
-    void close_app(ActionEvent event) {
+    void closeApp(ActionEvent event) {
         // Fully close the app
         Platform.exit();
         System.exit(0);
     }
 
     @FXML
-    void open_default_browser(ActionEvent event) throws IOException, URISyntaxException {
+    void openDefaultBrowser(ActionEvent event) throws IOException, URISyntaxException {
         // Shows the github side of the project in the current standard browser
         if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
             Desktop.getDesktop().browse(new URI("https://duckduckgo.com/"));
         }
     }
 
     @FXML
-    void open_default_mail(ActionEvent event) throws IOException, URISyntaxException {
+    void openDefautMail(ActionEvent event) throws IOException, URISyntaxException {
         // Shows the github side of the project in the current standard browser
         if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
             Desktop.getDesktop().mail();
         }
     }
 
     @FXML
-    void open_file_explorer(ActionEvent event) {
+    void openFileExplorer(ActionEvent event) {
         // Open the file explorer in the user directory
         File file = new File(System.getProperty("user.home"));
         try {
@@ -263,7 +263,7 @@ void open_file_explorer(ActionEvent event) {
     }
 
     @FXML
-    void add_tab(ActionEvent event) throws IOException {
+    void addTab(ActionEvent event) throws IOException {
         // Open a new empty tab
         Tab newTab = new Tab();
         newTab.setText("New tab");
@@ -274,27 +274,27 @@ void add_tab(ActionEvent event) throws IOException {
     }
 
     @FXML
-    void close_current_tab(ActionEvent event) {
+    void closeCurrentTab(ActionEvent event) {
         // Close the current tab
         SingleSelectionModel<Tab> selectionModel = tab_pane.getSelectionModel();
         Tab currentTab = selectionModel.getSelectedItem();
         tab_pane.getTabs().remove(currentTab);
     }
 
     @FXML
-    void close_all_tabs(ActionEvent event) {
+    void closeAllTabs(ActionEvent event) {
         // Close all tabs of tabpane
         tab_pane.getTabs().clear();
     }
 
     @FXML
-    void close_file(ActionEvent event) {
+    void closeFile(ActionEvent event) {
         // Closes the current file and make the tab content empty
         get_current_tab().setContent(null);
     }
 
     @FXML
-    void new_todo_list(ActionEvent event) throws IOException {
+    void newTosoList(ActionEvent event) throws IOException {
         if (current_project_path != "") {
             // Shows the create a new file dialog
             FXMLLoader loader = new FXMLLoader();

src/main/resources/fxml/MainView.fxml

@@ -14,7 +14,7 @@
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.ainm.controllers.MainController">
    <left>
-      <TreeView fx:id="file_explorer" prefHeight="352.0" prefWidth="296.0" BorderPane.alignment="CENTER">
+      <TreeView fx:id="fileExplorer" prefHeight="352.0" prefWidth="296.0" BorderPane.alignment="CENTER">
          <stylesheets>
             <URL value="@../styles/treeview/background.css" />
             <URL value="@../styles/treeview/tree_cell.css" />
@@ -28,8 +28,8 @@
             <Button layoutX="10.0" layoutY="10.0" mnemonicParsing="false" text="Properties" />
             <Button layoutX="122.0" layoutY="10.0" mnemonicParsing="false" text="Messanges" />
             <Button layoutX="193.0" layoutY="10.0" mnemonicParsing="false" text="24°" />
-            <Button fx:id="date_button" layoutX="272.0" layoutY="10.0" mnemonicParsing="false" text="17/10/2021" />
-            <Button fx:id="time_button" layoutX="310.0" layoutY="10.0" mnemonicParsing="false" text="12:30" />
+            <Button fx:id="dateButton" layoutX="272.0" layoutY="10.0" mnemonicParsing="false" text="17/10/2021" />
+            <Button fx:id="timeButton" layoutX="310.0" layoutY="10.0" mnemonicParsing="false" text="12:30" />
         </items>
          <stylesheets>
             <URL value="@../styles/airbar/button.css" />
@@ -38,7 +38,7 @@
       </ToolBar>
    </bottom>
    <center>
-      <TabPane fx:id="tab_pane" prefHeight="33.0" prefWidth="600.0" tabClosingPolicy="ALL_TABS" BorderPane.alignment="CENTER">
+      <TabPane fx:id="tabPane" prefHeight="33.0" prefWidth="600.0" tabClosingPolicy="ALL_TABS" BorderPane.alignment="CENTER">
         <tabs>
           <Tab text="New tab">
             <content>
@@ -88,34 +88,34 @@
               <items>
                 <MenuItem fx:id="menu_item_close_all_tabs" mnemonicParsing="false" onAction="#close_all_tabs" text="Close all tabs" />
                   <MenuItem fx:id="menu_item_new_tab" mnemonicParsing="false" onAction="#add_tab" text="New tab" />
-                  <MenuItem fx:id="menu_item_close_tab" mnemonicParsing="false" onAction="#close_current_tab" text="Close tab" />
+                  <MenuItem fx:id="menuItemCloseTab" mnemonicParsing="false" onAction="#closeCurrentTab" text="Close tab" />
               </items>
             </Menu>
             <Menu mnemonicParsing="false" text="Projects">
                <items>
                   <MenuItem disable="true" mnemonicParsing="false" text="Start new project" />
                   <MenuItem fx:id="menu_item_add_project" mnemonicParsing="false" onAction="#add_project" text="Add project" />
                   <MenuItem fx:id="menu_item_close_project" mnemonicParsing="false" onAction="#close_current_project" text="Close current project" />
-                  <MenuItem fx:id="menu_item_delete_project" mnemonicParsing="false" onAction="#delete_current_project" text="Delete project" />
+                  <MenuItem fx:id="menuItemDeleteProject" mnemonicParsing="false" onAction="#deleteCurrentProject" text="Delete project" />
                   <Menu fx:id="RegisteredProjectsListMenu" mnemonicParsing="false" text="Project list" />
                </items>
             </Menu>
             <Menu mnemonicParsing="false" text="Window">
                <items>
                   <MenuItem fx:id="menu_item_new_window" mnemonicParsing="false" onAction="#open_new_window" text="New window" />
-                  <MenuItem fx:id="menu_item_close_current_window" mnemonicParsing="false" onAction="#close_current_window" text="Close current window" />
-                  <MenuItem fx:id="menu_item_open_file_explorer" mnemonicParsing="false" onAction="#open_file_explorer" text="Open file explorer" />
-                  <MenuItem fx:id="menu_item_open_browser" mnemonicParsing="false" onAction="#open_default_browser" text="Open browser" />
-                  <MenuItem fx:id="menu_item_open_mail" mnemonicParsing="false" onAction="#open_default_mail" text="Open mail" />
+                  <MenuItem fx:id="menuItemCloseCurrentWindow" mnemonicParsing="false" onAction="#closeCurrentWindow" text="Close current window" />
+                  <MenuItem fx:id="menuItemOpenFileExplorer" mnemonicParsing="false" onAction="#openFileExplorer" text="Open file explorer" />
+                  <MenuItem fx:id="menuItemOpenBrowser" mnemonicParsing="false" onAction="#openDefaultBrowser" text="Open browser" />
+                  <MenuItem fx:id="menuItemOpenMail" mnemonicParsing="false" onAction="#openDefaultMail" text="Open mail" />
                   <MenuItem disable="true" mnemonicParsing="false" text="Open in standard app" />
                </items>
             </Menu>
           <Menu mnemonicParsing="false" text="Help">
             <items>
               <MenuItem disable="true" mnemonicParsing="false" text="About" />
-                  <MenuItem fx:id="menu_item_github" mnemonicParsing="false" onAction="#show_github_site" text="Github" />
+                  <MenuItem fx:id="menuItemGithub" mnemonicParsing="false" onAction="#showGithubSite" text="Github" />
                   <MenuItem disable="true" mnemonicParsing="false" text="Settings" />
-                  <MenuItem fx:id="menu_item_close_app" mnemonicParsing="false" onAction="#close_app" text="Close" />
+                  <MenuItem fx:id="menuItemCloseApp" mnemonicParsing="false" onAction="#closeApp" text="Close" />
             </items>
           </Menu>
         </menus>