svn commit: r566656 - in /maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor: DoxiaEditor.java io/DocumentParser.java

[vs...@apache.org]

Author: vsiveton
Date: Thu Aug 16 03:58:59 2007
New Revision: 566656

URL: http://svn.apache.org/viewvc?view=rev&rev=566656
Log:
o try to fix compile error due to r561199 (not sure if it is what is supposed to do)

Modified:
    maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/DoxiaEditor.java
    maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/io/DocumentParser.java

Modified: maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/DoxiaEditor.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/DoxiaEditor.java?view=diff&rev=566656&r1=566655&r2=566656
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/DoxiaEditor.java (original)
+++ maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/DoxiaEditor.java Thu Aug 16 03:58:59 2007
@@ -20,7 +20,9 @@
  */
 
 import org.apache.maven.doxia.editor.windows.EditorWindow;
-import org.codehaus.plexus.embed.Embedder;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.DefaultContainerConfiguration;
+import org.codehaus.plexus.DefaultPlexusContainer;
 
 import javax.swing.*;
 
@@ -39,11 +41,12 @@
     private void work()
         throws Exception
     {
-        Embedder embedder = new Embedder();
+        ContainerConfiguration c = new DefaultContainerConfiguration()
+        .setName( "Doxia editor" );
 
-        embedder.start();
+        DefaultPlexusContainer container = new DefaultPlexusContainer( c );
 
-        Application application = (Application) embedder.lookup( Application.ROLE );
+        Application application = (Application) container.lookup( Application.ROLE );
 
         EditorWindow window = new EditorWindow( application );
 
@@ -63,6 +66,6 @@
         // Power off
         // ----------------------------------------------------------------------
 
-        embedder.release( application );
+        container.release( application );
     }
 }

Modified: maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/io/DocumentParser.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/io/DocumentParser.java?view=diff&rev=566656&r1=566655&r2=566656
==============================================================================
--- maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/io/DocumentParser.java (original)
+++ maven/sandbox/trunk/doxia/doxia-editor/src/main/java/org/apache/maven/doxia/editor/io/DocumentParser.java Thu Aug 16 03:58:59 2007
@@ -20,8 +20,8 @@
  */
 
 import org.apache.maven.doxia.editor.model.DoxiaAttribute;
+import org.apache.maven.doxia.parser.AbstractParser;
 import org.apache.maven.doxia.parser.ParseException;
-import org.apache.maven.doxia.parser.Parser;
 import org.apache.maven.doxia.sink.Sink;
 
 import javax.swing.text.AttributeSet;
@@ -35,7 +35,7 @@
  * @version $Id$
  */
 public class DocumentParser
-    implements Parser
+    extends AbstractParser
 {
     public static ThreadLocal document = new ThreadLocal();