Revision 759

View differences:

trunk/frameworks/_fwAndami/src/com/iver/andami/Launcher.java
339 339
            TreeMap orderedExtensions = new TreeMap(new ExtensionComparator());
340 340

  
341 341
            for (int j = 0; j < exts.length; j++) {
342
            	if (!exts[j].getActive()) continue;
342 343
                if (orderedExtensions.containsKey(exts[j])) {
343 344
                    logger.error(
344 345
                        "Two extensions with the same priority. Only will load one. " +
......
394 395
                Extension[] exts = pc.getExtensions().getExtension();
395 396

  
396 397
                for (int j = 0; j < exts.length; j++) {
398
                	if (!exts[j].getActive()) continue;
397 399
                    Menu[] menu = exts[j].getMenu();
398 400

  
399 401
                    for (int k = 0; k < menu.length; k++) {
......
460 462
                TreeMap orderedExtensions = new TreeMap(new ExtensionComparator());
461 463

  
462 464
                for (int j = 0; j < exts.length; j++) {
463
                    if (orderedExtensions.containsKey(exts[j])) {
464
                        logger.error(
465
                            "Two extensions with the same priority. Only will load one. " +
466
                            exts[j].getClassName());
467
                    }
468

  
469
                    orderedExtensions.put(exts[j], null);
465
                	if (exts[j].getActive()){
466
	                    if (orderedExtensions.containsKey(exts[j])) {
467
	                        logger.error(
468
	                            "Two extensions with the same priority. Only will load one. " +
469
	                            exts[j].getClassName());
470
	                    }
471
	
472
	                    orderedExtensions.put(exts[j], null);
473
                	}
470 474
                }
471 475

  
472 476
                Iterator e = orderedExtensions.keySet().iterator();

Also available in: Unified diff