Revision 42968

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.coreplugin.app/org.gvsig.coreplugin.app.mainplugin/src/main/java/org/gvsig/coreplugin/preferences/general/AppearancePage.java
24 24

  
25 25
package org.gvsig.coreplugin.preferences.general;
26 26

  
27
import java.awt.Component;
28 27
import java.awt.event.ActionEvent;
29 28
import java.awt.event.ActionListener;
30 29
import java.util.ArrayList;
......
33 32
import javax.swing.JComboBox;
34 33
import javax.swing.JPanel;
35 34
import javax.swing.LookAndFeel;
36
import javax.swing.SwingUtilities;
37 35
import javax.swing.UIManager;
38 36
import javax.swing.UIManager.LookAndFeelInfo;
37
import org.apache.commons.lang3.BooleanUtils;
39 38

  
40 39
import org.slf4j.Logger;
41 40
import org.slf4j.LoggerFactory;
42 41

  
43 42
import org.gvsig.andami.Launcher;
44 43
import org.gvsig.andami.PluginServices;
45
import org.gvsig.andami.messages.Messages;
44
import org.gvsig.andami.PluginsLocator;
46 45
import org.gvsig.andami.preferences.AbstractPreferencePage;
47 46

  
48 47
/**
......
149 148

  
150 149
    private JComboBox getLookAndFeelComboBox() {
151 150
        if (lookAndFeelCombo==null) {
152
            LookAndFeelInfo[] lfs = UIManager.getInstalledLookAndFeels();
153
            ArrayList a = new ArrayList();
154
            for (int i = 0; i < lfs.length; i++) {
155
                LF lf = new LF(lfs[i]);
151
            boolean enablelaf = BooleanUtils.toBoolean(PluginServices.getArgumentByName("enablelaf"));
152
            if( enablelaf ) {
153
                LookAndFeelInfo[] lfs = UIManager.getInstalledLookAndFeels();
154
                ArrayList a = new ArrayList();
155
                for (int i = 0; i < lfs.length; i++) {
156
                    LF lf = new LF(lfs[i]);
156 157

  
157
                // test if the look and feel is supported in this platform before adding it to the list
158
                Class lafClassDef;
159
				try {
160
					lafClassDef = Class.forName(lfs[i].getClassName());
161
					LookAndFeel laf;
162
					laf = (LookAndFeel) lafClassDef.newInstance();
158
                    // test if the look and feel is supported in this platform before adding it to the list
159
                    Class lafClassDef;
160
                                    try {
161
                                            lafClassDef = Class.forName(lfs[i].getClassName());
162
                                            LookAndFeel laf;
163
                                            laf = (LookAndFeel) lafClassDef.newInstance();
163 164

  
164
		            if (laf.isSupportedLookAndFeel()) {
165
						a.add(lf);
166
					}
165
                                if (laf.isSupportedLookAndFeel()) {
166
                                                    a.add(lf);
167
                                            }
167 168

  
168
				} catch (ClassNotFoundException e2) {
169
					logger.error(ps.getText("error_loading_look_and_feel_"+lfs[i].getName()), e2);
170
				} catch (InstantiationException e1) {
171
					logger.error(ps.getText("error_loading_look_and_feel_"+lfs[i].getName()), e1);
172
				} catch (IllegalAccessException e1) {
173
					logger.error(ps.getText("error_loading_look_and_feel_"+lfs[i].getName()), e1);
174
				}
169
                                    } catch (ClassNotFoundException e2) {
170
                                            logger.error(ps.getText("error_loading_look_and_feel_"+lfs[i].getName()), e2);
171
                                    } catch (InstantiationException e1) {
172
                                            logger.error(ps.getText("error_loading_look_and_feel_"+lfs[i].getName()), e1);
173
                                    } catch (IllegalAccessException e1) {
174
                                            logger.error(ps.getText("error_loading_look_and_feel_"+lfs[i].getName()), e1);
175
                                    }
176
                }
177
                lookAndFeelCombo = new JComboBox(a.toArray(new LF[a.size()]));
178
            } else {
179
                lookAndFeelCombo = new JComboBox();
175 180
            }
176
            lookAndFeelCombo = new JComboBox(a.toArray(new LF[a.size()]));
177

  
178 181
        }
179 182
        return lookAndFeelCombo;
180 183
    }

Also available in: Unified diff