From 4299cab0ff5662b2163f087bb91b9bc9a271081d Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Sat, 16 Apr 2011 21:02:04 +0000 Subject: [PATCH] added display of some basic data --- .../java/src/org/forester/archaeopteryx/MainPanel.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/forester/java/src/org/forester/archaeopteryx/MainPanel.java b/forester/java/src/org/forester/archaeopteryx/MainPanel.java index 8062491..17335bd 100644 --- a/forester/java/src/org/forester/archaeopteryx/MainPanel.java +++ b/forester/java/src/org/forester/archaeopteryx/MainPanel.java @@ -94,14 +94,13 @@ public class MainPanel extends JPanel implements ComponentListener { treepanel.setControlPanel( getControlPanel() ); _treepanels.add( treepanel ); String name = ""; - // if ( !ForesterUtil.isEmpty( phy.getName() ) ) { - // name = phy.getName(); - // } - // else if ( phy.getIdentifier() != null ) { - // name = phy.getIdentifier().toString(); - // } - /* else */ - if ( !ForesterUtil.isEmpty( default_name ) ) { + if ( !ForesterUtil.isEmpty( phy.getName() ) ) { + name = phy.getName(); + } + else if ( phy.getIdentifier() != null ) { + name = phy.getIdentifier().toString(); + } + else if ( !ForesterUtil.isEmpty( default_name ) ) { name = default_name; } else { -- 1.7.10.2