Revision 361 org.gvsig.scripting.app/trunk/org.gvsig.scripting.app/org.gvsig.scripting.app.extension/src/main/java/org/gvsig/scripting/app/extension/ScriptingExtension.java

View differences:

ScriptingExtension.java
25 25

  
26 26
import java.io.File;
27 27

  
28
import javax.swing.JOptionPane;
29

  
28 30
import org.gvsig.andami.PluginsLocator;
29 31
import org.gvsig.andami.PluginsManager;
30 32
import org.gvsig.andami.plugins.Extension;
33
import org.gvsig.app.ApplicationLocator;
34
import org.gvsig.app.ApplicationManager;
31 35
import org.gvsig.scripting.ScriptingBaseScript;
32 36
import org.gvsig.scripting.ScriptingLocator;
33 37
import org.gvsig.scripting.ScriptingManager;
......
53 57
		
54 58
		if( "Launcher".equalsIgnoreCase(command) ) {
55 59
		    winmanager.showWindow(uimanager.createLauncher(), "Scripting Launcher", WindowManager.MODE.TOOL);
60
		    
56 61
		} else if( "Composer".equalsIgnoreCase(command) ) {
57 62
			DynObject preferences = this.getPlugin().getPluginProperties();
58 63
			Boolean composerUseHisWindowManager = (Boolean) preferences.getDynValue("ComposerUseHisWindowManager");
......
64 69
			} else {
65 70
				winmanager.showWindow(composer, "Scripting Composer", WindowManager.MODE.WINDOW);
66 71
			}
67
//		} else { 
68
//			ScriptingBaseScript script = uimanager.getManager().getScript(command);
69
//			script.run(args);
72
			
73
		} else { 
74
			ScriptingBaseScript script = uimanager.getManager().getScript(command);
75
			if( script != null ) {
76
				script.run(args);
77
			} else {
78
				ApplicationManager application = ApplicationLocator.getManager();
79
				application.messageDialog("Can't locate script '"+command+"'.", "ScriptLaunch", JOptionPane.OK_OPTION);
80
			}
70 81
		}
71 82
	}
72 83
	

Also available in: Unified diff