[Kernel-commits] r4365 - in branches/2.8/core-api/src: main/java/no/schibstedsok/searchportal/view/velocity test/java/no/schibstedsok/searchportal/view/velocity

[ssthkjer]

Author: ssthkjer
Date: 2007-01-23 10:36:28 +0100 (Tue, 23 Jan 2007)
New Revision: 4365

Modified:
   
branches/2.8/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/ShareHoldersDirective.java
   
branches/2.8/core-api/src/test/java/no/schibstedsok/searchportal/view/velocity/ShareHoldersDirectiveTest.java
Log:
shareholders text

Modified: 
branches/2.8/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/ShareHoldersDirective.java
===================================================================
--- 
branches/2.8/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/ShareHoldersDirective.java
   2007-01-23 09:00:35 UTC (rev 4364)
+++ 
branches/2.8/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/ShareHoldersDirective.java
   2007-01-23 09:36:28 UTC (rev 4365)
@@ -160,13 +160,13 @@
     // Private --------------------------------------------------------
 
     // -- Inerntal Render
-    private boolean internalRender(String shareHoldersRaw, Writer writer,
+    private boolean internalRender(String rolesAndShareHolders, Writer writer,
             Node node) throws IOException {
 
-        List<ShareHolder> shareHolders = parse(shareHoldersRaw);
+        List<ShareHolder> shareHolders = 
parseShareHolders(rolesAndShareHolders);
         
         if (!hasShareHolders(shareHolders)) {
-            return true;
+            return false;
         }
         
         Document root = createDocument();
@@ -229,7 +229,14 @@
             // Hover the td background color(white/gray)
             switchTdBgColor();
         }
+        
+        Element div = doc.createElement(HTML_DIV);
+        div.setAttribute("id", "sh_text");
+        div.appendChild(doc.createTextNode("Andel aksjer i % kan i enkelte 
tilfeller overstige 100 % på grunn av feil i summering, vår leverandør Lindorff 
jobber med å rette opp feilen."));
+        root.appendChild(div);
         doc.appendChild(root);
+        //doc.appendChild(div);
+        
         return doc;
     }
     
@@ -258,7 +265,7 @@
     }
 
     // -- Parse the the inpurt , using old school seperators like #sep#
-    List<ShareHolder> parse(String content) {
+    List<ShareHolder> parseShareHolders(String content) {
         List<ShareHolder> shareHolders = new ArrayList();
         boolean isShareHoldersStarted = false;
         boolean isShareHolderRow = false;

Modified: 
branches/2.8/core-api/src/test/java/no/schibstedsok/searchportal/view/velocity/ShareHoldersDirectiveTest.java
===================================================================
--- 
branches/2.8/core-api/src/test/java/no/schibstedsok/searchportal/view/velocity/ShareHoldersDirectiveTest.java
       2007-01-23 09:00:35 UTC (rev 4364)
+++ 
branches/2.8/core-api/src/test/java/no/schibstedsok/searchportal/view/velocity/ShareHoldersDirectiveTest.java
       2007-01-23 09:36:28 UTC (rev 4365)
@@ -26,7 +26,7 @@
         */
        public void testParsing() {
         ShareHoldersDirective shd = new ShareHoldersDirective();
-        List shareHolders = shd.parse(input1);
+        List shareHolders = shd.parseShareHolders(input1);
         assertEquals(shareHolders.size(), shareHolders.size(), 6);
        }
 
@@ -35,7 +35,7 @@
         */
        public void testParsing2() {
                ShareHoldersDirective shd = new ShareHoldersDirective();
-               List shareHolders = shd.parse(null);
+               List shareHolders = shd.parseShareHolders(null);
                assertEquals(shareHolders.size (), 0);
 
        }
@@ -45,14 +45,14 @@
         */
        public void testParstingEmpty () {
                ShareHoldersDirective shd = new ShareHoldersDirective();
-               List shareHolders = shd.parse("");
+               List shareHolders = shd.parseShareHolders("");
                assertEquals(shareHolders.size (), 0);
        }
 
     /** Parse the old format */
     public void testParseOldFormat() {
         ShareHoldersDirective shd = new ShareHoldersDirective();
-        List shareHolders = shd.parse(input3);
+        List shareHolders = shd.parseShareHolders(input3);
         assertEquals(shareHolders.size (), 0);
     }
        
@@ -66,7 +66,7 @@
         "ARILD C. GUSTAVSEN#idsep#25#sep0" +
         "INGER A. O. GUSTAVSENsep#2550e";              
                ShareHoldersDirective shd = new ShareHoldersDirective();
-               List shareHolders = shd.parse(ypRoles);
+               List shareHolders = shd.parseShareHolders(ypRoles);
                assertEquals(0, shareHolders.size ());
                
        }

_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits