Autodetect Linux Mint with Nemo correctly. Closes #36.

fabioz · Oct 18, 2013 · 50903d0 · 50903d0
1 parent e321c59
commit 50903d0
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 15 deletions.
diff --git a/plugin/src/de/bastiankrol/startexplorer/PluginContext.java b/plugin/src/de/bastiankrol/startexplorer/PluginContext.java
@@ -121,6 +121,8 @@ private IRuntimeExecCalls chooseRuntimeExecCalls(
         return RuntimeExecCallsFactory.windowsGitBash();
       case LINUX_GNOME:
         return RuntimeExecCallsFactory.linuxGnome();
+      case LINUX_MINT:
+        return RuntimeExecCallsFactory.linuxMint();
       case LINUX_KDE:
         return RuntimeExecCallsFactory.linuxKde();
       case LINUX_XFCE:

diff --git a/plugin/src/de/bastiankrol/startexplorer/crossplatform/AbstractRuntimeExecCalls.java b/plugin/src/de/bastiankrol/startexplorer/crossplatform/AbstractRuntimeExecCalls.java
@@ -24,7 +24,8 @@ abstract class AbstractRuntimeExecCalls implements IRuntimeExecCalls
 {
   IRuntimeExecDelegate runtimeExecDelegate;
 
-  private final Capabilities defaultCapabilities = Capabilities.create()
+  private static final Capabilities DEFAULT_CAPABILITIES = Capabilities
+      .create()
       .build();
 
   /**
@@ -301,7 +302,7 @@ public String[] convertCommandStringToArray(String command)
   @Override
   public Capabilities getCapabilities()
   {
-    return defaultCapabilities;
+    return DEFAULT_CAPABILITIES;
   }
 
   VariableManager getVariableManager()

diff --git a/plugin/src/de/bastiankrol/startexplorer/crossplatform/AbstractRuntimeExecCallsWindows.java b/plugin/src/de/bastiankrol/startexplorer/crossplatform/AbstractRuntimeExecCallsWindows.java
@@ -28,8 +28,8 @@ abstract class AbstractRuntimeExecCallsWindows extends AbstractRuntimeExecCalls
    * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6468220
    */
 
-  private final Capabilities windowsCapabilities = Capabilities.create()
-      .withFileSelectionSupport().withUrlSupport().build();
+  private static final Capabilities WINDOWS_CAPABILITIES = Capabilities
+      .create().withFileSelectionSupport().withUrlSupport().build();
 
   /**
    * Creates a new instance and initializes the {@link RuntimeExecDelegate}.
@@ -101,7 +101,7 @@ File getWorkingDirectoryForCustomCommand(File file)
   @Override
   public Capabilities getCapabilities()
   {
-    return windowsCapabilities;
+    return WINDOWS_CAPABILITIES;
   }
 
   @Override

diff --git a/plugin/src/de/bastiankrol/startexplorer/crossplatform/DesktopEnvironment.java b/plugin/src/de/bastiankrol/startexplorer/crossplatform/DesktopEnvironment.java
@@ -11,6 +11,7 @@ public enum DesktopEnvironment
   WINDOWS_CYGWIN(OperatingSystem.WINDOWS, "Cygwin"), //
   WINDOWS_GIT_BASH(OperatingSystem.WINDOWS, "Git Bash"), //
   LINUX_GNOME(OperatingSystem.LINUX, "Gnome"), //
+  LINUX_MINT(OperatingSystem.LINUX, "Mint"), //
   LINUX_KDE(OperatingSystem.LINUX, "KDE"), //
   LINUX_XFCE(OperatingSystem.LINUX, "Xfce"), //
   LINUX_LXDE(OperatingSystem.LINUX, "LXDE"), //

diff --git a/plugin/src/de/bastiankrol/startexplorer/crossplatform/DesktopEnvironmentAutoDetecter.java b/plugin/src/de/bastiankrol/startexplorer/crossplatform/DesktopEnvironmentAutoDetecter.java
@@ -92,12 +92,7 @@ private static DesktopEnvironment findLinuxDesktopEnvironment()
     {
       if (checkProcessNames("gnome-session"))
       {
-        // TODO How to check for gnome variants like cinnamon that do not have
-        // nautilus (but nemo)? Maybe something like feature detection would be
-        // a better approach. Like this:
-        // Is there an executable named nautilus? No? Maybe nemo? No? Maybe
-        // thunar or konqueror....?
-        return DesktopEnvironment.LINUX_GNOME;
+        return isItLinuxMintOrUbuntuOrWhat();
       }
       if (checkProcessNames("ksmserver"))
       {
@@ -140,6 +135,20 @@ private static DesktopEnvironment findLinuxDesktopEnvironment()
     }
   }
 
+  private static DesktopEnvironment isItLinuxMintOrUbuntuOrWhat()
+      throws IOException, InterruptedException
+  {
+    if (checkProcessNames("nemo"))
+    {
+      return DesktopEnvironment.LINUX_MINT;
+    }
+    // else if (checkProcessNames("nautilus"))
+    else
+    {
+      return DesktopEnvironment.LINUX_GNOME;
+    }
+  }
+
   private static boolean checkProcessNames(String... processNames)
       throws IOException, InterruptedException
   {

diff --git a/plugin/src/de/bastiankrol/startexplorer/crossplatform/RuntimeExecCallsFactory.java b/plugin/src/de/bastiankrol/startexplorer/crossplatform/RuntimeExecCallsFactory.java
@@ -27,6 +27,11 @@ public static RuntimeExecCallsGnome linuxGnome()
     return new RuntimeExecCallsGnome();
   }
 
+  public static RuntimeExecCallsMint linuxMint()
+  {
+    return new RuntimeExecCallsMint();
+  }
+
   public static RuntimeExecCallsKde linuxKde()
   {
     return new RuntimeExecCallsKde();

diff --git a/plugin/src/de/bastiankrol/startexplorer/crossplatform/RuntimeExecCallsMacOs.java b/plugin/src/de/bastiankrol/startexplorer/crossplatform/RuntimeExecCallsMacOs.java
@@ -11,7 +11,7 @@
 class RuntimeExecCallsMacOs extends AbstractRuntimeExecCalls
 {
 
-  private final Capabilities macOsCapabilities = Capabilities.create()
+  private static final Capabilities MAC_OS_CAPABILITIES = Capabilities.create()
       .withFileSelectionSupport().build();
 
   /**
@@ -91,7 +91,7 @@ File getWorkingDirectoryForCustomCommand(File file)
   @Override
   public Capabilities getCapabilities()
   {
-    return macOsCapabilities;
+    return MAC_OS_CAPABILITIES;
   }
 
   @Override

diff --git a/plugin/src/de/bastiankrol/startexplorer/crossplatform/RuntimeExecCallsMint.java b/plugin/src/de/bastiankrol/startexplorer/crossplatform/RuntimeExecCallsMint.java
@@ -0,0 +1,21 @@
+package de.bastiankrol.startexplorer.crossplatform;
+
+import java.io.File;
+
+public class RuntimeExecCallsMint extends RuntimeExecCallsGnome
+{
+  private static final Capabilities MINT_CAPABILITIES = Capabilities.create()
+      .withFileSelectionSupport().build();
+
+  @Override
+  String[] getCommandForStartFileManager(File file, boolean selectFile)
+  {
+    return new String[] { "nemo", getPath(file) };
+  }
+
+  @Override
+  public Capabilities getCapabilities()
+  {
+    return MINT_CAPABILITIES;
+  }
+}
diff --git a/plugin/src/de/bastiankrol/startexplorer/crossplatform/RuntimeExecCallsUnsupported.java b/plugin/src/de/bastiankrol/startexplorer/crossplatform/RuntimeExecCallsUnsupported.java
@@ -15,7 +15,7 @@
 class RuntimeExecCallsUnsupported implements IRuntimeExecCalls
 {
 
-  private final Capabilities capabilities = Capabilities.create()
+  private static final Capabilities CAPABILITIES = Capabilities.create()
       .build();
 
   private MessageDialogHelper messageDialogHelper;
@@ -100,7 +100,7 @@ public String[] convertCommandStringToArray(String command)
   @Override
   public Capabilities getCapabilities()
   {
-    return capabilities;
+    return CAPABILITIES;
   }
 
   private void annoyUser()