[Jboss-svn-commits] JBL Code SVN: r890 - in trunk/forge/portal-extensions/forge-wiki/src: java/org/jboss/wiki/plugins test/java/org/jboss/wiki/test

[<jbo...@li...>]

Author: ral...@jb...
Date: 2005-08-17 14:17:00 -0400 (Wed, 17 Aug 2005)
New Revision: 890

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
   trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java
Log:
test disabled and HTMLTranslator init() updated

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java	2005-08-17 16:30:41 UTC (rev 889)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java	2005-08-17 18:17:00 UTC (rev 890)
@@ -33,7 +33,7 @@
     private Matcher myMatcher;
 
     /* URL components, later to be configurable */
-    private String portalHome = "http://forge.sicore.org:8080/portal/";
+    private String portalHome = "";
 
     private String wikiHome = "index.html?ctrl:id=window.default.WikiPortletWindow";
 
@@ -690,8 +690,10 @@
     /**
      * Figures out if a link is an off-site link. This recognizes the most
      * common protocols by checking how it starts.
+     * (clears all white space in case the link starts with '\n' or [space]
      */
     private boolean isExternalLink(String link) {
+        link = link.trim();
         return link.startsWith("http:") || link.startsWith("ftp:")
                 || link.startsWith("https:") || link.startsWith("mailto:")
                 || link.startsWith("news:") || link.startsWith("file:");
@@ -766,7 +768,7 @@
     {}
 
     public WikiPage process(final WikiPage wikiPage) {
-    	System.out.println("propertu: "+getProperty("htmlTranslatorURL"));
+    	//System.out.println("propertu: "+getProperty("htmlTranslatorURL"));
         WikiPage newPage = null;
 
         try {
@@ -790,7 +792,7 @@
 
 	@Override
 	public void init() {
-		// TODO Auto-generated method stub
+	    portalHome = getProperty("htmlTranslatorURL");
 		
 	}
 

Modified: trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java	2005-08-17 16:30:41 UTC (rev 889)
+++ trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java	2005-08-17 18:17:00 UTC (rev 890)
@@ -46,22 +46,22 @@
             for (int i = 0; i < files.length; i++) {
                 File file = files[i];
                 fin = new FileReader(file);
-                System.out.println("Processing file:  " + file);
+            //    System.out.println("Processing file:  " + file);
                 final BufferedReader in = new BufferedReader(fin);
                 int line;
                 StringBuffer text = new StringBuffer();
                 String parsed = "";
 
-                while ((line = in.read()) != -1) {
-                    text.append((char) line);
-                }
+           //     while ((line = in.read()) != -1) {
+            //        text.append((char) line);
+               // }//while
                 //  System.out.println(text.toString());
 
-              //  parsed = tr.parseLinks(text.toString(), "");
+          //     parsed = tr.parseLinks(text.toString());
                 //  System.out.println(parsed);
 
-            }
-        }
+            }//for
+        }//try
 
 
         catch (IOException e) {