Projects >> jgralab >>00f790a8e86ecd1765a5ea9bbd0426397803b9e8

Chunk
Conflicting content 
			code.add("public #type# #isOrGet#_#name#() {", "\treturn _#name#;",
					"}");
			break;
<<<<<<< HEAD
		case DISKV2IMPL:
			code.add("public #type# #isOrGet#_#name#() {", "\treturn _#name#;",
					"}");
=======
		case CLASSONLY:
>>>>>>> 4dc2f05d58330b34415249279decb0e8871b6a04
			break;
		}
		return code;
Solution content 
			code.add("public #type# #isOrGet#_#name#() {", "\treturn _#name#;",
					"}");
			break;
		case DISKV2IMPL:
			code.add("public #type# #isOrGet#_#name#() {", "\treturn _#name#;",
					"}");
		case CLASSONLY:
			break;
		}
		return code;
File
AttributedElementCodeGenerator.java
Developer's decision
Concatenation
Kind of conflict
Case statement
Method invocation
Chunk
Conflicting content 
		case CLASSONLY:
					"\tecaAttributeChanged(\"#name#\", oldValue, _#name#);",
					"}");
			break;
<<<<<<< HEAD
		case DISKV2IMPL:
			code.add(
					"public void set_#name#(#type# _#name#) {",
					"\tecaAttributeChanging(\"#name#\", this._#name#, _#name#);",
					"\tObject oldValue = this._#name#;",
					"\tthis._#name# = _#name#;", "\tgraphModified();",
					"\tecaAttributeChanged(\"#name#\", oldValue, _#name#);",
					"\tattributeChanged();",
					"}");
=======
>>>>>>> 4dc2f05d58330b34415249279decb0e8871b6a04
			break;
		}
		return code;
Solution content 
					"\tecaAttributeChanged(\"#name#\", oldValue, _#name#);",
					"}");
			break;
		case DISKV2IMPL:
			code.add(
					"public void set_#name#(#type# _#name#) {",
					"\tecaAttributeChanging(\"#name#\", this._#name#, _#name#);",
					"\tObject oldValue = this._#name#;",
					"\tthis._#name# = _#name#;", "\tgraphModified();",
					"\tecaAttributeChanged(\"#name#\", oldValue, _#name#);",
					"\tattributeChanged();",
					"}");
		case CLASSONLY:
			break;
		}
		return code;
File
AttributedElementCodeGenerator.java
Developer's decision
Concatenation
Kind of conflict
Case statement
Method invocation