Skip to content

Commit 452bfcc

Browse files
committed
fixed a problem with resources.
1 parent ed96e84 commit 452bfcc

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed
74 Bytes
Binary file not shown.

libs/extensions/rlib-6.1.2.jar

235 Bytes
Binary file not shown.

src/com/ss/editor/ui/component/creator/impl/material/definition/MaterialDefinitionFileCreator.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static com.ss.editor.FileExtensions.JME_MATERIAL_DEFINITION;
44
import static com.ss.rlib.util.ObjectUtils.notNull;
55
import static java.lang.Character.toUpperCase;
6-
import static java.nio.file.Files.readAllBytes;
76
import static java.util.Objects.requireNonNull;
87
import com.jme3.material.TechniqueDef;
98
import com.jme3.renderer.Caps;
@@ -18,7 +17,6 @@
1817
import com.ss.editor.util.EditorUtil;
1918
import com.ss.rlib.ui.util.FXUtils;
2019
import com.ss.rlib.util.FileUtils;
21-
import com.ss.rlib.util.Utils;
2220
import javafx.collections.ObservableList;
2321
import javafx.scene.control.ComboBox;
2422
import javafx.scene.control.Label;
@@ -31,11 +29,10 @@
3129
import rlib.util.array.ArrayFactory;
3230

3331
import java.io.IOException;
32+
import java.io.InputStream;
3433
import java.io.PrintWriter;
35-
import java.net.URL;
3634
import java.nio.file.Files;
3735
import java.nio.file.Path;
38-
import java.nio.file.Paths;
3936

4037
/**
4138
* The creator to create a new material definition.
@@ -78,12 +75,12 @@ public class MaterialDefinitionFileCreator extends AbstractFileCreator {
7875
private static final String VERT_TEMPLATE;
7976

8077
static {
81-
final URL mdResource = FileCreator.class.getResource("/template/matdef/empty.j3md");
82-
final URL fragResourcesource = FileCreator.class.getResource("/template/frag/empty.frag");
83-
final URL vertResource = FileCreator.class.getResource("/template/vert/empty.vert");
84-
MD_TEMPLATE = requireNonNull(Utils.get(() -> new String(readAllBytes(Paths.get(mdResource.toURI())), "UTF-8")));
85-
FRAG_TEMPLATE = requireNonNull(Utils.get(() -> new String(readAllBytes(Paths.get(fragResourcesource.toURI())), "UTF-8")));
86-
VERT_TEMPLATE = requireNonNull(Utils.get(() -> new String(readAllBytes(Paths.get(vertResource.toURI())), "UTF-8")));
78+
final InputStream mdResource = FileCreator.class.getResourceAsStream("/template/matdef/empty.j3md");
79+
final InputStream fragResource = FileCreator.class.getResourceAsStream("/template/frag/empty.frag");
80+
final InputStream vertResource = FileCreator.class.getResourceAsStream("/template/vert/empty.vert");
81+
MD_TEMPLATE = FileUtils.read(mdResource);
82+
FRAG_TEMPLATE = FileUtils.read(fragResource);
83+
VERT_TEMPLATE = FileUtils.read(vertResource);
8784
}
8885

8986
/**

0 commit comments

Comments
 (0)