Changeset 8509 in josm for trunk/src/org/openstreetmap/josm/plugins
- Timestamp:
- 2015-06-20T14:36:00+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/plugins
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r8471 r8509 614 614 * @since 5601 615 615 */ 616 public static boolean checkRequiredPluginsPreconditions(Component parent, Collection<PluginInformation> plugins, PluginInformation plugin, boolean local) { 616 public static boolean checkRequiredPluginsPreconditions(Component parent, Collection<PluginInformation> plugins, 617 PluginInformation plugin, boolean local) { 617 618 618 619 String requires = local ? plugin.localrequires : plugin.requires; … … 1173 1174 if (plugin.exists() && !plugin.delete() && dowarn) { 1174 1175 Main.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString())); 1175 Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName)); 1176 Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", 1177 pluginName)); 1176 1178 continue; 1177 1179 } … … 1181 1183 } catch (Exception e) { 1182 1184 if (dowarn) { 1183 Main.warn(tr("Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}", plugin.toString(), updatedPlugin.toString(), e.getLocalizedMessage())); 1185 Main.warn(tr("Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}", 1186 plugin.toString(), updatedPlugin.toString(), e.getLocalizedMessage())); 1184 1187 } 1185 1188 continue; … … 1187 1190 // Install plugin 1188 1191 if (!updatedPlugin.renameTo(plugin) && dowarn) { 1189 Main.warn(tr("Failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed.", plugin.toString(), updatedPlugin.toString())); 1190 Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName)); 1192 Main.warn(tr("Failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed.", 1193 plugin.toString(), updatedPlugin.toString())); 1194 Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", 1195 pluginName)); 1191 1196 } 1192 1197 } -
trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
r8461 r8509 221 221 } 222 222 223 private void displayErrorMessage(final ProgressMonitor monitor, final String msg, final String details, final String title, final String firstMessage) { 223 private void displayErrorMessage(final ProgressMonitor monitor, final String msg, final String details, final String title, 224 final String firstMessage) { 224 225 GuiHelper.runInEDTAndWait(new Runnable() { 225 226 @Override public void run() { … … 255 256 File pluginDir = Main.pref.getPluginsDirectory(); 256 257 if (!pluginDir.exists() && !pluginDir.mkdirs()) { 257 Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site)); 258 Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", 259 pluginDir.toString(), site)); 258 260 } 259 261 File cacheFile = createSiteCacheFile(pluginDir, site);
Note:
See TracChangeset
for help on using the changeset viewer.