Author: pwang
Date: 2011-11-16 16:54:15 -0800 (Wed, 16 Nov 2011)
New Revision: 27507
Modified:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/DownloadableInfo.java
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginFileReader.java
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginInfo.java
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginManager.java
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginProperties.java
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginTracker.java
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginVersionUtils.java
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/ThemeInfo.java
Log:
Support three digits for plugin version
Modified:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/DownloadableInfo.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/DownloadableInfo.java
2011-11-17 00:52:58 UTC (rev 27506)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/DownloadableInfo.java
2011-11-17 00:54:15 UTC (rev 27507)
@@ -197,9 +197,11 @@
* @param objVersion
* Sets the version of this object.
*/
- public void setObjectVersion(double objVersion)
+ //public void setObjectVersion(double objVersion)
+ public void setObjectVersion(String objVersion)
throws NumberFormatException {
- String Version = Double.toString(objVersion);
+ //String Version = Double.toString(objVersion);
+ String Version = objVersion.trim();
if (versionOk(Version, true)) {
this.objVersion = Version;
} else {
@@ -446,10 +448,11 @@
}
// logger.debug("Comparing versions: " + Arrays.toString(cyVersion) + " :
" + Arrays.toString(plVersion));
- if (compareVersions(cyVersion, plVersion)) {
+ // TODO: we do not compae version for now
+ //if (compareVersions(cyVersion, plVersion)) {
compatible = true;
break;
- }
+ //}
}
return compatible;
}
Modified:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginFileReader.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginFileReader.java
2011-11-17 00:52:58 UTC (rev 27506)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginFileReader.java
2011-11-17 00:54:15 UTC (rev 27507)
@@ -296,7 +296,8 @@
}
try {
- obj.setObjectVersion(Double.valueOf(Version));
+ //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:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginInfo.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginInfo.java
2011-11-17 00:52:58 UTC (rev 27506)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginInfo.java
2011-11-17 00:54:15 UTC (rev 27507)
@@ -135,7 +135,7 @@
authors = new ArrayList<AuthorInfo>();
setName("Unknown");
setDescription("No description");
- setObjectVersion(0.1);
+ setObjectVersion("0.1");
setCategory(Category.NONE);
setPluginClassName("");
}
Modified:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginManager.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginManager.java
2011-11-17 00:52:58 UTC (rev 27506)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginManager.java
2011-11-17 00:54:15 UTC (rev 27507)
@@ -382,7 +382,7 @@
pluginObj = new PluginInfo();
pluginObj.addCytoscapeVersion(cyVersion);
pluginObj.setName(plugin.getClass().getName());
- pluginObj.setObjectVersion(0.1);
+ pluginObj.setObjectVersion("0.1");
}
pluginObj.setPluginClassName(plugin.getClass().getName());
Modified:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginProperties.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginProperties.java
2011-11-17 00:52:58 UTC (rev 27506)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginProperties.java
2011-11-17 00:54:15 UTC (rev 27507)
@@ -139,11 +139,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??
logger.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:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginTracker.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginTracker.java
2011-11-17 00:52:58 UTC (rev 27506)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginTracker.java
2011-11-17 00:54:15 UTC (rev 27507)
@@ -536,7 +536,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()) {
@@ -615,7 +615,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:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginVersionUtils.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginVersionUtils.java
2011-11-17 00:52:58 UTC (rev 27506)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/PluginVersionUtils.java
2011-11-17 00:54:15 UTC (rev 27507)
@@ -64,6 +64,12 @@
// this just checks the downloadable object version and the cytoscape version
protected static boolean versionOk(String version, boolean downloadObj) {
+ // TODO: do not check the downloadObj for now.
+ if (downloadObj){
+ return true;
+ }
+
+
// \d+.\+d ok
String Match = versionMatch;
String Split = versionSplit;
Modified:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/ThemeInfo.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/ThemeInfo.java
2011-11-17 00:52:58 UTC (rev 27506)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/ThemeInfo.java
2011-11-17 00:54:15 UTC (rev 27507)
@@ -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.
