svn commit: r422175 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/freemarker/tags/ main/java/org/apache/struts2/views/jsp/ui/ main/java/org/apache/struts2/views/velocity/components/ mai...

[tmjee]

Author: tmjee
Date: Sat Jul 15 01:07:22 2006
New Revision: 422175

URL: http://svn.apache.org/viewvc?rev=422175&view=rev
Log:
WW-1379
  - removed rich text editor from Struts2


Removed:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRichtexteditorConnector.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DefaultRichtexteditorConnector.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RichTextEditor.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RichTextEditorModel.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorResult.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/RichTextEditorTag.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java
    
struts/struts2/trunk/core/src/main/resources/template/css_xhtml/richtexteditor.ftl
    
struts/struts2/trunk/core/src/main/resources/template/simple/richtexteditor.ftl
    
struts/struts2/trunk/core/src/main/resources/template/xhtml/richtexteditor.ftl
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/MockRichtexteditorConnector.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java
    
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-1.txt
    
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-2.txt
    
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-3.txt
    
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-4.txt
Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java?rev=422175&r1=422174&r2=422175&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
 Sat Jul 15 01:07:22 2006
@@ -73,7 +73,6 @@
     protected OptionTransferSelectModel optiontransferselect;
     protected TreeModel treeModel;
     protected UpDownSelectModel updownselect;
-    protected RichTextEditorModel richtexteditorModel;
     protected OptGroupModel optGroupModel;
     
 
@@ -421,13 +420,6 @@
                updownselect = new UpDownSelectModel(stack, req, res);
        }
        return updownselect;
-    }
-    
-    public RichTextEditorModel getRichtexteditor() {
-       if (richtexteditorModel == null) {
-               richtexteditorModel = new RichTextEditorModel(stack, req, res);
-       }
-       return richtexteditorModel;
     }
     
     public OptGroupModel getOptgroup() {

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java?rev=422175&r1=422174&r2=422175&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
 Sat Jul 15 01:07:22 2006
@@ -38,7 +38,6 @@
 import org.apache.struts2.views.jsp.URLTag;
 import org.apache.struts2.views.jsp.iterator.AppendIteratorTag;
 import org.apache.struts2.views.jsp.iterator.MergeIteratorTag;
-import org.apache.struts2.views.jsp.ui.RichTextEditorTag;
 import org.apache.struts2.views.jsp.ui.TextFieldTag;
 import org.apache.struts2.views.jsp.ui.UpDownSelectTag;
 import com.opensymphony.xwork2.ActionContext;
@@ -492,32 +491,6 @@
                tag.setPageContext(pageContext);
                tag.setName("updownselectName");
                tag.setList("{}");
-               
-               try {
-                       t.doStartTag();
-                       tag.doStartTag();
-                       
assertEquals(tag.getComponent().getComponentStack().peek(), tag.getComponent());
-                       tag.doEndTag();
-                       
assertEquals(t.getComponent().getComponentStack().peek(), t.getComponent());
-                       t.doEndTag();
-               }
-               catch(Exception e) {
-                       e.printStackTrace();
-                       fail(e.toString());
-               }
-       }
-       
-       
-       // richtexteditor
-       public void testRichTextEditorDisposeItselfFromComponentStack() throws 
Exception {
-               TextFieldTag t = new TextFieldTag();
-               t.setPageContext(pageContext);
-               t.setName("textFieldName");
-               
-               RichTextEditorTag tag = new RichTextEditorTag();
-               tag.setId("myId");
-               tag.setPageContext(pageContext);
-               tag.setName("myRichtTextEditor");
                
                try {
                        t.doStartTag();