обновление версии и мелкие правки

Author: JavaSaBr

build-native.xml

@@ -127,7 +127,7 @@
                         name="jME3-SpaceShift-Editor"
                         mainClass="com.ss.editor.Starter"
                         toolkit="fx"
-                        version="0.7.3"
+                        version="0.7.4"
                 />
 
         <mkdir dir="build/classes/META-INF"/>
@@ -140,7 +140,7 @@
             <manifest>
                 <attribute name="Implementation-Vendor" value="spaceshift.ru"/>
                 <attribute name="Implementation-Title" value="jME3 SpaceShift Editor"/>
-                <attribute name="Implementation-Version" value="0.7.3"/>
+                <attribute name="Implementation-Version" value="0.7.4"/>
             </manifest>
         </fx:jar>
 

build/package/linux/control

@@ -1,5 +1,5 @@
 Package: jme3-spaceshift-editor
-Version: 0.7.3
+Version: 0.7.4
 Section: tool
 Maintainer: spaceshift.ru <[email protected]>
 Priority: optional

src/com/ss/editor/config/Config.java

@@ -20,7 +20,7 @@ public abstract class Config {
     public static final String CONFIG_RESOURCE_PATH = "/com/ss/editor/config/config.xml";
 
     public static final String TITLE = "jME3 SpaceShift Editor";
-    public static final String VERSION = "v.0.7.3";
+    public static final String VERSION = "v.0.7.4";
 
     public static final String SS_FOLDER_IN_USER_HOME = ".jme3-spaceshift-editor";
 

src/com/ss/editor/config/EditorConfig.java

@@ -10,6 +10,8 @@
 import com.ss.editor.util.EditorUtil;
 
 import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
 import java.io.Serializable;
 import java.net.URI;
 import java.nio.file.Files;
@@ -20,6 +22,8 @@
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 
+import javax.imageio.ImageIO;
+
 import rlib.logging.Logger;
 import rlib.logging.LoggerManager;
 
@@ -291,17 +295,31 @@ public AppSettings getSettings() {
         final GraphicsDevice device = graphicsEnvironment.getDefaultScreenDevice();
         final DisplayMode displayMode = device.getDisplayMode();
 
+
         final AppSettings settings = new AppSettings(true);
         settings.setRenderer("CUSTOM" + EditorContext.class.getName());
         settings.setTitle(Config.TITLE + " " + Config.VERSION);
         settings.setFullscreen(isFullscreen() && screenSize.isFullscreenSupported());
         settings.setResolution(screenSize.getWidth(), screenSize.getHeight());
         settings.setFrequency(displayMode.getRefreshRate());
-        settings.setFrameRate(60);
         settings.setGammaCorrection(isGammaCorrection());
         settings.setResizable(true);
         // settings.putBoolean("GraphicsDebug", true);
 
+        try {
+
+            final BufferedImage[] icons = new BufferedImage[5];
+            icons[0] = ImageIO.read(EditorUtil.getInputStream("/ui/icons/app/SSEd256.png"));
+            icons[1] = ImageIO.read(EditorUtil.getInputStream("/ui/icons/app/SSEd128.png"));
+            icons[2] = ImageIO.read(EditorUtil.getInputStream("/ui/icons/app/SSEd64.png"));
+            icons[3] = ImageIO.read(EditorUtil.getInputStream("/ui/icons/app/SSEd32.png"));
+            icons[4] = ImageIO.read(EditorUtil.getInputStream("/ui/icons/app/SSEd16.png"));
+
+            settings.setIcons(icons);
+        } catch (final IOException e) {
+            LOGGER.warning(e);
+        }
+
         return settings;
     }
 

src/com/ss/editor/ui/event/FXEventManager.java

@@ -7,7 +7,6 @@
 
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.glfw.GLFWWindowFocusCallback;
-import org.lwjgl.opengl.GL11;
 
 import javafx.application.Platform;
 import javafx.event.Event;
@@ -55,10 +54,10 @@ private void initListener() {
         windowFocusCallback = new GLFWWindowFocusCallback() {
 
             @Override
-            public void invoke(final long window, final int focused) {
+            public void invoke(final long window, final boolean focused) {
 
                 final WindowChangeFocusEvent event = new WindowChangeFocusEvent();
-                event.setFocused(focused == GL11.GL_TRUE);
+                event.setFocused(focused);
 
                 FXEventManager.this.notify(event);
             }

src/com/ss/editor/util/EditorUtil.java

@@ -318,9 +318,7 @@ public static void openFileInExternalEditor(final Path path) {
             commands.add("xdg-open");
         }
 
-        if (commands.isEmpty()) {
-            return;
-        }
+        if (commands.isEmpty()) return;
 
         final String url;
         try {
@@ -362,17 +360,14 @@ public static byte[] serialize(final Serializable object) {
      * Десериализация объекта из массива байтов.
      */
     public static <T> T deserialize(final byte[] bytes) {
-
-        if (bytes == null) {
-            return null;
-        }
+        if (bytes == null) return null;
 
         final ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
 
         try (final ObjectInputStream in = new ObjectInputStream(bin)) {
             return unsafeCast(in.readObject());
-        } catch (ClassNotFoundException | IOException e) {
-            e.printStackTrace();
+        } catch (final ClassNotFoundException | IOException e) {
+            LOGGER.warning(e);
         }
 
         return null;