Index: /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 1622) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 1623) @@ -29,18 +29,17 @@ */ public class PluginInformation { - - public final File file; - public final String name; - public final String mainversion; - public final String className; - public final String requires; - public final String link; - public final String description; - public final boolean early; - public final String author; - public final int stage; - public final String version; + public File file = null; + public String name = null; + public String mainversion = null; + public String className = null; + public String requires = null; + public String link = null; + public String description = null; + public boolean early = false; + public String author = null; + public int stage = 50; + public String version = null; public String downloadlink = null; - public final List libraries = new LinkedList(); + public List libraries = new LinkedList(); public final Map attr = new TreeMap(); @@ -59,82 +58,73 @@ */ public PluginInformation(File file) { - this(file, file.getName().substring(0, file.getName().length()-4), null); - } - - public PluginInformation(File file, String name, InputStream manifestStream) { + this(file, file.getName().substring(0, file.getName().length()-4)); + } + + public PluginInformation(File file, String name) { this.name = name; this.file = file; try { - Manifest manifest; - JarInputStream jar = null; - if (file != null) { - jar = new JarInputStream(new FileInputStream(file)); - manifest = jar.getManifest(); - if (manifest == null) - throw new IOException(file+" contains no manifest."); - } else { - manifest = new Manifest(); - manifest.read(manifestStream); + JarInputStream jar = new JarInputStream(new FileInputStream(file)); + Manifest manifest = jar.getManifest(); + if (manifest == null) + throw new IOException(file+" contains no manifest."); + scanManifest(manifest); + libraries.add(0, fileToURL(file)); + jar.close(); + } catch (IOException e) { + throw new PluginException(null, name, e); + } + } + + public PluginInformation(InputStream manifestStream, String name) { + this.name = name; + try { + Manifest manifest = new Manifest(); + manifest.read(manifestStream); + scanManifest(manifest); + } catch (IOException e) { + throw new PluginException(null, name, e); + } + } + + private void scanManifest(Manifest manifest) + { + String lang = Main.getLanguageCode()+"_"; + Attributes attr = manifest.getMainAttributes(); + className = attr.getValue("Plugin-Class"); + String s = attr.getValue(lang+"Plugin-Link"); + if(s == null) + s = attr.getValue("Plugin-Link"); + link = s; + requires = attr.getValue("Plugin-Requires"); + s = attr.getValue(lang+"Plugin-Description"); + if(s == null) + { + s = attr.getValue("Plugin-Description"); + if(s != null) + s = tr(s); + } + description = s; + early = Boolean.parseBoolean(attr.getValue("Plugin-Early")); + String stageStr = attr.getValue("Plugin-Stage"); + stage = stageStr == null ? 50 : Integer.parseInt(stageStr); + version = attr.getValue("Plugin-Version"); + mainversion = attr.getValue("Plugin-Mainversion"); + author = attr.getValue("Author"); + + String classPath = attr.getValue(Attributes.Name.CLASS_PATH); + if (classPath != null) { + for (String entry : classPath.split(" ")) { + File entryFile; + if (new File(entry).isAbsolute()) + entryFile = new File(entry); + else + entryFile = new File(file.getParent(), entry); + + libraries.add(fileToURL(entryFile)); } - if (manifest != null) { - String s; - String lang = Main.getLanguageCode()+"_"; - Attributes attr = manifest.getMainAttributes(); - className = attr.getValue("Plugin-Class"); - s = attr.getValue(lang+"Plugin-Link"); - if(s == null) - s = attr.getValue("Plugin-Link"); - link = s; - requires = attr.getValue("Plugin-Requires"); - s = attr.getValue(lang+"Plugin-Description"); - if(s == null) - { - s = attr.getValue("Plugin-Description"); - if(s != null) - s = tr(s); - } - description = s; - early = Boolean.parseBoolean(attr.getValue("Plugin-Early")); - String stageStr = attr.getValue("Plugin-Stage"); - stage = stageStr == null ? 50 : Integer.parseInt(stageStr); - version = attr.getValue("Plugin-Version"); - mainversion = attr.getValue("Plugin-Mainversion"); - author = attr.getValue("Author"); - - String classPath = attr.getValue(Attributes.Name.CLASS_PATH); - if (classPath != null) { - for (String entry : classPath.split(" ")) { - File entryFile; - if (new File(entry).isAbsolute()) { - entryFile = new File(entry); - } else { - entryFile = new File(file.getParent(), entry); - } - - libraries.add(fileToURL(entryFile)); - } - } - for (Object o : attr.keySet()) - this.attr.put(o.toString(), attr.getValue(o.toString())); - } else { - // resource-only plugin - className = null; - mainversion = null; - description = null; - early = false; - stage = 50; - requires = null; - link = null; - version = null; - author = null; - } - if (file != null) - libraries.add(0, fileToURL(file)); - - if (jar != null) - jar.close(); - } catch (IOException e) { - throw new PluginException(null, name, e); - } + } + for (Object o : attr.keySet()) + this.attr.put(o.toString(), attr.getValue(o.toString())); } @@ -221,5 +211,5 @@ InputStream manifestStream = PluginInformation.class.getResourceAsStream("/org/openstreetmap/josm/plugins/"+name+"/MANIFEST.MF"); if (manifestStream != null) - return new PluginInformation(null, pluginName, manifestStream); + return new PluginInformation(manifestStream, pluginName); Collection locations = getPluginLocations(); Index: /trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (revision 1622) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (revision 1623) @@ -141,5 +141,5 @@ if (availablePlugins.get(pname) == null) pluginsToRemove.add(pname); } - + for (String pname : pluginsToRemove) { pluginMap.remove(pname); @@ -272,5 +272,5 @@ if (fname.endsWith(".jar")) { try { - PluginInformation info = new PluginInformation(f,fname.substring(0,fname.length()-4), null); + PluginInformation info = new PluginInformation(f,fname.substring(0,fname.length()-4)); if (!availablePlugins.containsKey(info.name)) availablePlugins.put(info.name, info); @@ -302,6 +302,7 @@ try { - PluginInformation info = new PluginInformation(null, name.substring(0,name.length()-4), - new ByteArrayInputStream(manifest.getBytes())); + PluginInformation info = new PluginInformation( + new ByteArrayInputStream(manifest.getBytes("utf-8")), + name.substring(0,name.length()-4)); info.downloadlink = url; if(!availablePlugins.containsKey(info.name)) @@ -322,6 +323,7 @@ if(name != null) { - PluginInformation info = new PluginInformation(null, name.substring(0,name.length()-4), - new ByteArrayInputStream(manifest.getBytes())); + PluginInformation info = new PluginInformation( + new ByteArrayInputStream(manifest.getBytes("utf-8")), + name.substring(0,name.length()-4)); info.downloadlink = url; if(!availablePlugins.containsKey(info.name))