рефакторинг и реализация архитектуры создателей файлов.

реализован создатель материалов

Author: JavaSaBr

resources/messages/messages.properties

@@ -2,6 +2,7 @@ EditorBarComponent.asset=Asset
 EditorBarComponent.asset.openAsset=Open Asset Folder
 EditorBarComponent.asset.openAsset.DirectoryChooser=Choose Asset
 
+AssetComponentResourceTreeContextMenuNewFile=New
 AssetComponentResourceTreeContextMenuOpenFile=Open
 AssetComponentResourceTreeContextMenuOpenWithFile=Open with
 AssetComponentResourceTreeContextMenuCopyFile=Copy
@@ -44,3 +45,11 @@ MaterialRenderStateDepthWrite=Write to depth buffer
 MaterialRenderStateColorWrite=Write to color buffer
 MaterialRenderStateDepthTest=Test depth
 MaterialRenderStateWireframe=Wireframe
+
+FileCreatorButtonOk=Create
+FileCreatorButtonCancel=Cancel
+FileCreatorFileNameLabel=File name
+
+MaterialFileCreatorTitle=Creating material
+MaterialFileCreatorMaterialTypeLabel=Material type
+MaterialFileCreatorFileDescription=New material

resources/messages/messages_ru.properties

@@ -2,6 +2,7 @@ EditorBarComponent.asset=Asset
 EditorBarComponent.asset.openAsset=Открыть папку Asset
 EditorBarComponent.asset.openAsset.DirectoryChooser=Выбор Asset
 
+AssetComponentResourceTreeContextMenuNewFile=Создать
 AssetComponentResourceTreeContextMenuOpenFile=Открыть
 AssetComponentResourceTreeContextMenuOpenWithFile=Открыть с помощью
 AssetComponentResourceTreeContextMenuCopyFile=Копировать
@@ -44,3 +45,11 @@ MaterialRenderStateDepthWrite=Делать запись в буффер глуб
 MaterialRenderStateColorWrite=Делать запись в буффер цвета
 MaterialRenderStateDepthTest=Проверять ли буффер глубины
 MaterialRenderStateWireframe=Отрисовывать как сетку
+
+FileCreatorButtonOk=Создать
+FileCreatorButtonCancel=Отменить
+FileCreatorFileNameLabel=Имя файла
+
+MaterialFileCreatorTitle=Создание материала
+MaterialFileCreatorMaterialTypeLabel=Тип материала
+MaterialFileCreatorFileDescription=Новый материал

resources/ui/css/custom_classes.css

@@ -98,29 +98,45 @@
     -fx-padding: 0;
 }
 
+.transparent-tree-view > .virtual-flow > .clipped-container > .sheet > .tree-cell:filled:selected {
+    -fx-background: -fx-color-panel-50;
+    -fx-background-insets: 0;
+    -fx-table-cell-border-color: transparent;
+    -fx-border-color: transparent;
+    -fx-border-width: 0;
+}
+
+.transparent-tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:filled:selected {
+    -fx-background: -fx-color-500;
+    -fx-background-insets: 0;
+    -fx-table-cell-border-color: transparent;
+    -fx-border-color: transparent;
+    -fx-border-width: 0;
+}
+
+
+
 /* Transparent TreeCell */
 
 .transparent-tree-cell {
     -fx-background: transparent;
     -fx-padding: 0.25em; /* 3 */
     -fx-indent: 1em;
 }
+
 .transparent-tree-cell .label {
     -fx-padding: 0.0em 0.0em 0.0em 0.25em; /* 0 0 0 3 */
 }
-.transparent-tree-cell > .tree-disclosure-node,
-.transparent-tree-table-row-cell > .tree-disclosure-node {
+.transparent-tree-cell > .tree-disclosure-node {
     -fx-padding: 4 6 4 8;
     -fx-background-color: transparent;
 }
-.transparent-tree-cell > .tree-disclosure-node > .arrow,
-.transparent-tree-table-row-cell > .tree-disclosure-node > .arrow {
+.transparent-tree-cell > .tree-disclosure-node > .arrow {
     -fx-background-color: -fx-font-color;
     -fx-padding: 0.333333em 0.229em 0.333333em 0.229em; /* 4 */
     -fx-shape: "M 0 -3.5 L 4 0 L 0 3.5 z";
 }
-.transparent-tree-cell:expanded > .tree-disclosure-node > .arrow,
-.transparent-tree-table-row-cell:expanded > .tree-disclosure-node > .arrow {
+.transparent-tree-cell:expanded > .tree-disclosure-node > .arrow {
     -fx-rotate: 90;
 }
 

resources/ui/css/custom_ids.css

@@ -110,14 +110,7 @@
     -fx-max-width: -fx-min-width;
 }
 
-#AssetEditorDialogButtonContainer {
-    -fx-alignment: center-right;
-    -fx-min-height: 45;
-    -fx-pref-height: -fx-min-height;
-    -fx-max-height: -fx-min-height;
-}
-
-#AssetEditorDialogButtonOk {
+#EditorDialogButtonOk {
     -fx-min-height: 28;
     -fx-pref-height: -fx-min-height;
     -fx-max-height: -fx-min-height;
@@ -126,7 +119,7 @@
     -fx-max-width: -fx-min-width;
 }
 
-#AssetEditorDialogButtonCancel {
+#EditorDialogButtonCancel {
     -fx-min-height: 28;
     -fx-pref-height: -fx-min-height;
     -fx-max-height: -fx-min-height;
@@ -135,6 +128,13 @@
     -fx-max-width: -fx-min-width;
 }
 
+#AssetEditorDialogButtonContainer {
+    -fx-alignment: center-right;
+    -fx-min-height: 45;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+}
+
 #AssetEditorDialogPreviewContainer {
     -fx-border-color: -fx-color-0;
     -fx-border-width: 1;
@@ -239,4 +239,20 @@
     -fx-min-height: 25;
     -fx-pref-height: -fx-min-height;
     -fx-max-height: -fx-min-height;
-}
+}
+
+#FileCreatorLabel {
+    -fx-alignment: center-right;
+    -fx-min-width: 120;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
+    -fx-min-height: 25;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+}
+
+#FileCreatorTextField {
+    -fx-min-height: 25;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+}

src/com/ss/editor/Editor.java

@@ -35,7 +35,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.locks.StampedLock;
-import java.util.logging.Level;
 
 import rlib.concurrent.atomic.AtomicInteger;
 import rlib.logging.Logger;
@@ -62,7 +61,6 @@ public void done(LightProbe result) {
 
     private static final Editor EDITOR = new Editor();
 
-
     public static Editor getInstance() {
         return EDITOR;
     }
@@ -108,7 +106,7 @@ public static void start(String[] args) throws IOException {
     protected static void configureLogger() {
 
         // выключаем стандартный логгер
-        java.util.logging.Logger.getLogger("").setLevel(Level.SEVERE);
+        // java.util.logging.Logger.getLogger("").setLevel(Level.SEVERE);
 
         // настраиваем логгер
         LoggerLevel.DEBUG.setEnabled(false);

src/com/ss/editor/FolderAssetLocator.java

@@ -20,7 +20,6 @@ public class FolderAssetLocator implements AssetLocator {
 
     @Override
     public void setRootPath(String rootPath) {
-
     }
 
     @Override

src/com/ss/editor/Messages.java

@@ -15,6 +15,7 @@ public class Messages {
     public static final String EDITOR_BAR_ASSET_OPEN_ASSET;
     public static final String EDITOR_BAR_ASSET_OPEN_ASSET_DIRECTORY_CHOOSER;
 
+    public static final String ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_NEW_FILE;
     public static final String ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_OPEN_FILE;
     public static final String ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_OPEN_WITH_FILE;
     public static final String ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_COPY_FILE;
@@ -58,6 +59,14 @@ public class Messages {
     public static final String POST_FILTER_EDITOR_NAME;
     public static final String MATERIAL_EDITOR_NAME;
 
+    public static final String FILE_CREATOR_BUTTON_OK;
+    public static final String FILE_CREATOR_BUTTON_CANCEL;
+    public static final String FILE_CREATOR_FILE_NAME_LABEL;
+
+    public static final String MATERIAL_FILE_CREATOR_TITLE;
+    public static final String MATERIAL_FILE_CREATOR_MATERIAL_TYPE_LABEL;
+    public static final String MATERIAL_FILE_CREATOR_FILE_DESCRIPTION;
+
     static {
 
         final ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME, ResourceControl.getInstance());
@@ -66,6 +75,7 @@ public class Messages {
         EDITOR_BAR_ASSET_OPEN_ASSET = bundle.getString("EditorBarComponent.asset.openAsset");
         EDITOR_BAR_ASSET_OPEN_ASSET_DIRECTORY_CHOOSER = bundle.getString("EditorBarComponent.asset.openAsset.DirectoryChooser");
 
+        ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_NEW_FILE = bundle.getString("AssetComponentResourceTreeContextMenuNewFile");
         ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_OPEN_FILE = bundle.getString("AssetComponentResourceTreeContextMenuOpenFile");
         ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_OPEN_WITH_FILE = bundle.getString("AssetComponentResourceTreeContextMenuOpenWithFile");
         ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_COPY_FILE = bundle.getString("AssetComponentResourceTreeContextMenuCopyFile");
@@ -108,5 +118,13 @@ public class Messages {
         TEXT_FILE_EDITOR_NAME = bundle.getString("TextFileEditorName");
         POST_FILTER_EDITOR_NAME = bundle.getString("PostFilterEditorName");
         MATERIAL_EDITOR_NAME = bundle.getString("MaterialEditorName");
+
+        FILE_CREATOR_BUTTON_OK = bundle.getString("FileCreatorButtonOk");
+        FILE_CREATOR_BUTTON_CANCEL = bundle.getString("FileCreatorButtonCancel");
+        FILE_CREATOR_FILE_NAME_LABEL = bundle.getString("FileCreatorFileNameLabel");
+
+        MATERIAL_FILE_CREATOR_TITLE = bundle.getString("MaterialFileCreatorTitle");
+        MATERIAL_FILE_CREATOR_MATERIAL_TYPE_LABEL = bundle.getString("MaterialFileCreatorMaterialTypeLabel");
+        MATERIAL_FILE_CREATOR_FILE_DESCRIPTION = bundle.getString("MaterialFileCreatorFileDescription");
     }
 }

src/com/ss/editor/executor/impl/EditorThreadExecutor.java

@@ -1,7 +1,5 @@
 package com.ss.editor.executor.impl;
 
-import rlib.logging.Logger;
-import rlib.logging.LoggerManager;
 import rlib.util.array.Array;
 import rlib.util.array.ArrayFactory;
 
@@ -12,8 +10,6 @@
  */
 public class EditorThreadExecutor {
 
-    private static final Logger LOGGER = LoggerManager.getLogger(EditorThreadExecutor.class);
-
     private static final EditorThreadExecutor INSTANCE = new EditorThreadExecutor();
 
     public static EditorThreadExecutor getInstance() {

src/com/ss/editor/manager/ExecutorManager.java

@@ -24,7 +24,7 @@ public class ExecutorManager {
 
     private static final Runtime RUNTIME = Runtime.getRuntime();
 
-    public static final int PROP_BACKGROUND_TASK_EXECUTORS = RUNTIME.availableProcessors();
+    private static final int PROP_BACKGROUND_TASK_EXECUTORS = RUNTIME.availableProcessors();
 
     private static ExecutorManager instance;
 

src/com/ss/editor/manager/FileIconManager.java

@@ -17,7 +17,7 @@
 import rlib.logging.LoggerManager;
 import rlib.manager.InitializeManager;
 
-import static com.ss.editor.util.EditorUtil.normalizePath;
+import static com.ss.editor.util.EditorUtil.toClasspath;
 import static java.lang.String.valueOf;
 
 /**
@@ -71,7 +71,7 @@ public Image getIcon(final Path path, int size) {
             LOGGER.warning(e);
         }
 
-        if(contentType == null && FILE_TYPE_MAP != null) {
+        if (contentType == null && FILE_TYPE_MAP != null) {
             contentType = FILE_TYPE_MAP.getContentType(path.toFile());
         }
 
@@ -90,13 +90,13 @@ public Image getIcon(final Path path, int size) {
         final Path mimeTypes = Paths.get("/ui/icons/faenza/mimetypes");
 
         Path iconPath = mimeTypes.resolve(valueOf(size)).resolve(contentType + ".png");
-        String url = normalizePath(iconPath);
+        String url = toClasspath(iconPath);
 
         LOGGER.info("url " + url);
 
         if (!EditorUtil.checkExists(url)) {
             iconPath = mimeTypes.resolve(valueOf(size)).resolve("none.png");
-            url = normalizePath(iconPath);
+            url = toClasspath(iconPath);
         }
 
         return getImage(url);