Revision: 15198
http://gate.svn.sourceforge.net/gate/?rev=15198&view=rev
Author: markagreenwood
Date: 2012-01-23 12:17:39 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
a null check when loading plugin update sites
Modified Paths:
--------------
gate/trunk/src/gate/gui/creole/manager/PluginUpdateManager.java
Modified: gate/trunk/src/gate/gui/creole/manager/PluginUpdateManager.java
===================================================================
--- gate/trunk/src/gate/gui/creole/manager/PluginUpdateManager.java
2012-01-23 07:53:08 UTC (rev 15197)
+++ gate/trunk/src/gate/gui/creole/manager/PluginUpdateManager.java
2012-01-23 12:17:39 UTC (rev 15198)
@@ -201,19 +201,21 @@
// invalid for some reason
for(RemoteUpdateSite rus : updateSites) {
if(rus.enabled && (rus.valid == null || rus.valid)) {
-
+
for(CreolePlugin p : rus.getCreolePlugins()) {
- int index = availableModel.data.indexOf(p);
- if(index == -1) {
- availableModel.data.add(p);
- } else {
- // if the plugin was already known then replace it if this
- // instance is a newer version
- CreolePlugin pp = availableModel.data.get(index);
+ if(p != null) {
+ int index = availableModel.data.indexOf(p);
+ if(index == -1) {
+ availableModel.data.add(p);
+ } else {
+ // if the plugin was already known then replace it if this
+ // instance is a newer version
+ CreolePlugin pp = availableModel.data.get(index);
- if(VersionComparator.compareVersions(p.version, pp.version) >
0) {
- availableModel.data.remove(pp);
- availableModel.data.add(p);
+ if(VersionComparator.compareVersions(p.version, pp.version)
> 0) {
+ availableModel.data.remove(pp);
+ availableModel.data.add(p);
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
