Projects >> blueprints >>96421e24ef922f596ef9d62df97cd7edb03aabb0

Chunk
Conflicting content 
    private final String graphURI;
    private int bufferSize;
<<<<<<< HEAD
=======
    private JSONObject rawGraph;
    private Iterable> indices = null;
>>>>>>> 396f9cfcff75dea443fcf5b6259b01d1fc5e2ec5

    public RexsterGraph(final String graphURI) {
        this(graphURI, 100);
Solution content 
    private final String graphURI;
    private int bufferSize;

    public RexsterGraph(final String graphURI) {
        this(graphURI, 100);
File
RexsterGraph.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    public RexsterGraph(final String graphURI, final int bufferSize) {
        this.graphURI = graphURI;
        this.bufferSize = bufferSize;
<<<<<<< HEAD
=======
        this.rawGraph = this.getRawGraph();
        // this.indices = this.getIndices(); // pre-load indices
>>>>>>> 396f9cfcff75dea443fcf5b6259b01d1fc5e2ec5
        // test to make sure its a valid, accessible url
        // RestHelper.get(graphURI);
    }
Solution content 
    public RexsterGraph(final String graphURI, final int bufferSize) {
        this.graphURI = graphURI;
        this.bufferSize = bufferSize;
    }
File
RexsterGraph.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
        } else { // last buffer
            this.start = this.end;
        }
<<<<<<< HEAD
        this.start = this.start + this.graph.getBufferSize();
        this.end = this.end + this.graph.getBufferSize();
=======
>>>>>>> 396f9cfcff75dea443fcf5b6259b01d1fc5e2ec5
    }
}
Solution content 
        } else { // last buffer
            this.start = this.end;
        }
    }
File
RexsterEdgeSequence.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        } else { // last buffer
            this.start = this.end;
        }
<<<<<<< HEAD
        this.start = this.start + this.graph.getBufferSize();
        this.end = this.end + this.graph.getBufferSize();
=======
>>>>>>> 396f9cfcff75dea443fcf5b6259b01d1fc5e2ec5
    }
}
Solution content 
        } else { // last buffer
            this.start = this.end;
        }
    }
}
File
RexsterVertexSequence.java
Developer's decision
Version 2
Kind of conflict
Method invocation