Revision 9956 trunk/frameworks/_fwAndami/src/com/iver/andami/Launcher.java

View differences:

Launcher.java
112 112
import com.iver.andami.plugins.config.generate.ActionTool;
113 113
import com.iver.andami.plugins.config.generate.ComboButton;
114 114
import com.iver.andami.plugins.config.generate.ComboButtonElement;
115
import com.iver.andami.plugins.config.generate.ComboCoords;
115 116
import com.iver.andami.plugins.config.generate.ComboScale;
116 117
import com.iver.andami.plugins.config.generate.Depends;
117 118
import com.iver.andami.plugins.config.generate.Extension;
......
370 371
		//File file=new File("theme/andami-theme.xml");
371 372
    	File file;
372 373
    	if (name==null){
373
    		file=new File("theme/andami-theme.xml");    		
374
    		file=new File("theme/andami-theme.xml");
374 375
    	}else{
375
    		file=new File(name);	
376
    		file=new File(name);
376 377
    	}
377
    	    	
378

  
378 379
    	if (file.exists()) {
379 380
			theme.readTheme(file);
380 381
		}
......
832 833
		Iterator e = orderedExtensions.keySet().iterator();
833 834

  
834 835
		// sort the toolbars and tools from 'normal' extensions (actiontools, selectabletools)
835
		// and load the  combo-scales and combo-buttons for the status bar
836
		// and load the  combo-scales combo-labels and combo-buttons for the status bar
836 837
		while (e.hasNext()) {
837 838
			Extension ext = (Extension) e.next();
838 839

  
......
896 897
					logger.error(Messages.getString("Launcher.error_getting_class_loader_for_status_bar_control"), e1);
897 898
				}
898 899
			}
900
			ComboCoords[] comboCoordsArray = ext.getComboCoords();
901
			for (int k=0; k < comboCoordsArray.length; k++) {
902
				org.gvsig.gui.beans.controls.combolabel.ComboCoords combo = new org.gvsig.gui.beans.controls.combolabel.ComboCoords();
903
				String name = comboCoordsArray[k].getName();
904
				if (name!=null)
905
					combo.setName(name);
906
				try {
907
					frame.addStatusBarControl(loader.loadClass(ext.getClassName()),combo);
908
				} catch (ClassNotFoundException e1) {
909
					logger.error(Messages.getString("Launcher.error_getting_class_loader_for_status_bar_control"), e1);
910
				}
911
			}
899 912

  
900 913
			ComboButton[] comboButtonArray = ext.getComboButton();
901 914
			for (int k=0; k < comboButtonArray.length; k++) {
......
2003 2016

  
2004 2017
		if (osName.length() > 4 && osName.substring(0,5).toLowerCase().equals("linux"))
2005 2018
			return nonWinDefaultLookAndFeel;
2006
		
2019

  
2007 2020
		return UIManager.getSystemLookAndFeelClassName();
2008 2021
	}
2009 2022

  

Also available in: Unified diff