← Back to branch summary

~smaioli/azureus/ubuntu-experimental

« back to all changes in this revision

Viewing changes to org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java

Merged Vuze 4.2.0.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
378
378
                                
379
379
                                if ( pi.getPluginState().isDisabled()){
380
380
                                        
381
 
                                        continue;
 
381
                                                // if it is disabled because it failed to load, carry on and check for updates as the newer version
 
382
                                                // may be there to fix the load failure!
 
383
                                        
 
384
                                        if ( !pi.getPluginState().hasFailed()){
 
385
                                                
 
386
                                                continue;
 
387
                                        }
382
388
                                }
383
389
                                
384
390
                                String  mand = pi.getPluginProperties().getProperty( "plugin.mandatory");
1163
1169
                                                                                                                
1164
1170
                                                                                if ( origin.exists()){
1165
1171
                                                                                        
1166
 
                                                                                        if (    file_name.toLowerCase().endsWith(".properties") ||
1167
 
                                                                                                        file_name.toLowerCase().endsWith(".config" )){
 
1172
                                                                                        if (    file_name.indexOf( '/' ) == -1 &&
 
1173
                                                                                                        (       file_name.toLowerCase().endsWith(".properties") ||
 
1174
                                                                                                                file_name.toLowerCase().endsWith(".config" ))){
 
1175
                                                                                                
 
1176
                                                                                                        // don't trash properties and config files in root as users may well
 
1177
                                                                                                        // have modified them
1168
1178
                                                                                                
1169
1179
                                                                                                is_plugin_properties    = file_name.toLowerCase().equals("plugin.properties");
1170
1180
                                                                                                
1569
1579
                                }       
1570
1580
                        }
1571
1581
                        
1572
 
                        String msg =   "Version " + version + " of plugin '" + update.getName() + "' " +
1573
 
                                                        "installed successfully";
1574
 
 
1575
 
                        if ( update_txt_found ){
1576
 
                                
1577
 
                                msg += " - See update log for details";
 
1582
                        Boolean b_disable = (Boolean)update.getCheckInstance().getProperty( UpdateCheckInstance.PT_UI_DISABLE_ON_SUCCESS_SLIDEY );
 
1583
                        
 
1584
                        if ( update_txt_found || b_disable == null || !b_disable ){
 
1585
                                
 
1586
                                String msg =   "Version " + version + " of plugin '" + update.getName() + "' " +
 
1587
                                                                "installed successfully";
 
1588
        
 
1589
                                if ( update_txt_found ){
 
1590
                                        
 
1591
                                        msg += " - See update log for details";
 
1592
                                }
 
1593
                                
 
1594
                                log.logAlertRepeatable( update_txt_found?LoggerChannel.LT_WARNING:LoggerChannel.LT_INFORMATION, msg );                  
1578
1595
                        }
1579
 
                        
1580
 
                        log.logAlertRepeatable( update_txt_found?LoggerChannel.LT_WARNING:LoggerChannel.LT_INFORMATION, msg );                  
1581
 
 
1582
1596
                }catch( Throwable e ){
1583
1597
                                        
1584
1598
                        String msg =   "Version " + version + " of plugin '" +  update.getName() + "' " +