From: Julien V. <coo...@us...> - 2003-06-20 22:59:00
|
User: cooperfbi Date: 03/06/20 15:58:59 Modified: news/src/main/org/jboss/nukes/addons/modules/news NewsModule.java Utils.java Log: o added blank image o made that no selected topic use the blank image o fixed NPE when using a null Topic o added menu operations Revision Changes Path 1.4 +1 -2 nukes/news/src/main/org/jboss/nukes/addons/modules/news/NewsModule.java Index: NewsModule.java =================================================================== RCS file: /cvsroot/jboss/nukes/news/src/main/org/jboss/nukes/addons/modules/news/NewsModule.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NewsModule.java 20 Jun 2003 20:47:39 -0000 1.3 +++ NewsModule.java 20 Jun 2003 22:58:59 -0000 1.4 @@ -22,7 +22,6 @@ import org.jboss.nukes.addons.modules.news.ejb.CommentEJBLocalHome; import org.jboss.nukes.module.ModuleSupport; import org.jboss.nukes.Api; -import org.apache.log4j.Logger; import javax.naming.InitialContext; @@ -32,7 +31,7 @@ * * This class defines the the core module of this package * - * @version $Revision: 1.3 $ $Date: 2003/06/20 20:47:39 $ + * @version $Revision: 1.4 $ $Date: 2003/06/20 22:58:59 $ * @author <a href="mailto:vi...@ya...">Viet Kévin</a> */ public class NewsModule 1.4 +16 -3 nukes/news/src/main/org/jboss/nukes/addons/modules/news/Utils.java Index: Utils.java =================================================================== RCS file: /cvsroot/jboss/nukes/news/src/main/org/jboss/nukes/addons/modules/news/Utils.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Utils.java 20 Jun 2003 20:47:39 -0000 1.3 +++ Utils.java 20 Jun 2003 22:58:59 -0000 1.4 @@ -23,7 +23,7 @@ import java.text.SimpleDateFormat; /** - * @version $Revision: 1.3 $ $Date: 2003/06/20 20:47:39 $ + * @version $Revision: 1.4 $ $Date: 2003/06/20 22:58:59 $ * @author <a href="mailto:vi...@ya...">Viet Kévin</a> */ public class Utils @@ -121,8 +121,21 @@ fStory.setBodyText(story.getBodyText()); fStory.setHomeText(story.getHomeText()); fStory.setNotes(story.getNotes()); - fStory.setSearchTopic("<a class=\"pn-normal\" href=\"modules.php?op=modload&name=News&file=index&catid=&topic=" + story.getTopic().getId() + "\"><img src=\"" + ModConstants.TOPICS_IMAGE_PATH + story.getTopic().getImage() + "\" border=\"0\" Alt=\"" + story.getTopic().getText() - + "\" align=\"left\" hspace=\"5\" vspace=\"5\" ></a>"); + TopicEJBLocal topic = story.getTopic(); + + if (topic != null) + { + fStory.setSearchTopic( + "<a class=\"pn-normal\" href=\"modules.php?op=modload&" + + "name=News&file=index&catid=&topic=" + story.getTopic().getId() + + "\"><img src=\"" + ModConstants.TOPICS_IMAGE_PATH + topic.getImage() + + "\" border=\"0\" Alt=\"" + topic.getText() + + "\" align=\"left\" hspace=\"5\" vspace=\"5\" ></a>"); + } + else + { + fStory.setSearchTopic(""); + } String mainText = story.getHomeText() + "\n" + story.getBodyText(); if (!"".equals(story.getNotes())) |