Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[16200] plugins/Updater/trunk
|
From: <sh...@us...> - 2009-09-15 21:22:49
|
Revision: 16200
http://jedit.svn.sourceforge.net/jedit/?rev=16200&view=rev
Author: shlomy
Date: 2009-09-15 20:52:33 +0000 (Tue, 15 Sep 2009)
Log Message:
-----------
Get rid of plugin updates. This should be done using the plugin manager, which should be added "update sites" like in eclipse.
Modified Paths:
--------------
plugins/Updater/trunk/Updater.props
plugins/Updater/trunk/actions.xml
plugins/Updater/trunk/src/updater/DailyBuildUpdateSource.java
plugins/Updater/trunk/src/updater/UpdateSource.java
plugins/Updater/trunk/src/updater/UpdaterPlugin.java
Removed Paths:
-------------
plugins/Updater/trunk/src/updater/DailyBuildPluginUpdateSource.java
Modified: plugins/Updater/trunk/Updater.props
===================================================================
--- plugins/Updater/trunk/Updater.props 2009-09-15 19:21:40 UTC (rev 16199)
+++ plugins/Updater/trunk/Updater.props 2009-09-15 20:52:33 UTC (rev 16200)
@@ -14,11 +14,10 @@
updater-update-release.label=Update jEdit to latest released version
updater-update-daily.label=Update jEdit to latest daily build
updater-reset-props.label=Reset plugin properties (e.g. daily build version)
-updater-update-plugins-daily.label=Update plugins to latest daily build
# menu items
plugin.updater.UpdaterPlugin.menu=updater-update-release updater-update-daily \
- updater-reset-props - updater-update-plugins-daily
+ updater-reset-props
# option pane
plugin.updater.UpdaterPlugin.option-pane=updater
@@ -48,9 +47,6 @@
updater.dailyBuildVersionPageLinkPattern=<a href="/projects/jedit-daily/index.php\\?dir=jEdit%2F(\\d+\\d+\\d+\\d+-\\d\\d-\\d\\d_\\d+\\d+-\\d+\\d+-\\d+\\d+%2F)"
updater.dailyBuildDownloadLinkPattern=<a href="(jEdit/\\d+\\d+\\d+\\d+-\\d\\d-\\d\\d_\\d+\\d+-\\d+\\d+-\\d+\\d+/[^"]*install\.jar)
updater.dailyBuildDownloadLinkPrefix=http://www.tellurianring.com/projects/jedit-daily/
-updater.dailyBuildPluginPage=http://www.tellurianring.com/projects/jedit-daily/index.php?dir={0}%2F
-updater.dailyBuildPluginVersionCheckPattern=<a href="/projects/jedit-daily/index.php\\?dir={0}%2F(\\d+\\d+\\d+\\d+-\\d\\d-\\d\\d_\\d+\\d+-\\d+\\d+-\\d+\\d+)%2F"
-updater.dailyBuildPluginPageLinkPattern=<a href="({0}/\\d+\\d+\\d+\\d+-\\d\\d-\\d\\d_\\d+\\d+-\\d+\\d+-\\d+\\d+/[^"]*\\.(jar|zip))"
# messages
updater.msg.downloadLinkNotFound=Cannot find download link on download page.
@@ -63,7 +59,7 @@
updater.msg.updateDialogTitle=UpdaterPlugin
updater.msg.checkingLatestVersion=Checking for the latest version...
updater.msg.findLatestVersion=Looking for the latest version...
-updater.msg.fetchingDownloadPage=Fetching download page...
+updater.msg.fetchingDownloadPage=Fetching jEdit download page...
updater.msg.downloadingNewVersion=Downloading the new version...
updater.msg.runningInstaller=Launching the installer...
updater.msg.installing=Installation in progress...
Modified: plugins/Updater/trunk/actions.xml
===================================================================
--- plugins/Updater/trunk/actions.xml 2009-09-15 19:21:40 UTC (rev 16199)
+++ plugins/Updater/trunk/actions.xml 2009-09-15 20:52:33 UTC (rev 16200)
@@ -18,10 +18,6 @@
updater.UpdaterPlugin.getInstance().resetProps();
</CODE>
</ACTION>
- <ACTION NAME="updater-update-plugins-daily" NO_REPEAT="TRUE">
- <CODE>
- updater.UpdaterPlugin.getInstance().updatePluginsDailyVersion();
- </CODE>
- </ACTION>
+
</ACTIONS>
Deleted: plugins/Updater/trunk/src/updater/DailyBuildPluginUpdateSource.java
===================================================================
--- plugins/Updater/trunk/src/updater/DailyBuildPluginUpdateSource.java 2009-09-15 19:21:40 UTC (rev 16199)
+++ plugins/Updater/trunk/src/updater/DailyBuildPluginUpdateSource.java 2009-09-15 20:52:33 UTC (rev 16200)
@@ -1,73 +0,0 @@
-package updater;
-
-import java.util.Vector;
-
-import org.gjt.sp.jedit.jEdit;
-
-public class DailyBuildPluginUpdateSource implements UpdateSource
-{
- private static final String INSTALLED_BUILD_PROP = "updater.dailyBuildInstalledVersion";
- private static String VERSION_PAGE_PROP = "updater.dailyBuildPluginPage";
- private static final String VERSION_CHECK_PATTERN_PROP = "updater.dailyBuildPluginVersionCheckPattern";
- private static final String DOWNLOAD_LINK_PATTERN_PROP = "updater.dailyBuildPluginPageLinkPattern";
- private static final String DOWNLOAD_LINK_PREFIX_PROP = "updater.dailyBuildDownloadLinkPrefix";
- private String plugin;
-
- public DailyBuildPluginUpdateSource(String plugin)
- {
- this.plugin = plugin;
- }
-
- public int compareVersions(String latest, String installed)
- {
- if (installed.length() == 0)
- return 1;
- if (latest.length() == 0)
- return BAD_VERSION_STRING;
- String [] latestVer = latest.split("\\D+");
- String [] installedVer = installed.split("\\D+");
- return UpdaterPlugin.compareNumericVersionArray(latestVer, installedVer);
- }
-
- public String getDownloadLink()
- {
- String versionPage = jEdit.getProperty(VERSION_PAGE_PROP,
- new String[] {plugin});
- Vector<String> versions = UrlUtils.extractMultiOccurrencePattern(
- versionPage, jEdit.getProperty(VERSION_CHECK_PATTERN_PROP,
- new String[] {plugin}));
- if (versions.size() == 0)
- return null;
- String downloadPage = versionPage + versions.lastElement();
- String link = UrlUtils.extractSingleOccurrencePattern(downloadPage,
- jEdit.getProperty(DOWNLOAD_LINK_PATTERN_PROP, new String[] {plugin}));
- if (link == null)
- return null;
- return jEdit.getProperty(DOWNLOAD_LINK_PREFIX_PROP) + link;
- }
-
- public String getInstalledVersion()
- {
- return jEdit.getProperty(INSTALLED_BUILD_PROP + "." + plugin, "");
- }
-
- public String getLatestVersion()
- {
- Vector<String> versions = UrlUtils.extractMultiOccurrencePattern(
- jEdit.getProperty(VERSION_PAGE_PROP, new String[] {plugin}),
- jEdit.getProperty(VERSION_CHECK_PATTERN_PROP, new String[] {plugin}));
- if (versions.size() == 0)
- return null;
- return versions.lastElement();
- }
-
- public void setInstalledVersion(String version)
- {
- String prop = INSTALLED_BUILD_PROP + "." + plugin;
- if (version == null)
- jEdit.resetProperty(prop);
- else
- jEdit.setProperty(prop, version);
- }
-
-}
Modified: plugins/Updater/trunk/src/updater/DailyBuildUpdateSource.java
===================================================================
--- plugins/Updater/trunk/src/updater/DailyBuildUpdateSource.java 2009-09-15 19:21:40 UTC (rev 16199)
+++ plugins/Updater/trunk/src/updater/DailyBuildUpdateSource.java 2009-09-15 20:52:33 UTC (rev 16200)
@@ -65,10 +65,7 @@
public void setInstalledVersion(String version)
{
- if (version == null)
- jEdit.resetProperty(INSTALLED_BUILD_PROP);
- else
- jEdit.setProperty(INSTALLED_BUILD_PROP, version);
+ jEdit.setProperty(INSTALLED_BUILD_PROP, version);
}
public String getLatestVersion()
Modified: plugins/Updater/trunk/src/updater/UpdateSource.java
===================================================================
--- plugins/Updater/trunk/src/updater/UpdateSource.java 2009-09-15 19:21:40 UTC (rev 16199)
+++ plugins/Updater/trunk/src/updater/UpdateSource.java 2009-09-15 20:52:33 UTC (rev 16200)
@@ -28,7 +28,6 @@
// Returns the installed version.
String getInstalledVersion();
// Sets the installed version (called during installation).
- // Use null to reset the installed version.
void setInstalledVersion(String version);
// Returns the latest version available for download.
String getLatestVersion();
Modified: plugins/Updater/trunk/src/updater/UpdaterPlugin.java
===================================================================
--- plugins/Updater/trunk/src/updater/UpdaterPlugin.java 2009-09-15 19:21:40 UTC (rev 16199)
+++ plugins/Updater/trunk/src/updater/UpdaterPlugin.java 2009-09-15 20:52:33 UTC (rev 16200)
@@ -20,7 +20,6 @@
package updater;
-import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@@ -29,16 +28,10 @@
import java.io.OutputStreamWriter;
import java.text.DecimalFormat;
-import javax.swing.JFrame;
import javax.swing.JOptionPane;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
import javax.swing.Timer;
-import javax.swing.text.BadLocationException;
import org.gjt.sp.jedit.EditPlugin;
-import org.gjt.sp.jedit.PluginJAR;
-import org.gjt.sp.jedit.View;
import org.gjt.sp.jedit.jEdit;
import updater.UrlUtils.ProgressHandler;
@@ -404,143 +397,11 @@
updateVersion(new DailyBuildUpdateSource(), false);
}
- private String getPluginName(PluginJAR pluginJar)
- {
- EditPlugin ep = pluginJar.getPlugin();
- if (ep == null || (ep instanceof Deferred))
- return null;
- return jEdit.getProperty("plugin."+ ep.getClassName() + ".name");
-
- }
public void resetProps()
{
- new DailyBuildUpdateSource().setInstalledVersion(null);
- PluginJAR [] plugins = jEdit.getPluginJARs();
- for (PluginJAR plugin: plugins)
- {
- String name = getPluginName(plugin);
- if (name == null)
- continue;
- new DailyBuildPluginUpdateSource(name).setInstalledVersion(null);
- }
+ new DailyBuildUpdateSource().setInstalledVersion("");
}
- private void addToTextArea(JTextArea ta, String s)
- {
- ta.append(s + "\n");
- ta.setCaretPosition(ta.getText().length());
- }
-
- private void updatePlugin(String plugin, final JTextArea ta)
- {
- addToTextArea(ta, "Trying to update plugin: " + plugin);
- UpdateSource source = new DailyBuildPluginUpdateSource(plugin);
- String installedVersion = source.getInstalledVersion();
- String latestVersion = source.getLatestVersion();
- if (latestVersion == null)
- {
- addToTextArea(ta, "Latest version not found.");
- return;
- }
- ta.append("Installed version: " + installedVersion + "\n");
- ta.append("Latest version: " + latestVersion + "\n");
- int comparison = source.compareVersions(latestVersion,
- installedVersion);
- if (comparison == BAD_VERSION_STRING)
- {
- addToTextArea(ta, jEdit.getProperty(
- "updater.msg.unknownVersionString"));
- return;
- }
- if (comparison <= 0)
- {
- addToTextArea(ta, jEdit.getProperty("updater.msg.noNewerVersion"));
- return;
- }
- addToTextArea(ta, jEdit.getProperty("updater.msg.fetchingDownloadPage"));
- String link = source.getDownloadLink();
- if (link == null)
- {
- addToTextArea(ta, jEdit.getProperty(
- "updater.msg.downloadLinkNotFound"));
- return;
- }
- addToTextArea(ta, jEdit.getProperty(
- "updater.msg.downloadingNewVersion") + " " + link);
- final int caretPos = ta.getCaretPosition();
- ProgressHandler progress = new ProgressHandler()
- {
- private String suffix = " bytes read";
- public void setSize(int size)
- {
- if (size > 0)
- {
- DecimalFormat format = new DecimalFormat();
- format.setGroupingSize(3);
- suffix = " (out of " + format.format(size) +
- ")" + suffix;
- }
- }
- public void bytesRead(final int numBytes)
- {
- DecimalFormat format = new DecimalFormat();
- format.setGroupingSize(3);
- try
- {
- ta.setText(ta.getText(0, caretPos));
- } catch (BadLocationException e)
- {
- e.printStackTrace();
- }
- ta.setCaretPosition(caretPos);
- addToTextArea(ta, "Progress: " + format.format(numBytes) + suffix);
- }
- public boolean isAborted()
- {
- return false;
- }
- };
- String savePath = home.getAbsoluteFile() + File.separator +
- plugin + ".zip";
- File installerFile = UrlUtils.downloadFile(link, savePath, progress);
- if (installerFile == null)
- {
- addToTextArea(ta, jEdit.getProperty("updater.msg.downloadFailed"));
- return;
- }
- source.setInstalledVersion(latestVersion);
- addToTextArea(ta, "Done");
- }
- public void updatePluginsDailyVersion()
- {
- JFrame frame = new JFrame("Plugin Update");
- final JTextArea text = new JTextArea(20, 80);
- text.setEditable(false);
- frame.setLayout(new BorderLayout());
- frame.add(new JScrollPane(text), BorderLayout.CENTER);
- frame.pack();
- frame.setVisible(true);
- Thread updateThread = new Thread() {
- @Override
- public void run() {
- if (executionAborted())
- return;
- View view = jEdit.getActiveView();
- view.getStatus().setMessage(jEdit.getProperty("updater.msg.checkingLatestVersion"));
- PluginJAR [] plugins = jEdit.getPluginJARs();
- for (PluginJAR plugin: plugins)
- {
- EditPlugin ep = plugin.getPlugin();
- if (ep == null || (ep instanceof Deferred))
- continue;
- String name = getPluginName(plugin);
- updatePlugin(name, text);
- }
- }
- };
- updateThread.start();
- }
-
private static class LauncherOutputHandler extends Thread
{
private InputStream is;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|