Author: pwang
Date: 2011-06-17 10:36:25 -0700 (Fri, 17 Jun 2011)
New Revision: 25791
Modified:
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/action/PluginManagerAction.java
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/ui/PluginManageDialog.java
Log:
Get plugin URL from CyProperty instead of hard-coded
Modified:
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/action/PluginManagerAction.java
===================================================================
---
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/action/PluginManagerAction.java
2011-06-17 17:33:18 UTC (rev 25790)
+++
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/action/PluginManagerAction.java
2011-06-17 17:36:25 UTC (rev 25791)
@@ -62,8 +62,8 @@
import java.util.List;
import java.util.Map;
import org.cytoscape.work.Task;
+import java.util.Properties;
-
/**
*
*/
@@ -75,11 +75,11 @@
private GUITaskManager guiTaskManagerServiceRef;
private CyProperty cytoscapePropertiesServiceRef;
private TaskFactory pluginLoaderTaskFactory;
+
+ public static String cyConfigVerDir;
+ public static String cyConfigDir = CyProperty.DEFAULT_CONFIG_DIR;
//".cytoscape";
+ public static String DefaultPluginUrl = null;
- // Hard-coded for now, should get system configuration
- public static String cyConfigDir = ".cytoscape";
- public static String cyConfigVerDir = "3.0.0";
-
/**
* Creates a new BookmarkAction object.
*/
@@ -100,10 +100,12 @@
// Note: We need pass cyConfigDir = ".cytoscape" and
cyConfigVerDir to PluginManager.java
this.cytoscapePropertiesServiceRef =
cytoscapePropertiesServiceRef;
+ DefaultPluginUrl =
((Properties)cytoscapePropertiesServiceRef.getProperties()).getProperty("defaultPluginDownloadUrl");
+
// initialize version
org.cytoscape.plugin.internal.util.CytoscapeVersion.version =
version.getVersion();
cyConfigVerDir = version.getVersion();
-
+
setPreferredMenu("Plugins");
setMenuGravity(1.0f);
@@ -150,11 +152,9 @@
dlg.addCategory(Category,
InstalledInfo.get(Category),PluginManageDialog.PluginInstallStatus.INSTALLED);
}
- // Get defaultURL from Cytoscape properties, hard-code for now
- String DefaultUrl =
"http://chianti.ucsd.edu/cyto_web/plugins3/plugins3.xml";//getDefaultUrl();
String DefaultTitle = "Cytoscape";
- Task task = new PluginManagerInquireTask(DefaultUrl, new
ManagerAction(dlg, DefaultTitle, DefaultUrl));
+ Task task = new PluginManagerInquireTask(this.DefaultPluginUrl,
new ManagerAction(dlg, DefaultTitle, this.DefaultPluginUrl));
PluginManagerInquireTaskFactory _taskFactory = new
PluginManagerInquireTaskFactory(task);
Modified:
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/ui/PluginManageDialog.java
===================================================================
---
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/ui/PluginManageDialog.java
2011-06-17 17:33:18 UTC (rev 25790)
+++
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/ui/PluginManageDialog.java
2011-06-17 17:36:25 UTC (rev 25791)
@@ -28,6 +28,7 @@
*/
package org.cytoscape.plugin.internal.ui;
+import org.cytoscape.plugin.internal.action.PluginManagerAction;
import org.cytoscape.plugin.internal.util.CytoscapeVersion;
import org.cytoscape.property.CyProperty;
import org.cytoscape.property.bookmark.Bookmarks;
@@ -97,7 +98,7 @@
public static String CURRENTLY_INSTALLED = "Currently Installed";
public static String AVAILABLE_FOR_INSTALL = "Available for Install";
- private String defaultPluginSiteURL =
"http://chianti.ucsd.edu/cyto_web/plugins/pluginx_test.xml";;
+ private String defaultPluginSiteURL =
PluginManagerAction.DefaultPluginUrl;
private String currentPluginSiteURL = defaultPluginSiteURL;
private String HOWTOSEARCH = "You can use wildcard * or ? in your
search words";
@@ -238,9 +239,6 @@
PluginManagerInquireTaskFactory _taskFactory = new
PluginManagerInquireTaskFactory(task);
this.guiTaskManagerServiceRef.execute(_taskFactory);
-
-
System.out.println("PluginManagerDialog.refreshPluginTree()....");
-
}
/*
--
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.
