Skip to content

Commit 69e37d5

Browse files
committed
Added remove file option
1 parent 2739b5a commit 69e37d5

18 files changed

+73
-63
lines changed

.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_openjfx_javafx_base_linux_17_0_0_1.xml renamed to .idea/libraries/Maven__org_openjfx_javafx_base_win_17_0_0_1.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_openjfx_javafx_controls_linux_17_0_0_1.xml renamed to .idea/libraries/Maven__org_openjfx_javafx_controls_win_17_0_0_1.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_openjfx_javafx_fxml_linux_17_0_0_1.xml renamed to .idea/libraries/Maven__org_openjfx_javafx_fxml_win_17_0_0_1.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_openjfx_javafx_graphics_linux_17_0_0_1.xml renamed to .idea/libraries/Maven__org_openjfx_javafx_graphics_win_17_0_0_1.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

+13-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.settings/org.eclipse.buildship.core.prefs

-2
This file was deleted.

.settings/org.eclipse.jdt.core.prefs

-16
This file was deleted.

.settings/org.eclipse.jdt.ui.prefs

-2
This file was deleted.

.settings/org.eclipse.ltk.core.refactoring.prefs

-2
This file was deleted.

.settings/org.eclipse.m2e.core.prefs

-4
This file was deleted.

idaesbasic.iml

+5-4
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<orderEntry type="inheritedJdk" />
3636
<orderEntry type="sourceFolder" forTests="false" />
3737
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:17.0.0.1" level="project" />
38-
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:linux:17.0.0.1" level="project" />
38+
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:win:17.0.0.1" level="project" />
3939
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:17.0.0.1" level="project" />
40-
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:linux:17.0.0.1" level="project" />
40+
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:win:17.0.0.1" level="project" />
4141
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:17.0.0.1" level="project" />
42-
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:linux:17.0.0.1" level="project" />
42+
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:win:17.0.0.1" level="project" />
4343
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:17.0.0.1" level="project" />
44-
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:linux:17.0.0.1" level="project" />
44+
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:win:17.0.0.1" level="project" />
4545
<orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-javafx:12.2.0" level="project" />
4646
<orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-core:12.2.0" level="project" />
4747
<orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-fontawesome-pack:12.2.0" level="project" />
@@ -59,5 +59,6 @@
5959
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" level="project" />
6060
<orderEntry type="library" scope="TEST" name="Maven: org.jetbrains.kotlin:kotlin-test:1.5.31" level="project" />
6161
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
62+
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
6263
</component>
6364
</module>

pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,10 @@
163163
<artifactId>gson</artifactId>
164164
<version>2.8.9</version>
165165
</dependency>
166+
<dependency>
167+
<groupId>commons-io</groupId>
168+
<artifactId>commons-io</artifactId>
169+
<version>2.11.0</version>
170+
</dependency>
166171
</dependencies>
167172
</project>

releases/roadmaps/0.9.1.todo

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[ ] New folder option 2021-11-14
2-
[ ] Auto select in dialogs 2021-11-14
3-
[ ] Write compare why use idaesbasic and not other apps
4-
[ ] Do you really want to quit dialog 2021-11-14
1+
[x] New folder option 2021-11-14
2+
[x] Write compare why use idaesbasic and not other apps No date picked
3+
[ ] Do you really want to quit dialog 2021-11-14
4+
[x] Remove folders option 2021-11-20

src/main/java/module-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
requires java.base;
1414
requires org.mnode.ical4j.core;
1515
requires kotlin.stdlib;
16+
requires org.apache.commons.io;
1617

1718
opens org.idaesbasic to javafx.fxml;
1819
opens org.idaesbasic.controllers to javafx.fxml;

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

+14
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.io.IOException;
66
import java.net.URI;
77
import java.net.URISyntaxException;
8+
import java.nio.file.Files;
89
import java.nio.file.Path;
910
import java.nio.file.Paths;
1011
import java.time.LocalDate;
@@ -14,6 +15,8 @@
1415
import java.util.Timer;
1516
import java.util.TimerTask;
1617

18+
import org.apache.commons.io.*;
19+
1720
import javafx.beans.value.ChangeListener;
1821
import javafx.beans.value.ObservableValue;
1922
import javafx.scene.control.*;
@@ -581,6 +584,17 @@ void createNewDirectoryAction(ActionEvent event) throws IOException {
581584
projectModel.addNewFolder(getPathOf(currentTreeItem()) + "/" + ((CreateNewDirectoryDialogController) createNewDirectoryLoader.getController()).getDirectoryName());}
582585
}
583586

587+
@FXML
588+
void deleteFileAction(ActionEvent event) throws IOException {
589+
// Delete currently selected file
590+
File toDeleteFile = new File(getPathOf(currentTreeItem()));
591+
if (toDeleteFile.isDirectory()) {
592+
FileUtils.deleteDirectory(toDeleteFile);
593+
} else {
594+
FileUtils.delete(toDeleteFile);
595+
}
596+
}
597+
584598
public static Object getController(Node node) {
585599
Object controller = null;
586600
do {

src/main/resources/fxml/MainView.fxml

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<?import javafx.scene.control.Button?>
4+
<?import javafx.scene.control.ContextMenu?>
45
<?import javafx.scene.control.Label?>
56
<?import javafx.scene.control.Menu?>
67
<?import javafx.scene.control.MenuBar?>
@@ -182,7 +183,14 @@
182183
</MenuBar>
183184
<SplitPane dividerPositions="0.2, 0.7" VBox.vgrow="ALWAYS">
184185
<items>
185-
<TreeView fx:id="fileExplorer" prefHeight="689.0" prefWidth="484.0" />
186+
<TreeView fx:id="fileExplorer" prefHeight="689.0" prefWidth="484.0">
187+
<contextMenu>
188+
<ContextMenu>
189+
<items>
190+
<MenuItem mnemonicParsing="false" onAction="#deleteFileAction" text="Delete file" />
191+
</items>
192+
</ContextMenu>
193+
</contextMenu></TreeView>
186194
<TabPane fx:id="tabPane" prefHeight="689.0" prefWidth="0.0" tabClosingPolicy="ALL_TABS">
187195
<tabs>
188196
<Tab text="New tab">

0 commit comments

Comments
 (0)