Projects >> jrds >>00ca53db5731b6e2608d1fdfe835901be844b233

Chunk
Conflicting content 
    protected void setGraphDefData(RrdGraphDef graphDef, Probe defProbe, ExtractInfo ei,
            Map customData) {
<<<<<<< HEAD
        GraphDesc gd = node.getGraphDesc();
        gd.fillGraphDef(graphDef, node.getProbe(), ei, customData);        
=======
        GraphDesc gd = getGraphDesc();
        gd.fillGraphDef(graphDef, node.getProbe(), customData);        
>>>>>>> cd1c9cf16b677e4370ac396ba0cfc8ccf7a084b0
    }
    
    protected GraphDesc getGraphDesc() {
Solution content 
    protected void setGraphDefData(RrdGraphDef graphDef, Probe defProbe, ExtractInfo ei,
            Map customData) {
        GraphDesc gd = node.getGraphDesc();
        gd.fillGraphDef(graphDef, node.getProbe(), ei, customData);        
    }

    protected GraphDesc getGraphDesc() {
File
Graph.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
     * @throws IOException
     */
    public DataProcessor getDataProcessor() throws IOException {
<<<<<<< HEAD
        ExtractInfo ei = ExtractInfo.get().make(start, end);
        DataProcessor dp = node.getGraphDesc().getPlottedDatas(node.getProbe(), ei, null);
=======
        PlottableMap customData = node.getCustomData();
        if(customData != null) {
            long startsec = getStartSec();
            long endsec = getEndSec();
            customData.configure(startsec, endsec, 1);            
        }
        DataProcessor dp = getGraphDesc().getPlottedDatas(node.getProbe(), customData, start.getTime() / 1000, end.getTime() / 1000);
>>>>>>> cd1c9cf16b677e4370ac396ba0cfc8ccf7a084b0
        dp.processData();
        return dp;
    }
Solution content 
     * @throws IOException
     */
    public DataProcessor getDataProcessor() throws IOException {
        ExtractInfo ei = ExtractInfo.get().make(start, end);
        DataProcessor dp = node.getGraphDesc().getPlottedDatas(node.getProbe(), ei, null);
        dp.processData();
        return dp;
    }
File
Graph.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
package jrds;

<<<<<<< HEAD
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
=======
import java.beans.PropertyDescriptor;
import java.lang.reflect.Constructor;
>>>>>>> cd1c9cf16b677e4370ac396ba0cfc8ccf7a084b0
import java.util.Collections;
import java.util.LinkedList;
import java.util.Map;
Solution content 
package jrds;

import java.beans.PropertyDescriptor;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.util.Collections;
import java.util.LinkedList;
import java.util.Map;
File
GraphNode.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.LinkedList;
import java.util.Map;

<<<<<<< HEAD
import jrds.store.ExtractInfo;
import jrds.webapp.ACL;
import jrds.webapp.WithACL;

import org.rrd4j.data.DataProcessor;
import org.rrd4j.data.Plottable;
import org.rrd4j.graph.RrdGraphDef;
=======
import jrds.configuration.HostBuilder;
import jrds.factories.ArgFactory;
import jrds.webapp.ACL;
import jrds.webapp.WithACL;

import org.apache.log4j.Logger;
>>>>>>> cd1c9cf16b677e4370ac396ba0cfc8ccf7a084b0

/**
 * @author Fabrice Bacchella
Solution content 
import java.util.LinkedList;
import java.util.Map;

import jrds.configuration.HostBuilder;
import jrds.factories.ArgFactory;
import jrds.store.ExtractInfo;
import jrds.webapp.ACL;
import jrds.webapp.WithACL;

import org.apache.log4j.Logger;
import org.rrd4j.data.DataProcessor;
import org.rrd4j.data.Plottable;

/**
 * @author Fabrice Bacchella
File
GraphNode.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    public Graph getGraph() {
        Class  gclass = gd.getGraphClass();

<<<<<<< HEAD
        //Exceptions can't happen, it was checked at configuration time
=======
>>>>>>> cd1c9cf16b677e4370ac396ba0cfc8ccf7a084b0
        try {
            Graph g =  gclass.getConstructor(GraphNode.class).newInstance(this);
            Map beansList = ArgFactory.getBeanPropertiesMap(gclass, Graph.class);
Solution content 
    public Graph getGraph() {
        Class  gclass = gd.getGraphClass();

        try {
            Graph g =  gclass.getConstructor(GraphNode.class).newInstance(this);
            Map beansList = ArgFactory.getBeanPropertiesMap(gclass, Graph.class);
File
GraphNode.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
        this.customData = customData;
    }

<<<<<<< HEAD
    public DataProcessor getPlottedDate(ExtractInfo ei) throws IOException {
        Map pmap = Collections.emptyMap();
        if(customData != null)
            pmap = customData;
        DataProcessor dp = gd.getPlottedDatas(probe, ei, pmap);
        dp.processData();
        return dp;
=======
    public Map getBeans() {
        return beans;
    }

    public void setBeans(Map beans) {
        this.beans = beans;
>>>>>>> cd1c9cf16b677e4370ac396ba0cfc8ccf7a084b0
    }

}
Solution content 
        this.customData = customData;
    }

    public DataProcessor getPlottedDate(ExtractInfo ei) throws IOException {
        Map pmap = Collections.emptyMap();
        if(customData != null)
            pmap = customData;
        DataProcessor dp = gd.getPlottedDatas(probe, ei, pmap);
        dp.processData();
        return dp;
    }

    public Map getBeans() {
        return beans;
    }

    public void setBeans(Map beans) {
        this.beans = beans;
    }

}
File
GraphNode.java
Developer's decision
Concatenation
Kind of conflict
Attribute
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable