Projects >> ProvToolbox >>7f34a1a7780b01d1ee826d419927ce0bcf8bfe2e

Chunk
Conflicting content 
			   
    
	    a.setAttributes(attrs);
	    return a;
    }
<<<<<<< HEAD

    public String unwrap (String s) {
	return s.substring(1,s.length()-1);
    }
    public void walk(Tree ast) {
        switch(ast.getType()) {
		case ASNParser.ACTIVITY:
			System.out.print("ACTIVITY ");
			walk(ast.getChild(0));
			walk(ast.getChild(1));
			walk(ast.getChild(2));
			walk(ast.getChild(3));
			walk(ast.getChild(4));
			System.out.print(";\n");
			break;
		case ASNParser.ENTITY:
			System.out.print("entity ");
			walk(ast.getChild(0));
			walk(ast.getChild(1));
			System.out.print(";\n");
			break;
		case ASNParser.CONTAINER:
			System.out.print("container ");
			for (int i=0; i< ast.getChildCount(); i++) {
			    walk(ast.getChild(i));
			}
			System.out.print(";\n");
			break;
		case ASNParser.ATTRIBUTES:
			System.out.print("ATTRIBUTES ");
			for (int i=0; i< ast.getChildCount(); i++) {
			    walk(ast.getChild(i));
			}
			break;
		case ASNParser.ID:
			System.out.print("ID ");
			walkToken(getTokenString(ast.getChild(0)));
			System.out.print(" ");
			break;
		case ASNParser.ATTRIBUTE:
			System.out.print("ATTRIBUTE ");
			walkToken(getTokenString(ast.getChild(0)));
			walk(ast.getChild(1));
			System.out.print(" ");
			break;
		case ASNParser.START:
			System.out.print("START ");
			walkToken(getTokenString(ast.getChild(0)));
			System.out.print(" ");
			break;
		case ASNParser.END:
			System.out.print("END ");
			walkToken(getTokenString(ast.getChild(0)));
			System.out.print(" ");
			break;
		case ASNParser.A:
            if (ast.getChildCount()==0) {
                walkToken(null);
            } else {
                walk(ast.getChild(0));
            }
			System.out.print(" ");
			break;
		case ASNParser.STRING:
			System.out.print("STRING ");
			walk(ast.getChild(0));
			System.out.print(" ");
			break;
		case ASNParser.TYPEDLITERAL:
			System.out.print("TYPEDLITERAL ");
			walk(ast.getChild(0));
			System.out.print(" ");
			walk(ast.getChild(1));
			break;
		case ASNParser.USED:
			System.out.print("USED ");
			walk(ast.getChild(0));
			walk(ast.getChild(1));
			walk(ast.getChild(2));
			walk(ast.getChild(3));
			System.out.print(";\n");
			break;
		case ASNParser.WGB:
			System.out.print("WGB ");
			walk(ast.getChild(0));
			walk(ast.getChild(1));
			walk(ast.getChild(2));
			walk(ast.getChild(3));
			System.out.print(";\n");
			break;
		case ASNParser.WDF:
			System.out.print("WDF ");
			walk(ast.getChild(0));
			walk(ast.getChild(1));
			walk(ast.getChild(2));
			walk(ast.getChild(3));
			walk(ast.getChild(4));
			System.out.print(";\n");
			break;
=======
>>>>>>> 2f214528f214aa5ff252443fd6bbb9c7c0032668

    public Object convertEntity(Object id, Object eAttrs) {
	    String s_id=(String)id;
Solution content 
    }

    public String unwrap (String s) {
	return s.substring(1,s.length()-1);
    }
			   
    public Object convertEntity(Object id, Object eAttrs) {
File
ProvConstructor.java
Developer's decision
Combination
Kind of conflict
Break statement
Case statement
For statement
If statement
Method declaration
Method invocation
Method signature
Switch statement
Chunk
Conflicting content 
            attrs.getAny().add(o);
	    }
	    return attrs;
<<<<<<< HEAD
	case ASNParser.ID:
	    return convertToken(getTokenString(ast.getChild(0)));
	case ASNParser.ATTRIBUTE:
	    System.out.print("ATTRIBUTE ");
	    String attr1=(String)convertToken(getTokenString(ast.getChild(0)));
	    System.out.print(" ");
	    Object value1=convert(ast.getChild(1));
	    if (value1 instanceof String) {
		String val1=(String)(value1);
		return pFactory.newAttribute("http://todo.org/soon",
					     attr1.substring(0,attr1.indexOf(':')),
					     attr1.substring(attr1.indexOf(':')+1,attr1.length()),
					     unwrap(val1));
	    } else {
		QName attr1_QNAME = new QName("http://todo.org/soon2",
					      attr1.substring(0,attr1.indexOf(':')),
					      attr1.substring(attr1.indexOf(':')+1,attr1.length()));
		
		return new JAXBElement(attr1_QNAME, TypedLiteral.class, null, (TypedLiteral)value1);
	    }
	case ASNParser.START:
	    System.out.print("START ");
	    convertToken(getTokenString(ast.getChild(0)));
	    System.out.print(" ");
	    return null;
	case ASNParser.END:
	    System.out.print("END ");
	    convertToken(getTokenString  (ast.getChild(0)));
	    System.out.print(" ");
	    return null;
	case ASNParser.A:
            if (ast.getChildCount()==0) {
                convertToken(null);
            } else {
                convert(ast.getChild(0));
            }
	    System.out.print(" ");
	    return null;
	case ASNParser.STRING:
	    System.out.print("STRING ");
	    String s=convertToken(getTokenString(ast.getChild(0)));
	    System.out.print(" ");
	    return s;
	case ASNParser.QNAM:
	    System.out.print("QNAME ");
	    s=convertToken(getTokenString(ast.getChild(0)));
	    System.out.print(" ");
	    return s;
	case ASNParser.IRI:
	    System.out.print("IRI ");
	    s=convertToken(getTokenString(ast.getChild(0)));
	    s=unwrap(s);
	    System.out.print(" ");
	    return s;
	case ASNParser.TYPEDLITERAL:
	    System.out.print("TYPEDLITERAL ");
	    String v1=convertToken(getTokenString(ast.getChild(0)));
	    String v2=(String)convert(ast.getChild(1));
	    v1=unwrap(v1);

	    return pFactory.newTypedLiteral(v1,v2);
	case ASNParser.USED:
	    System.out.print("USED ");
	    String id2=(String)convert(ast.getChild(0));
	    String id1=(String)(convert(ast.getChild(1)));
            Activity a2=activityTable.get(id2);
            ActivityRef a2r=pFactory.newActivityRef(a2);
            Entity e1=entityTable.get(id1);
            EntityRef e1r=pFactory.newEntityRef(e1);
	    convert(ast.getChild(2));
	    convert(ast.getChild(3));
            Used u=pFactory.newUsed(null,
                                    a2r,
                                    null,
                                    e1r);
	    System.out.print(";\n");
	    return u;
	case ASNParser.WGB:
	    System.out.print("WGB ");
	    id2=(String)convert(ast.getChild(0));
	    id1=(String)(convert(ast.getChild(1)));
            Activity a1=activityTable.get(id1);
            ActivityRef a1r=pFactory.newActivityRef(a1);
            Entity e2=entityTable.get(id2);
            EntityRef e2r=pFactory.newEntityRef(e2);
=======
    }
    
    public Object convertId(String id) {
	    return id;
    }
>>>>>>> 2f214528f214aa5ff252443fd6bbb9c7c0032668

    public Object convertAttribute(Object name, Object value) {
Solution content 
	return attrs;
            attrs.getAny().add(o);
	}
    }
    
    public Object convertId(String id) {
	return id;
    }

    public Object convertAttribute(Object name, Object value) {
File
ProvConstructor.java
Developer's decision
Version 2
Kind of conflict
Case statement
Cast expression
If statement
Method declaration
Method invocation
Return statement
Variable