Changeset dcd6229473626901e04428944a3530f2492ded88

Timestamp:

06/07/07 17:27:55 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1181230075 +0200

git-parent:

[46eee675eabc62a7f42e701cc36bf056b5dcf3fc]

git-author:

Christopher Jung <bktheg@web.de> 1181230075 +0200

Message:

DS-spezifische BBCodes sind nun nicht mehr Teil des Frameworks

Files:

• src/META-INF/services/net.driftingsouls.ds2.server.framework.bbcode.BBCodeFunction (added)
• src/net/driftingsouls/ds2/server/bbcodes/TagIntrnlConfTask.java (added)
• src/net/driftingsouls/ds2/server/bbcodes/TagResource.java (added)
• src/net/driftingsouls/ds2/server/bbcodes/TagShipType.java (added)
• src/net/driftingsouls/ds2/server/framework/bbcode/BBCodeParser.java (modified) (3 diffs)
• src/net/driftingsouls/ds2/server/framework/bbcode/TagIntrnlConfTask.java (deleted)
• src/net/driftingsouls/ds2/server/framework/bbcode/TagResource.java (deleted)
• src/net/driftingsouls/ds2/server/framework/bbcode/TagShipType.java (deleted)
• src/net/driftingsouls/ds2/server/framework/xml/XMLUtils.java (modified) (1 diff)
• src/net/driftingsouls/ds2/server/modules/CommController.java (modified) (2 diffs)

src/net/driftingsouls/ds2/server/framework/bbcode/BBCodeParser.java

@@ -19 +19 @@
-package net.driftingsouls.ds2.server.framework.bbcode;
-
+import java.net.URL;
-import java.util.Arrays;
+import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import net.driftingsouls.ds2.server.framework.Common;
+import net.driftingsouls.ds2.server.framework.Loggable;
+import net.driftingsouls.ds2.server.framework.xml.XMLUtils;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
-/**
-
+<p>
- * handelt es sich um Tags in der Form [name]...[/name] oder [name] oder 
-
-
-
+
+
+
+
+
+
+
- * 
- * @author Christopher Jung
- *
- */
-
-;
+implements Loggable 
+
-        
-        private Map<String,BBCodeFunction> replaceFunctions = new HashMap<String,BBCodeFunction>();
@@ -42 +60 @@
-        private BBCodeParser() {
-                try {
+                        // Framework-BBCodes registrieren
-                        registerHandler( "url", 1, new TagURL() );
-                        registerHandler( "url", 2, new TagURL() );
@@ -61 +80 @@
-                        registerHandler( "align", 2, "<div style=\"text-align:$2\">$1</div>" );
-                        registerHandler( "mark", 2, "<span style=\"background-color:$2\">$1</span>" );
-                        registerHandler( "shiptype", 1, new TagShipType() );
-                        registerHandler( "resource", 3, new TagResource() );
-                        registerHandler( "resource", 2, new TagResource() );
-                        registerHandler( "userprofile", 2, "<a class=\"profile\" href=\"ds?module=userprofile&sess={{{__SESSID__}}}&user=$2\">$1</a>" );
-                        registerHandler( "userprofile", 3, "<a class=\"$3\" href=\"ds?module=userprofile&sess={{{__SESSID__}}}&user=$2\">$1</a>" );
-                        registerHandler( "hr", 0, "<hr style=\"height:1px; border:0px; background-color:#606060; color:#606060\" />" );
-                        registerHandler( "hide", 1, "" );
+                        
+                        // Weitere BBCodes aus META-INF/services/net.driftingsouls.ds2.server.framework.bbcode.BBCodeFunction lesen
+                        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+                        DocumentBuilder builder = factory.newDocumentBuilder();
+                        
+                        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+                        Enumeration<URL> resources = loader.getResources("META-INF/services/"+BBCodeFunction.class.getName());
+                        while( resources.hasMoreElements() ) {
+                                URL elem = resources.nextElement();
+                                
+                                Document doc = builder.parse(elem.openStream());
+                                Element root = doc.getDocumentElement();
+                                NodeList bbcodes = root.getElementsByTagName("bbcode");
+                                for( int i=0; i < bbcodes.getLength(); i++ ) {
+                                        Element bbcode = (Element)bbcodes.item(i);
+                                        
+                                        final String tag = bbcode.getAttribute("tag");
+                                        final int params = Integer.parseInt(bbcode.getAttribute("params")); 
+                                        
+                                        if( bbcode.getAttribute("handler").length() == 0 ) {
+                                                String text = XMLUtils.firstChildOfType(bbcode, Node.CDATA_SECTION_NODE).getNodeValue();
+                                                text = Common.trimLines(text).trim();
+                                                registerHandler(tag, params, text);
+                                        }
+                                        else {
+                                                String cls = bbcode.getAttribute("handler");
+                                                try {
+                                                        Class<? extends BBCodeFunction> bbcodeCls = Class.forName(cls).asSubclass(BBCodeFunction.class);
+                                                        registerHandler(tag, params, bbcodeCls.newInstance());
+                                                }
+                                                catch( ClassNotFoundException e ) {
+                                                        LOG.warn("Konnte BBCode "+tag+"("+params+") nicht laden. Handler-Klasse '"+cls+"' nicht vorhanden");
+                                                }
+                                        }
+                                }
+                        }
-                }
-                catch( Exception e ) {

src/net/driftingsouls/ds2/server/framework/xml/XMLUtils.java

@@ -219 +219 @@
-                return null;
-        }
+        
+        /**
+         * Gibt den ersten Knoten eines bestimmten Typs unterhalb eines Knotens zurueck.
+         * Wenn kein Knoten des Typs direkt unter dem angegebenen Knoten gefunden wird, so wird <code>null</code>
+         * zurueckgegeben.
+         *  
+         * @param node Der Knoten unter dem gesucht werden soll
+         * @param type Der Typ des Knotens
+         * @return Der erste Knoten vom angegebenen Typ oder <code>null</code>
+         */
+        public static Node firstChildOfType(Node node, short type) {
+                NodeList list = node.getChildNodes();
+                for( int i=0; i < list.getLength(); i++ ) {
+                        if( list.item(i).getNodeType() == type) {
+                                return list.item(i);
+                        }
+                }
+                
+                return null;
+        }
-}

src/net/driftingsouls/ds2/server/modules/CommController.java

@@ -29 +29 @@
-
-import net.driftingsouls.ds2.server.ContextCommon;
+import net.driftingsouls.ds2.server.bbcodes.TagIntrnlConfTask;
-import net.driftingsouls.ds2.server.comm.Ordner;
-import net.driftingsouls.ds2.server.comm.PM;
@@ -39 +40 @@
-import net.driftingsouls.ds2.server.framework.bbcode.BBCodeParser;
-import net.driftingsouls.ds2.server.framework.bbcode.Smilie;
-import net.driftingsouls.ds2.server.framework.bbcode.TagIntrnlConfTask;
-import net.driftingsouls.ds2.server.framework.db.Database;
-import net.driftingsouls.ds2.server.framework.db.SQLQuery;