Projects >> cdc >>3d45430b4cdcbdd7784a7eb21612cf253be3b4fe

Chunk
Conflicting content 
 */
public class CdcContentGenerator extends SimpleContentGenerator {

<<<<<<< HEAD
    private static final long serialVersionUID = 1L;
    public static final String ENCODING = "utf-8";
    private static final String CDE_PLUGIN = "pentaho-cdf-dd";

=======
  private static final long serialVersionUID = 1L;
  
  public static final String ENCODING = "utf-8";
  
  
>>>>>>> f23a5fb394ef5db0c96f8c8650e955a61bfb9776
    @Exposed(accessLevel = AccessLevel.PUBLIC)
    public void edit(OutputStream out) throws IOException {
        IParameterProvider pathParams = parameterProviders.get("path");
Solution content 
 */
public class CdcContentGenerator extends SimpleContentGenerator {

    private static final long serialVersionUID = 1L;
    public static final String ENCODING = "utf-8";

    @Exposed(accessLevel = AccessLevel.PUBLIC)
    public void edit(OutputStream out) throws IOException {
        IParameterProvider pathParams = parameterProviders.get("path");
File
CdcContentGenerator.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
        params.put("path", "cdc/presentation/");
        params.put("file", "cdcHome.wcdf");
        params.put("absolute", "true");
<<<<<<< HEAD
        params.put("root", getRoot());
        out.write(InterPluginComms.callPlugin(CDE_PLUGIN, "Render", params).getBytes(ENCODING));
=======
        params.put("root", "http://localhost:8080");
        out.write(InterPluginComms.callPlugin(InterPluginComms.Plugin.CDE, "Render", params).getBytes(ENCODING));
>>>>>>> f23a5fb394ef5db0c96f8c8650e955a61bfb9776
    }

    @Exposed(accessLevel = AccessLevel.PUBLIC)
Solution content 
        params.put("path", "cdc/presentation/");
        params.put("file", "cdcHome.wcdf");
        params.put("absolute", "true");
        params.put("root", getRoot());
        out.write(InterPluginComms.callPlugin(InterPluginComms.Plugin.CDE, "Render", params).getBytes(ENCODING));
    }

    @Exposed(accessLevel = AccessLevel.PUBLIC)
File
CdcContentGenerator.java
Developer's decision
Combination
Kind of conflict
Method invocation