kcassell    2003/01/17 13:00:10

  Modified:    src/components/org/apache/jmeter/visualizers
                        ViewResultsFullVisualizer.java
  Log:
  Now searches for HTML tag in addition to html tag.
  
  Revision  Changes    Path
  1.14      +23 -8     
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
  
  Index: ViewResultsFullVisualizer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ViewResultsFullVisualizer.java    28 Dec 2002 01:18:07 -0000      1.13
  +++ ViewResultsFullVisualizer.java    17 Jan 2003 21:00:09 -0000      1.14
  @@ -163,7 +163,7 @@
          }
   
          private void addSubResults(DefaultMutableTreeNode currNode,
  -                               SampleResult res) {
  +                                  SampleResult res) {
                   SampleResult[] subResults = res.getSubResults();
                   if (subResults != null)
                   {
  @@ -175,7 +175,7 @@
                                           log.debug("updateGui1 : child sample result 
- " + child);
                                   DefaultMutableTreeNode leafNode = new 
DefaultMutableTreeNode(child);
                                   treeModel.insertNodeInto(leafNode, currNode, 
leafIndex++);
  -                             addSubResults(leafNode, child);
  +                                addSubResults(leafNode, child);
                           }
                   }
           }
  @@ -410,17 +410,32 @@
   
           protected void showRenderedResponse(String response)
           {
  -                resultPanel.remove(textArea);
  +                int htmlIndex = response.indexOf("<HTML>");
   
  -                int htmlIndex = response.indexOf("<html>");
  -                String html = response.substring(htmlIndex, response.length());
  -                htmlEditPane.setText(html);
  -                htmlEditPane.setCaretPosition(0);
  +                // Look for a case variation
  +                if (htmlIndex < 0)
  +                {
  +                        htmlIndex = response.indexOf("<html>");
  +                }
   
  +                // If there is text, render it
  +                if (htmlIndex > -1)
  +                {
  +                        resultPanel.remove(textArea);
  +                        String html = response.substring(htmlIndex, 
response.length());
  +                        htmlEditPane.setText(html);
  +                }
  +                // No HTML tag, so try to render what's there
  +                else
  +                {
  +                        htmlEditPane.setText(response);
  +                }
  +                htmlEditPane.setCaretPosition(0);
                   gbc.gridx = 0;
                   gbc.gridy++;
                   gridBag.setConstraints(htmlEditPane, gbc);
                   resultPanel.add(htmlEditPane);
  +
           }
   
           protected void initHtmlOrTextButton()
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to