| Chunk |
|---|
| Conflicting content |
|---|
import org.python.core.PyObject;
import org.python.core.PyString;
import org.python.util.PythonInterpreter;
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Interpretor.java
=======
import edu.isi.karma.webserver.ServletContextParameterMap;
import edu.isi.karma.webserver.ServletContextParameterMap.ContextParameter;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Interpretor.java
public class Interpretor {
private PyObject interpreterClass;
|
| Solution content |
|---|
import org.python.core.PyObject;
import org.python.core.PyString;
import org.python.util.PythonInterpreter;
import edu.isi.karma.webserver.ServletContextParameterMap;
import edu.isi.karma.webserver.ServletContextParameterMap.ContextParameter;
public class Interpretor {
private PyObject interpreterClass;
|
| File |
|---|
| Interpretor.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
public String getHashKey() {
String s = "";
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Partition.java
List |
| Solution content |
|---|
public String getHashKey() {
String s = "";
ArrayList |
| File |
|---|
| Partition.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| For statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
return s;
}
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Partition.java
public String toString()
{
String s = "partition:" + this.label + "\n";
s += "Examples:\n";
List |
| Solution content |
|---|
}
return s;
}
public String toString() {
String s = "partition:" + this.label + "\n";
s += "Examples:\n";
ArrayList |
| File |
|---|
| Partition.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| For statement |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.HashSet;
import java.util.Vector;
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/ProgSynthesis.java
=======
import edu.isi.karma.cleaning.Research.ConfigParameters;
import edu.isi.karma.cleaning.Research.Prober;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/ProgSynthesis.java
public class ProgSynthesis {
public static int time_limit = 20;
Vector |
| Solution content |
|---|
import java.util.HashSet;
import java.util.Vector;
import edu.isi.karma.cleaning.Research.ConfigParameters;
import edu.isi.karma.cleaning.Research.Prober;
public class ProgSynthesis {
public static int time_limit = 20;
Vector |
| File |
|---|
| ProgSynthesis.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.cleaning; <<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Program.java ======= import java.util.Vector; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Program.java import edu.isi.karma.cleaning.Research.ConfigParameters; import java.util.Vector; |
| Solution content |
|---|
package edu.isi.karma.cleaning; import java.util.Vector; import edu.isi.karma.cleaning.Research.ConfigParameters; import java.util.Vector; |
| File |
|---|
| Program.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
******************************************************************************/ package edu.isi.karma.cleaning.QuestionableRecord; <<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/QuestionableRecord/Feature1.java ======= import java.util.Vector; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/QuestionableRecord/Feature1.java import edu.isi.karma.cleaning.TNode; |
| Solution content |
|---|
******************************************************************************/ package edu.isi.karma.cleaning.QuestionableRecord; import java.util.Vector; import edu.isi.karma.cleaning.TNode; |
| File |
|---|
| Feature1.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import edu.isi.karma.cleaning.TNode;
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/QuestionableRecord/Feature4.java
import java.util.Vector;
public class Feature4 implements RecFeature{
public String target;
public Vector |
| Solution content |
|---|
import edu.isi.karma.cleaning.TNode;
import java.util.Vector;
import edu.isi.karma.cleaning.TNode;
public class Feature4 implements RecFeature {
public String target;
public Vector |
| File |
|---|
| Feature4.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| For statement |
| If statement |
| Import |
| Method declaration |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.HashSet;
import java.util.Vector;
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Research/RecordDistiller.java
=======
import edu.isi.karma.cleaning.Ruler;
import edu.isi.karma.cleaning.TNode;
import au.com.bytecode.opencsv.CSVReader;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Research/RecordDistiller.java
public class RecordDistiller {
// {anchor:{"Id": , "Count": , "LefContext":[], "RigContext":[]} |
| Solution content |
|---|
import java.util.HashSet;
import java.util.Vector;
import edu.isi.karma.cleaning.Ruler;
import edu.isi.karma.cleaning.TNode;
import au.com.bytecode.opencsv.CSVReader;
public class RecordDistiller {
// {anchor:{"Id": , "Count": , "LefContext":[], "RigContext":[]} |
| File |
|---|
| RecordDistiller.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.Collection;
import java.util.HashMap;
import java.util.Vector;
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Research/Test.java
=======
import org.apache.mahout.math.Arrays;
import au.com.bytecode.opencsv.CSVReader;
import edu.isi.karma.cleaning.ExampleSelection;
import edu.isi.karma.cleaning.InterpreterType;
import edu.isi.karma.cleaning.MyLogger;
import edu.isi.karma.cleaning.ProgSynthesis;
import edu.isi.karma.cleaning.ProgramRule;
import edu.isi.karma.cleaning.UtilTools;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Research/Test.java
public class Test {
public static void test1() { |
| Solution content |
|---|
import java.util.Collection;
import java.util.HashMap;
import java.util.Vector;
import org.apache.mahout.math.Arrays;
import au.com.bytecode.opencsv.CSVReader;
import edu.isi.karma.cleaning.ExampleSelection;
import edu.isi.karma.cleaning.InterpreterType;
import edu.isi.karma.cleaning.MyLogger;
import edu.isi.karma.cleaning.ProgSynthesis;
import edu.isi.karma.cleaning.ProgramRule;
import edu.isi.karma.cleaning.UtilTools;
public class Test {
public static void test1() { |
| File |
|---|
| Test.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
examples.add(x3);
examples.add(x7);
examples.add(x8);
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Research/Test.java
examples.add(x9);
for(String[] elem:examples)
{
System.out.println("Examples inputed: "+ Arrays.toString(elem));
=======
examples.add(x9);
for (String[] elem : examples) {
System.out.println("Examples inputed: " + Arrays.toString(elem));
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Research/Test.java
}
ProgSynthesis psProgSynthesis = new ProgSynthesis();
psProgSynthesis.inite(examples); |
| Solution content |
|---|
examples.add(x3);
examples.add(x7);
examples.add(x8);
examples.add(x9);
for (String[] elem : examples) {
System.out.println("Examples inputed: " + Arrays.toString(elem));
}
ProgSynthesis psProgSynthesis = new ProgSynthesis();
psProgSynthesis.inite(examples); |
| File |
|---|
| Test.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| For statement |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
* and related projects, please see: http://www.isi.edu/integration ******************************************************************************/ package edu.isi.karma.cleaning; <<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Ruler.java ======= import java.util.Collections; import java.util.Iterator; import java.util.ListIterator; import java.util.StringTokenizer; import java.util.Vector; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Ruler.java import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CharStream; import org.antlr.runtime.Token; |
| Solution content |
|---|
* and related projects, please see: http://www.isi.edu/integration ******************************************************************************/ package edu.isi.karma.cleaning; import java.util.Collections; import java.util.Iterator; import java.util.ListIterator; import java.util.StringTokenizer; import java.util.Vector; import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CharStream; import org.antlr.runtime.Token; |
| File |
|---|
| Ruler.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.antlr.runtime.CharStream;
import org.antlr.runtime.Token;
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Ruler.java
import java.util.*;
=======
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Ruler.java
public class Ruler {
String Org = "";
String Trgt = ""; |
| Solution content |
|---|
import org.antlr.runtime.CharStream;
import org.antlr.runtime.Token;
public class Ruler {
String Org = "";
String Trgt = ""; |
| File |
|---|
| Ruler.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
// $ANTLR end "DIGIT"
import org.antlr.runtime.*;
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Tokenizer.java
@SuppressWarnings({"all", "warnings", "unchecked"})
public class Tokenizer extends Lexer
{
public static final int EOF=-1;
public static final int BLANK=4;
public static final int COL=5;
public static final int DIGIT=6;
public static final int END=7;
public static final int LETTER=8;
public static final int LOWER=9;
public static final int LWRD=10;
public static final int NUMBER=11;
public static final int ROW=12;
public static final int START=13;
public static final int SYBS=14;
public static final int SYMBOL=15;
public static final int UPPER=16;
public static final int UWRD=17;
// delegates
// delegators
public Lexer[] getDelegates() {
return new Lexer[] {};
}
public Tokenizer() {}
public Tokenizer(CharStream input) {
this(input, new RecognizerSharedState());
}
public Tokenizer(CharStream input, RecognizerSharedState state) {
super(input,state);
}
public String getGrammarFileName() { return "Tokenizer.g"; }
public Token nextToken() {
while (true) {
if ( input.LA(1)==CharStream.EOF ) {
Token eof = new CommonToken((CharStream)input,Token.EOF,
Token.DEFAULT_CHANNEL,
input.index(),input.index());
eof.setLine(getLine());
eof.setCharPositionInLine(getCharPositionInLine());
return eof;
}
state.token = null;
state.channel = Token.DEFAULT_CHANNEL;
state.tokenStartCharIndex = input.index();
state.tokenStartCharPositionInLine = input.getCharPositionInLine();
state.tokenStartLine = input.getLine();
state.text = null;
try {
int m = input.mark();
state.backtracking=1;
state.failed=false;
mTokens();
state.backtracking=0;
if ( state.failed ) {
input.rewind(m);
input.consume();
}
else {
emit();
return state.token;
}
}
catch (RecognitionException re) {
// shouldn't happen in backtracking mode, but...
reportError(re);
recover(re);
}
}
}
public void memoize(IntStream input,
int ruleIndex,
int ruleStartIndex)
{
if ( state.backtracking>1 ) super.memoize(input, ruleIndex, ruleStartIndex);
}
public boolean alreadyParsedRule(IntStream input, int ruleIndex) {
if ( state.backtracking>1 ) return super.alreadyParsedRule(input, ruleIndex);
return false;
}
// $ANTLR start "BLANK"
public final void mBLANK() throws RecognitionException {
try {
int _type = BLANK;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:4:6: ( ( '\\t' | ' ' | '\\r' | '\\n' | '\\u000C' ) )
// Tokenizer.g:
{
if ( (input.LA(1) >= '\t' && input.LA(1) <= '\n')||(input.LA(1) >= '\f' && input.LA(1) <= '\r')||input.LA(1)==' ' ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
state.type = _type;
state.channel = _channel;
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "BLANK"
// $ANTLR start "UWRD"
public final void mUWRD() throws RecognitionException {
try {
int _type = UWRD;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:5:6: ( UPPER )
// Tokenizer.g:
{
if ( (input.LA(1) >= 'A' && input.LA(1) <= 'Z')||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00DE') ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
state.type = _type;
state.channel = _channel;
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "UWRD"
// $ANTLR start "LWRD"
public final void mLWRD() throws RecognitionException {
try {
int _type = LWRD;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:6:6: ( ( LOWER )+ )
// Tokenizer.g:6:8: ( LOWER )+
{
// Tokenizer.g:6:8: ( LOWER )+
int cnt1=0;
loop1:
do {
int alt1=2;
int LA1_0 = input.LA(1);
if ( ((LA1_0 >= 'a' && LA1_0 <= 'z')||(LA1_0 >= '\u00DF' && LA1_0 <= '\u00F6')||(LA1_0 >= '\u00F8' && LA1_0 <= '\u00FF')) ) {
alt1=1;
}
switch (alt1) {
case 1 :
// Tokenizer.g:
{
if ( (input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u00DF' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u00FF') ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
break;
default :
if ( cnt1 >= 1 ) break loop1;
if (state.backtracking>0) {state.failed=true; return ;}
EarlyExitException eee =
new EarlyExitException(1, input);
throw eee;
}
cnt1++;
} while (true);
}
state.type = _type;
state.channel = _channel;
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "LWRD"
// $ANTLR start "NUMBER"
public final void mNUMBER() throws RecognitionException {
try {
int _type = NUMBER;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:7:7: ( ( DIGIT )+ )
// Tokenizer.g:7:9: ( DIGIT )+
{
// Tokenizer.g:7:9: ( DIGIT )+
int cnt2=0;
loop2:
do {
int alt2=2;
int LA2_0 = input.LA(1);
if ( ((LA2_0 >= '0' && LA2_0 <= '9')) ) {
alt2=1;
}
switch (alt2) {
case 1 :
// Tokenizer.g:
{
if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
break;
default :
if ( cnt2 >= 1 ) break loop2;
if (state.backtracking>0) {state.failed=true; return ;}
EarlyExitException eee =
new EarlyExitException(2, input);
throw eee;
}
cnt2++;
} while (true);
}
state.type = _type;
state.channel = _channel;
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "NUMBER"
// $ANTLR start "SYBS"
public final void mSYBS() throws RecognitionException {
try {
int _type = SYBS;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:8:5: ( ( SYMBOL ) )
// Tokenizer.g:
{
if ( (input.LA(1) >= '!' && input.LA(1) <= '/')||(input.LA(1) >= ':' && input.LA(1) <= '@')||(input.LA(1) >= '[' && input.LA(1) <= '`')||(input.LA(1) >= '{' && input.LA(1) <= '~')||input.LA(1)=='€' ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
state.type = _type;
state.channel = _channel;
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "SYBS"
// $ANTLR start "START"
public final void mSTART() throws RecognitionException {
try {
int _type = START;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:9:7: ( '<_START>' )
// Tokenizer.g:9:9: '<_START>'
{
match("<_START>"); if (state.failed) return ;
}
state.type = _type;
state.channel = _channel;
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "START"
// $ANTLR start "END"
public final void mEND() throws RecognitionException {
try {
int _type = END;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:10:5: ( '<_END>' )
// Tokenizer.g:10:7: '<_END>'
{
match("<_END>"); if (state.failed) return ;
}
state.type = _type;
state.channel = _channel;
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "END"
// $ANTLR start "COL"
public final void mCOL() throws RecognitionException {
try {
int _type = COL;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:11:5: ( '<_COL>' )
// Tokenizer.g:11:7: '<_COL>'
{
match("<_COL>"); if (state.failed) return ;
}
state.type = _type;
state.channel = _channel;
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "COL"
// $ANTLR start "ROW"
public final void mROW() throws RecognitionException {
try {
int _type = ROW;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:12:5: ( '<_ROW>' )
// Tokenizer.g:12:7: '<_ROW>'
{
match("<_ROW>"); if (state.failed) return ;
}
state.type = _type;
state.channel = _channel;
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "ROW"
// $ANTLR start "SYMBOL"
public final void mSYMBOL() throws RecognitionException {
try {
// Tokenizer.g:15:2: ( '!' .. '/' | ':' .. '@' | '[' .. '`' | '{' .. '~' | '�' )
// Tokenizer.g:
{
if ( (input.LA(1) >= '!' && input.LA(1) <= '/')||(input.LA(1) >= ':' && input.LA(1) <= '@')||(input.LA(1) >= '[' && input.LA(1) <= '`')||(input.LA(1) >= '{' && input.LA(1) <= '~')||input.LA(1)=='€' ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "SYMBOL"
// $ANTLR start "LETTER"
public final void mLETTER() throws RecognitionException {
try {
// Tokenizer.g:17:2: ( LOWER | UPPER )
// Tokenizer.g:
{
if ( (input.LA(1) >= 'A' && input.LA(1) <= 'Z')||(input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u00FF') ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "LETTER"
// $ANTLR start "LOWER"
public final void mLOWER() throws RecognitionException {
try {
// Tokenizer.g:19:2: ( '\\u0061' .. '\\u007a' | '\\u00df' .. '\\u00f6' | '\\u00f8' .. '\\u00ff' )
// Tokenizer.g:
{
if ( (input.LA(1) >= 'a' && input.LA(1) <= 'z')||(input.LA(1) >= '\u00DF' && input.LA(1) <= '\u00F6')||(input.LA(1) >= '\u00F8' && input.LA(1) <= '\u00FF') ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "LOWER"
// $ANTLR start "UPPER"
public final void mUPPER() throws RecognitionException {
try {
// Tokenizer.g:21:2: ( 'A' .. 'Z' )
// Tokenizer.g:
{
case '\u00DC':
if ( (input.LA(1) >= 'A' && input.LA(1) <= 'Z')||(input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')||(input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00DE') ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
}
finally {
// do for sure before leaving
}
}
// $ANTLR end "UPPER"
// $ANTLR start "DIGIT"
public final void mDIGIT() throws RecognitionException {
try {
// Tokenizer.g:22:16: ( '0' .. '9' )
// Tokenizer.g:
{
if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
}
finally {
// do for sure before leaving
}
}
public void mTokens() throws RecognitionException {
// Tokenizer.g:1:39: ( BLANK | UWRD | LWRD | NUMBER | SYBS | START | END | COL | ROW )
int alt3=9;
switch ( input.LA(1) ) {
case '\t':
case '\n':
case '\f':
case '\r':
case ' ':
{
alt3=1;
}
break;
case 'A':
case 'B':
case 'C':
case 'D':
case 'E':
case 'F':
case 'G':
case 'H':
case 'I':
case 'J':
case 'K':
case 'L':
case 'M':
case 'N':
case 'O':
case 'P':
case 'Q':
case 'R':
case 'S':
case 'T':
case 'U':
case 'V':
case 'W':
case 'X':
case 'Y':
case 'Z':
case '\u00C0':
case '\u00C1':
case '\u00C2':
case '\u00C3':
case '\u00C4':
case '\u00C5':
case '\u00C6':
case '\u00C7':
case '\u00C8':
case '\u00C9':
case '\u00CA':
case '\u00CB':
case '\u00CC':
case '\u00CD':
case '\u00CE':
case '\u00CF':
case '\u00D0':
case '\u00D1':
case '\u00D2':
case '\u00D3':
case '\u00D4':
case '\u00D5':
case '\u00D6':
case '\u00D8':
case '\u00D9':
case '\u00DA':
case '\u00DB':
case '\u00DD':
case '\u00DE':
{
alt3=2;
}
break;
case 'a':
case 'b':
case 'c':
case 'd':
case 'e':
case 'f':
case 'g':
case 'h':
case 'i':
case 'j':
case 'k':
case 'l':
case 'm':
case 'n':
case 'o':
case 'p':
case 'q':
case 'r':
case 's':
case 't':
case 'u':
case 'v':
case 'w':
case 'x':
case 'y':
case 'z':
case '\u00DF':
case '\u00E0':
case '\u00E1':
case '\u00E2':
case '\u00E3':
case '\u00E4':
case '\u00E5':
case '\u00E6':
case '\u00E7':
case '\u00E8':
case '\u00E9':
case '\u00EA':
case '\u00EB':
case '\u00EC':
case '\u00ED':
case '\u00EE':
case '\u00EF':
case '\u00F0':
case '\u00F1':
case '\u00F2':
case '\u00F3':
case '\u00F4':
case '\u00F5':
case '\u00F6':
case '\u00F8':
case '\u00F9':
case '\u00FA':
case '\u00FB':
case '\u00FC':
case '\u00FD':
case '\u00FE':
case '\u00FF':
{
alt3=3;
}
break;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
{
alt3=4;
}
break;
case '<':
{
int LA3_5 = input.LA(2);
if ( (LA3_5=='_') ) {
int LA3_7 = input.LA(3);
if ( (LA3_7=='S') ) {
alt3=6;
}
else if ( (LA3_7=='E') ) {
alt3=7;
}
else {
NoViableAltException nvae =
new NoViableAltException("", 3, 7, input);
throw nvae;
}
}
else {
alt3=5;
}
}
break;
case '!':
case '\"':
case '#':
case '$':
case '%':
case '&':
case '\'':
case '(':
case ')':
case '*':
case '+':
case ',':
case '-':
case '.':
case '/':
case ':':
case ';':
case '=':
case '>':
case '?':
case '@':
case '[':
case '\\':
case ']':
case '^':
case '_':
case '`':
case '{':
case '|':
case '}':
case '~':
case '€':
{
alt3=5;
}
break;
default:
if (state.backtracking>0) {state.failed=true; return ;}
NoViableAltException nvae =
new NoViableAltException("", 3, 0, input);
throw nvae;
}
switch (alt3) {
case 1 :
// Tokenizer.g:1:41: BLANK
{
mBLANK(); if (state.failed) return ;
}
break;
case 2 :
// Tokenizer.g:1:47: UWRD
{
mUWRD(); if (state.failed) return ;
}
break;
case 3 :
// Tokenizer.g:1:52: LWRD
{
mLWRD(); if (state.failed) return ;
}
break;
case 4 :
// Tokenizer.g:1:57: NUMBER
{
mNUMBER(); if (state.failed) return ;
}
break;
case 5 :
// Tokenizer.g:1:64: SYBS
{
mSYBS(); if (state.failed) return ;
}
break;
case 6 :
// Tokenizer.g:1:69: START
{
mSTART(); if (state.failed) return ;
}
break;
case 7 :
// Tokenizer.g:1:75: END
{
mEND(); if (state.failed) return ;
}
break;
case 8 :
// Tokenizer.g:1:79: COL
{
mCOL(); if (state.failed) return ;
}
break;
case 9 :
// Tokenizer.g:1:83: ROW
{
mROW(); if (state.failed) return ;
}
break;
}
}
// $ANTLR start synpred5_Tokenizer
public final void synpred5_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:64: ( SYBS )
// Tokenizer.g:
{
if ( (input.LA(1) >= '!' && input.LA(1) <= '/')||(input.LA(1) >= ':' && input.LA(1) <= '@')||(input.LA(1) >= '[' && input.LA(1) <= '`')||(input.LA(1) >= '{' && input.LA(1) <= '~')||input.LA(1)=='€' ) {
input.consume();
state.failed=false;
}
else {
if (state.backtracking>0) {state.failed=true; return ;}
MismatchedSetException mse = new MismatchedSetException(null,input);
recover(mse);
throw mse;
}
}
}
// $ANTLR end synpred5_Tokenizer
// $ANTLR start synpred6_Tokenizer
public final void synpred6_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:69: ( START )
// Tokenizer.g:1:69: START
{
mSTART(); if (state.failed) return ;
}
}
// $ANTLR end synpred6_Tokenizer
// $ANTLR start synpred7_Tokenizer
public final void synpred7_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:75: ( END )
// Tokenizer.g:1:75: END
{
mEND(); if (state.failed) return ;
}
}
// $ANTLR end synpred7_Tokenizer
// $ANTLR start synpred8_Tokenizer
public final void synpred8_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:79: ( COL )
// Tokenizer.g:1:79: COL
{
mCOL(); if (state.failed) return ;
}
}
// $ANTLR end synpred8_Tokenizer
public final boolean synpred8_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred8_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: "+re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed=false;
return success;
}
public final boolean synpred5_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred5_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: "+re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed=false;
return success;
}
public final boolean synpred7_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred7_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: "+re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed=false;
return success;
}
public final boolean synpred6_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred6_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
input.consume();
System.err.println("impossible: "+re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed=false;
return success;
}
=======
@SuppressWarnings({ "all", "warnings", "unchecked" })
public class Tokenizer extends Lexer {
public static final int EOF = -1;
public static final int BLANK = 4;
public static final int COL = 5;
public static final int DIGIT = 6;
public static final int END = 7;
public static final int LETTER = 8;
public static final int LOWER = 9;
public static final int LWRD = 10;
public static final int NUMBER = 11;
public static final int ROW = 12;
public static final int START = 13;
public static final int SYBS = 14;
public static final int SYMBOL = 15;
public static final int UPPER = 16;
public static final int UWRD = 17;
// delegates
// delegators
public Lexer[] getDelegates() {
return new Lexer[] {};
}
public Tokenizer() {
}
public Tokenizer(CharStream input) {
this(input, new RecognizerSharedState());
}
public Tokenizer(CharStream input, RecognizerSharedState state) {
super(input, state);
}
public String getGrammarFileName() {
return "Tokenizer.g";
}
public Token nextToken() {
while (true) {
if (input.LA(1) == CharStream.EOF) {
Token eof = new CommonToken((CharStream) input, Token.EOF,
Token.DEFAULT_CHANNEL, input.index(), input.index());
eof.setLine(getLine());
eof.setCharPositionInLine(getCharPositionInLine());
return eof;
}
state.token = null;
state.channel = Token.DEFAULT_CHANNEL;
state.tokenStartCharIndex = input.index();
state.tokenStartCharPositionInLine = input.getCharPositionInLine();
state.tokenStartLine = input.getLine();
state.text = null;
try {
int m = input.mark();
state.backtracking = 1;
state.failed = false;
mTokens();
state.backtracking = 0;
if (state.failed) {
input.rewind(m);
input.consume();
} else {
emit();
return state.token;
}
} catch (RecognitionException re) {
// shouldn't happen in backtracking mode, but...
reportError(re);
recover(re);
}
}
}
public void memoize(IntStream input, int ruleIndex, int ruleStartIndex) {
if (state.backtracking > 1)
super.memoize(input, ruleIndex, ruleStartIndex);
}
public boolean alreadyParsedRule(IntStream input, int ruleIndex) {
if (state.backtracking > 1)
return super.alreadyParsedRule(input, ruleIndex);
return false;
}
// $ANTLR start "BLANK"
public final void mBLANK() throws RecognitionException {
try {
int _type = BLANK;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:4:6: ( ( '\\t' | ' ' | '\\r' | '\\n' | '\ ' ) )
// Tokenizer.g:
{
if ((input.LA(1) >= '\t' && input.LA(1) <= '\n')
|| (input.LA(1) >= '\f' && input.LA(1) <= '\r')
|| input.LA(1) == ' ') {
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "BLANK"
// $ANTLR start "UWRD"
public final void mUWRD() throws RecognitionException {
try {
int _type = UWRD;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:5:6: ( UPPER )
// Tokenizer.g:
{
if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z')
|| (input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')
|| (input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00DE')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "UWRD"
// $ANTLR start "LWRD"
public final void mLWRD() throws RecognitionException {
try {
int _type = LWRD;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:6:6: ( ( LOWER )+ )
// Tokenizer.g:6:8: ( LOWER )+
{
// Tokenizer.g:6:8: ( LOWER )+
int cnt1 = 0;
loop1: do {
int alt1 = 2;
int LA1_0 = input.LA(1);
if (((LA1_0 >= 'a' && LA1_0 <= 'z')
|| (LA1_0 >= '\u00DF' && LA1_0 <= '\u00F6') || (LA1_0 >= '\u00F8' && LA1_0 <= '\u00FF'))) {
alt1 = 1;
}
switch (alt1) {
case 1:
// Tokenizer.g:
{
if ((input.LA(1) >= 'a' && input.LA(1) <= 'z')
|| (input.LA(1) >= '\u00DF' && input.LA(1) <= '\u00F6')
|| (input.LA(1) >= '\u00F8' && input.LA(1) <= '\u00FF')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
break;
default:
if (cnt1 >= 1)
break loop1;
if (state.backtracking > 0) {
state.failed = true;
return;
}
EarlyExitException eee = new EarlyExitException(1,
input);
throw eee;
}
cnt1++;
} while (true);
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "LWRD"
// $ANTLR start "NUMBER"
public final void mNUMBER() throws RecognitionException {
try {
int _type = NUMBER;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:7:7: ( ( DIGIT )+ )
// Tokenizer.g:7:9: ( DIGIT )+
{
// Tokenizer.g:7:9: ( DIGIT )+
int cnt2 = 0;
loop2: do {
int alt2 = 2;
int LA2_0 = input.LA(1);
if (((LA2_0 >= '0' && LA2_0 <= '9'))) {
alt2 = 1;
}
switch (alt2) {
case 1:
// Tokenizer.g:
{
if ((input.LA(1) >= '0' && input.LA(1) <= '9')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
break;
default:
if (cnt2 >= 1)
break loop2;
if (state.backtracking > 0) {
state.failed = true;
return;
}
EarlyExitException eee = new EarlyExitException(2,
input);
throw eee;
}
cnt2++;
} while (true);
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "NUMBER"
// $ANTLR start "SYBS"
public final void mSYBS() throws RecognitionException {
try {
int _type = SYBS;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:8:5: ( ( SYMBOL ) )
// Tokenizer.g:
{
if ((input.LA(1) >= '!' && input.LA(1) <= '/')
|| (input.LA(1) >= ':' && input.LA(1) <= '@')
|| (input.LA(1) >= '[' && input.LA(1) <= '`')
|| (input.LA(1) >= '{' && input.LA(1) <= '~')
|| input.LA(1) == '€') {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "SYBS"
// $ANTLR start "START"
public final void mSTART() throws RecognitionException {
try {
int _type = START;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:9:7: ( '<_START>' )
// Tokenizer.g:9:9: '<_START>'
{
match("<_START>");
if (state.failed)
return;
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "START"
// $ANTLR start "END"
public final void mEND() throws RecognitionException {
try {
int _type = END;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:10:5: ( '<_END>' )
// Tokenizer.g:10:7: '<_END>'
{
match("<_END>");
if (state.failed)
return;
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "END"
// $ANTLR start "COL"
public final void mCOL() throws RecognitionException {
try {
int _type = COL;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:11:5: ( '<_COL>' )
// Tokenizer.g:11:7: '<_COL>'
{
match("<_COL>");
if (state.failed)
return;
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "COL"
// $ANTLR start "ROW"
public final void mROW() throws RecognitionException {
try {
int _type = ROW;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:12:5: ( '<_ROW>' )
// Tokenizer.g:12:7: '<_ROW>'
{
match("<_ROW>");
if (state.failed)
return;
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "ROW"
// $ANTLR start "SYMBOL"
public final void mSYMBOL() throws RecognitionException {
try {
// Tokenizer.g:15:2: ( '!' .. '/' | ':' .. '@' | '[' .. '`' | '{' ..
// '~' | '�' )
// Tokenizer.g:
{
if ((input.LA(1) >= '!' && input.LA(1) <= '/')
|| (input.LA(1) >= ':' && input.LA(1) <= '@')
|| (input.LA(1) >= '[' && input.LA(1) <= '`')
|| (input.LA(1) >= '{' && input.LA(1) <= '~')
|| input.LA(1) == '€') {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "SYMBOL"
// $ANTLR start "LETTER"
public final void mLETTER() throws RecognitionException {
try {
// Tokenizer.g:17:2: ( LOWER | UPPER )
// Tokenizer.g:
{
if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z')
|| (input.LA(1) >= 'a' && input.LA(1) <= 'z')
|| (input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')
|| (input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')
|| (input.LA(1) >= '\u00F8' && input.LA(1) <= '\u00FF')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "LETTER"
// $ANTLR start "LOWER"
public final void mLOWER() throws RecognitionException {
try {
// Tokenizer.g:19:2: ( '\\u0061' .. '\\u007a' | '\\u00df' ..
// '\\u00f6' | '\\u00f8' .. '\\u00ff' )
// Tokenizer.g:
{
if ((input.LA(1) >= 'a' && input.LA(1) <= 'z')
|| (input.LA(1) >= '\u00DF' && input.LA(1) <= '\u00F6')
|| (input.LA(1) >= '\u00F8' && input.LA(1) <= '\u00FF')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "LOWER"
// $ANTLR start "UPPER"
public final void mUPPER() throws RecognitionException {
try {
// Tokenizer.g:21:2: ( 'A' .. 'Z' )
// Tokenizer.g:
{
if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z')
|| (input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')
|| (input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00DE')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "UPPER"
// $ANTLR start "DIGIT"
public final void mDIGIT() throws RecognitionException {
try {
// Tokenizer.g:22:16: ( '0' .. '9' )
// Tokenizer.g:
{
if ((input.LA(1) >= '0' && input.LA(1) <= '9')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "DIGIT"
public void mTokens() throws RecognitionException {
// Tokenizer.g:1:39: ( BLANK | UWRD | LWRD | NUMBER | SYBS | START | END
// | COL | ROW )
int alt3 = 9;
switch (input.LA(1)) {
case '\t':
case '\n':
case '\f':
case '\r':
case ' ': {
alt3 = 1;
}
break;
case 'A':
case 'B':
case 'C':
case 'D':
case 'E':
case 'F':
case 'G':
case 'H':
case 'I':
case 'J':
case 'K':
case 'L':
case 'M':
case 'N':
case 'O':
case 'P':
case 'Q':
case 'R':
case 'S':
case 'T':
case 'U':
case 'V':
case 'W':
case 'X':
case 'Y':
case 'Z':
case '\u00C0':
case '\u00C1':
case '\u00C2':
case '\u00C3':
case '\u00C4':
case '\u00C5':
case '\u00C6':
case '\u00C7':
case '\u00C8':
case '\u00C9':
case '\u00CA':
case '\u00CB':
case '\u00CC':
case '\u00CD':
case '\u00CE':
case '\u00CF':
case '\u00D0':
case '\u00D1':
case '\u00D2':
case '\u00D3':
case '\u00D4':
case '\u00D5':
case '\u00D6':
case '\u00D8':
case '\u00D9':
case '\u00DA':
case '\u00DB':
case '\u00DC':
case '\u00DD':
case '\u00DE': {
alt3 = 2;
}
break;
case 'a':
case 'b':
case 'c':
case 'd':
case 'e':
case 'f':
case 'g':
case 'h':
case 'i':
case 'j':
case 'k':
case 'l':
case 'm':
case 'n':
case 'o':
case 'p':
case 'q':
case 'r':
case 's':
case 't':
case 'u':
case 'v':
case 'w':
case 'x':
case 'y':
case 'z':
case '\u00DF':
case '\u00E0':
case '\u00E1':
case '\u00E2':
case '\u00E3':
case '\u00E4':
case '\u00E5':
case '\u00E6':
case '\u00E7':
case '\u00E8':
case '\u00E9':
case '\u00EA':
case '\u00EB':
case '\u00EC':
case '\u00ED':
case '\u00EE':
case '\u00EF':
case '\u00F0':
case '\u00F1':
case '\u00F2':
case '\u00F3':
case '\u00F4':
case '\u00F5':
case '\u00F6':
case '\u00F8':
case '\u00F9':
case '\u00FA':
case '\u00FB':
case '\u00FC':
case '\u00FD':
case '\u00FE':
case '\u00FF': {
alt3 = 3;
}
break;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9': {
alt3 = 4;
}
break;
case '<': {
int LA3_5 = input.LA(2);
if ((LA3_5 == '_')) {
int LA3_7 = input.LA(3);
if ((LA3_7 == 'S')) {
alt3 = 6;
} else if ((LA3_7 == 'E')) {
alt3 = 7;
} else {
NoViableAltException nvae = new NoViableAltException("", 3,
7, input);
throw nvae;
}
} else {
alt3 = 5;
}
}
break;
case '!':
case '\"':
case '#':
case '$':
case '%':
case '&':
case '\'':
case '(':
case ')':
case '*':
case '+':
case ',':
case '-':
case '.':
case '/':
case ':':
case ';':
case '=':
case '>':
case '?':
case '@':
case '[':
case '\\':
case ']':
case '^':
case '_':
case '`':
case '{':
case '|':
case '}':
case '~':
case '€': {
alt3 = 5;
}
break;
default:
if (state.backtracking > 0) {
state.failed = true;
return;
}
NoViableAltException nvae = new NoViableAltException("", 3, 0,
input);
throw nvae;
}
switch (alt3) {
case 1:
// Tokenizer.g:1:41: BLANK
{
mBLANK();
if (state.failed)
return;
}
break;
case 2:
// Tokenizer.g:1:47: UWRD
{
mUWRD();
if (state.failed)
return;
}
break;
case 3:
// Tokenizer.g:1:52: LWRD
{
mLWRD();
if (state.failed)
return;
}
break;
case 4:
// Tokenizer.g:1:57: NUMBER
{
mNUMBER();
if (state.failed)
return;
}
break;
case 5:
// Tokenizer.g:1:64: SYBS
{
mSYBS();
if (state.failed)
return;
}
break;
case 6:
// Tokenizer.g:1:69: START
{
mSTART();
if (state.failed)
return;
}
break;
case 7:
// Tokenizer.g:1:75: END
{
mEND();
if (state.failed)
return;
}
break;
case 8:
// Tokenizer.g:1:79: COL
{
mCOL();
if (state.failed)
return;
}
break;
case 9:
// Tokenizer.g:1:83: ROW
{
mROW();
if (state.failed)
return;
}
break;
}
}
// $ANTLR start synpred5_Tokenizer
public final void synpred5_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:64: ( SYBS )
// Tokenizer.g:
{
if ((input.LA(1) >= '!' && input.LA(1) <= '/')
|| (input.LA(1) >= ':' && input.LA(1) <= '@')
|| (input.LA(1) >= '[' && input.LA(1) <= '`')
|| (input.LA(1) >= '{' && input.LA(1) <= '~')
|| input.LA(1) == '€') {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(null,
input);
recover(mse);
throw mse;
}
}
}
// $ANTLR end synpred5_Tokenizer
// $ANTLR start synpred6_Tokenizer
public final void synpred6_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:69: ( START )
// Tokenizer.g:1:69: START
{
mSTART();
if (state.failed)
return;
}
}
// $ANTLR end synpred6_Tokenizer
// $ANTLR start synpred7_Tokenizer
public final void synpred7_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:75: ( END )
// Tokenizer.g:1:75: END
{
mEND();
if (state.failed)
return;
}
}
// $ANTLR end synpred7_Tokenizer
// $ANTLR start synpred8_Tokenizer
public final void synpred8_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:79: ( COL )
// Tokenizer.g:1:79: COL
{
mCOL();
if (state.failed)
return;
}
}
// $ANTLR end synpred8_Tokenizer
public final boolean synpred8_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred8_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: " + re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed = false;
return success;
}
public final boolean synpred5_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred5_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: " + re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed = false;
return success;
}
public final boolean synpred7_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred7_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: " + re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed = false;
return success;
}
public final boolean synpred6_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred6_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: " + re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed = false;
return success;
}
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Tokenizer.java
} |
| Solution content |
|---|
import org.antlr.runtime.*;
import org.antlr.runtime.*;
import java.util.Stack;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
@SuppressWarnings({ "all", "warnings", "unchecked" })
public class Tokenizer extends Lexer {
public static final int EOF = -1;
public static final int BLANK = 4;
public static final int COL = 5;
public static final int DIGIT = 6;
public static final int END = 7;
public static final int LETTER = 8;
public static final int LOWER = 9;
public static final int LWRD = 10;
public static final int NUMBER = 11;
public static final int ROW = 12;
public static final int START = 13;
public static final int SYBS = 14;
public static final int SYMBOL = 15;
public static final int UPPER = 16;
public static final int UWRD = 17;
// delegates
// delegators
public Lexer[] getDelegates() {
return new Lexer[] {};
}
public Tokenizer() {
}
public Tokenizer(CharStream input) {
this(input, new RecognizerSharedState());
}
public Tokenizer(CharStream input, RecognizerSharedState state) {
super(input, state);
}
public String getGrammarFileName() {
return "Tokenizer.g";
}
public Token nextToken() {
while (true) {
if (input.LA(1) == CharStream.EOF) {
Token eof = new CommonToken((CharStream) input, Token.EOF,
Token.DEFAULT_CHANNEL, input.index(), input.index());
eof.setLine(getLine());
eof.setCharPositionInLine(getCharPositionInLine());
return eof;
}
state.token = null;
state.channel = Token.DEFAULT_CHANNEL;
state.tokenStartCharIndex = input.index();
state.tokenStartCharPositionInLine = input.getCharPositionInLine();
state.tokenStartLine = input.getLine();
state.text = null;
try {
int m = input.mark();
state.backtracking = 1;
state.failed = false;
mTokens();
state.backtracking = 0;
if (state.failed) {
input.rewind(m);
input.consume();
} else {
emit();
return state.token;
}
} catch (RecognitionException re) {
// shouldn't happen in backtracking mode, but...
reportError(re);
recover(re);
}
}
}
public void memoize(IntStream input, int ruleIndex, int ruleStartIndex) {
if (state.backtracking > 1)
super.memoize(input, ruleIndex, ruleStartIndex);
}
public boolean alreadyParsedRule(IntStream input, int ruleIndex) {
if (state.backtracking > 1)
return super.alreadyParsedRule(input, ruleIndex);
return false;
}
// $ANTLR start "BLANK"
public final void mBLANK() throws RecognitionException {
try {
int _type = BLANK;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:4:6: ( ( '\\t' | ' ' | '\\r' | '\\n' | '\ ' ) )
// Tokenizer.g:
{
if ((input.LA(1) >= '\t' && input.LA(1) <= '\n')
|| (input.LA(1) >= '\f' && input.LA(1) <= '\r')
|| input.LA(1) == ' ') {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "BLANK"
// $ANTLR start "UWRD"
public final void mUWRD() throws RecognitionException {
try {
int _type = UWRD;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:5:6: ( UPPER )
// Tokenizer.g:
{
if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z')
|| (input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')
|| (input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00DE')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "UWRD"
// $ANTLR start "LWRD"
public final void mLWRD() throws RecognitionException {
try {
int _type = LWRD;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:6:6: ( ( LOWER )+ )
// Tokenizer.g:6:8: ( LOWER )+
{
// Tokenizer.g:6:8: ( LOWER )+
int cnt1 = 0;
loop1: do {
int alt1 = 2;
int LA1_0 = input.LA(1);
if (((LA1_0 >= 'a' && LA1_0 <= 'z')
|| (LA1_0 >= '\u00DF' && LA1_0 <= '\u00F6') || (LA1_0 >= '\u00F8' && LA1_0 <= '\u00FF'))) {
alt1 = 1;
}
switch (alt1) {
case 1:
// Tokenizer.g:
{
if ((input.LA(1) >= 'a' && input.LA(1) <= 'z')
|| (input.LA(1) >= '\u00DF' && input.LA(1) <= '\u00F6')
|| (input.LA(1) >= '\u00F8' && input.LA(1) <= '\u00FF')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
break;
default:
} while (true);
recover(mse);
if (cnt1 >= 1)
break loop1;
if (state.backtracking > 0) {
state.failed = true;
return;
}
EarlyExitException eee = new EarlyExitException(1,
input);
throw eee;
}
cnt1++;
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "LWRD"
// $ANTLR start "NUMBER"
public final void mNUMBER() throws RecognitionException {
try {
int _type = NUMBER;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:7:7: ( ( DIGIT )+ )
// Tokenizer.g:7:9: ( DIGIT )+
{
// Tokenizer.g:7:9: ( DIGIT )+
int cnt2 = 0;
loop2: do {
int alt2 = 2;
int LA2_0 = input.LA(1);
if (((LA2_0 >= '0' && LA2_0 <= '9'))) {
alt2 = 1;
}
switch (alt2) {
case 1:
// Tokenizer.g:
{
if ((input.LA(1) >= '0' && input.LA(1) <= '9')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
break;
default:
if (cnt2 >= 1)
break loop2;
if (state.backtracking > 0) {
state.failed = true;
return;
}
EarlyExitException eee = new EarlyExitException(2,
input);
throw eee;
}
cnt2++;
} while (true);
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "NUMBER"
// $ANTLR start "SYBS"
public final void mSYBS() throws RecognitionException {
try {
int _type = SYBS;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:8:5: ( ( SYMBOL ) )
// Tokenizer.g:
{
if ((input.LA(1) >= '!' && input.LA(1) <= '/')
|| (input.LA(1) >= ':' && input.LA(1) <= '@')
|| (input.LA(1) >= '[' && input.LA(1) <= '`')
|| (input.LA(1) >= '{' && input.LA(1) <= '~')
|| input.LA(1) == '€') {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "SYBS"
// $ANTLR start "START"
public final void mSTART() throws RecognitionException {
try {
int _type = START;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:9:7: ( '<_START>' )
// Tokenizer.g:9:9: '<_START>'
{
match("<_START>");
if (state.failed)
return;
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "START"
// $ANTLR start "END"
public final void mEND() throws RecognitionException {
try {
int _type = END;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:10:5: ( '<_END>' )
// Tokenizer.g:10:7: '<_END>'
{
match("<_END>");
if (state.failed)
return;
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "END"
// $ANTLR start "COL"
public final void mCOL() throws RecognitionException {
try {
int _type = COL;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:11:5: ( '<_COL>' )
// Tokenizer.g:11:7: '<_COL>'
{
match("<_COL>");
if (state.failed)
return;
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "COL"
// $ANTLR start "ROW"
public final void mROW() throws RecognitionException {
try {
int _type = ROW;
int _channel = DEFAULT_TOKEN_CHANNEL;
// Tokenizer.g:12:5: ( '<_ROW>' )
// Tokenizer.g:12:7: '<_ROW>'
{
match("<_ROW>");
if (state.failed)
return;
}
state.type = _type;
state.channel = _channel;
} finally {
// do for sure before leaving
}
}
// $ANTLR end "ROW"
// $ANTLR start "SYMBOL"
public final void mSYMBOL() throws RecognitionException {
try {
// Tokenizer.g:15:2: ( '!' .. '/' | ':' .. '@' | '[' .. '`' | '{' ..
// '~' | '�' )
// Tokenizer.g:
{
if ((input.LA(1) >= '!' && input.LA(1) <= '/')
|| (input.LA(1) >= ':' && input.LA(1) <= '@')
|| (input.LA(1) >= '[' && input.LA(1) <= '`')
|| (input.LA(1) >= '{' && input.LA(1) <= '~')
|| input.LA(1) == '€') {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "SYMBOL"
// $ANTLR start "LETTER"
public final void mLETTER() throws RecognitionException {
try {
// Tokenizer.g:17:2: ( LOWER | UPPER )
// Tokenizer.g:
{
if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z')
|| (input.LA(1) >= 'a' && input.LA(1) <= 'z')
|| (input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')
|| (input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00F6')
|| (input.LA(1) >= '\u00F8' && input.LA(1) <= '\u00FF')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "LETTER"
// $ANTLR start "LOWER"
public final void mLOWER() throws RecognitionException {
try {
// Tokenizer.g:19:2: ( '\\u0061' .. '\\u007a' | '\\u00df' ..
// '\\u00f6' | '\\u00f8' .. '\\u00ff' )
// Tokenizer.g:
{
if ((input.LA(1) >= 'a' && input.LA(1) <= 'z')
|| (input.LA(1) >= '\u00DF' && input.LA(1) <= '\u00F6')
|| (input.LA(1) >= '\u00F8' && input.LA(1) <= '\u00FF')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "LOWER"
// $ANTLR start "UPPER"
public final void mUPPER() throws RecognitionException {
try {
// Tokenizer.g:21:2: ( 'A' .. 'Z' )
// Tokenizer.g:
{
if ((input.LA(1) >= 'A' && input.LA(1) <= 'Z')
|| (input.LA(1) >= '\u00C0' && input.LA(1) <= '\u00D6')
|| (input.LA(1) >= '\u00D8' && input.LA(1) <= '\u00DE')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "UPPER"
// $ANTLR start "DIGIT"
public final void mDIGIT() throws RecognitionException {
try {
// Tokenizer.g:22:16: ( '0' .. '9' )
// Tokenizer.g:
{
if ((input.LA(1) >= '0' && input.LA(1) <= '9')) {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(
null, input);
recover(mse);
throw mse;
}
}
} finally {
// do for sure before leaving
}
}
// $ANTLR end "DIGIT"
public void mTokens() throws RecognitionException {
// Tokenizer.g:1:39: ( BLANK | UWRD | LWRD | NUMBER | SYBS | START | END
// | COL | ROW )
int alt3 = 9;
switch (input.LA(1)) {
case '\t':
case '\n':
case '\f':
case '\r':
case ' ': {
alt3 = 1;
}
break;
case 'A':
case 'B':
case 'C':
case 'D':
case 'E':
case 'F':
case 'G':
case 'H':
case 'I':
case 'J':
case 'K':
case 'L':
case 'M':
case 'N':
case 'O':
case 'P':
case 'Q':
case 'R':
case 'S':
case 'T':
case 'U':
case 'V':
case 'W':
case 'X':
case 'Y':
case 'Z':
case '\u00C0':
case '\u00C1':
case '\u00C2':
case '\u00C3':
case '\u00C4':
case '\u00C5':
case '\u00C6':
case '\u00C7':
case '\u00C8':
case '\u00C9':
case '\u00CA':
case '\u00CB':
case '\u00CC':
case '\u00CD':
case '\u00CE':
case '\u00CF':
case '\u00D0':
case '\u00D1':
case '\u00D2':
case '\u00D3':
case '\u00D4':
case '\u00D5':
case '\u00D6':
case '\u00D8':
case '\u00D9':
case '\u00DA':
case '\u00DB':
case '\u00DC':
case '\u00DD':
case '\u00DE': {
alt3 = 2;
}
break;
case 'a':
case 'b':
case 'c':
case 'd':
case 'e':
case 'f':
case 'g':
case 'h':
case 'i':
case 'j':
case 'k':
case 'l':
case 'm':
case 'n':
case 'o':
case 'p':
case 'q':
case 'r':
case 's':
case 't':
case 'u':
case 'v':
case 'w':
case 'x':
case 'y':
case 'z':
case '\u00DF':
case '\u00E0':
case '\u00E1':
case '\u00E2':
case '\u00E3':
case '\u00E4':
case '\u00E5':
case '\u00E6':
case '\u00E7':
case '\u00E8':
case '\u00E9':
case '\u00EA':
case '\u00EB':
case '\u00EC':
case '\u00ED':
case '\u00EE':
case '\u00EF':
case '\u00F0':
case '\u00F1':
case '\u00F2':
case '\u00F3':
case '\u00F4':
case '\u00F5':
case '\u00F6':
case '\u00F8':
case '\u00F9':
case '\u00FA':
case '\u00FB':
case '\u00FC':
case '\u00FD':
case '\u00FE':
case '\u00FF': {
alt3 = 3;
}
break;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9': {
alt3 = 4;
}
break;
case '<': {
int LA3_5 = input.LA(2);
if ((LA3_5 == '_')) {
int LA3_7 = input.LA(3);
if ((LA3_7 == 'S')) {
alt3 = 6;
} else if ((LA3_7 == 'E')) {
alt3 = 7;
} else {
NoViableAltException nvae = new NoViableAltException("", 3,
7, input);
throw nvae;
}
} else {
alt3 = 5;
}
}
break;
case '!':
case '\"':
case '#':
case '$':
case '%':
case '&':
case '\'':
case '(':
case ')':
case '*':
case '+':
case ',':
case '-':
case '.':
case '/':
case ':':
case ';':
case '=':
case '>':
case '?':
case '@':
case '[':
case '\\':
case ']':
case '^':
case '_':
case '`':
case '{':
case '|':
case '}':
case '~':
case '€': {
alt3 = 5;
}
break;
default:
if (state.backtracking > 0) {
state.failed = true;
return;
}
NoViableAltException nvae = new NoViableAltException("", 3, 0,
input);
throw nvae;
}
switch (alt3) {
case 1:
// Tokenizer.g:1:41: BLANK
{
mBLANK();
if (state.failed)
return;
}
break;
case 2:
// Tokenizer.g:1:47: UWRD
{
mUWRD();
if (state.failed)
return;
}
break;
case 3:
// Tokenizer.g:1:52: LWRD
{
mLWRD();
if (state.failed)
return;
}
break;
case 4:
// Tokenizer.g:1:57: NUMBER
{
mNUMBER();
if (state.failed)
return;
}
break;
case 5:
// Tokenizer.g:1:64: SYBS
{
mSYBS();
if (state.failed)
return;
}
break;
case 6:
// Tokenizer.g:1:69: START
{
mSTART();
if (state.failed)
return;
}
break;
case 7:
// Tokenizer.g:1:75: END
{
mEND();
if (state.failed)
return;
}
break;
case 8:
// Tokenizer.g:1:79: COL
{
mCOL();
if (state.failed)
return;
}
break;
case 9:
// Tokenizer.g:1:83: ROW
{
mROW();
if (state.failed)
return;
}
break;
}
}
// $ANTLR start synpred5_Tokenizer
public final void synpred5_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:64: ( SYBS )
// Tokenizer.g:
{
if ((input.LA(1) >= '!' && input.LA(1) <= '/')
|| (input.LA(1) >= ':' && input.LA(1) <= '@')
|| (input.LA(1) >= '[' && input.LA(1) <= '`')
|| (input.LA(1) >= '{' && input.LA(1) <= '~')
|| input.LA(1) == '€') {
input.consume();
state.failed = false;
} else {
if (state.backtracking > 0) {
state.failed = true;
return;
}
MismatchedSetException mse = new MismatchedSetException(null,
input);
recover(mse);
throw mse;
}
}
}
// $ANTLR end synpred5_Tokenizer
// $ANTLR start synpred6_Tokenizer
public final void synpred6_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:69: ( START )
// Tokenizer.g:1:69: START
{
mSTART();
if (state.failed)
return;
}
}
// $ANTLR end synpred6_Tokenizer
// $ANTLR start synpred7_Tokenizer
public final void synpred7_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:75: ( END )
// Tokenizer.g:1:75: END
{
mEND();
if (state.failed)
return;
}
}
// $ANTLR end synpred7_Tokenizer
// $ANTLR start synpred8_Tokenizer
public final void synpred8_Tokenizer_fragment() throws RecognitionException {
// Tokenizer.g:1:79: ( COL )
// Tokenizer.g:1:79: COL
{
mCOL();
if (state.failed)
return;
}
}
// $ANTLR end synpred8_Tokenizer
public final boolean synpred8_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred8_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: " + re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed = false;
return success;
}
public final boolean synpred5_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred5_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: " + re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed = false;
return success;
}
public final boolean synpred7_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred7_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: " + re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed = false;
return success;
}
public final boolean synpred6_Tokenizer() {
state.backtracking++;
int start = input.mark();
try {
synpred6_Tokenizer_fragment(); // can never throw exception
} catch (RecognitionException re) {
System.err.println("impossible: " + re);
}
boolean success = !state.failed;
input.rewind(start);
state.backtracking--;
state.failed = false;
return success;
}
} |
| File |
|---|
| Tokenizer.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
* and related projects, please see: http://www.isi.edu/integration ******************************************************************************/ package edu.isi.karma.cleaning; <<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Tools.java ======= import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.InputStreamReader; import java.util.Collection; import java.util.Vector; import org.apache.mahout.math.Arrays; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Tools.java import au.com.bytecode.opencsv.CSVWriter; import edu.isi.karma.cleaning.Research.ConfigParameters; |
| Solution content |
|---|
* and related projects, please see: http://www.isi.edu/integration ******************************************************************************/ package edu.isi.karma.cleaning; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.InputStreamReader; import java.util.Collection; import java.util.Vector; import org.apache.mahout.math.Arrays; import au.com.bytecode.opencsv.CSVWriter; import edu.isi.karma.cleaning.Research.ConfigParameters; |
| File |
|---|
| Tools.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
String[] xStrings = { "<_START>" + raw + "<_END>", tar };
examples.add(xStrings);
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/Tools.java
for(String[] elem:examples)
{
System.out.println("Examples inputed: "+ Arrays.toString(elem));
=======
for (String[] elem : examples) {
System.out.println("Examples inputed: "
+ Arrays.toString(elem));
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/Tools.java
}
ProgSynthesis psProgSynthesis = new ProgSynthesis();
psProgSynthesis.inite(examples); |
| Solution content |
|---|
String[] xStrings = { "<_START>" + raw + "<_END>", tar };
examples.add(xStrings);
for (String[] elem : examples) {
System.out.println("Examples inputed: "
+ Arrays.toString(elem));
}
ProgSynthesis psProgSynthesis = new ProgSynthesis();
psProgSynthesis.inite(examples); |
| File |
|---|
| Tools.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| For statement |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.HashMap;
import java.util.Vector;
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/features/CntFeature.java
public class CntFeature implements Feature{
String name = "";
double score = 0.0;
Vector |
| Solution content |
|---|
import java.util.HashMap;
import java.util.Vector;
public class CntFeature implements Feature {
String name = "";
double score = 0.0;
Vector |
| File |
|---|
| CntFeature.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Class signature |
| Comment |
| For statement |
| If statement |
| Import |
| Method declaration |
| Method invocation |
| Method signature |
| Variable |
| While statement |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.cleaning.features; <<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/cleaning/features/RecordFeatureSet.java ======= import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Vector; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/cleaning/features/RecordFeatureSet.java import edu.isi.karma.cleaning.Ruler; import edu.isi.karma.cleaning.TNode; |
| Solution content |
|---|
package edu.isi.karma.cleaning.features; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Vector; import edu.isi.karma.cleaning.Ruler; import edu.isi.karma.cleaning.TNode; |
| File |
|---|
| RecordFeatureSet.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
<<<<<<< HEAD:karma-cleaning/src/main/java/edu/isi/karma/rep/cleaning/RamblerTransformationOutput.java
=======
import edu.isi.karma.cleaning.ProgSynthesis;
import edu.isi.karma.cleaning.ProgramRule;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/rep/cleaning/RamblerTransformationOutput.java
public class RamblerTransformationOutput implements TransformationOutput {
|
| Solution content |
|---|
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import edu.isi.karma.cleaning.ProgSynthesis;
import edu.isi.karma.cleaning.ProgramRule;
public class RamblerTransformationOutput implements TransformationOutput {
|
| File |
|---|
| RamblerTransformationOutput.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.isi.karma.controller.command.Command; import edu.isi.karma.controller.command.CommandException; <<<<<<< HEAD:karma-commands/commands-alignment-openrdf/src/main/java/edu/isi/karma/controller/command/alignment/GenerateR2RMLModelCommand.java import edu.isi.karma.controller.command.CommandType; import edu.isi.karma.controller.history.HistoryJsonUtil; ======= import edu.isi.karma.controller.command.publish.PublishRDFCommand; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/alignment/GenerateR2RMLModelCommand.java import edu.isi.karma.controller.update.AbstractUpdate; import edu.isi.karma.controller.update.ErrorUpdate; import edu.isi.karma.controller.update.InfoUpdate; |
| Solution content |
|---|
import com.hp.hpl.jena.rdf.model.ModelFactory; import edu.isi.karma.controller.command.Command; import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.command.CommandType; import edu.isi.karma.controller.history.HistoryJsonUtil; import edu.isi.karma.controller.command.publish.PublishRDFCommand; import edu.isi.karma.controller.update.AbstractUpdate; import edu.isi.karma.controller.update.ErrorUpdate; import edu.isi.karma.controller.update.InfoUpdate; |
| File |
|---|
| GenerateR2RMLModelCommand.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<< HEAD:karma-commands/commands-alignment-openrdf/src/main/java/edu/isi/karma/controller/command/worksheet/ApplyHistoryFromR2RMLModelCommand.java
import java.io.File;
import java.io.IOException;
=======
import edu.isi.karma.controller.command.CommandException;
import edu.isi.karma.controller.command.WorksheetCommand;
import edu.isi.karma.controller.history.WorksheetCommandHistoryExecutor;
import edu.isi.karma.controller.update.ErrorUpdate;
import edu.isi.karma.controller.update.InfoUpdate;
import edu.isi.karma.controller.update.UpdateContainer;
import edu.isi.karma.controller.update.WorksheetUpdateFactory;
import edu.isi.karma.kr2rml.KR2RMLMapping;
import edu.isi.karma.kr2rml.KR2RMLVersion;
import edu.isi.karma.kr2rml.R2RMLMappingIdentifier;
import edu.isi.karma.kr2rml.WorksheetR2RMLJenaModelParser;
import edu.isi.karma.rep.Worksheet;
import edu.isi.karma.rep.Workspace;
import edu.isi.karma.webserver.KarmaException;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/worksheet/ApplyHistoryFromR2RMLModelCommand.java
public class ApplyHistoryFromR2RMLModelCommand extends WorksheetCommand {
private final File r2rmlModelFile; |
| Solution content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import edu.isi.karma.controller.command.CommandException;
import edu.isi.karma.controller.command.WorksheetCommand;
import edu.isi.karma.controller.history.WorksheetCommandHistoryExecutor;
import edu.isi.karma.controller.update.ErrorUpdate;
import edu.isi.karma.controller.update.InfoUpdate;
import edu.isi.karma.controller.update.UpdateContainer;
import edu.isi.karma.controller.update.WorksheetUpdateFactory;
import edu.isi.karma.kr2rml.KR2RMLMapping;
import edu.isi.karma.kr2rml.KR2RMLVersion;
import edu.isi.karma.kr2rml.R2RMLMappingIdentifier;
import edu.isi.karma.kr2rml.WorksheetR2RMLJenaModelParser;
import edu.isi.karma.rep.Worksheet;
import edu.isi.karma.rep.Workspace;
import edu.isi.karma.webserver.KarmaException;
public class ApplyHistoryFromR2RMLModelCommand extends WorksheetCommand {
private final File r2rmlModelFile; |
| File |
|---|
| ApplyHistoryFromR2RMLModelCommand.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.modeling.alignment.learner; <<<<<<< HEAD:karma-commands/commands-alignment/src/main/java/edu/isi/karma/modeling/alignment/learner/ModelLearner.java ======= import java.io.File; import java.io.PrintWriter; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; import org.jgrapht.UndirectedGraph; import org.jgrapht.graph.AsUndirectedGraph; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/learner/ModelLearner.java import edu.isi.karma.modeling.ModelingConfiguration; import edu.isi.karma.modeling.ModelingParams; import edu.isi.karma.modeling.Uris; |
| Solution content |
|---|
package edu.isi.karma.modeling.alignment.learner; import java.io.File; import java.io.PrintWriter; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; import org.jgrapht.UndirectedGraph; import org.jgrapht.graph.AsUndirectedGraph; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import edu.isi.karma.modeling.ModelingConfiguration; import edu.isi.karma.modeling.ModelingParams; import edu.isi.karma.modeling.Uris; |
| File |
|---|
| ModelLearner.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import edu.isi.karma.modeling.ModelingConfiguration; import edu.isi.karma.modeling.ModelingParams; import edu.isi.karma.modeling.Uris; <<<<<<< HEAD:karma-commands/commands-alignment/src/main/java/edu/isi/karma/modeling/alignment/learner/ModelLearner.java import edu.isi.karma.modeling.alignment.*; ======= import edu.isi.karma.modeling.alignment.GraphBuilder; import edu.isi.karma.modeling.alignment.GraphUtil; import edu.isi.karma.modeling.alignment.GraphVizUtil; import edu.isi.karma.modeling.alignment.LinkFrequency; import edu.isi.karma.modeling.alignment.LinkIdFactory; import edu.isi.karma.modeling.alignment.ModelEvaluation; import edu.isi.karma.modeling.alignment.NodeIdFactory; import edu.isi.karma.modeling.alignment.SemanticModel; import edu.isi.karma.modeling.alignment.SteinerTree; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/learner/ModelLearner.java import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.modeling.research.ModelReader; import edu.isi.karma.modeling.research.Params; |
| Solution content |
|---|
import edu.isi.karma.modeling.ModelingConfiguration; import edu.isi.karma.modeling.ModelingParams; import edu.isi.karma.modeling.Uris; import edu.isi.karma.modeling.alignment.*; import edu.isi.karma.modeling.alignment.GraphBuilder; import edu.isi.karma.modeling.alignment.GraphUtil; import edu.isi.karma.modeling.alignment.GraphVizUtil; import edu.isi.karma.modeling.alignment.LinkFrequency; import edu.isi.karma.modeling.alignment.LinkIdFactory; import edu.isi.karma.modeling.alignment.ModelEvaluation; import edu.isi.karma.modeling.alignment.NodeIdFactory; import edu.isi.karma.modeling.alignment.SemanticModel; import edu.isi.karma.modeling.alignment.SteinerTree; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.modeling.research.ModelReader; import edu.isi.karma.modeling.research.Params; |
| File |
|---|
| ModelLearner.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.modeling.alignment.learner; <<<<<<< HEAD:karma-commands/commands-alignment/src/main/java/edu/isi/karma/modeling/alignment/learner/SteinerNodes.java ======= import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.Vector; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/learner/SteinerNodes.java import com.google.common.base.Function; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; |
| Solution content |
|---|
package edu.isi.karma.modeling.alignment.learner; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.Vector; import com.google.common.base.Function; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; |
| File |
|---|
| SteinerNodes.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import com.google.common.collect.Multimap; import edu.isi.karma.modeling.ModelingParams; import edu.isi.karma.modeling.Uris; <<<<<<< HEAD:karma-commands/commands-alignment/src/main/java/edu/isi/karma/modeling/research/Approach1.java import edu.isi.karma.modeling.alignment.*; ======= import edu.isi.karma.modeling.alignment.GraphBuilder; import edu.isi.karma.modeling.alignment.GraphUtil; import edu.isi.karma.modeling.alignment.GraphVizUtil; import edu.isi.karma.modeling.alignment.LinkIdFactory; import edu.isi.karma.modeling.alignment.NodeIdFactory; import edu.isi.karma.modeling.alignment.SemanticModel; import edu.isi.karma.modeling.alignment.SteinerTree; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/research/Approach1.java import edu.isi.karma.modeling.alignment.learner.CandidateSteinerSets; import edu.isi.karma.modeling.alignment.learner.SemanticTypeMapping; import edu.isi.karma.modeling.alignment.learner.SortableSemanticModel; |
| Solution content |
|---|
import com.google.common.collect.Multimap; import edu.isi.karma.modeling.ModelingParams; import edu.isi.karma.modeling.Uris; import edu.isi.karma.modeling.alignment.*; import edu.isi.karma.modeling.alignment.GraphBuilder; import edu.isi.karma.modeling.alignment.GraphUtil; import edu.isi.karma.modeling.alignment.GraphVizUtil; import edu.isi.karma.modeling.alignment.LinkIdFactory; import edu.isi.karma.modeling.alignment.NodeIdFactory; import edu.isi.karma.modeling.alignment.SemanticModel; import edu.isi.karma.modeling.alignment.SteinerTree; import edu.isi.karma.modeling.alignment.learner.CandidateSteinerSets; import edu.isi.karma.modeling.alignment.learner.SemanticTypeMapping; import edu.isi.karma.modeling.alignment.learner.SortableSemanticModel; |
| File |
|---|
| Approach1.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import com.google.common.collect.Multimap; import edu.isi.karma.modeling.ModelingParams; import edu.isi.karma.modeling.Uris; <<<<<<< HEAD:karma-commands/commands-alignment/src/main/java/edu/isi/karma/modeling/research/Approach2.java import edu.isi.karma.modeling.alignment.*; ======= import edu.isi.karma.modeling.alignment.GraphBuilder; import edu.isi.karma.modeling.alignment.GraphUtil; import edu.isi.karma.modeling.alignment.GraphVizUtil; import edu.isi.karma.modeling.alignment.LinkIdFactory; import edu.isi.karma.modeling.alignment.NodeIdFactory; import edu.isi.karma.modeling.alignment.SemanticModel; import edu.isi.karma.modeling.alignment.SteinerTree; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/research/Approach2.java import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.alignment.*; import edu.isi.karma.util.RandomGUID; |
| Solution content |
|---|
import com.google.common.collect.Multimap; import edu.isi.karma.modeling.ModelingParams; import edu.isi.karma.modeling.Uris; import edu.isi.karma.modeling.alignment.*; import edu.isi.karma.modeling.alignment.GraphBuilder; import edu.isi.karma.modeling.alignment.GraphUtil; import edu.isi.karma.modeling.alignment.GraphVizUtil; import edu.isi.karma.modeling.alignment.LinkIdFactory; import edu.isi.karma.modeling.alignment.NodeIdFactory; import edu.isi.karma.modeling.alignment.SemanticModel; import edu.isi.karma.modeling.alignment.SteinerTree; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.alignment.*; import edu.isi.karma.util.RandomGUID; |
| File |
|---|
| Approach2.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.json.JSONException; import org.json.JSONObject; <<<<<<< HEAD:karma-commands/commands-cleaning/src/main/java/edu/isi/karma/controller/command/cleaning/InvokeCleaningServiceCommand.java import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.PrintWriter; import java.net.URI; import java.util.ArrayList; import java.util.Collection; import java.util.List; ======= import edu.isi.karma.controller.command.Command; import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.update.AbstractUpdate; import edu.isi.karma.controller.update.ErrorUpdate; import edu.isi.karma.controller.update.UpdateContainer; import edu.isi.karma.rep.HNodePath; import edu.isi.karma.rep.Node; import edu.isi.karma.rep.Worksheet; import edu.isi.karma.rep.Workspace; import edu.isi.karma.view.VWorkspace; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/cleaning/InvokeCleaningServiceCommand.java /* import net.sf.json.JSONArray; import net.sf.json.JSONObject; |
| Solution content |
|---|
import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import edu.isi.karma.controller.command.Command;
import edu.isi.karma.controller.command.CommandException;
import edu.isi.karma.controller.update.AbstractUpdate;
import edu.isi.karma.controller.update.ErrorUpdate;
import edu.isi.karma.controller.update.UpdateContainer;
import edu.isi.karma.rep.HNodePath;
import edu.isi.karma.rep.Node;
import edu.isi.karma.rep.Worksheet;
import edu.isi.karma.rep.Workspace;
import edu.isi.karma.view.VWorkspace;
public class InvokeCleaningServiceCommand extends Command {
private String hNodeId;
private String worksheetId;
// private static Logger logger =
// LoggerFactory.getLogger(InvokeCleaningServiceCommand.class);
public InvokeCleaningServiceCommand(String id, String hNodeId,
String worksheetId) {
super(id);
this.hNodeId = hNodeId;
this.worksheetId = worksheetId;
}
@Override
public String getCommandName() {
return this.getClass().getName();
}
@Override
public String getTitle() {
return "Invoke cleaning service";
}
@Override
public String getDescription() {
return "";
}
@Override
public CommandType getCommandType() {
return CommandType.notInHistory;
}
@Override
public UpdateContainer doIt(Workspace workspace) throws CommandException {
Worksheet worksheet = workspace.getWorksheet(worksheetId);
HNodePath selectedPath = null;
List |
| File |
|---|
| InvokeCleaningServiceCommand.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import javax.servlet.http.HttpServletRequest;
<<<<<<< HEAD:karma-commands/commands-cleaning/src/main/java/edu/isi/karma/controller/command/cleaning/InvokeCleaningServiceCommandFactory.java
public class InvokeCleaningServiceCommandFactory extends JSONInputCommandFactory {
=======
public class InvokeCleaningServiceCommandFactory extends CommandFactory
implements JSONInputCommandFactory {
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/cleaning/InvokeCleaningServiceCommandFactory.java
private enum Arguments {
hNodeId, worksheetId, hTableID
} |
| Solution content |
|---|
import javax.servlet.http.HttpServletRequest;
public class InvokeCleaningServiceCommandFactory extends JSONInputCommandFactory {
private enum Arguments {
hNodeId, worksheetId, hTableID
} |
| File |
|---|
| InvokeCleaningServiceCommandFactory.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Class signature |
| Chunk |
|---|
| Conflicting content |
|---|
import javax.servlet.http.HttpServletRequest;
<<<<<<< HEAD:karma-commands/commands-cleaning/src/main/java/edu/isi/karma/controller/command/cleaning/SubmitCleaningCommandFactory.java
public class SubmitCleaningCommandFactory extends JSONInputCommandFactory {
=======
public class SubmitCleaningCommandFactory extends CommandFactory implements
JSONInputCommandFactory {
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/cleaning/SubmitCleaningCommandFactory.java
private enum Arguments {
hNodeId, worksheetId, hTableId, examples |
| Solution content |
|---|
import javax.servlet.http.HttpServletRequest;
public class SubmitCleaningCommandFactory extends JSONInputCommandFactory {
private enum Arguments {
hNodeId, worksheetId, hTableId, examples |
| File |
|---|
| SubmitCleaningCommandFactory.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Class signature |
| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD:karma-commands/commands-import/import-database/src/main/java/edu/isi/karma/imp/database/DatabaseTableImport.java
/**
* Save the db info in the source information part of worksheet's
* metadata *
*/
SourceInformation srcInfo = new SourceInformation();
srcInfo.setAttributeValue(InfoAttribute.dbType, dbType.name());
srcInfo.setAttributeValue(InfoAttribute.hostname, hostname);
srcInfo.setAttributeValue(InfoAttribute.portnumber, String.valueOf(portnumber));
srcInfo.setAttributeValue(InfoAttribute.username, username);
srcInfo.setAttributeValue(InfoAttribute.dBorSIDName, dBorSIDName);
srcInfo.setAttributeValue(InfoAttribute.tableName, tableName);
getWorksheet().getMetadataContainer().setSourceInformation(srcInfo);
return getWorksheet();
=======
/**
* Save the db info in the source information part of worksheet's
* metadata *
*/
SourceInformation srcInfo = new SourceInformation();
srcInfo.setAttributeValue(InfoAttribute.dbType, dbType.name());
srcInfo.setAttributeValue(InfoAttribute.hostname, hostname);
srcInfo.setAttributeValue(InfoAttribute.portnumber, String.valueOf(portnumber));
srcInfo.setAttributeValue(InfoAttribute.username, username);
srcInfo.setAttributeValue(InfoAttribute.dBorSIDName, dBorSIDName);
srcInfo.setAttributeValue(InfoAttribute.tableName, tableName);
getWorksheet().getMetadataContainer().setSourceInformation(srcInfo);
getWorksheet().getMetadataContainer().getWorksheetProperties().setPropertyValue(Property.sourceType, SourceTypes.DB.toString());
return getWorksheet();
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/imp/database/DatabaseTableImport.java
}
} |
| Solution content |
|---|
}
}
/**
* Save the db info in the source information part of worksheet's
* metadata *
*/
SourceInformation srcInfo = new SourceInformation();
srcInfo.setAttributeValue(InfoAttribute.dbType, dbType.name());
srcInfo.setAttributeValue(InfoAttribute.hostname, hostname);
srcInfo.setAttributeValue(InfoAttribute.portnumber, String.valueOf(portnumber));
srcInfo.setAttributeValue(InfoAttribute.username, username);
srcInfo.setAttributeValue(InfoAttribute.dBorSIDName, dBorSIDName);
srcInfo.setAttributeValue(InfoAttribute.tableName, tableName);
getWorksheet().getMetadataContainer().setSourceInformation(srcInfo);
getWorksheet().getMetadataContainer().getWorksheetProperties().setPropertyValue(Property.sourceType, SourceTypes.DB.toString());
return getWorksheet();
}
} |
| File |
|---|
| DatabaseTableImport.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import org.slf4j.Logger; import org.slf4j.LoggerFactory; <<<<<<< HEAD:karma-commands/commands-import/import-xml/src/main/java/edu/isi/karma/imp/json/XMLImport.java import java.io.File; import java.io.IOException; ======= import edu.isi.karma.imp.Import; import edu.isi.karma.rep.Worksheet; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.metadata.WorksheetProperties.Property; import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes; import edu.isi.karma.util.FileUtil; import edu.isi.karma.webserver.KarmaException; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/imp/json/XMLImport.java /** * |
| Solution content |
|---|
import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; import edu.isi.karma.imp.Import; import edu.isi.karma.rep.Worksheet; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.metadata.WorksheetProperties.Property; import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes; import edu.isi.karma.util.FileUtil; import edu.isi.karma.webserver.KarmaException; /** * |
| File |
|---|
| XMLImport.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.controller.command.transformation; <<<<<<< HEAD:karma-commands/commands-python/src/main/java/edu/isi/karma/controller/command/transformation/SubmitEditPythonTransformationCommand.java ======= import org.slf4j.Logger; import org.slf4j.LoggerFactory; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/transformation/SubmitEditPythonTransformationCommand.java import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.command.CommandType; import edu.isi.karma.controller.command.ICommand; |
| Solution content |
|---|
package edu.isi.karma.controller.command.transformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.command.CommandType; import edu.isi.karma.controller.command.ICommand; |
| File |
|---|
| SubmitEditPythonTransformationCommand.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
public class SubmitEditPythonTransformationCommand extends SubmitPythonTransformationCommand {
<<<<<<< HEAD:karma-commands/commands-python/src/main/java/edu/isi/karma/controller/command/transformation/SubmitEditPythonTransformationCommand.java
private ICommand previousPythonTransformationCommand;
private final String previousCommandId;
=======
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/transformation/SubmitEditPythonTransformationCommand.java
private final String targetHNodeId;
private static Logger logger = LoggerFactory
.getLogger(SubmitEditPythonTransformationCommand.class); |
| Solution content |
|---|
public class SubmitEditPythonTransformationCommand extends SubmitPythonTransformationCommand {
private final String targetHNodeId;
private static Logger logger = LoggerFactory
.getLogger(SubmitEditPythonTransformationCommand.class); |
| File |
|---|
| SubmitEditPythonTransformationCommand.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.controller.command.transformation; <<<<<<< HEAD:karma-commands/commands-python/src/main/java/edu/isi/karma/controller/command/transformation/SubmitPythonTransformationCommand.java ======= import java.util.ArrayList; import java.util.Collection; import org.json.JSONArray; import org.json.JSONException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import edu.isi.karma.controller.command.Command; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/transformation/SubmitPythonTransformationCommand.java import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.command.CommandType; import edu.isi.karma.controller.command.worksheet.AddColumnCommand; |
| Solution content |
|---|
package edu.isi.karma.controller.command.transformation; import java.util.ArrayList; import java.util.Collection; import org.json.JSONArray; import org.json.JSONException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import edu.isi.karma.controller.command.Command; import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.command.CommandType; import edu.isi.karma.controller.command.worksheet.AddColumnCommand; |
| File |
|---|
| SubmitPythonTransformationCommand.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.controller.command.service; <<<<<<< HEAD:karma-commands/commands-update/src/main/java/edu/isi/karma/controller/command/service/InvokeServiceCommand.java ======= import java.io.IOException; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.List; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/service/InvokeServiceCommand.java import com.rits.cloning.Cloner; import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.command.CommandType; |
| Solution content |
|---|
package edu.isi.karma.controller.command.service; import java.io.IOException; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.List; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.rits.cloning.Cloner; import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.command.CommandType; |
| File |
|---|
| InvokeServiceCommand.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import edu.isi.karma.controller.update.SemanticTypesUpdate; import edu.isi.karma.controller.update.UpdateContainer; import edu.isi.karma.controller.update.WorksheetUpdateFactory; <<<<<<< HEAD:karma-commands/commands-update/src/main/java/edu/isi/karma/controller/command/service/InvokeServiceCommand.java import edu.isi.karma.rep.*; ======= import edu.isi.karma.modeling.alignment.Alignment; import edu.isi.karma.modeling.alignment.AlignmentManager; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.HNodePath; import edu.isi.karma.rep.Row; import edu.isi.karma.rep.Worksheet; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.alignment.Link; import edu.isi.karma.rep.alignment.Node; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/service/InvokeServiceCommand.java import edu.isi.karma.rep.metadata.MetadataContainer; import edu.isi.karma.rep.sources.InvocationManager; import edu.isi.karma.rep.sources.Table; |
| Solution content |
|---|
import edu.isi.karma.controller.update.SemanticTypesUpdate; import edu.isi.karma.controller.update.UpdateContainer; import edu.isi.karma.controller.update.WorksheetUpdateFactory; import edu.isi.karma.rep.*; import edu.isi.karma.modeling.alignment.Alignment; import edu.isi.karma.modeling.alignment.AlignmentManager; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.HNodePath; import edu.isi.karma.rep.Row; import edu.isi.karma.rep.Worksheet; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.alignment.Link; import edu.isi.karma.rep.alignment.Node; import edu.isi.karma.rep.metadata.MetadataContainer; import edu.isi.karma.rep.sources.InvocationManager; import edu.isi.karma.rep.sources.Table; |
| File |
|---|
| InvokeServiceCommand.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.json.JSONException; import org.json.JSONObject; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/controller/command/CommandPreferences.java import java.io.IOException; ======= import edu.isi.karma.util.Preferences; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/command/CommandPreferences.java /** * @author szekely |
| Solution content |
|---|
import org.json.JSONException; import org.json.JSONObject; import java.io.IOException; import edu.isi.karma.util.Preferences; >>>>>>> refs/remotes/origin/development:src/main/java/edu/isi/karma/controller/command/CommandPreferences.java /** * @author szekely |
| File |
|---|
| CommandPreferences.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
// Save the modeling commands
effects.add(new HistoryAddCommandUpdate(command));
}
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/controller/history/CommandHistory.java
if (!(instanceOf(command, "ResetKarmaCommand"))) {
CommandHistoryWriter chWriter = new CommandHistoryWriter(history, workspace);
try {
chWriter.writeHistoryPerWorksheet();
} catch (JSONException e) {
logger.error("Error occured while writing history!" , e);
e.printStackTrace();
=======
if(!ModelingConfiguration.getManualAlignment()) {
// Save the modeling commands
if (!(command instanceof ResetKarmaCommand)) {
CommandHistoryWriter chWriter = new CommandHistoryWriter(history, workspace);
try {
chWriter.writeHistoryPerWorksheet();
} catch (JSONException e) {
logger.error("Error occured while writing history!" , e);
e.printStackTrace();
}
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/controller/history/CommandHistory.java
}
}
return effects; |
| Solution content |
|---|
effects.add(new HistoryAddCommandUpdate(command));
}
// Save the modeling commands
if (!(instanceOf(command, "ResetKarmaCommand"))) {
CommandHistoryWriter chWriter = new CommandHistoryWriter(history, workspace);
try {
chWriter.writeHistoryPerWorksheet();
} catch (JSONException e) {
logger.error("Error occured while writing history!" , e);
e.printStackTrace();
}
}
return effects; |
| File |
|---|
| CommandHistory.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Catch clause |
| Comment |
| If statement |
| Method invocation |
| Try statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import au.com.bytecode.opencsv.CSVReader; import edu.isi.karma.imp.Import; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/imp/csv/CSVFileImport.java import edu.isi.karma.rep.*; ======= import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.HTable; import edu.isi.karma.rep.RepFactory; import edu.isi.karma.rep.Row; import edu.isi.karma.rep.Table; import edu.isi.karma.rep.Worksheet; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.metadata.WorksheetProperties.Property; import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/imp/csv/CSVFileImport.java import edu.isi.karma.util.EncodingDetector; import edu.isi.karma.webserver.KarmaException; import org.slf4j.Logger; |
| Solution content |
|---|
import au.com.bytecode.opencsv.CSVReader; import edu.isi.karma.imp.Import; import edu.isi.karma.rep.*; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.HTable; import edu.isi.karma.rep.RepFactory; import edu.isi.karma.rep.Row; import edu.isi.karma.rep.Table; import edu.isi.karma.rep.Worksheet; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.metadata.WorksheetProperties.Property; import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes; import edu.isi.karma.util.EncodingDetector; import edu.isi.karma.webserver.KarmaException; import org.slf4j.Logger; |
| File |
|---|
| CSVFileImport.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
rowCount++;
}
@Override
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/imp/csv/CSVFileImport.java
public Worksheet generateWorksheet() throws IOException, KarmaException
{
Table dataTable = getWorksheet().getDataTable();
// Prepare the reader for reading file line by line
InputStreamReader isr = EncodingDetector.getInputStreamReader(csvFile, encoding);
BufferedReader br = new BufferedReader(isr);
// Index for row currently being read
int rowCount = 0;
List |
| Solution content |
|---|
}
@Override
public Worksheet generateWorksheet() throws IOException, KarmaException {
Table dataTable = getWorksheet().getDataTable();
// Prepare the reader for reading file line by line
InputStreamReader isr = EncodingDetector.getInputStreamReader(csvFile, encoding);
BufferedReader br = new BufferedReader(isr);
// Index for row currently being read
int rowCount = 0;
ArrayList |
| File |
|---|
| CSVFileImport.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Method signature |
| Return statement |
| Variable |
| While statement |
| Chunk |
|---|
| Conflicting content |
|---|
*/ package edu.isi.karma.imp.json; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/imp/json/JsonImport.java import edu.isi.karma.imp.Import; import edu.isi.karma.rep.*; import edu.isi.karma.util.FileUtil; import edu.isi.karma.util.JSONUtil; ======= import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/imp/json/JsonImport.java import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; |
| Solution content |
|---|
*/ package edu.isi.karma.imp.json; import edu.isi.karma.imp.Import; import edu.isi.karma.rep.*; import edu.isi.karma.util.FileUtil; import edu.isi.karma.util.JSONUtil; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; |
| File |
|---|
| JsonImport.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.slf4j.Logger; import org.slf4j.LoggerFactory; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/imp/json/JsonImport.java import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; ======= import edu.isi.karma.imp.Import; import edu.isi.karma.rep.ColumnMetadata.DataStructure; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.HTable; import edu.isi.karma.rep.Node; import edu.isi.karma.rep.RepFactory; import edu.isi.karma.rep.Row; import edu.isi.karma.rep.Table; import edu.isi.karma.rep.Worksheet; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.metadata.WorksheetProperties.Property; import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes; import edu.isi.karma.util.FileUtil; import edu.isi.karma.util.JSONUtil; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/imp/json/JsonImport.java /** * @author szekely |
| Solution content |
|---|
import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import edu.isi.karma.imp.Import; import edu.isi.karma.rep.ColumnMetadata.DataStructure; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.HTable; import edu.isi.karma.rep.Node; import edu.isi.karma.rep.RepFactory; import edu.isi.karma.rep.Row; import edu.isi.karma.rep.Table; import edu.isi.karma.rep.Worksheet; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.metadata.WorksheetProperties.Property; import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes; import edu.isi.karma.util.FileUtil; import edu.isi.karma.util.JSONUtil; /** * @author szekely |
| File |
|---|
| JsonImport.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.HashMap;
import java.util.Map;
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/KR2RMLMapping.java
=======
import org.json.JSONArray;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatter;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/KR2RMLMapping.java
public class KR2RMLMapping extends R2RMLMapping{
private KR2RMLVersion version; |
| Solution content |
|---|
import java.util.HashMap;
import java.util.Map;
import org.json.JSONArray;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatter;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
public class KR2RMLMapping extends R2RMLMapping{
private KR2RMLVersion version; |
| File |
|---|
| KR2RMLMapping.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.kr2rml; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/KR2RMLMappingGenerator.java import edu.isi.karma.modeling.alignment.Alignment; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.RepFactory; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.alignment.*; ======= import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.UUID; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/KR2RMLMappingGenerator.java import org.jgrapht.graph.DirectedWeightedMultigraph; import org.json.JSONArray; import org.slf4j.Logger; |
| Solution content |
|---|
package edu.isi.karma.kr2rml; import edu.isi.karma.modeling.alignment.Alignment; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.RepFactory; import edu.isi.karma.rep.Workspace; import edu.isi.karma.rep.alignment.*; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.UUID; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.json.JSONArray; import org.slf4j.Logger; |
| File |
|---|
| KR2RMLMappingGenerator.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/KR2RMLMappingGenerator.java
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
=======
import edu.isi.karma.controller.history.HistoryJsonUtil;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatterFactory;
import edu.isi.karma.modeling.alignment.Alignment;
import edu.isi.karma.modeling.ontology.OntologyManager;
import edu.isi.karma.rep.Worksheet;
import edu.isi.karma.rep.Workspace;
import edu.isi.karma.rep.alignment.ClassInstanceLink;
import edu.isi.karma.rep.alignment.ColumnNode;
import edu.isi.karma.rep.alignment.ColumnSubClassLink;
import edu.isi.karma.rep.alignment.DataPropertyLink;
import edu.isi.karma.rep.alignment.DataPropertyOfColumnLink;
import edu.isi.karma.rep.alignment.DisplayModel;
import edu.isi.karma.rep.alignment.InternalNode;
import edu.isi.karma.rep.alignment.Label;
import edu.isi.karma.rep.alignment.Link;
import edu.isi.karma.rep.alignment.LinkKeyInfo;
import edu.isi.karma.rep.alignment.Node;
import edu.isi.karma.rep.alignment.ObjectPropertySpecializationLink;
import edu.isi.karma.rep.alignment.SemanticType;
import edu.isi.karma.rep.alignment.SemanticTypes;
import edu.isi.karma.rep.alignment.SynonymSemanticTypes;
import edu.isi.karma.rep.metadata.WorksheetProperties.Property;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
import edu.isi.karma.transformation.tokenizer.PythonTransformationAsURITokenizer;
import edu.isi.karma.transformation.tokenizer.PythonTransformationAsURIValidator;
import edu.isi.karma.transformation.tokenizer.PythonTransformationToken;
import edu.isi.karma.util.EncodingDetector;
import edu.isi.karma.util.FileUtil;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/KR2RMLMappingGenerator.java
public class KR2RMLMappingGenerator {
|
| Solution content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import edu.isi.karma.controller.history.HistoryJsonUtil;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatterFactory;
import edu.isi.karma.modeling.alignment.Alignment;
import edu.isi.karma.modeling.ontology.OntologyManager;
import edu.isi.karma.rep.Worksheet;
import edu.isi.karma.rep.Workspace;
import edu.isi.karma.rep.alignment.ClassInstanceLink;
import edu.isi.karma.rep.alignment.ColumnNode;
import edu.isi.karma.rep.alignment.ColumnSubClassLink;
import edu.isi.karma.rep.alignment.DataPropertyLink;
import edu.isi.karma.rep.alignment.DataPropertyOfColumnLink;
import edu.isi.karma.rep.alignment.DisplayModel;
import edu.isi.karma.rep.alignment.InternalNode;
import edu.isi.karma.rep.alignment.Label;
import edu.isi.karma.rep.alignment.Link;
import edu.isi.karma.rep.alignment.LinkKeyInfo;
import edu.isi.karma.rep.alignment.Node;
import edu.isi.karma.rep.alignment.ObjectPropertySpecializationLink;
import edu.isi.karma.rep.alignment.SemanticType;
import edu.isi.karma.rep.alignment.SemanticTypes;
import edu.isi.karma.rep.alignment.SynonymSemanticTypes;
import edu.isi.karma.rep.metadata.WorksheetProperties.Property;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
import edu.isi.karma.transformation.tokenizer.PythonTransformationAsURITokenizer;
import edu.isi.karma.transformation.tokenizer.PythonTransformationAsURIValidator;
import edu.isi.karma.transformation.tokenizer.PythonTransformationToken;
import edu.isi.karma.util.EncodingDetector;
import edu.isi.karma.util.FileUtil;
public class KR2RMLMappingGenerator {
|
| File |
|---|
| KR2RMLMappingGenerator.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.kr2rml; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/KR2RMLWorksheetRDFGenerator.java import edu.isi.karma.modeling.Namespaces; import edu.isi.karma.modeling.Uris; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.*; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.*; import java.util.*; ======= import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import edu.isi.karma.kr2rml.ErrorReport.Priority; import edu.isi.karma.modeling.Namespaces; import edu.isi.karma.modeling.Uris; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.Node; import edu.isi.karma.rep.RepFactory; import edu.isi.karma.rep.Row; import edu.isi.karma.rep.Table; import edu.isi.karma.rep.Worksheet; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/KR2RMLWorksheetRDFGenerator.java /** * Class KR2RMLWorksheetRDFGenerator |
| Solution content |
|---|
package edu.isi.karma.kr2rml; import edu.isi.karma.modeling.Namespaces; import edu.isi.karma.modeling.Uris; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.*; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.*; import java.util.*; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import edu.isi.karma.kr2rml.ErrorReport.Priority; import edu.isi.karma.modeling.Namespaces; import edu.isi.karma.modeling.Uris; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.HNode; import edu.isi.karma.rep.Node; import edu.isi.karma.rep.RepFactory; import edu.isi.karma.rep.Row; import edu.isi.karma.rep.Table; import edu.isi.karma.rep.Worksheet; /** * Class KR2RMLWorksheetRDFGenerator |
| File |
|---|
| KR2RMLWorksheetRDFGenerator.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
this.addColumnContextInformation = addColumnContextInformation; this.translator = new KR2RMLMappingColumnNameHNodeTranslator(factory, worksheet); populatePrefixToNamespaceMap(); <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/KR2RMLWorksheetRDFGenerator.java populateHNodeIdAndColumnNameMaps(); ======= >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/KR2RMLWorksheetRDFGenerator.java } |
| Solution content |
|---|
this.addColumnContextInformation = addColumnContextInformation; this.translator = new KR2RMLMappingColumnNameHNodeTranslator(factory, worksheet); populatePrefixToNamespaceMap(); populateHNodeIdAndColumnNameMaps(); } |
| File |
|---|
| KR2RMLWorksheetRDFGenerator.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
predicatesFailed.remove(pom.getPredicate().getId());
}
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/KR2RMLWorksheetRDFGenerator.java
private void populateHNodeIdAndColumnNameMaps()
{
for(String columnName : kr2rmlMapping.getAuxInfo().getColumnNameToPredObjLinks().keySet())
{
try
{
getHNodeIdForColumnName(columnName);
}
catch (HNodeNotFoundKarmaException ex)
{
logger.debug("Unable to find HNodeId for column name: " + columnName, ex);
}
}
}
private String getHNodeIdForColumnName(String templateTermValue) throws HNodeNotFoundKarmaException {
if(!this.columnNameToHNodeId.containsKey(templateTermValue))
{
try {
String hNodeId = translateColumnNameToHNodeId(templateTermValue);
columnNameToHNodeId.put(templateTermValue, hNodeId);
hNodeIdToColumnName.put(hNodeId, templateTermValue);
} catch (JSONException e) {
throw new HNodeNotFoundKarmaException("Unable to find HNodeId for column name", templateTermValue);
}
}
return this.columnNameToHNodeId.get(templateTermValue);
}
private String translateColumnNameToHNodeId(String colTermVal) throws JSONException
{
HTable hTable = worksheet.getHeaders();
// If hierarchical columns
if (colTermVal.startsWith("[") && colTermVal.endsWith("]") && colTermVal.contains(",")) {
JSONArray strArr = new JSONArray(colTermVal);
for (int i=0; i |
| Solution content |
|---|
predicatesFailed.remove(pom.getPredicate().getId());
}
private void populateHNodeIdAndColumnNameMaps()
{
for(String columnName : kr2rmlMapping.getAuxInfo().getColumnNameToPredObjLinks().keySet())
{
try
{
getHNodeIdForColumnName(columnName);
}
catch (HNodeNotFoundKarmaException ex)
{
logger.debug("Unable to find HNodeId for column name: " + columnName, ex);
}
}
}
private String getHNodeIdForColumnName(String templateTermValue) throws HNodeNotFoundKarmaException {
if(!this.columnNameToHNodeId.containsKey(templateTermValue))
{
try {
String hNodeId = translateColumnNameToHNodeId(templateTermValue);
columnNameToHNodeId.put(templateTermValue, hNodeId);
hNodeIdToColumnName.put(hNodeId, templateTermValue);
} catch (JSONException e) {
throw new HNodeNotFoundKarmaException("Unable to find HNodeId for column name", templateTermValue);
}
}
return this.columnNameToHNodeId.get(templateTermValue);
}
private String translateColumnNameToHNodeId(String colTermVal) throws JSONException
{
HTable hTable = worksheet.getHeaders();
// If hierarchical columns
if (colTermVal.startsWith("[") && colTermVal.endsWith("]") && colTermVal.contains(",")) {
JSONArray strArr = new JSONArray(colTermVal);
for (int i=0; i |
| File |
|---|
| KR2RMLWorksheetRDFGenerator.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
String colUri = getColumnContextUri(hNodeId);
// Generate the type
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/KR2RMLWorksheetRDFGenerator.java
String typeTriple = constructTripleWithURIObject(colUri, Uris.RDF_TYPE_URI,
Uris.PROV_ENTITY_URI);
=======
String typeTriple = constructTripleWithURIObject("<" + colUri + ">", Uris.RDF_TYPE_URI,
"<" + Uris.PROV_ENTITY_URI + ">");
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/KR2RMLWorksheetRDFGenerator.java
colContextTriples.add(typeTriple);
// Generate the label |
| Solution content |
|---|
String colUri = getColumnContextUri(hNodeId);
// Generate the type
String typeTriple = constructTripleWithURIObject("<" + colUri + ">", Uris.RDF_TYPE_URI,
"<" + Uris.PROV_ENTITY_URI + ">");
colContextTriples.add(typeTriple);
// Generate the label |
| File |
|---|
| KR2RMLWorksheetRDFGenerator.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
// Generate the label
HNode hNode = factory.getHNode(hNodeId);
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/KR2RMLWorksheetRDFGenerator.java
String labelTriple = constructTripleWithLiteralObject(colUri, Uris.RDFS_LABEL_URI,
=======
String labelTriple = constructTripleWithLiteralObject("<" + colUri + ">", Uris.RDFS_LABEL_URI,
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/KR2RMLWorksheetRDFGenerator.java
hNode.getColumnName(), "");
colContextTriples.add(labelTriple);
|
| Solution content |
|---|
// Generate the label
HNode hNode = factory.getHNode(hNodeId);
String labelTriple = constructTripleWithLiteralObject("<" + colUri + ">", Uris.RDFS_LABEL_URI,
hNode.getColumnName(), "");
colContextTriples.add(labelTriple);
|
| File |
|---|
| KR2RMLWorksheetRDFGenerator.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import org.json.JSONException;
import org.json.JSONObject;
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/TemplateTermSet.java
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
=======
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatter;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatterFactory;
import edu.isi.karma.rep.HNode;
import edu.isi.karma.rep.RepFactory;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/TemplateTermSet.java
public class TemplateTermSet {
|
| Solution content |
|---|
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatter;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatterFactory;
import edu.isi.karma.rep.HNode;
import edu.isi.karma.rep.RepFactory;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
public class TemplateTermSet {
|
| File |
|---|
| TemplateTermSet.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/TemplateTermSetBuilder.java
import java.util.regex.Matcher;
import java.util.regex.Pattern;
=======
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatter;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatterFactory;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/TemplateTermSetBuilder.java
public class TemplateTermSetBuilder {
|
| Solution content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatter;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatterFactory;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
public class TemplateTermSetBuilder {
|
| File |
|---|
| TemplateTermSetBuilder.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.kr2rml; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/WorksheetR2RMLJenaModelParser.java import com.hp.hpl.jena.rdf.model.*; import edu.isi.karma.modeling.Uris; import edu.isi.karma.webserver.KarmaException; ======= import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/WorksheetR2RMLJenaModelParser.java import org.json.JSONArray; import org.json.JSONException; import org.slf4j.Logger; |
| Solution content |
|---|
package edu.isi.karma.kr2rml; import com.hp.hpl.jena.rdf.model.*; import edu.isi.karma.modeling.Uris; import edu.isi.karma.webserver.KarmaException; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; import org.json.JSONArray; import org.json.JSONException; import org.slf4j.Logger; |
| File |
|---|
| WorksheetR2RMLJenaModelParser.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/WorksheetR2RMLJenaModelParser.java
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
=======
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.NodeIterator;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.ResIterator;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.Statement;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatter;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatterFactory;
import edu.isi.karma.modeling.Uris;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
import edu.isi.karma.webserver.KarmaException;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/WorksheetR2RMLJenaModelParser.java
public class WorksheetR2RMLJenaModelParser {
|
| Solution content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.NodeIterator;
import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.ResIterator;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.Statement;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatter;
import edu.isi.karma.kr2rml.formatter.KR2RMLColumnNameFormatterFactory;
import edu.isi.karma.modeling.Uris;
import edu.isi.karma.rep.metadata.WorksheetProperties.SourceTypes;
import edu.isi.karma.webserver.KarmaException;
public class WorksheetR2RMLJenaModelParser {
|
| File |
|---|
| WorksheetR2RMLJenaModelParser.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
RDFNode templNode = templateItr.next(); String template = templNode.toString(); subjTemplTermSet = TemplateTermSetBuilder.constructTemplateTermSetFromR2rmlTemplateString( <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/kr2rml/WorksheetR2RMLJenaModelParser.java template); ======= template, kr2rmlMapping.getColumnNameFormatter()); >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/kr2rml/WorksheetR2RMLJenaModelParser.java } if(subjTemplTermSet != null) subjMap.setTemplate(subjTemplTermSet); |
| Solution content |
|---|
RDFNode templNode = templateItr.next(); String template = templNode.toString(); subjTemplTermSet = TemplateTermSetBuilder.constructTemplateTermSetFromR2rmlTemplateString( template, kr2rmlMapping.getColumnNameFormatter()); } if(subjTemplTermSet != null) subjMap.setTemplate(subjTemplTermSet); |
| File |
|---|
| WorksheetR2RMLJenaModelParser.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return semanticTypeMatches;
}
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/modeling/alignment/GraphBuilder.java
public void resetOntologyMaps()
{
=======
public int getNumberOfModelLinks() {
return numberOfModelLinks;
}
public void resetOntologyMaps() {
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/GraphBuilder.java
String[] currentUris = this.uriClosure.keySet().toArray(new String[0]);
this.uriClosure.clear();
for (String uri : currentUris) |
| Solution content |
|---|
return semanticTypeMatches;
}
public int getNumberOfModelLinks() {
return numberOfModelLinks;
}
public void resetOntologyMaps() {
String[] currentUris = this.uriClosure.keySet().toArray(new String[0]);
this.uriClosure.clear();
for (String uri : currentUris) |
| File |
|---|
| GraphBuilder.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method declaration |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
}
this.sourceToTargetLinkUris.add(key);
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/modeling/alignment/GraphBuilder.java
if (link.getModelIds() != null)
this.modelIds.addAll(link.getModelIds());
=======
if (link.getModelIds() != null) {
this.modelIds.addAll(link.getModelIds());
this.numberOfModelLinks++;
}
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/GraphBuilder.java
this.updateLinkCountMap(link);
logger.debug("exit>"); |
| Solution content |
|---|
}
this.sourceToTargetLinkUris.add(key);
if (link.getModelIds() != null) {
this.modelIds.addAll(link.getModelIds());
this.numberOfModelLinks++;
}
this.updateLinkCountMap(link);
logger.debug("exit>"); |
| File |
|---|
| GraphBuilder.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
******************************************************************************/ package edu.isi.karma.modeling.alignment; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/modeling/alignment/GraphUtil.java import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import edu.isi.karma.rep.HTable; import edu.isi.karma.rep.alignment.*; import edu.isi.karma.rep.alignment.SemanticType.Origin; ======= import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/GraphUtil.java import org.jgrapht.DirectedGraph; import org.jgrapht.Graph; import org.jgrapht.UndirectedGraph; |
| Solution content |
|---|
******************************************************************************/ package edu.isi.karma.modeling.alignment; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import edu.isi.karma.rep.HTable; import edu.isi.karma.rep.alignment.*; import edu.isi.karma.rep.alignment.SemanticType.Origin; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; >>>>>>> refs/remotes/origin/development:src/main/java/edu/isi/karma/modeling/alignment/GraphUtil.java import org.jgrapht.DirectedGraph; import org.jgrapht.Graph; import org.jgrapht.UndirectedGraph; |
| File |
|---|
| GraphUtil.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.modeling.alignment; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/modeling/alignment/GraphVizUtil.java ======= import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.text.DecimalFormat; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/GraphVizUtil.java import edu.isi.karma.rep.alignment.ColumnNode; import edu.isi.karma.rep.alignment.Link; import edu.isi.karma.rep.alignment.LiteralNode; |
| Solution content |
|---|
package edu.isi.karma.modeling.alignment; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.text.DecimalFormat; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import edu.isi.karma.rep.alignment.ColumnNode; import edu.isi.karma.rep.alignment.Link; import edu.isi.karma.rep.alignment.LiteralNode; |
| File |
|---|
| GraphVizUtil.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.modeling.alignment; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/modeling/alignment/SemanticModel.java ======= import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.math.BigInteger; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Function; import com.google.common.collect.Collections2; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/SemanticModel.java import com.google.common.collect.Sets; import com.google.common.math.BigIntegerMath; import com.google.gson.stream.JsonReader; |
| Solution content |
|---|
package edu.isi.karma.modeling.alignment; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.math.BigInteger; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Function; import com.google.common.collect.Collections2; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; import com.google.common.math.BigIntegerMath; import com.google.gson.stream.JsonReader; |
| File |
|---|
| SemanticModel.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/modeling/alignment/SemanticModel.java import edu.isi.karma.rep.alignment.*; ======= import com.hp.hpl.jena.graph.impl.BaseGraphMaker; import edu.isi.karma.rep.alignment.ColumnNode; import edu.isi.karma.rep.alignment.InternalNode; import edu.isi.karma.rep.alignment.Link; import edu.isi.karma.rep.alignment.Node; import edu.isi.karma.rep.alignment.SemanticType; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/SemanticModel.java import edu.isi.karma.rep.alignment.SemanticType.Origin; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; |
| Solution content |
|---|
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import com.hp.hpl.jena.graph.impl.BaseGraphMaker; import edu.isi.karma.rep.alignment.ColumnNode; import edu.isi.karma.rep.alignment.InternalNode; import edu.isi.karma.rep.alignment.Link; import edu.isi.karma.rep.alignment.Node; import edu.isi.karma.rep.alignment.SemanticType; import edu.isi.karma.rep.alignment.SemanticType.Origin; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; |
| File |
|---|
| SemanticModel.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import edu.isi.karma.modeling.ModelingConfiguration; import edu.isi.karma.modeling.ModelingParams; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/modeling/alignment/learner/ModelLearningGraph.java import edu.isi.karma.modeling.alignment.*; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.alignment.*; ======= import edu.isi.karma.modeling.alignment.GraphBuilder; import edu.isi.karma.modeling.alignment.GraphUtil; import edu.isi.karma.modeling.alignment.GraphVizUtil; import edu.isi.karma.modeling.alignment.LinkIdFactory; import edu.isi.karma.modeling.alignment.NodeIdFactory; import edu.isi.karma.modeling.alignment.SemanticModel; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.alignment.ColumnNode; import edu.isi.karma.rep.alignment.DataPropertyLink; import edu.isi.karma.rep.alignment.InternalNode; import edu.isi.karma.rep.alignment.Label; import edu.isi.karma.rep.alignment.Link; import edu.isi.karma.rep.alignment.Node; import edu.isi.karma.rep.alignment.ObjectPropertyLink; import edu.isi.karma.rep.alignment.ObjectPropertyType; import edu.isi.karma.rep.alignment.SubClassLink; import edu.isi.karma.util.EncodingDetector; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/modeling/alignment/learner/ModelLearningGraph.java import edu.isi.karma.util.RandomGUID; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; |
| Solution content |
|---|
import edu.isi.karma.modeling.ModelingConfiguration; import edu.isi.karma.modeling.ModelingParams; import edu.isi.karma.modeling.alignment.GraphBuilder; import edu.isi.karma.modeling.alignment.GraphUtil; import edu.isi.karma.modeling.alignment.GraphVizUtil; import edu.isi.karma.modeling.alignment.LinkIdFactory; import edu.isi.karma.modeling.alignment.NodeIdFactory; import edu.isi.karma.modeling.alignment.SemanticModel; import edu.isi.karma.modeling.ontology.OntologyManager; import edu.isi.karma.rep.alignment.ColumnNode; import edu.isi.karma.rep.alignment.DataPropertyLink; import edu.isi.karma.rep.alignment.InternalNode; import edu.isi.karma.rep.alignment.Label; import edu.isi.karma.rep.alignment.Link; import edu.isi.karma.rep.alignment.Node; import edu.isi.karma.rep.alignment.ObjectPropertyLink; import edu.isi.karma.rep.alignment.ObjectPropertyType; import edu.isi.karma.rep.alignment.SubClassLink; import edu.isi.karma.util.EncodingDetector; import edu.isi.karma.util.RandomGUID; import org.jgrapht.graph.DirectedWeightedMultigraph; import org.slf4j.Logger; |
| File |
|---|
| ModelLearningGraph.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.json.JSONException;
import org.json.JSONObject;
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/rep/metadata/WorksheetProperties.java
import java.util.HashMap;
import java.util.Map;
=======
import edu.isi.karma.rep.ColumnMetadata.DataStructure;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/rep/metadata/WorksheetProperties.java
public class WorksheetProperties {
|
| Solution content |
|---|
import org.json.JSONException;
import org.json.JSONObject;
import java.util.HashMap;
import java.util.Map;
import edu.isi.karma.rep.ColumnMetadata.DataStructure;
public class WorksheetProperties {
|
| File |
|---|
| WorksheetProperties.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
package edu.isi.karma.util; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/util/Preferences.java import edu.isi.karma.webserver.ServletContextParameterMap; import edu.isi.karma.webserver.ServletContextParameterMap.ContextParameter; ======= import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import org.json.JSONException; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/util/Preferences.java import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; |
| Solution content |
|---|
package edu.isi.karma.util; import edu.isi.karma.webserver.ServletContextParameterMap; import edu.isi.karma.webserver.ServletContextParameterMap.ContextParameter; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import org.json.JSONException; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; |
| File |
|---|
| Preferences.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/util/Preferences.java
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
=======
import edu.isi.karma.modeling.ModelingConfiguration;
import edu.isi.karma.webserver.ServletContextParameterMap;
import edu.isi.karma.webserver.ServletContextParameterMap.ContextParameter;
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/util/Preferences.java
public abstract class Preferences {
/** |
| Solution content |
|---|
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import edu.isi.karma.modeling.ModelingConfiguration;
import edu.isi.karma.webserver.ServletContextParameterMap;
import edu.isi.karma.webserver.ServletContextParameterMap.ContextParameter;
public abstract class Preferences {
/** |
| File |
|---|
| Preferences.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
*/ package edu.isi.karma.view; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/view/ViewPreferences.java import edu.isi.karma.util.FileUtil; ======= import java.io.IOException; import org.json.JSONException; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/view/ViewPreferences.java import edu.isi.karma.util.Preferences; import org.json.JSONException; |
| Solution content |
|---|
*/ package edu.isi.karma.view; import edu.isi.karma.util.FileUtil; import java.io.IOException; import org.json.JSONException; import edu.isi.karma.util.Preferences; import org.json.JSONException; |
| File |
|---|
| ViewPreferences.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
} catch (JSONException e) {
Preferences.logger.error("Error setting int value!", e);
} catch (IOException e) {
<<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/view/ViewPreferences.java
Preferences.logger.error("Error writing the changed preferences to file!" + jsonFile.getName(), e);
=======
logger.error("Error writing the changed preferences to file!", e);
>>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/view/ViewPreferences.java
}
}
} |
| Solution content |
|---|
} catch (JSONException e) {
Preferences.logger.error("Error setting int value!", e);
} catch (IOException e) {
Preferences.logger.error("Error writing the changed preferences to file!" + jsonFile.getName(), e);
}
}
} |
| File |
|---|
| ViewPreferences.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.command.CommandFactory; import edu.isi.karma.controller.command.IPreviewable; <<<<<<< HEAD:karma-common/src/main/java/edu/isi/karma/webserver/ExecutionController.java ======= import edu.isi.karma.controller.command.JSONInputCommandFactory; import edu.isi.karma.controller.command.ResetKarmaCommand; import edu.isi.karma.controller.command.ResetKarmaCommandFactory; import edu.isi.karma.controller.command.TestSPARQLEndPointCommand; import edu.isi.karma.controller.command.TestSPARQLEndPointCommandFactory; import edu.isi.karma.controller.command.UndoRedoCommand; import edu.isi.karma.controller.command.UndoRedoCommandFactory; import edu.isi.karma.controller.command.alignment.AddUserLinkToAlignmentCommand; import edu.isi.karma.controller.command.alignment.AddUserLinkToAlignmentCommandFactory; import edu.isi.karma.controller.command.alignment.ApplyModelFromTripleStoreCommand; import edu.isi.karma.controller.command.alignment.ApplyModelFromTripleStoreCommandFactory; import edu.isi.karma.controller.command.alignment.ChangeInternalNodeLinksCommand; import edu.isi.karma.controller.command.alignment.ChangeInternalNodeLinksCommandFactory; import edu.isi.karma.controller.command.alignment.CreateNewModelCommand; import edu.isi.karma.controller.command.alignment.CreateNewModelCommandFactory; import edu.isi.karma.controller.command.alignment.FetchExistingModelsForWorksheetCommand; import edu.isi.karma.controller.command.alignment.FetchExistingModelsForWorksheetCommandFactory; import edu.isi.karma.controller.command.alignment.FetchR2RMLModelsCommand; import edu.isi.karma.controller.command.alignment.FetchR2RMLModelsCommandFactory; import edu.isi.karma.controller.command.alignment.GenerateR2RMLModelCommand; import edu.isi.karma.controller.command.alignment.GenerateR2RMLModelCommandFactory; import edu.isi.karma.controller.command.alignment.GetAlternativeLinksCommand; import edu.isi.karma.controller.command.alignment.GetAlternativeLinksCommandFactory; import edu.isi.karma.controller.command.alignment.GetCurrentLinksOfInternalNodeCommand; import edu.isi.karma.controller.command.alignment.GetCurrentLinksOfInternalNodeCommandFactory; import edu.isi.karma.controller.command.alignment.GetDataPropertiesForClassCommand; import edu.isi.karma.controller.command.alignment.GetDataPropertiesForClassCommandFactory; import edu.isi.karma.controller.command.alignment.GetDataPropertyHierarchyCommand; import edu.isi.karma.controller.command.alignment.GetDataPropertyHierarchyCommandFactory; import edu.isi.karma.controller.command.alignment.GetDomainsForDataPropertyCommand; import edu.isi.karma.controller.command.alignment.GetDomainsForDataPropertyCommandFactory; import edu.isi.karma.controller.command.alignment.GetInternalNodesListOfAlignmentCommand; import edu.isi.karma.controller.command.alignment.GetInternalNodesListOfAlignmentCommandFactory; import edu.isi.karma.controller.command.alignment.GetLinksOfAlignmentCommand; import edu.isi.karma.controller.command.alignment.GetLinksOfAlignmentCommandFactory; import edu.isi.karma.controller.command.alignment.GetOntologyClassHierarchyCommand; import edu.isi.karma.controller.command.alignment.GetOntologyClassHierarchyCommandFactory; import edu.isi.karma.controller.command.alignment.GetPropertiesAndClassesList; import edu.isi.karma.controller.command.alignment.GetPropertiesAndClassesListCommandFactory; import edu.isi.karma.controller.command.alignment.InvokeDataMiningServiceCommand; import edu.isi.karma.controller.command.alignment.InvokeDataMiningServiceCommandFactory; import edu.isi.karma.controller.command.alignment.SetMetaPropertyCommand; import edu.isi.karma.controller.command.alignment.SetMetaPropertyCommandFactory; import edu.isi.karma.controller.command.alignment.SetSemanticTypeCommand; import edu.isi.karma.controller.command.alignment.SetSemanticTypeCommandFactory; import edu.isi.karma.controller.command.alignment.ShowAutoModelCommand; import edu.isi.karma.controller.command.alignment.ShowAutoModelCommandFactory; import edu.isi.karma.controller.command.alignment.ShowModelCommand; import edu.isi.karma.controller.command.alignment.ShowModelCommandFactory; import edu.isi.karma.controller.command.alignment.UnassignSemanticTypeCommand; import edu.isi.karma.controller.command.alignment.UnassignSemanticTypeCommandFactory; import edu.isi.karma.controller.command.cleaning.FetchTransformingDataCommand; import edu.isi.karma.controller.command.cleaning.FetchTransformingDataFactory; import edu.isi.karma.controller.command.cleaning.GenerateCleaningRulesCommand; import edu.isi.karma.controller.command.cleaning.GenerateCleaningRulesCommandFactory; import edu.isi.karma.controller.command.cleaning.InvokeCleaningServiceCommand; import edu.isi.karma.controller.command.cleaning.InvokeCleaningServiceCommandFactory; import edu.isi.karma.controller.command.cleaning.SubmitCleaningCommand; import edu.isi.karma.controller.command.cleaning.SubmitCleaningCommandFactory; import edu.isi.karma.controller.command.importdata.ImportCSVFileCommand; import edu.isi.karma.controller.command.importdata.ImportCSVFileCommandFactory; import edu.isi.karma.controller.command.importdata.ImportDatabaseTableCommand; import edu.isi.karma.controller.command.importdata.ImportDatabaseTableCommandFactory; import edu.isi.karma.controller.command.importdata.ImportExcelFileCommand; import edu.isi.karma.controller.command.importdata.ImportExcelFileCommandFactory; import edu.isi.karma.controller.command.importdata.ImportJSONFileCommand; import edu.isi.karma.controller.command.importdata.ImportJSONFileCommandFactory; import edu.isi.karma.controller.command.importdata.ImportOntologyCommand; import edu.isi.karma.controller.command.importdata.ImportOntologyCommandFactory; import edu.isi.karma.controller.command.importdata.ImportServiceCommand; import edu.isi.karma.controller.command.importdata.ImportServiceCommandFactory; import edu.isi.karma.controller.command.importdata.ImportXMLFileCommand; import edu.isi.karma.controller.command.importdata.ImportXMLFileCommandFactory; import edu.isi.karma.controller.command.publish.PublishCSVCommand; import edu.isi.karma.controller.command.publish.PublishCSVCommandFactory; import edu.isi.karma.controller.command.publish.PublishDatabaseCommand; import edu.isi.karma.controller.command.publish.PublishDatabaseCommandFactory; import edu.isi.karma.controller.command.publish.PublishKMLLayerCommand; import edu.isi.karma.controller.command.publish.PublishKMLLayerCommandFactory; import edu.isi.karma.controller.command.publish.PublishMDBCommand; import edu.isi.karma.controller.command.publish.PublishMDBCommandFactory; import edu.isi.karma.controller.command.publish.PublishRDFCellCommand; import edu.isi.karma.controller.command.publish.PublishRDFCellCommandFactory; import edu.isi.karma.controller.command.publish.PublishRDFCommand; import edu.isi.karma.controller.command.publish.PublishRDFCommandFactory; import edu.isi.karma.controller.command.publish.PublishSpatialDataCommand; import edu.isi.karma.controller.command.publish.PublishSpatialDataCommandFactory; import edu.isi.karma.controller.command.publish.PublishWorksheetHistoryCommand; import edu.isi.karma.controller.command.publish.PublishWorksheetHistoryCommandFactory; import edu.isi.karma.controller.command.reconciliation.InvokeRubenReconciliationService; import edu.isi.karma.controller.command.reconciliation.InvokeRubenReconciliationServiceFactory; import edu.isi.karma.controller.command.service.InvokeServiceCommand; import edu.isi.karma.controller.command.service.InvokeServiceCommandFactory; import edu.isi.karma.controller.command.service.PopulateCommand; import edu.isi.karma.controller.command.service.PopulateCommandFactory; import edu.isi.karma.controller.command.service.PublishModelCommand; import edu.isi.karma.controller.command.service.PublishModelCommandFactory; import edu.isi.karma.controller.command.transformation.PreviewPythonTransformationResultsCommand; import edu.isi.karma.controller.command.transformation.PreviewPythonTransformationResultsCommandFactory; import edu.isi.karma.controller.command.transformation.SubmitEditPythonTransformationCommand; import edu.isi.karma.controller.command.transformation.SubmitEditPythonTransformationCommandFactory; import edu.isi.karma.controller.command.transformation.SubmitPythonTransformationCommand; import edu.isi.karma.controller.command.transformation.SubmitPythonTransformationCommandFactory; import edu.isi.karma.controller.command.worksheet.AddColumnCommand; import edu.isi.karma.controller.command.worksheet.AddColumnCommandFactory; import edu.isi.karma.controller.command.worksheet.AddRowCommand; import edu.isi.karma.controller.command.worksheet.AddRowCommandFactory; import edu.isi.karma.controller.command.worksheet.ApplyHistoryFromR2RMLModelCommand; import edu.isi.karma.controller.command.worksheet.ApplyHistoryFromR2RMLModelCommandFactory; import edu.isi.karma.controller.command.worksheet.ApplyWorksheetHistoryCommand; import edu.isi.karma.controller.command.worksheet.ApplyWorksheetHistoryCommandFactory; import edu.isi.karma.controller.command.worksheet.EditCellCommand; import edu.isi.karma.controller.command.worksheet.EditCellCommandFactory; import edu.isi.karma.controller.command.worksheet.FetchExistingWorksheetPropertiesCommand; import edu.isi.karma.controller.command.worksheet.FetchExistingWorksheetPropertiesCommandFactory; import edu.isi.karma.controller.command.worksheet.LoadAdditionalWorksheetRowsCommand; import edu.isi.karma.controller.command.worksheet.LoadAdditionalWorksheetRowsCommandFactory; import edu.isi.karma.controller.command.worksheet.MultipleValueEditColumnCommand; import edu.isi.karma.controller.command.worksheet.MultipleValueEditColumnCommandFactory; import edu.isi.karma.controller.command.worksheet.RenameColumnCommand; import edu.isi.karma.controller.command.worksheet.RenameColumnCommandFactory; import edu.isi.karma.controller.command.worksheet.SetWorksheetPropertiesCommand; import edu.isi.karma.controller.command.worksheet.SetWorksheetPropertiesCommandFactory; import edu.isi.karma.controller.command.worksheet.SplitByCommaCommand; import edu.isi.karma.controller.command.worksheet.SplitByCommaCommandFactory; >>>>>>> 7d4eefb8ee3745f7e2529df9caa8870752e22a1e:src/main/java/edu/isi/karma/webserver/ExecutionController.java import edu.isi.karma.controller.update.ErrorUpdate; import edu.isi.karma.controller.update.UpdateContainer; import edu.isi.karma.rep.Workspace; |
| Solution content |
|---|
import edu.isi.karma.controller.command.CommandException; import edu.isi.karma.controller.command.CommandFactory; import edu.isi.karma.controller.command.IPreviewable; import edu.isi.karma.controller.update.ErrorUpdate; import edu.isi.karma.controller.update.UpdateContainer; import edu.isi.karma.rep.Workspace; |
| File |
|---|
| ExecutionController.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |