Projects >> fitnesse >>fa25c72f14c2a9d80d2f33f375e9afe706612615

Chunk
Conflicting content 
    variableRoot.render();
  }

<<<<<<< HEAD
    private String processHTMLWidgets(String content, WikiPage context)
        throws Exception {
      ParentWidget root = new WidgetRoot(content, context,
          WidgetBuilder.htmlWidgetBuilder);

      return root.render();
    }*/

    private String processHTMLWidgets(WikiPage context) throws Exception {
        Symbol tree = getSyntaxTree();
        return new HtmlTranslator(new WikiSourcePage(context), parsingPage).translateTree(tree);
    }
=======
  private String processHTMLWidgets(String content, WikiPage context) throws Exception {
    return getWidgets(content, context).render();
  }

  private WidgetRoot getWidgets(String content, WikiPage context) throws Exception {
    if(widgetRoot == null)
      widgetRoot = new WidgetRoot(content, context, WidgetBuilder.htmlWidgetBuilder);
    return widgetRoot;
  }

  public WidgetRoot getWidgets() throws Exception {
    if(widgetRoot == null)
      widgetRoot = new WidgetRoot(content, wikiPage, WidgetBuilder.htmlWidgetBuilder);
    return widgetRoot;
  }
>>>>>>> 4a19a4ff8a3b90721aef6dee11c8c5f827ce6edf

  public void setWikiPage(WikiPage page) {
    wikiPage = page;
Solution content 
  }

    variableRoot.render();
  }

  private String processHTMLWidgets(String content, WikiPage context) throws Exception {
    return getWidgets(content, context).render();
  private WidgetRoot getWidgets(String content, WikiPage context) throws Exception {
    if(widgetRoot == null)
      widgetRoot = new WidgetRoot(content, context, WidgetBuilder.htmlWidgetBuilder);
    return widgetRoot;
  }

  public WidgetRoot getWidgets() throws Exception {
    if(widgetRoot == null)
      widgetRoot = new WidgetRoot(content, wikiPage, WidgetBuilder.htmlWidgetBuilder);
    return widgetRoot;
  } */

    private String processHTMLWidgets(WikiPage context) throws Exception {
        Symbol tree = getSyntaxTree();
        return new HtmlTranslator(new WikiSourcePage(context), parsingPage).translateTree(tree);
    }

  public void setWikiPage(WikiPage page) {
    wikiPage = page;
File
PageData.java
Developer's decision
Combination
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
import java.util.regex.Matcher;
import java.util.regex.Pattern;

<<<<<<< HEAD
import util.Expression;
import fitnesse.html.HtmlUtil;
import util.Maybe;

=======
>>>>>>> 4a19a4ff8a3b90721aef6dee11c8c5f827ce6edf
public class EvaluatorWidget extends ParentWidget {
  public static final String REGEXP = "\\$\\{=[ \\t]*(?:%[-#+ 0,(]*(?:[0-9]*\\.?[0-9]*)?[a-zA-Z]+[ \\t]*:)?[^:=]*=\\}";
  public static final Pattern pattern = Pattern.compile("\\$\\{=([^=]*)=\\}", Pattern.MULTILINE + Pattern.DOTALL);
Solution content 
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class EvaluatorWidget extends ParentWidget {
  public static final String REGEXP = "\\$\\{=[ \\t]*(?:%[-#+ 0,(]*(?:[0-9]*\\.?[0-9]*)?[a-zA-Z]+[ \\t]*:)?[^:=]*=\\}";
  public static final Pattern pattern = Pattern.compile("\\$\\{=([^=]*)=\\}", Pattern.MULTILINE + Pattern.DOTALL);
File
EvaluatorWidget.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.regex.Matcher;
import java.util.regex.Pattern;

<<<<<<< HEAD
import fitnesse.html.HtmlElement;
import junit.framework.TestCase;
import fitnesse.wiki.InMemoryPage;
import fitnesse.wiki.PageCrawler;
import fitnesse.wiki.PageData;
import fitnesse.wiki.PathParser;
import fitnesse.wiki.WikiPage;
import fitnesse.wiki.WikiPagePath;

=======
>>>>>>> 4a19a4ff8a3b90721aef6dee11c8c5f827ce6edf
public class WikiWordWidgetTest extends TestCase {
  private WikiPage root;
  private PageCrawler crawler;
Solution content 
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class WikiWordWidgetTest extends TestCase {
  private WikiPage root;
  private PageCrawler crawler;
File
WikiWordWidgetTest.java
Developer's decision
Version 2
Kind of conflict
Import