File tree Expand file tree Collapse file tree 2 files changed +11
-6
lines changed
src/com/ss/editor/manager Expand file tree Collapse file tree 2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change 1717import rlib .logging .LoggerManager ;
1818import rlib .manager .InitializeManager ;
1919
20+ import static com .ss .editor .util .EditorUtil .normalizePath ;
2021import static java .lang .String .valueOf ;
2122
2223/**
@@ -89,13 +90,13 @@ public Image getIcon(final Path path, int size) {
8990 final Path mimeTypes = Paths .get ("/ui/icons/faenza/mimetypes" );
9091
9192 Path iconPath = mimeTypes .resolve (valueOf (size )).resolve (contentType + ".png" );
92- String url = EditorUtil . normalizePath (iconPath );
93+ String url = normalizePath (iconPath );
9394
9495 LOGGER .info ("url " + url );
9596
9697 if (!EditorUtil .checkExists (url )) {
9798 iconPath = mimeTypes .resolve (valueOf (size )).resolve ("none.png" );
98- url = EditorUtil . normalizePath (iconPath );
99+ url = normalizePath (iconPath );
99100 }
100101
101102 return getImage (url );
Original file line number Diff line number Diff line change 2525import rlib .util .array .ArrayComparator ;
2626import rlib .util .array .ArrayFactory ;
2727
28+ import static com .ss .editor .util .EditorUtil .normalizePath ;
29+
2830/**
2931 * Менеджер по работе с ресурсами.
3032 *
@@ -115,7 +117,7 @@ private void processEvent(final DeletedFileEvent event) {
115117 final Array <String > materialDefinitions = getMaterialDefinitions ();
116118 materialDefinitions .writeLock ();
117119 try {
118- materialDefinitions .fastRemove (assetFile . toString ( ));
120+ materialDefinitions .fastRemove (normalizePath ( assetFile ));
119121 } finally {
120122 materialDefinitions .writeUnlock ();
121123 }
@@ -138,8 +140,10 @@ private void processEvent(final CreatedFileEvent event) {
138140 materialDefinitions .writeLock ();
139141 try {
140142
141- if (!materialDefinitions .contains (assetFile )) {
142- materialDefinitions .add (filename );
143+ final String resource = normalizePath (assetFile );
144+
145+ if (!materialDefinitions .contains (resource )) {
146+ materialDefinitions .add (resource );
143147 }
144148
145149 } finally {
@@ -237,7 +241,7 @@ private void reload() {
237241
238242 if (filename .endsWith (FileExtensions .JME_MATERIAL_DEFINITION )) {
239243 final Path assetFile = EditorUtil .getAssetFile (file );
240- materialDefinitions .add (assetFile . toString ( ));
244+ materialDefinitions .add (normalizePath ( assetFile ));
241245 }
242246 };
243247
You can’t perform that action at this time.
0 commit comments