Source file or external sources viewer can have space in path, fixed icon in Select Roots | Subfolders

Author: jisedlac

plugins/sources/src/org/graalvm/visualvm/sources/options/SourcesOptionsPanel.java

@@ -318,7 +318,9 @@ public String getDescription() {
                     }
                 });
 
-                SourceRootsCustomizer customizer = new SourceRootsCustomizer();
+                String aFile = System.getProperties().getProperty("netbeans.home"); // NOI18N
+                Icon fileIcon = fileChooser.getIcon(new File(aFile));
+                SourceRootsCustomizer customizer = new SourceRootsCustomizer(fileIcon);
                 fileChooser.setAccessory(customizer);
                 fileChooser.addPropertyChangeListener(JFileChooser.SELECTED_FILES_CHANGED_PROPERTY, customizer);
 
@@ -561,10 +563,10 @@ private static final class SourceRootsCustomizer extends JPanel implements Prope
         private RequestProcessor processor;
 
 
-        SourceRootsCustomizer() {
+        SourceRootsCustomizer(Icon fileIcon) {
             super(null);
 
-            initUI();
+            initUI(fileIcon);
         }
 
 
@@ -586,7 +588,7 @@ String createRootString(String root) {
         }
 
 
-        private void initUI() {
+        private void initUI(Icon fileIcon) {
             setLayout(new GridBagLayout());
 
             GridBagConstraints c;
@@ -629,9 +631,11 @@ private void initUI() {
             add(commonFolderChoice, c);
 
             subdirectoryList = new JList();
-            subdirectoryList.setCellRenderer(new DefaultListCellRenderer() {
+            DefaultListCellRenderer renderer = new DefaultListCellRenderer() {
                 @Override public void setIcon(Icon icon) { if (icon != null) super.setIcon(icon); }
-            });
+            };
+            renderer.setIcon(fileIcon);
+            subdirectoryList.setCellRenderer(renderer);
             c = new GridBagConstraints();
             c.gridx = 0;
             c.gridy = y++;
@@ -706,19 +710,13 @@ public void propertyChange(PropertyChangeEvent evt) {
 
             final File[] subdirs = (File[])evt.getNewValue();
 
-            JFileChooser source = evt.getSource() instanceof JFileChooser ? (JFileChooser)evt.getSource() : null;
-            final Icon icon = source != null && subdirs != null && subdirs.length > 0 ? source.getIcon(subdirs[0]) : null;
-            
             if (processor == null) processor = new RequestProcessor("Source Roots Subfoldes Processor"); // NOI18N
 
             processor.post(new Runnable() {
                 public void run() {
                     final List<String> subdirsL = getCommonSubDirs(subdirs);
                     SwingUtilities.invokeLater(new Runnable() {
                         public void run() {
-                            if (!subdirsL.isEmpty())
-                                ((DefaultListCellRenderer)subdirectoryList.getCellRenderer()).setIcon(icon);
-                            
                             subdirectoryList.setListData(subdirsL.toArray(new String[0]));
                             subdirectoryList.setEnabled(true);
 

plugins/sources/src/org/graalvm/visualvm/sources/viewer/ExternalSourcesViewer.java

@@ -31,6 +31,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.Box;
@@ -88,7 +89,7 @@ private static enum IdePreset {
         ECLIPSE("Eclipse", "eclipse " + SourceHandle.Feature.FILE.getCode() + ":" + SourceHandle.Feature.LINE.getCode()), // NOI18N
         IDEA("IntelliJ IDEA", "idea --line " + SourceHandle.Feature.LINE.getCode() + " --column " + SourceHandle.Feature.COLUMN.getCode() + " " + SourceHandle.Feature.FILE.getCode()), // NOI18N
         VSCODE("Visual Studio Code", "code -g " + SourceHandle.Feature.FILE.getCode() + ":" + SourceHandle.Feature.LINE.getCode()), // NOI18N
-        XCODE("Xcode", "open -a Xcode " + SourceHandle.Feature.FILE.getCode() + " ???"); // NOI18N
+        XCODE("Xcode", "open -a Xcode " + SourceHandle.Feature.FILE.getCode()); // NOI18N
 
         private final String name;
         private final String command;
@@ -173,7 +174,16 @@ public boolean open(SourceHandle handle) {
         if (expandedCommand.isEmpty()) {
             ProfilerDialogs.displayError(Bundle.ExternalSourcesViewer_EmptyCommand());
         } else {
-            new ExternalViewerLauncher(expandedCommand) {
+            String commandS = getCommand();
+            List<String> commandL = ExternalViewerLauncher.getCommandStrings(commandS);
+            
+            for (int i = 0; i < commandL.size(); i++) {
+                String command = commandL.get(i);
+                command = handle.expandFeatures(command);
+                commandL.set(i, command);
+            }
+            
+            new ExternalViewerLauncher(commandL) {
                 @Override protected void failed(IOException e)     {
                     ProfilerDialogs.displayError(Bundle.ExternalSourcesViewer_CommandFailed(e.getMessage()));
                     LOGGER.log(Level.INFO, "Opening external sources viewer failed", e); // NOI18N
@@ -326,21 +336,11 @@ private static String appendSpaces(String string, int targetLength) {
     }
 
     private static void insertFile(JTextField textField, File file) {
-        Document document = textField.getDocument();
-        int length = document.getLength();
-        int position = textField.getCaretPosition();
-        
-        boolean dir = file.isDirectory();
         String path = file.getAbsolutePath();
+        if (path.contains(" ")) path = "\"" + path + "\"";                      // NOI18N
 
-        try {
-            if (dir && position == 0 && length > 0) {
-                String nextChar = document.getText(position, 1);
-                if (!" ".equals(nextChar) && !"{".equals(nextChar)) path = path + File.separator; // NOI18N
-            }
-            
-            textField.getDocument().insertString(position, path, null);
-        } catch (BadLocationException ex) {}
+        try { textField.getDocument().insertString(textField.getCaretPosition(), path, null); }
+        catch (BadLocationException ex) {}
     }
 
     private static void insertParameter(JTextField textField, String parameter) {

plugins/sources/src/org/graalvm/visualvm/sources/viewer/ExternalViewerLauncher.java

@@ -39,17 +39,17 @@ class ExternalViewerLauncher implements Runnable {
     private static final String COMMAND_STRINGS_REGEX = "\"[^\"]*\"|\\S+";      // NOI18N
 
 
-    private final String command;
+    private final List<String> command;
 
 
-    ExternalViewerLauncher(String command) {
+    ExternalViewerLauncher(List<String> command) {
         this.command = command;
     }
 
 
     public final void run() {
         ProcessBuilder builder = new ProcessBuilder();
-        builder.command(getCommandStrings(command));
+        builder.command(command);
         builder.directory(Storage.getTemporaryStorageDirectory());
 
         try { builder.start(); }