Changeset d1ed30e


Ignore:
Timestamp:
Mar 19, 2012 1:46:47 AM (8 years ago)
Author:
sponge <sponge@…>
Branches:
master
Children:
4ffbfce
Parents:
8ca5591
Message:

Plugins: less confusing message, fix CNFE by catch and ignore on delete.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java

    r8ca5591 rd1ed30e  
    22
    33import java.io.File;
    4 import java.io.IOException;
    54import java.util.HashMap;
    65import java.util.Iterator;
     
    8988                try {
    9089                    PluginStarter.stopPlugin(_context, app);
     90                } catch (ClassNotFoundException cnfe) {
     91                    // don't complain here. Some plugins need to be ran to be deleted.
     92                    // I tried to check to see if the plugin was ran elsewhere,
     93                    // and it sait it was when it was not. -- Sponge
     94                } catch (Throwable e) {
     95                    addFormError(_("Error stopping plugin {0}", app) + ": " + e);
     96                    _log.error("Error stopping plugin " + app,  e);
     97                }
     98                try {
    9199                    PluginStarter.deletePlugin(_context, app);
    92100                    addFormNotice(_("Deleted plugin {0}", app));
  • apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java

    r8ca5591 rd1ed30e  
    123123            _updated = false;
    124124            if(_xpi2pURL.startsWith("file://")) {
    125                 updateStatus("<b>" + _("Attempting to copy plugin from {0}", _xpi2pURL) + "</b>");
     125                updateStatus("<b>" + _("Attempting to install from file {0}", _xpi2pURL) + "</b>");
    126126                // strip off "file://"
    127127                String xpi2pfile = _xpi2pURL.substring(7);
     
    134134                        transferComplete(alreadyTransferred, alreadyTransferred, 0L, _xpi2pURL, _updateFile, false);
    135135                    } else {
    136                         statusDone("<b>" + _("Failed to copy file {0}", _xpi2pURL) + "</b>");
     136                        statusDone("<b>" + _("Failed to install from file {0}, copy failed.", _xpi2pURL) + "</b>");
    137137                    }
    138138                }
  • history.txt

    r8ca5591 rd1ed30e  
     12012-03-19 sponge
     2  * Plugins: less confusing message, fix CNFE by catch and ignore on delete.
     3
    142012-03-17 zzz
    25  * BuildHandler: Implement restart and shutdown to stop the thread
  • router/java/src/net/i2p/router/RouterVersion.java

    r8ca5591 rd1ed30e  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 17;
     21    public final static long BUILD = 18;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.