Author: scooter
Date: 2011-11-18 14:31:40 -0800 (Fri, 18 Nov 2011)
New Revision: 27526
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/plugin/DownloadableInfo.java
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginFileReader.java
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginInfo.java
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginProperties.java
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginTracker.java
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginVersionUtils.java
cytoscape/trunk/application/src/main/java/cytoscape/plugin/ThemeInfo.java
Log:
We want to treat plugin versions as "." separated integers, not as floats.
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/plugin/DownloadableInfo.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/plugin/DownloadableInfo.java
2011-11-18 20:51:36 UTC (rev 27525)
+++
cytoscape/trunk/application/src/main/java/cytoscape/plugin/DownloadableInfo.java
2011-11-18 22:31:40 UTC (rev 27526)
@@ -184,9 +184,7 @@
* @param objVersion
* Sets the version of this object.
*/
- public void setObjectVersion(double objVersion)
- throws NumberFormatException {
- String Version = Double.toString(objVersion);
+ public void setObjectVersion(String Version) {
if (versionOk(Version, true)) {
this.objVersion = Version;
} else {
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginFileReader.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginFileReader.java
2011-11-18 20:51:36 UTC (rev 27525)
+++
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginFileReader.java
2011-11-18 22:31:40 UTC (rev 27526)
@@ -238,6 +238,7 @@
// object version
Info = addVersion(Info, E, Type);
+
// cytoscape version
Iterator<Element> versionI = E.getChild(
PluginXml.CYTOSCAPE_VERSIONS.getTag()).getChildren(
@@ -294,7 +295,7 @@
}
try {
- obj.setObjectVersion(Double.valueOf(Version));
+ obj.setObjectVersion(Version);
return obj;
} catch (NumberFormatException ie) { // is there a better way
to let
// people know it's a bad
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginInfo.java
===================================================================
--- cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginInfo.java
2011-11-18 20:51:36 UTC (rev 27525)
+++ cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginInfo.java
2011-11-18 22:31:40 UTC (rev 27526)
@@ -135,7 +135,7 @@
authors = new ArrayList<AuthorInfo>();
setName("Unknown");
setDescription("No description");
- setObjectVersion(0.1);
+ setObjectVersion("0.1");
setCategory(Category.NONE);
setPluginClassName("");
}
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginProperties.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginProperties.java
2011-11-18 20:51:36 UTC (rev 27525)
+++
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginProperties.java
2011-11-18 22:31:40 UTC (rev 27526)
@@ -136,11 +136,11 @@
pi.setName(getProperty(PluginProperty.NAME.getPropertyKey()));
try {
- pi.setObjectVersion(
Double.valueOf(getProperty(PluginProperty.VERSION.getPropertyKey())) );
+ pi.setObjectVersion(
getProperty(PluginProperty.VERSION.getPropertyKey()) );
} catch (java.lang.NumberFormatException ne) { // skip it or
set it to a default value??
CyLogger.getLogger().warn(pi.getName() + " version is
incorrectly formatted, format is: \\d+.\\d+. Version set to 0.1 to allow plugin
to load");
// ne.printStackTrace();
- pi.setObjectVersion(0.1);
+ pi.setObjectVersion("0.1");
}
pi.setDescription(getProperty(PluginProperty.DESCRIPTION.getPropertyKey()));
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginTracker.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginTracker.java
2011-11-18 20:51:36 UTC (rev 27525)
+++
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginTracker.java
2011-11-18 22:31:40 UTC (rev 27526)
@@ -534,7 +534,7 @@
continue;
}
- themeInfo.setObjectVersion(
Double.valueOf(CurrentTheme.getChildTextTrim(PluginXml.THEME_VERSION.getTag()))
);
+ themeInfo.setObjectVersion(
CurrentTheme.getChildTextTrim(PluginXml.THEME_VERSION.getTag()) );
// add plugins
Iterator<Element> pluginI =
CurrentTheme.getChild(PluginXml.PLUGIN_LIST.getTag()).getChildren(PluginXml.PLUGIN.getTag()).iterator();
while (pluginI.hasNext()) {
@@ -613,7 +613,7 @@
Info.setPluginClassName(PluginElement.getChildTextTrim(classTag));
Info.setInstallLocation(PluginElement.getChildTextTrim(installLocTag));
-
Info.setObjectVersion(Double.valueOf(PluginElement.getChildTextTrim(pluginVersTag)));
+ Info.setObjectVersion(PluginElement.getChildTextTrim(pluginVersTag));
Info.setProjectUrl(PluginElement.getChildTextTrim(projUrlTag));
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginVersionUtils.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginVersionUtils.java
2011-11-18 20:51:36 UTC (rev 27525)
+++
cytoscape/trunk/application/src/main/java/cytoscape/plugin/PluginVersionUtils.java
2011-11-18 22:31:40 UTC (rev 27526)
@@ -56,8 +56,12 @@
}
// this just checks the downloadable object version and the cytoscape
version
- public static boolean versionOk(final String version, final boolean
downloadObj) {
+ public static boolean versionOk(String version, final boolean
downloadObj) {
final String pattern = downloadObj ? "^\\d+\\.\\d+$" :
VALID_CYTOSCAPE_VERSION_PATTERN;
+
+ // Check to see if we've got a subversion number
+ if (version.indexOf('.') < 0)
+ version = version+".0"; // No, give it one
return version.matches(pattern);
}
}
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/plugin/ThemeInfo.java
===================================================================
--- cytoscape/trunk/application/src/main/java/cytoscape/plugin/ThemeInfo.java
2011-11-18 20:51:36 UTC (rev 27525)
+++ cytoscape/trunk/application/src/main/java/cytoscape/plugin/ThemeInfo.java
2011-11-18 22:31:40 UTC (rev 27526)
@@ -69,7 +69,7 @@
private void init() {
setName("Unknown");
setDescription("No description");
- setObjectVersion(0.1);
+ setObjectVersion("0.1");
setCategory(Category.THEME);
themePlugins = new HashSet<PluginInfo>();
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
