Author: paperwing
Date: 2012-06-05 16:02:16 -0700 (Tue, 05 Jun 2012)
New Revision: 29469
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/util/DebugHelper.java
Log:
Fixed small bug with not properly checking if an app store app is compatible
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-06-05 22:48:02 UTC (rev 29468)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-06-05 23:02:16 UTC (rev 29469)
@@ -130,7 +130,7 @@
}
public void start(BundleContext bc) {
-
+
CyApplicationManager cyApplicationManagerRef =
getService(bc,CyApplicationManager.class);
CyEventHelper cyEventHelperRef =
getService(bc,CyEventHelper.class);
CyGroupAggregationManager cyGroupAggregationManagerRef =
getService(bc,CyGroupAggregationManager.class);
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
2012-06-05 22:48:02 UTC (rev 29468)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
2012-06-05 23:02:16 UTC (rev 29469)
@@ -109,7 +109,7 @@
this.webQuerier = webQuerier;
apps = new HashSet<App>();
-
+
appParser = new AppParser();
initializeAppsDirectories();
@@ -124,6 +124,8 @@
apps.addAll(uninstalledApps);
setupAlterationMonitor();
+
+ DebugHelper.print(this, "config dir: " +
applicationConfiguration.getConfigurationDirectoryLocation());
}
@@ -183,7 +185,7 @@
try {
parsedApp = appParser.parseApp(file);
installApp(parsedApp);
-
+
DebugHelper.print("Installed: " +
parsedApp.getAppName());
} catch (AppParsingException e) {
DebugHelper.print("Failed to parse: " +
file.getName());
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
2012-06-05 22:48:02 UTC (rev 29468)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
2012-06-05 23:02:16 UTC (rev 29469)
@@ -417,7 +417,7 @@
for (WebApp.Release release : webApp.getReleases()) {
// Get releases that are compatible with the current
version of Cytoscape (version 3)
- if
(release.getReleaseVersion().matches(COMPATIBLE_RELEASE_REGEX)) {
+ if
(release.getCompatibleCytoscapeVersions().matches(COMPATIBLE_RELEASE_REGEX)) {
compatibleReleases.add(release);
}
}
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/util/DebugHelper.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/util/DebugHelper.java
2012-06-05 22:48:02 UTC (rev 29468)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/util/DebugHelper.java
2012-06-05 23:02:16 UTC (rev 29469)
@@ -4,11 +4,22 @@
* A class used to manage print commands for aiding in debugging
*/
public class DebugHelper {
+ private static boolean debug = false;
+
public static void print(String message) {
- boolean debug = false;
-
if (debug) {
System.out.println(message);
}
}
+
+ /**
+ * Prints a message with a source. This method is meant to be called as
print(this, message).
+ * @param source The source, you can usually use the 'this' pointer.
+ * @param message The message to print
+ */
+ public static void print(Object source, String message) {
+ if (debug) {
+ System.out.println("<" + source + ">: " + message);
+ }
+ }
}
--
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.
