Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -38,6 +38,7 @@ import com.fr.general.log.Log4jConfig;
 import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
+import com.fr.stable.os.OperatingSystem;
 import com.fr.third.apache.log4j.Level;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.Worker;
@@ -218,10 +219,12 @@ public class PreferencePane extends BasicPane {
         oracleSpace = new UICheckBox(i18nText("Fine-Design_Basic_Show_All_Oracle_Tables"));
         oraclePane.add(oracleSpace);
 
-        JPanel upmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Update_Plugin_Manager"));
-        useOptimizedUPMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Update_Plugin_Manager"));
-        upmSelectorPane.add(useOptimizedUPMCheckbox);
-        advancePane.add(upmSelectorPane);
+        if (!OperatingSystem.isLinux()) {
+            JPanel upmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Update_Plugin_Manager"));
+            useOptimizedUPMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Update_Plugin_Manager"));
+            upmSelectorPane.add(useOptimizedUPMCheckbox);
+            advancePane.add(upmSelectorPane);
+        }
 
         JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Database_Manager"));
         useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager"));
@@ -711,7 +714,9 @@ public class PreferencePane extends BasicPane {
 
         this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort()));
 
-        useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
+        if (useOptimizedUPMCheckbox != null) {
+            useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
+        }
 
         useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM());
 
@@ -832,7 +837,9 @@ public class PreferencePane extends BasicPane {
         Configurations.update(new Worker() {
             @Override
             public void run() {
-                ServerPreferenceConfig.getInstance().setUseOptimizedUPM(useOptimizedUPMCheckbox.isSelected());
+                if (useOptimizedUPMCheckbox != null) {
+                    ServerPreferenceConfig.getInstance().setUseOptimizedUPM(useOptimizedUPMCheckbox.isSelected());
+                }
                 ServerPreferenceConfig.getInstance().setUseUniverseDBM(useUniverseDBMCheckbox.isSelected());
             }
 

designer-realize/src/main/java/com/fr/start/DesignerLauncher.java

@@ -3,6 +3,9 @@ package com.fr.start;
 import com.fr.process.FineProcess;
 import com.fr.process.engine.FineJavaProcessFactory;
 import com.fr.process.engine.core.FineProcessContext;
+import com.fr.stable.StableUtils;
+
+import java.io.File;
 
 /**
  * @author hades
@@ -11,6 +14,10 @@ import com.fr.process.engine.core.FineProcessContext;
  */
 public class DesignerLauncher {
 
+    private static final String BIN = "bin";
+    private static final String DOT =".";
+    private static final String BIN_HOME = generateBinHome();
+
     private static final DesignerLauncher INSTANCE = new DesignerLauncher();
 
     private String[] args;
@@ -19,6 +26,11 @@ public class DesignerLauncher {
 
     }
 
+    private static String generateBinHome() {
+        return DOT.equals(StableUtils.getInstallHome()) ?
+                DOT : StableUtils.getInstallHome() + File.separator + BIN;
+    }
+
     public static DesignerLauncher getInstance() {
         return INSTANCE;
     }
@@ -32,6 +44,7 @@ public class DesignerLauncher {
                 inheritJvmSettings().
                 jvmSettings(DesignerJavaRuntime.getInstance().getJvmOptions()).
                 arguments(args).
+                directory(BIN_HOME).
                 startProcess(DesignerProcessType.INSTANCE);
         DesignerSuperListener.getInstance().start();
     }