Skip to content
This repository was archived by the owner on Mar 15, 2023. It is now read-only.

Commit 311d87f

Browse files
author
Jacob van Mourik
committed
Fixed issue with storing project state for new projects. #13
1 parent 68aed9c commit 311d87f

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

src/main/java/com/jvms/i18neditor/editor/Editor.java

+13-5
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ public void createProject(Path dir, ResourceType type) {
108108
reset();
109109
}
110110

111-
project = new EditorProject(dir, type);
111+
project = new EditorProject(dir);
112+
restoreProjectState(project);
113+
project.setResourceType(type);
112114

113115
if (type == ResourceType.Properties) {
114116
Resource resource = Resources.create(dir, type, Optional.empty(), project.getResourceName());
@@ -706,10 +708,16 @@ private void storeProjectState() {
706708

707709
private void restoreProjectState(EditorProject project) {
708710
ExtendedProperties props = new ExtendedProperties();
709-
props.load(Paths.get(project.getPath().toString(), PROJECT_FILE));
710-
project.setMinifyResources(props.getBooleanProperty("minify_resources", settings.isMinifyResources()));
711-
project.setResourceName(props.getProperty("resource_name", settings.getResourceName()));
712-
project.setResourceType(props.getEnumProperty("resource_type", ResourceType.class));
711+
Path path = Paths.get(project.getPath().toString(), PROJECT_FILE);
712+
if (Files.exists(path)) {
713+
props.load(Paths.get(project.getPath().toString(), PROJECT_FILE));
714+
project.setMinifyResources(props.getBooleanProperty("minify_resources", settings.isMinifyResources()));
715+
project.setResourceName(props.getProperty("resource_name", settings.getResourceName()));
716+
project.setResourceType(props.getEnumProperty("resource_type", ResourceType.class));
717+
} else {
718+
project.setResourceName(settings.getResourceName());
719+
project.setMinifyResources(settings.isMinifyResources());
720+
}
713721
}
714722

715723
private void storeEditorState() {

src/main/java/com/jvms/i18neditor/editor/EditorProject.java

-5
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ public class EditorProject {
2121
private boolean minifyResources;
2222

2323
public EditorProject(Path path) {
24-
this(path, null);
25-
}
26-
27-
public EditorProject(Path path, ResourceType resourceType) {
2824
this.path = path;
29-
this.resourceType = resourceType;
3025
}
3126

3227
public Path getPath() {

0 commit comments

Comments
 (0)