quick and dirty fix for tools.jar absense

yusuke · Oct 26, 2015 · f486a7a · f486a7a
1 parent aeba228
commit f486a7a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/gui/src/main/java/samurai/swing/Context.java b/gui/src/main/java/samurai/swing/Context.java
@@ -31,7 +31,7 @@ public class Context {
     private final Configuration config = new Configuration("samurai");
     private final FileHistory fileHistory = new FileHistory(config);
 
-    private final LocalProcesses localProcesses = new LocalProcesses(config, fileHistory);
+    private  LocalProcesses localProcesses = null;
     private final CustomizableKeyStroke keyStroke = new CustomizableKeyStroke(resources);
     ExecuteThread executeThread = new ExecuteThread();
     private final JLabel statusBar;
@@ -44,6 +44,12 @@ public Context(JLabel statusBar, TileTabPanel<SamuraiPanel> tab) {
         this.searchPanel = new SearchPanel(this);
         this.resources.inject(searchPanel);
         this.config.apply(searchPanel);
+        try {
+
+            this.localProcesses = new LocalProcesses(config, fileHistory);
+        }catch(java.lang.NoClassDefFoundError toolsJarNotFound){
+        }
+
         executeThread.start();
     }
 

diff --git a/gui/src/main/java/samurai/swing/MainFrame.java b/gui/src/main/java/samurai/swing/MainFrame.java
@@ -130,9 +130,12 @@ public void actionPerformed(ActionEvent e) {
         context.getFileHistory().setFileHistoryListener(this);
         menuFileRecent = context.getFileHistory().getOpenRecentMenu();
         menuFileRecent.setText("menu.file.openRecent");
-        menuFileLocalProcesses = context.getLocalProcesses().getLocalProcessesMenu();
-        menuFileLocalProcesses.setText("menu.file.processes");
-        menuFileLocalProcesses.setEnabled(true);
+        LocalProcesses localProcesses = context.getLocalProcesses();
+        if(localProcesses != null) {
+            menuFileLocalProcesses = localProcesses.getLocalProcessesMenu();
+            menuFileLocalProcesses.setText("menu.file.processes");
+            menuFileLocalProcesses.setEnabled(true);
+        }
 
         menuFileClose
                 .addActionListener(new ActionListener() {
@@ -255,7 +258,9 @@ public void actionPerformed(ActionEvent e) {
         menuFile.add(menuFileNewTab);
         menuFile.add(menuFileOpen);
         menuFile.add(menuFileRecent);
-        menuFile.add(menuFileLocalProcesses);
+        if(localProcesses != null) {
+            menuFile.add(menuFileLocalProcesses);
+        }
         menuFile.addSeparator();
         menuFile.add(menuFileClose);
         if (!OSDetector.isMac()) {