Author: kono
Date: 2012-07-20 15:43:52 -0700 (Fri, 20 Jul 2012)
New Revision: 29950
Added:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/NewsAndLinkPanel.java
core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/README.txt
core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/accept.png
core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/error.png
Removed:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/HelpPanel.java
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CyActivator.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenAction.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenDialog.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/CreateNewNetworkPanel.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/OpenPanel.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/StatusPanel.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/task/DownloadBiogridDataTask.java
Log:
Re-designed the layout.
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CyActivator.java
2012-07-20 21:10:35 UTC (rev 29949)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CyActivator.java
2012-07-20 22:43:52 UTC (rev 29950)
@@ -27,7 +27,7 @@
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.welcome.internal.panel.CreateNewNetworkPanel;
-import org.cytoscape.welcome.internal.panel.HelpPanel;
+import org.cytoscape.welcome.internal.panel.NewsAndLinkPanel;
import org.cytoscape.welcome.internal.panel.OpenPanel;
import org.cytoscape.welcome.internal.panel.StatusPanel;
import org.cytoscape.welcome.internal.task.GenerateCustomStyleTaskFactory;
@@ -82,14 +82,13 @@
importNetworkFileTF, importNetworkTF,
dsManagerServiceRef);
registerAllServices(bc, createNewNetworkPanel, new
Properties());
- final HelpPanel helpPanel = new
HelpPanel(openBrowserServiceRef, cytoscapePropertiesServiceRef);
-
// TODO: implement contents
final StatusPanel statusPanel = new StatusPanel(cyVersion);
+ final NewsAndLinkPanel helpPanel = new
NewsAndLinkPanel(statusPanel, openBrowserServiceRef,
cytoscapePropertiesServiceRef);
// Show Welcome Screen
final WelcomeScreenAction welcomeScreenAction = new
WelcomeScreenAction(createNewNetworkPanel, openPanel,
- helpPanel, statusPanel,
cytoscapePropertiesServiceRef, cytoscapeDesktop);
+ helpPanel, cytoscapePropertiesServiceRef,
cytoscapeDesktop);
registerAllServices(bc, welcomeScreenAction, new Properties());
// Export preset tasks
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenAction.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenAction.java
2012-07-20 21:10:35 UTC (rev 29949)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenAction.java
2012-07-20 22:43:52 UTC (rev 29950)
@@ -9,9 +9,8 @@
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.property.CyProperty;
import org.cytoscape.welcome.internal.panel.CreateNewNetworkPanel;
-import org.cytoscape.welcome.internal.panel.HelpPanel;
+import org.cytoscape.welcome.internal.panel.NewsAndLinkPanel;
import org.cytoscape.welcome.internal.panel.OpenPanel;
-import org.cytoscape.welcome.internal.panel.StatusPanel;
public class WelcomeScreenAction extends AbstractCyAction {
@@ -27,14 +26,13 @@
// Child Panels
private final CreateNewNetworkPanel importPanel;
private final OpenPanel openPanel;
- private final HelpPanel helpPanel;
- private final StatusPanel statusPanel;
+ private final NewsAndLinkPanel helpPanel;
private final CyProperty<Properties> cyProps;
private final CySwingApplication cytoscapeDesktop;
public WelcomeScreenAction(final CreateNewNetworkPanel importPanel,
final OpenPanel openPanel,
- final HelpPanel helpPanel, final StatusPanel
statusPanel, final CyProperty<Properties> cyProps,
+ final NewsAndLinkPanel helpPanel, final
CyProperty<Properties> cyProps,
final CySwingApplication cytoscapeDesktop) {
super(MENU_NAME);
setPreferredMenu(PARENT_NAME);
@@ -43,7 +41,6 @@
this.importPanel = importPanel;
this.openPanel = openPanel;
this.helpPanel = helpPanel;
- this.statusPanel = statusPanel;
this.cytoscapeDesktop = cytoscapeDesktop;
this.cyProps = cyProps;
@@ -58,8 +55,8 @@
@Override
public void actionPerformed(ActionEvent ae) {
- final WelcomeScreenDialog welcomeScreen = new
WelcomeScreenDialog(importPanel, openPanel, helpPanel,
- statusPanel, cyProps, hide);
+ final WelcomeScreenDialog welcomeScreen = new
WelcomeScreenDialog(importPanel, openPanel, helpPanel, cyProps,
+ hide);
welcomeScreen.setLocationRelativeTo(cytoscapeDesktop.getJFrame());
welcomeScreen.setVisible(true);
welcomeScreen.setModal(true);
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenDialog.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenDialog.java
2012-07-20 21:10:35 UTC (rev 29949)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenDialog.java
2012-07-20 22:43:52 UTC (rev 29950)
@@ -24,10 +24,9 @@
import org.cytoscape.property.CyProperty;
import org.cytoscape.welcome.internal.panel.CreateNewNetworkPanel;
-import org.cytoscape.welcome.internal.panel.HelpPanel;
import org.cytoscape.welcome.internal.panel.LogoPanel;
+import org.cytoscape.welcome.internal.panel.NewsAndLinkPanel;
import org.cytoscape.welcome.internal.panel.OpenPanel;
-import org.cytoscape.welcome.internal.panel.StatusPanel;
import org.cytoscape.welcome.internal.panel.WelcomeScreenChildPanel;
public class WelcomeScreenDialog extends JDialog {
@@ -41,7 +40,7 @@
private static final String IMAGE_LOCATION = "images/background.png";
private BufferedImage bgImage;
- private static final Dimension DEF_SIZE = new Dimension(900, 500);
+ private static final Dimension DEF_SIZE = new Dimension(600, 500);
private BackgroundImagePanel basePanel;
private JPanel mainPanel;
@@ -53,21 +52,18 @@
// Child Panels
private final CreateNewNetworkPanel importPanel;
private final OpenPanel openPanel;
- private final HelpPanel helpPanel;
- private final StatusPanel statusPanel;
+ private final NewsAndLinkPanel helpPanel;
public WelcomeScreenDialog(final CreateNewNetworkPanel importPanel,
final OpenPanel openPanel,
- final HelpPanel helpPanel, final StatusPanel
statusPanel, final CyProperty<Properties> cyProps, final boolean hide) {
+ final NewsAndLinkPanel helpPanel, final
CyProperty<Properties> cyProps, final boolean hide) {
this.importPanel = importPanel;
this.openPanel = openPanel;
this.helpPanel = helpPanel;
- this.statusPanel = statusPanel;
this.importPanel.setParentWindow(this);
this.openPanel.setParentWindow(this);
this.helpPanel.setParentWindow(this);
- this.statusPanel.setParentWindow(this);
this.cyProps = cyProps;
@@ -108,7 +104,7 @@
mainPanel = new JPanel();
mainPanel.setSize(DEF_SIZE);
- mainPanel.setLayout(new GridLayout(1, 3));
+ mainPanel.setLayout(new GridLayout(1, 2));
mainPanel.setOpaque(false);
basePanel.add(mainPanel, BorderLayout.CENTER);
@@ -153,13 +149,11 @@
JPanel panel2 = new JPanel();
JPanel panel3 = new JPanel();
JPanel panel4 = new JPanel();
- JPanel statusPanelBase = new JPanel();
panel1.setOpaque(false);
panel2.setOpaque(false);
panel3.setOpaque(false);
panel4.setOpaque(false);
- statusPanelBase.setOpaque(false);
Color borderPaint = new Color(0xff, 0xff, 0xff, 50);
final LineBorder border = new LineBorder(borderPaint, 5, false);
@@ -167,18 +161,15 @@
panel2.setBorder(border);
panel3.setBorder(border);
panel4.setBorder(border);
- statusPanelBase.setBorder(border);
panel1.setBackground(PANEL_COLOR);
panel2.setBackground(PANEL_COLOR);
panel3.setBackground(PANEL_COLOR);
panel4.setBackground(PANEL_COLOR);
- statusPanelBase.setBackground(PANEL_COLOR);
setChildPanel(panel1, openPanel, "Open Recent Session");
setChildPanel(panel2, importPanel, "Common Workflow");
- setChildPanel(panel3, helpPanel, "Help");
- setChildPanel(statusPanelBase, statusPanel, "News");
+ setChildPanel(panel3, helpPanel, "News and Links");
setLogoPanel(panel4, new LogoPanel());
final JPanel leftPanel = new JPanel();
@@ -195,15 +186,11 @@
mainPanel.setBorder(border);
leftPanel.add(panel1);
- leftPanel.add(panel4);
+ leftPanel.add(panel3);
rightPanel.add(panel2);
- centerPanel.add(panel3);
- centerPanel.add(statusPanelBase);
-
mainPanel.add(leftPanel);
- mainPanel.add(centerPanel);
mainPanel.add(rightPanel);
}
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/CreateNewNetworkPanel.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/CreateNewNetworkPanel.java
2012-07-20 21:10:35 UTC (rev 29949)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/CreateNewNetworkPanel.java
2012-07-20 22:43:52 UTC (rev 29950)
@@ -94,7 +94,6 @@
// Enable combo box listener here to avoid unnecessary reaction.
this.networkList.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent e) {
loadPreset();
Deleted:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/HelpPanel.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/HelpPanel.java
2012-07-20 21:10:35 UTC (rev 29949)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/HelpPanel.java
2012-07-20 22:43:52 UTC (rev 29950)
@@ -1,95 +0,0 @@
-package org.cytoscape.welcome.internal.panel;
-
-import java.awt.Cursor;
-import java.awt.GridLayout;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-
-import org.cytoscape.property.CyProperty;
-import org.cytoscape.util.swing.OpenBrowser;
-
-public class HelpPanel extends AbstractWelcomeScreenChildPanel {
-
- private static final long serialVersionUID = -1685752658901305871L;
-
- private JLabel about;
- private JLabel manual;
- private JLabel tutorial;
- private JLabel bugReport;
-
- private final List<JLabel> labelSet;
- private final Map<JLabel, String> urlMap;
-
- private final OpenBrowser openBrowserServiceRef;
- private final CyProperty<Properties> cyProps;
-
- public HelpPanel(final OpenBrowser openBrowserServiceRef,
CyProperty<Properties> cyProps) {
- labelSet = new ArrayList<JLabel>();
- urlMap = new HashMap<JLabel, String>();
- this.openBrowserServiceRef = openBrowserServiceRef;
- this.cyProps = cyProps;
- initComponents();
- }
-
- private void initComponents() {
- this.setLayout(new GridLayout(4, 1));
- about = new JLabel("<html><u>About Cytoscape</u></html>");
- manual = new JLabel("<html><u>User Documentation</u></html>");
- tutorial = new JLabel("<html><u>Tutorials</u></html>");
- bugReport = new JLabel("<html><u>Report a bug</u></html>");
-
- // get Cytoscape version
- String cyversion =
this.cyProps.getProperties().getProperty("cytoscape.version.number");
-
- // get OS string
- String os_str = System.getProperty("os.name") + "_" +
System.getProperty("os.version");
- os_str = os_str.replace(" ", "_");
-
- labelSet.add(about);
- labelSet.add(manual);
- labelSet.add(tutorial);
- labelSet.add(bugReport);
- urlMap.put(about,
"http://www.cytoscape.org/what_is_cytoscape.html";);
- urlMap.put(manual,
"http://www.cytoscape.org/documentation_users.html";);
- urlMap.put(tutorial,
"http://opentutorials.cgl.ucsf.edu/index.php/Portal:Cytoscape3";);
- urlMap.put(bugReport,
"http://chianti.ucsd.edu/cyto_web/bugreport/bugreport.php?cyversion="; +
cyversion
- + "&os=" + os_str);
-
- for (final JLabel label : labelSet) {
- label.setBorder(BorderFactory.createEmptyBorder(4, 8,
4, 8));
- label.setFont(LINK_FONT);
- label.setForeground(LINK_FONT_COLOR);
- label.setHorizontalAlignment(SwingConstants.LEFT);
- label.setHorizontalTextPosition(SwingConstants.LEFT);
- label.setOpaque(false);
- label.setCursor(new Cursor(Cursor.HAND_CURSOR));
- label.addMouseListener(new LabelMouseListener(label,
urlMap.get(label), this));
- add(label);
- }
- }
-
- private final class LabelMouseListener extends MouseAdapter {
-
- private final String url;
-
- LabelMouseListener(final JLabel label, final String url, final
JPanel parent) {
- this.url = url;
- }
-
- @Override
- public void mouseClicked(MouseEvent arg0) {
- openBrowserServiceRef.openURL(url);
- }
- }
-
-}
Copied:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/NewsAndLinkPanel.java
(from rev 29946,
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/HelpPanel.java)
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/NewsAndLinkPanel.java
(rev 0)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/NewsAndLinkPanel.java
2012-07-20 22:43:52 UTC (rev 29950)
@@ -0,0 +1,124 @@
+package org.cytoscape.welcome.internal.panel;
+
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import javax.swing.border.TitledBorder;
+
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.util.swing.OpenBrowser;
+
+public class NewsAndLinkPanel extends AbstractWelcomeScreenChildPanel {
+
+ private static final long serialVersionUID = -1685752658901305871L;
+
+ private JLabel about;
+ private JLabel manual;
+ private JLabel tutorial;
+ private JLabel bugReport;
+
+ private final List<JLabel> labelSet;
+ private final Map<JLabel, String> urlMap;
+
+ private final OpenBrowser openBrowserServiceRef;
+ private final CyProperty<Properties> cyProps;
+
+ private final StatusPanel statusPanel;
+
+ public NewsAndLinkPanel(final StatusPanel statusPanel, final
OpenBrowser openBrowserServiceRef,
+ CyProperty<Properties> cyProps) {
+ labelSet = new ArrayList<JLabel>();
+ urlMap = new HashMap<JLabel, String>();
+ this.openBrowserServiceRef = openBrowserServiceRef;
+ this.cyProps = cyProps;
+ this.statusPanel = statusPanel;
+ initComponents();
+ }
+
+ private void initComponents() {
+ this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+ setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
+
+
+ final JPanel linkPanel = new JPanel();
+ linkPanel.setOpaque(false);
+ linkPanel.setMaximumSize(new Dimension(300, 65));
+
linkPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(REGULAR_FONT_COLOR,
1),
+ "Web Links", TitledBorder.LEFT,
TitledBorder.CENTER, REGULAR_FONT, REGULAR_FONT_COLOR));
+ linkPanel.setLayout(new GridLayout(2, 2));
+
+
+ about = new JLabel("<html><u>About Cytoscape</u></html>");
+ manual = new JLabel("<html><u>User Documentation</u></html>");
+ tutorial = new JLabel("<html><u>Tutorials</u></html>");
+ bugReport = new JLabel("<html><u>Report a bug</u></html>");
+
+ // get Cytoscape version
+ String cyversion =
this.cyProps.getProperties().getProperty("cytoscape.version.number");
+
+ // get OS string
+ String os_str = System.getProperty("os.name") + "_" +
System.getProperty("os.version");
+ os_str = os_str.replace(" ", "_");
+
+ labelSet.add(about);
+ labelSet.add(manual);
+ labelSet.add(tutorial);
+ labelSet.add(bugReport);
+ urlMap.put(about,
"http://www.cytoscape.org/what_is_cytoscape.html";);
+ urlMap.put(manual,
"http://www.cytoscape.org/documentation_users.html";);
+ urlMap.put(tutorial,
"http://opentutorials.cgl.ucsf.edu/index.php/Portal:Cytoscape3";);
+ urlMap.put(bugReport,
"http://chianti.ucsd.edu/cyto_web/bugreport/bugreport.php?cyversion="; +
cyversion
+ + "&os=" + os_str);
+
+ for (final JLabel label : labelSet) {
+ label.setBorder(BorderFactory.createEmptyBorder(4, 8,
4, 8));
+ label.setFont(LINK_FONT);
+ label.setForeground(LINK_FONT_COLOR);
+ label.setHorizontalAlignment(SwingConstants.LEFT);
+ label.setHorizontalTextPosition(SwingConstants.LEFT);
+ label.setOpaque(false);
+ label.setCursor(new Cursor(Cursor.HAND_CURSOR));
+ label.addMouseListener(new LabelMouseListener(label,
urlMap.get(label), this));
+ linkPanel.add(label);
+ }
+
+ statusPanel.setOpaque(false);
+ final Dimension statusPanelSize = new Dimension(300, 100);
+ statusPanel.setPreferredSize(statusPanelSize);
+ statusPanel.setSize(statusPanelSize);
+
statusPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(REGULAR_FONT_COLOR,
1),
+ "Latest News", TitledBorder.LEFT,
TitledBorder.CENTER, REGULAR_FONT, REGULAR_FONT_COLOR));
+
+ add(linkPanel);
+ add(statusPanel);
+
+ }
+
+ private final class LabelMouseListener extends MouseAdapter {
+
+ private final String url;
+
+ LabelMouseListener(final JLabel label, final String url, final
JPanel parent) {
+ this.url = url;
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent arg0) {
+ openBrowserServiceRef.openURL(url);
+ }
+ }
+
+}
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/OpenPanel.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/OpenPanel.java
2012-07-20 21:10:35 UTC (rev 29949)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/OpenPanel.java
2012-07-20 22:43:52 UTC (rev 29950)
@@ -2,7 +2,6 @@
import java.awt.Color;
import java.awt.Cursor;
-import java.awt.Font;
import java.awt.GridLayout;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/StatusPanel.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/StatusPanel.java
2012-07-20 21:10:35 UTC (rev 29949)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/panel/StatusPanel.java
2012-07-20 22:43:52 UTC (rev 29950)
@@ -3,37 +3,64 @@
import java.awt.GridLayout;
import javax.swing.BorderFactory;
-import javax.swing.JTextField;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
import org.cytoscape.application.CyVersion;
+import org.cytoscape.welcome.internal.WelcomeScreenDialog;
public final class StatusPanel extends AbstractWelcomeScreenChildPanel {
private static final long serialVersionUID = 54718654342142203L;
+
+ private static final String UP_TO_DATE_ICON_LOCATION =
"images/Icons/accept.png";
+ private static final String NEW_VER_AVAILABLE_ICON_LOCATION =
"images/Icons/error.png";
private final CyVersion cyVersion;
+ private final Icon upToDateIcon;
+ private final Icon newVersionAvailableIcon;
+
public StatusPanel(final CyVersion cyVersion) {
this.cyVersion = cyVersion;
-
+
+ upToDateIcon= new
ImageIcon(WelcomeScreenDialog.class.getClassLoader().getResource(UP_TO_DATE_ICON_LOCATION));
+ newVersionAvailableIcon= new
ImageIcon(WelcomeScreenDialog.class.getClassLoader().getResource(NEW_VER_AVAILABLE_ICON_LOCATION));
initComponents();
}
private void initComponents() {
final String versionStr = cyVersion.getVersion();
+
+ this.setLayout(new GridLayout(5, 1));
+
+ final JLabel status = new JLabel();
+ status.setOpaque(false);
+ status.setFont(REGULAR_FONT);
+ status.setForeground(REGULAR_FONT_COLOR);
+ status.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
- this.setLayout(new GridLayout(5,1));
-
- final JTextField isUpToDate = new JTextField();
- isUpToDate.setEditable(false);
- isUpToDate.setOpaque(false);
- isUpToDate.setFont(REGULAR_FONT);
- isUpToDate.setForeground(REGULAR_FONT_COLOR);
- isUpToDate.setBorder(BorderFactory.createEmptyBorder(5, 10, 5,
10));
- isUpToDate.setText("Cytoscape " + versionStr + " is the latest
version.");
-
- this.add(isUpToDate);
+ if(isUpToDate()) {
+ status.setIcon(upToDateIcon);
+ status.setText("Your Cytoscape " + versionStr + " is up
to date!");
+ } else {
+ status.setIcon(newVersionAvailableIcon);
+ status.setText("New version is available: " +
versionStr);
+ }
+ this.add(status);
// TODO: add feed reader to show latest news about Cytoscape.
}
+
+ private boolean isUpToDate() {
+ // TODO: Implement this!
+ return true;
+ }
+
+ private String getNewVersionNumber() {
+ // TODO: implement this!
+ return "3.1.0";
+ }
+
}
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/task/DownloadBiogridDataTask.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/task/DownloadBiogridDataTask.java
2012-07-20 21:10:35 UTC (rev 29949)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/task/DownloadBiogridDataTask.java
2012-07-20 22:43:52 UTC (rev 29950)
@@ -2,16 +2,13 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
Added: core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/README.txt
===================================================================
--- core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/README.txt
(rev 0)
+++ core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/README.txt
2012-07-20 22:43:52 UTC (rev 29950)
@@ -0,0 +1,5 @@
+accept.png and error.png icons in this directory is created by the following
designer:
+
+Icon Pack:Farm-Fresh Web
+Designer:FatCow Web Hosting
+License:Creative Commons Attribution (by)
\ No newline at end of file
Property changes on:
core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/README.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/accept.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/accept.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/error.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/welcome-impl/src/main/resources/images/Icons/error.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
--
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.
