Revision 212 trunk/org.gvsig.scripting/org.gvsig.scripting.lib/org.gvsig.scripting.lib.impl/src/main/java/org/gvsig/scripting/impl/DefaultScriptingManager.java

View differences:

DefaultScriptingManager.java
33 33
public class DefaultScriptingManager implements ScriptingManager{
34 34

  
35 35
	protected String rootUserFolder;
36
	protected Map icons;
36
    protected Map<String, ImageIcon> icons;
37 37
	protected List<RegisterSystemFolder> systemFolders = new ArrayList<RegisterSystemFolder>();
38 38
	protected ScriptEngineManager engineManager = null;
39
	private SimpleBindings bindings = new SimpleBindings();
40
	private ScriptingHelpManager helpManager;
39
	private final SimpleBindings bindings = new SimpleBindings();
40
	private final ScriptingHelpManager helpManager;
41 41
	private List<String> unitTypes = null;
42 42
	
43 43
	public DefaultScriptingManager(){
......
47 47
		File f = new File (System.getProperty("user.dir")+File.separator+".."+File.separator+"org.gvsig.scripting.lib"+File.separator+"org.gvsig.scripting.lib.api"+File.separator+"target"+File.separator+"site"+File.separator+"apidoc");
48 48
		if(f.exists()){
49 49
			try {
50
				this.helpManager.importHelp("ScriptingFrameworkHelp", f.toURL());
50
                this.helpManager.importHelp("ScriptingFrameworkHelp", f.toURI()
51
                    .toURL());
51 52
			} catch (MalformedURLException e) {
52 53
				// TODO Auto-generated catch block
53 54
				e.printStackTrace();
......
70 71
	}
71 72
	
72 73
	public ImageIcon getIcon(String name){
73
		return (ImageIcon) this.icons.get(name);
74
		return this.icons.get(name);
74 75
	}
75 76

  
76 77
	public Map<String,String> getSupportedLanguagesByExtension(){
......
82 83
		return l;
83 84
	}
84 85
	
85
	public Map getExtensionsByLanguages(){
86
		Map l = getSupportedLanguagesByExtension();
86
	public Map<String, String> getExtensionsByLanguages(){
87
        Map<String, String> l = getSupportedLanguagesByExtension();
87 88
		Map<String,String> result = new HashMap<String,String>();
88
		Iterator it = l.entrySet().iterator();
89
        Iterator<Map.Entry<String, String>> it = l.entrySet().iterator();
89 90
	    while (it.hasNext()) {
90
	        Map.Entry pairs = (Map.Entry)it.next();
91
	        result.put(pairs.getValue().toString(), pairs.getKey().toString());
91
            Map.Entry<String, String> pairs = it.next();
92
            result.put(pairs.getValue(), pairs.getKey());
92 93
	    }
93 94
		return result;
94 95
	}
95 96
	
96 97
	public boolean validateUnitId(ScriptingFolder folder, String id){
97
		List units = folder.getUnits();
98
        List<ScriptingUnit> units = folder.getUnits();
98 99
		String fileName;
99 100
		String s[];
100 101
		String extension;
101 102
		for(int i=0; i<units.size();i++){
102
			fileName = ((ScriptingUnit)units.get(i)).getId();
103
			fileName = (units.get(i)).getId();
103 104
			s = fileName.split("\\.");
104 105
			extension = null;
105 106
			if (s.length>1){
......
177 178
		}
178 179
	    
179 180
		sd.load(folder, id);
180
		return (ScriptingDialog)sd;
181
		return sd;
181 182
	}
182 183

  
183 184
	public ScriptingFolder createFolder(ScriptingFolder folder, String id) {
......
185 186
		File dir = new File(((DefaultScriptingFolder)folder).getPath()+File.separator+id);
186 187
		dir.mkdir();
187 188
		fd.load(folder,id);
188
		return (ScriptingFolder)fd;
189
		return fd;
189 190
	}
190 191

  
191 192
	public ScriptingProject createProject(ScriptingFolder folder, String id) {
......
205 206
			return null;
206 207
		}
207 208
		sc.load(folder, id);
208
		return (ScriptingScript)sc;
209
		return sc;
209 210
	}
210 211

  
211 212
	public ScriptingBaseScript getScript(File file) {
......
245 246
	}
246 247

  
247 248
	public ScriptingFolder getSystemFolder() {
248
		return new SystemFolder((ScriptingManager)this);
249
		return new SystemFolder(this);
249 250
	}
250 251

  
251 252
	public ScriptingFolder getUserFolder() {
252
		return new UserFolder((ScriptingManager)this,new File(this.getRootUserFolder()));
253
		return new UserFolder(this,new File(this.getRootUserFolder()));
253 254
	}
254 255

  
255 256
	public String getRootUserFolder() {
......
264 265
		this.systemFolders.add(new RegisterSystemFolder(name, folder));
265 266
	}
266 267
	
267
	public List getSystemFolders(){
268
	public List<RegisterSystemFolder> getSystemFolders(){
268 269
		return this.systemFolders;
269 270
	}
270 271
	
......
281 282

  
282 283

  
283 284
	public String getExtensionByLanguage(String langName) {
284
		Map extensions = getSupportedLanguagesByExtension();
285
		Iterator iterator = extensions.keySet().iterator();
285
        Map<String, String> extensions = getSupportedLanguagesByExtension();
286
        Iterator<String> iterator = extensions.keySet().iterator();
286 287
		String extension = null;
287 288
		String s = null;
288 289
		
289 290
		while (iterator. hasNext()){
290
			extension = (String) iterator.next();
291
			s = (String) extensions.get(extension);
291
			extension = iterator.next();
292
			s = extensions.get(extension);
292 293
			if(s.equals(langName)){
293 294
				return extension;
294 295
			}

Also available in: Unified diff