diff -r 000000000000 -r 82d1d1de1a01 carbidecpp20devenv/plugins/org.eclipse.emf.source_2.4.1.v200808251517/src/org.eclipse.emf.ant_2.4.0.v200808251517/examples/jmerger/Source.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/carbidecpp20devenv/plugins/org.eclipse.emf.source_2.4.1.v200808251517/src/org.eclipse.emf.ant_2.4.0.v200808251517/examples/jmerger/Source.java Wed Mar 18 17:21:00 2009 -0500 @@ -0,0 +1,163 @@ +/** + * + * + * Copyright (c) 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM - Initial API and implementation + * + * + * + * $Id: Source.java,v 1.2 2005/06/08 06:17:17 nickb Exp $ + */ +package org.eclipse.emf.test.tools.merger; + +import source.ClassA; +import source.ClassB; + +/** + * Source javadoc 1 + * Source javadoc 2 + * + * Source user javadoc 3 + * Source user javadoc 4 + * + * + * @author EMF Team (source) + * @generated + */ +public class MergerExample +{ + private int a1 = 1; + + /** + * Source javadoc 5 + */ + int a2 = 2; + + /** + * Source javadoc 6 + * @generated + */ + protected int a3 = 3; + + /** + * Source javadoc 7 + * + * Source user javadoc 8 + * + */ + public int a4 = 4; + + /** + * Source javadoc 9 + * + * Source user javadoc 10 + * + * @generated + */ + protected int a5 = 5; + + + + + /** + * Source javadoc 11 + * + * + * @generated + */ + protected String id = "source"; + + /** + * Source javadoc 12 + * + * + * @generated + */ + protected boolean newAttribute = true; + + /** + * Source javadoc 13 + * + * Source user javadoc 14 + * + * Source javadoc 15 + * @return source + * @generated + */ + public boolean isID() + { + // begin-user-code + System.out.println("Source user code 1"); + // end-user-code + System.out.println("Source code 2"); + return id == "source"; + } + + /** + * Source javadoc 16 + * + * + * Source javadoc 17 + * @param source + * @generated + */ + public void setID(boolean value) + { + System.out.println("Source code 3"); + id = value ? "source" : "target"; + } + + /** + * Source javadoc 17 + * + * Source user javadoc 18 + * + * Source javadoc 19 + * @param source + * @unmodifiable + */ + protected Object sourceRequired() + { + System.out.println("Source code 4"); + } + + /** + * Source javadoc 20 + * + * Source user javadoc 21 + * + * Source javadoc 22 + * @generated + */ + private void methodWithTargetWithoutUserSections() + { + // begin-user-code + System.out.println("Source user code 5"); + // end-user-code + System.out.println("Source code 6"); + } + + /** + * Source javadoc 23 + * @generated + */ + private void methodWithSourceWithoutUserSections() + { + System.out.println("Source code 7"); + } + + /** + * Source javadoc 24 + * @generated + */ + private void methodWithoutUserSections() + { + System.out.println("Source code 8"); + } +} \ No newline at end of file