Author: rozagh
Date: 2012-04-10 11:43:24 -0700 (Tue, 10 Apr 2012)
New Revision: 28782
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpReportABugTask.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpReportABugTaskFactory.java
Log:
changed the URL of bug report task to send the version and OS info.
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-04-10 18:41:14 UTC (rev 28781)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-04-10 18:43:24 UTC (rev 28782)
@@ -54,6 +54,7 @@
import org.cytoscape.application.CyApplicationConfiguration;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.CyShutdown;
+import org.cytoscape.application.CyVersion;
import org.cytoscape.application.events.CyShutdownListener;
import org.cytoscape.application.events.SetCurrentNetworkViewListener;
import org.cytoscape.application.swing.CyAction;
@@ -149,6 +150,7 @@
RecentlyOpenedTracker.class);
CyProperty cytoscapePropertiesServiceRef = getService(bc,
CyProperty.class,
"(cyPropertyName=cytoscape3.props)");
+ CyVersion cyVersionServiceRef = getService(bc, CyVersion.class);
CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,
CyApplicationManager.class);
CySessionManager cySessionManagerServiceRef = getService(bc,
CySessionManager.class);
@@ -245,7 +247,7 @@
HelpContentsTaskFactory helpContentsTaskFactory = new
HelpContentsTaskFactory(cyHelpBroker,
cytoscapeDesktop);
HelpContactHelpDeskTaskFactory helpContactHelpDeskTaskFactory =
new HelpContactHelpDeskTaskFactory(openBrowserServiceRef);
- HelpReportABugTaskFactory helpReportABugTaskFactory = new
HelpReportABugTaskFactory(openBrowserServiceRef);
+ HelpReportABugTaskFactory helpReportABugTaskFactory = new
HelpReportABugTaskFactory(openBrowserServiceRef, cyVersionServiceRef);
HelpAboutTaskFactory helpAboutTaskFactory = new
HelpAboutTaskFactory();
ArrangeTaskFactory arrangeGridTaskFactory = new
ArrangeTaskFactory((CytoscapeDesktop)cytoscapeDesktop, GRID);
ArrangeTaskFactory arrangeCascadeTaskFactory = new
ArrangeTaskFactory((CytoscapeDesktop)cytoscapeDesktop,
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpReportABugTask.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpReportABugTask.java
2012-04-10 18:41:14 UTC (rev 28781)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpReportABugTask.java
2012-04-10 18:43:24 UTC (rev 28782)
@@ -1,20 +1,28 @@
package org.cytoscape.internal.view.help;
+import org.cytoscape.application.CyVersion;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
public class HelpReportABugTask extends AbstractTask{
- private String bugReport =
"http://chianti.ucsd.edu/cyto_web/bugreport/bugreport.php";;
+ private String bugReportURL =
"http://chianti.ucsd.edu/cyto_web/bugreport/bugreport.php";;
private OpenBrowser openBrowser;
-
- public HelpReportABugTask(OpenBrowser openBrowser) {
+ private final CyVersion cyVersion;
+
+ public HelpReportABugTask(OpenBrowser openBrowser, CyVersion
cyVersion) {
this.openBrowser = openBrowser;
+ this.cyVersion = cyVersion;
}
public void run(TaskMonitor tm) {
- openBrowser.openURL(bugReport);
+ // get OS string
+ String os_str = System.getProperty("os.name")+ "_"+
System.getProperty("os.version");
+ os_str = os_str.replace(" ", "_");
+
+ bugReportURL =
"http://chianti.ucsd.edu/cyto_web/bugreport/bugreport.php?cyversion="+cyVersion.getVersion()+"&os="+os_str;
+ openBrowser.openURL(bugReportURL);
}
}
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpReportABugTaskFactory.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpReportABugTaskFactory.java
2012-04-10 18:41:14 UTC (rev 28781)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpReportABugTaskFactory.java
2012-04-10 18:43:24 UTC (rev 28782)
@@ -1,5 +1,6 @@
package org.cytoscape.internal.view.help;
+import org.cytoscape.application.CyVersion;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
@@ -7,14 +8,15 @@
public class HelpReportABugTaskFactory extends AbstractTaskFactory {
private OpenBrowser openBrowser;
-
- public HelpReportABugTaskFactory(OpenBrowser openBrowser) {
+ private final CyVersion cyVersion;
+ public HelpReportABugTaskFactory(OpenBrowser openBrowser, CyVersion
cyVersion) {
this.openBrowser = openBrowser;
+ this.cyVersion = cyVersion;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new HelpReportABugTask(openBrowser));
+ return new TaskIterator(new HelpReportABugTask(openBrowser,
cyVersion));
}
}
--
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.
