Revision 47571 trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/preferences/GenericDlgPreferences.java

View differences:

GenericDlgPreferences.java
31 31
import java.awt.event.ActionEvent;
32 32
import java.awt.event.ActionListener;
33 33
import java.util.ArrayList;
34
import java.util.ConcurrentModificationException;
34 35
import java.util.Enumeration;
35 36
import java.util.Hashtable;
36 37
import java.util.Iterator;
......
227 228
		treeModel = new DefaultTreeModel(root);
228 229
	}
229 230

  
230
	public void refreshExtensionPoints() {
231
		ExtensionPoint ep = this.extensionPoints.add("AplicationPreferences", "");
231
    public void refreshExtensionPoints() {
232
        ExtensionPoint ep = this.extensionPoints.add("AplicationPreferences", "");
232 233

  
233

  
234 234
        @SuppressWarnings("unchecked")
235 235
        Iterator<ExtensionPoint.Extension> iterator = ep.iterator();
236
		while (iterator.hasNext()) {
237
			String preferencesPageName = "Unkown";
238
			try {
239
				Object obj = iterator.next();
240
				if( obj != null ) {
241
					preferencesPageName = obj.getClass().getName();
242
				}
243
				ExtensionPoint.Extension epe = (Extension) obj;
244
				if( epe!=null ) {
245
					preferencesPageName = epe.getName();
246
				}
236
        while (iterator.hasNext()) {
237
            String preferencesPageName = "Unkown";
238
            try {
239
                Object obj = iterator.next();
240
                if (obj != null) {
241
                    preferencesPageName = obj.getClass().getName();
242
                }
243
                ExtensionPoint.Extension epe = (Extension) obj;
244
                if (epe != null) {
245
                    preferencesPageName = epe.getName();
246
                }
247 247
                IPreference page = (IPreference) (epe.create());
248
                if( page != null ) {
249
                	preferencesPageName = page.getID();
248
                if (page != null) {
249
                    preferencesPageName = page.getID();
250 250
                }
251
				this.addPreferencePage(page);
252
			} catch (Exception e) {
253
				logger.warn("Can't initialice preferences page '"+preferencesPageName+"'.", e);
254
			}
255
		}
256
		List<IPreference> prefList = new ArrayList<IPreference>(preferences.values());
257
		addPreferencePages(prefList);
258
	}
251
                this.addPreferencePage(page);
252
            } catch (ConcurrentModificationException e1) {
253
                logger.warn("Can't initialize preferences page '" + preferencesPageName + "'.", e1);
254
                return;
255
            } catch (Exception e) {
256
                logger.warn("Can't initialize preferences page '" + preferencesPageName + "'.", e);
257
            }
258
        }
259
        List<IPreference> prefList = new ArrayList<IPreference>(preferences.values());
260
        addPreferencePages(prefList);
261
    }
259 262

  
260 263
	//	TODO este m�todo es un parche provisional mientras se hace un refactoring de
261 264
	//las PreferencePages para disponer de un m�todo que inicialize las variables

Also available in: Unified diff