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

View differences:

DefaultScriptingFolder.java
61 61
				unit = new DefaultScriptingFolder(this.manager);
62 62
			}
63 63
		}else{
64
			Map extensions = this.manager.getSupportedLanguagesByExtension();		
65
			Iterator iterator = extensions.keySet().iterator();
64
            Map<String, String> extensions =
65
                this.manager.getSupportedLanguagesByExtension();
66
            Iterator<String> iterator = extensions.keySet().iterator();
66 67

  
67 68
			while (iterator.hasNext()){
68
				String extension = (String) iterator.next();
69
				String extension = iterator.next();
69 70
				if (file.getName().toLowerCase().endsWith(extension)){
70 71
					String fname = file.getName();
71 72
					String id = fname.substring(0,fname.length()-extension.length());
......
80 81
		}
81 82
		
82 83
		if(unit != null){
83
			unit.load((ScriptingFolder)new DefaultScriptingFolder(this.manager,file.getParentFile()), file.getName());
84
			unit.load(new DefaultScriptingFolder(this.manager,file.getParentFile()), file.getName());
84 85
		}
85 86
		return unit;
86 87
	}
87 88

  
88
	public List getUnits() {
89
    public List<ScriptingUnit> getUnits() {
89 90
		// Listar los ficheros del directorio y pasarlo a un vector para ordenarlo
90 91
		List<ScriptingUnit> ol = new ArrayList<ScriptingUnit>();
91 92
		File[] files = this.folder.listFiles();
......
110 111
		String fileName = null;
111 112
		String s[] = null;
112 113
		String extension = null;
113
		List units = this.getUnits();
114
        List<ScriptingUnit> units = this.getUnits();
114 115
		for(int i=0; i<units.size();i++){
115
			fileName = ((ScriptingUnit)units.get(i)).getId();
116
			fileName = (units.get(i)).getId();
116 117
			s = fileName.split("\\.");
117 118
			extension = "";
118 119
			if (s.length>1){
......
138 139
		}	
139 140
	}
140 141

  
141
	public void load(ScriptingFolder folder, String id) {
142
	@Override
143
    public void load(ScriptingFolder folder, String id) {
142 144
		DefaultScriptingFolder parent = (DefaultScriptingFolder) folder;
143 145
		this.setParent(folder);
144 146
		this.setId(id);	

Also available in: Unified diff