Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit: [7623] jEdit/trunk
|
From: <kp...@us...> - 2006-10-19 13:25:52
|
Revision: 7623
http://svn.sourceforge.net/jedit/?rev=7623&view=rev
Author: kpouer
Date: 2006-10-19 06:25:36 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
better message when having errors on plugin download
Modified Paths:
--------------
jEdit/trunk/doc/CHANGES.txt
jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props
jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java
Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt 2006-10-19 12:47:17 UTC (rev 7622)
+++ jEdit/trunk/doc/CHANGES.txt 2006-10-19 13:25:36 UTC (rev 7623)
@@ -2,7 +2,8 @@
{{{ Version 4.3pre8
-Thanks to Matthieu Casanova, Marcelo Vanzin for contributing to this release.
+Thanks to Matthieu Casanova, Martin Raspe, Marcelo Vanzin for contributing
+to this release.
{{{ Bug Fixes
@@ -22,6 +23,9 @@
sorted column and sort direction. Clicking on the "Type" column header
now sorts the files by extension (Martin Raspe)
+- When the plugin manager fail to download a plugin or to read the downloaded
+ file, a new message dialog suggest the user to try another mirror
+ (Matthieu Casanova)
}}}
}}}
Modified: jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2006-10-19 12:47:17 UTC (rev 7622)
+++ jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2006-10-19 13:25:36 UTC (rev 7623)
@@ -1486,6 +1486,9 @@
plugin-error.obsolete=This plugin is obsolete. Please remove it.
plugin-error.not-42=This plugin does not support dynamic loading.\n\
You must restart jEdit after removing or installing this plugin.
+
+plugin-error-download.title=Plugin error
+plugin-error-download.message=Error while downloading the plugin, please try another mirror\n{0}
#}}}
#{{{ Macro dialogs
Modified: jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java 2006-10-19 12:47:17 UTC (rev 7622)
+++ jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java 2006-10-19 13:25:36 UTC (rev 7623)
@@ -62,7 +62,7 @@
//{{{ getOperation() method
public Operation getOperation(int i)
{
- return (Operation)operations.get(i);
+ return operations.get(i);
} //}}}
//{{{ getOperationCount() method
@@ -82,7 +82,7 @@
{
for(int i = 0; i < operations.size(); i++)
{
- Operation op = (Operation)operations.get(i);
+ Operation op = operations.get(i);
op.runInWorkThread(progress);
progress.done();
@@ -96,7 +96,7 @@
{
for(int i = 0; i < operations.size(); i++)
{
- Operation op = (Operation)operations.get(i);
+ Operation op = operations.get(i);
op.runInAWTThread(comp);
}
@@ -104,7 +104,7 @@
// require all JARs to be present
for(int i = 0; i < toLoad.size(); i++)
{
- String pluginName = (String)toLoad.get(i);
+ String pluginName = toLoad.get(i);
if(jEdit.getPluginJAR(pluginName) != null)
{
Log.log(Log.WARNING,this,"Already loaded: "
@@ -116,7 +116,7 @@
for(int i = 0; i < toLoad.size(); i++)
{
- String pluginName = (String)toLoad.get(i);
+ String pluginName = toLoad.get(i);
PluginJAR plugin = jEdit.getPluginJAR(pluginName);
if(plugin != null)
plugin.checkDependencies();
@@ -125,7 +125,7 @@
// now activate the plugins
for(int i = 0; i < toLoad.size(); i++)
{
- String pluginName = (String)toLoad.get(i);
+ String pluginName = toLoad.get(i);
PluginJAR plugin = jEdit.getPluginJAR(pluginName);
if(plugin != null)
plugin.activatePluginIfNecessary();
@@ -229,6 +229,7 @@
//{{{ unloadPluginJAR() method
/**
* This should go into a public method somewhere.
+ * @param jar the jar of the plugin
*/
private void unloadPluginJAR(PluginJAR jar)
{
@@ -254,15 +255,12 @@
//{{{ equals() method
public boolean equals(Object o)
{
- if(o instanceof Remove
- && ((Remove)o).plugin.equals(plugin))
- return true;
- else
- return false;
+ return o instanceof Remove
+ && ((Remove) o).plugin.equals(plugin);
} //}}}
//{{{ Private members
- private String plugin;
+ private final String plugin;
private boolean deleteRecursively(File file)
{
@@ -336,10 +334,10 @@
{
zipFile = new ZipFile(path);
- Enumeration e = zipFile.entries();
+ Enumeration<? extends ZipEntry> e = zipFile.entries();
while(e.hasMoreElements())
{
- ZipEntry entry = (ZipEntry)e.nextElement();
+ ZipEntry entry = e.nextElement();
String name = entry.getName().replace('/',File.separatorChar);
File file = new File(installDirectory,name);
if(entry.isDirectory())
@@ -371,8 +369,13 @@
catch(InterruptedIOException iio)
{
}
- catch(final IOException io)
+ catch(ZipException e)
{
+ Log.log(Log.ERROR,this,e);
+ GUIUtilities.error(null,"plugin-error-download",new Object[]{""});
+ }
+ catch(IOException io)
+ {
Log.log(Log.ERROR,this,io);
String[] args = { io.getMessage() };
@@ -405,19 +408,13 @@
//{{{ equals() method
public boolean equals(Object o)
{
- if(o instanceof Install
- && ((Install)o).url.equals(url))
- {
- /* even if installDirectory is different */
- return true;
- }
- else
- return false;
+ return o instanceof Install
+ && ((Install) o).url.equals(url);
} //}}}
//{{{ Private members
private String installed;
- private String url;
+ private final String url;
private String installDirectory;
private String path;
@@ -455,6 +452,20 @@
// do nothing, user clicked 'Stop'
return null;
}
+ catch(FileNotFoundException e)
+ {
+ Log.log(Log.ERROR,this,e);
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ GUIUtilities.error(null,"plugin-error-download",new Object[]{""});
+ }
+ });
+
+ return null;
+ }
catch(final IOException io)
{
Log.log(Log.ERROR,this,io);
@@ -464,7 +475,7 @@
public void run()
{
String[] args = { io.getMessage() };
- GUIUtilities.error(null,"ioerror",args);
+ GUIUtilities.error(null,"plugin-error-download",args);
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|