[Cdk-commits] CVS: cdk-plugins/rssviewer/src/org/openscience/cdkplugin/rssviewer RSSViewerPlugin.java,1.23,1.24

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk-plugins/rssviewer/src/org/openscience/cdkplugin/rssviewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30032/src/org/openscience/cdkplugin/rssviewer

Modified Files:
	RSSViewerPlugin.java 
Log Message:
Don't show null when a field is empty and Show INChI in item info panel

Index: RSSViewerPlugin.java
===================================================================
RCS file: /cvsroot/cdk/cdk-plugins/rssviewer/src/org/openscience/cdkplugin/rssviewer/RSSViewerPlugin.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- RSSViewerPlugin.java	3 Dec 2004 14:23:38 -0000	1.23
+++ RSSViewerPlugin.java	6 Dec 2004 19:15:12 -0000	1.24
@@ -95,7 +95,7 @@
 public class RSSViewerPlugin implements CDKPluginInterface {
 
     private final String implementedCDKPluginAPIVersion = "1.8";
-    private final String pluginVersion = "0.14";
+    private final String pluginVersion = "0.15";
     
     private final String newFeedTitle = "New Channel";
     
@@ -987,6 +987,7 @@
         private JTextField itemTitle;
         private JTextField itemLink;
         private JTextField itemCreator;
+        private JTextField inchi;
         private JEditorPane itemDescription;
         
         private int rows;
@@ -1000,6 +1001,8 @@
             addField("Link", itemLink);
             itemCreator = new JTextField(30);
             addField("Creator", itemCreator);
+            inchi = new JTextField(30);
+            addField("INChI", inchi);
             itemDescription = new JEditorPane();
             addArea("Description", itemDescription);
             validate();
@@ -1007,10 +1010,16 @@
         
         public void setInfo(ChemModel model) {
             if (model != null) {
-                itemTitle.setText("" + model.getProperty(ChemicalRSSReader.RSS_ITEM_TITLE));
-                itemLink.setText("" + model.getProperty(ChemicalRSSReader.RSS_ITEM_LINK));
-                itemCreator.setText("" + model.getProperty(ChemicalRSSReader.RSS_ITEM_CREATOR));
-                itemDescription.setText("" + model.getProperty(ChemicalRSSReader.RSS_ITEM_DESCRIPTION));
+                if (model.getProperty(ChemicalRSSReader.RSS_ITEM_TITLE) != null)
+                    itemTitle.setText("" + model.getProperty(ChemicalRSSReader.RSS_ITEM_TITLE));
+                if (model.getProperty(ChemicalRSSReader.RSS_ITEM_LINK) != null)
+                    itemLink.setText("" + model.getProperty(ChemicalRSSReader.RSS_ITEM_LINK));
+                if (model.getProperty(ChemicalRSSReader.RSS_ITEM_CREATOR) != null)
+                    itemCreator.setText("" + model.getProperty(ChemicalRSSReader.RSS_ITEM_CREATOR));
+                if (model.getProperty(ChemicalRSSReader.RSS_ITEM_INCHI) != null)
+                    inchi.setText("" + model.getProperty(ChemicalRSSReader.RSS_ITEM_INCHI));
+                if (model.getProperty(ChemicalRSSReader.RSS_ITEM_DESCRIPTION) != null)
+                    itemDescription.setText("" + model.getProperty(ChemicalRSSReader.RSS_ITEM_DESCRIPTION));
             }
         }
     }