Author: mes
Date: 2012-05-08 12:36:12 -0700 (Tue, 08 May 2012)
New Revision: 29150
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/CreditScreen.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTask.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTaskFactory.java
core3/impl/trunk/swing-application-impl/src/main/resources/credits.txt
Log:
fixes #659 Updated the about screen
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-05-08 19:03:32 UTC (rev 29149)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-05-08 19:36:12 UTC (rev 29150)
@@ -245,7 +245,7 @@
cytoscapeDesktop);
HelpContactHelpDeskTaskFactory helpContactHelpDeskTaskFactory =
new HelpContactHelpDeskTaskFactory(openBrowserServiceRef);
HelpReportABugTaskFactory helpReportABugTaskFactory = new
HelpReportABugTaskFactory(openBrowserServiceRef, cyVersionServiceRef);
- HelpAboutTaskFactory helpAboutTaskFactory = new
HelpAboutTaskFactory();
+ HelpAboutTaskFactory helpAboutTaskFactory = new
HelpAboutTaskFactory(cyVersionServiceRef);
ArrangeTaskFactory arrangeGridTaskFactory = new
ArrangeTaskFactory((CytoscapeDesktop)cytoscapeDesktop, GRID);
ArrangeTaskFactory arrangeCascadeTaskFactory = new
ArrangeTaskFactory((CytoscapeDesktop)cytoscapeDesktop,
CASCADE);
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/CreditScreen.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/CreditScreen.java
2012-05-08 19:03:32 UTC (rev 29149)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/CreditScreen.java
2012-05-08 19:36:12 UTC (rev 29150)
@@ -56,6 +56,8 @@
import java.io.IOException;
import java.io.InputStreamReader;
+import org.cytoscape.application.CyVersion;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,9 +73,11 @@
private static final Logger logger =
LoggerFactory.getLogger(CreditScreen.class);
private static final String CREDIT_IMAGE =
"/images/CytoscapeCredits.png";
private static final String CREDITS = "/credits.txt";
+ private final String version;
- public CreditScreen() {
+ public CreditScreen(CyVersion vers) {
+ version = vers.getVersion();
try {
image = new
ImageIcon(getClass().getResource(CREDIT_IMAGE));
BufferedReader br = new BufferedReader(
@@ -129,7 +133,7 @@
timer.stop();
}
- private static class ScrollingLinesPanel extends JPanel {
+ private class ScrollingLinesPanel extends JPanel {
private final static long serialVersionUID = 1202339874718767L;
int yPos;
int xPos;
@@ -148,15 +152,17 @@
protected void paintComponent(Graphics g) {
g.drawImage(background.getImage(), 0, 0, null);
- ((Graphics2D) g).setPaint(Color.white);
+ ((Graphics2D) g).setPaint(Color.black);
+ g.drawString(version,xPos,35);
+
int i = 1;
int y = yPos;
for ( String sub : lines ) {
y = yPos + (12 * i);
- if (y > 80)
+ if (y > 120)
g.drawString(sub, xPos, y);
i++;
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTask.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTask.java
2012-05-08 19:03:32 UTC (rev 29149)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTask.java
2012-05-08 19:36:12 UTC (rev 29150)
@@ -32,10 +32,16 @@
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.application.CyVersion;
public class HelpAboutTask extends AbstractTask {
+ private final CyVersion vers;
+ HelpAboutTask(CyVersion vers) {
+ this.vers = vers;
+ }
+
public void run(TaskMonitor tm) {
- new CreditScreen().showCredits();
+ new CreditScreen(vers).showCredits();
}
}
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTaskFactory.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTaskFactory.java
2012-05-08 19:03:32 UTC (rev 29149)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/help/HelpAboutTaskFactory.java
2012-05-08 19:36:12 UTC (rev 29150)
@@ -32,11 +32,18 @@
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
+import org.cytoscape.application.CyVersion;
public class HelpAboutTaskFactory extends AbstractTaskFactory {
+ private final CyVersion vers;
+
+ public HelpAboutTaskFactory(CyVersion vers) {
+ this.vers = vers;
+ }
+
public TaskIterator createTaskIterator() {
- return new TaskIterator(new HelpAboutTask());
+ return new TaskIterator(new HelpAboutTask(vers));
}
}
Modified: core3/impl/trunk/swing-application-impl/src/main/resources/credits.txt
===================================================================
--- core3/impl/trunk/swing-application-impl/src/main/resources/credits.txt
2012-05-08 19:03:32 UTC (rev 29149)
+++ core3/impl/trunk/swing-application-impl/src/main/resources/credits.txt
2012-05-08 19:36:12 UTC (rev 29150)
@@ -1,15 +1,27 @@
Cytoscape is a collaboration
-between the Institute for
-Systems Biology, University of
-California San Diego, Memorial
-Sloan-Kettering Cancer Center,
-Institut Pasteur, and Agilent
-Technologies.
+between the University of
+California San Diego,
+the University of Toronto,
+the University of California
+San Francisco, the Institute
+for Systems Biology, Memorial
+Sloan-Kettering Cancer Center
+the Institut Pasteur, and
+Agilent Technologies.
-For more information, please see:
-http://www.cytoscape.org
+Cytoscape is organized under
+the auspices of the National
+Resource for Network Biology
+(NRNB).
-Cytosape Developers, past and present,
+For more information,
+please see:
+
+http://cytoscape.org
+http://nrnb.org
+
+Cytosape Developers,
+past and present,
in alphabetical order:
Annette Adler
@@ -24,11 +36,13 @@
Mike Creech
Paul Edlefsen
Stephanie Fan
+Roza Ghamari
Trey Ideker
Liz Kain
Larissa Kamenkovich
Ryan Kelley
Sarah Killcoyne
+Michael Kirby
Brad Kohlenberg
Allan Kuchinsky
Nerius Landys
--
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.
