Changeset 24707 for main/trunk/gli

Show
Ignore:
Timestamp:
03.10.2011 14:13:03 (8 years ago)
Author:
ak19
Message:

Reverting code committed last time which started using xdg-open as the default FileAssociation? command for Linux. This doesn't work on the CentOS here which doesn't recognise xdg-open and says it can't find it (installed). The old code used to popup the FileAssociation? dialog instead for Linux, so that the user could choose something that would work, rather than what the code does now: fail quietly.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

    r24704 r24707  
    7474            XMLTools.setValue(entry, StaticStrings.MAC_OPEN_COMMAND); 
    7575            } 
    76             else { // assume linux? 
    77             XMLTools.setValue(entry, StaticStrings.LINUX_OPEN_COMMAND); 
    78             } 
     76            //else { XMLTools.setValue(entry, StaticStrings.LINUX_OPEN_COMMAND); } // assume linux? 
    7977        } 
    8078        command = null; 
     
    124122        } 
    125123        } 
    126         if (command == null) {   
    127             command = StaticStrings.LINUX_OPEN_COMMAND; // "xdg-open %1" 
    128         }    
     124        //if (command == null) { command = StaticStrings.LINUX_OPEN_COMMAND; } // "xdg-open %1" 
    129125    } 
    130126 
     
    197193        } 
    198194         
    199         else { // If we are on a linux, default to using the xdg-open program 
    200             command = StaticStrings.LINUX_OPEN_COMMAND; 
    201         } 
     195        //else { command = StaticStrings.LINUX_OPEN_COMMAND; } // If linux, default to using xdg-open 
    202196         
    203197        // Otherwise display the dialog and ask the user to enter launching command.