ASTMergerExpectedAlt.java

/**
* Copyright (c) 2006 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
*
* This is the target header
*/
/*
 * target comment before import that will removed
 */
import b;
import a  ;
import org.eclipse.emf.ecore.util.EObjectCompositeEListNew;

/**
 * Test similar to merge5 and 6. There are extra inner and top-level classes that are brought
 * from source to target.
 * 
 * @implements Comparable 
 *
 */
protected abstract class EchoSoapBindingImpl implements echo.Echo, Comparable
{
  /**
   * source comment for newMethodA()
   */
  public static void newMethodA()
  {
    // first line comment
    int a;
    if (true)
    {
      a = 0;
    }
  }

  /**
   * target javadoc 
   * for InnerClass1
   */
  public class InnerClass1
  {
    /**
     * target javadoc line 1
     * line 2
     * @ordered
     */
    int b   = 2;
    
    /**
     * @ordered
     */
    int a 
    = 1;
  } 
  
  // after a
  
  // between a and b
  
  // before b
  /**
   * javadoc b
   */
  int b;// after b on the same line
  // hanging before a
  
  /*
   * hanging block before a
   * 
   */
  
  // before a
  /**
   * javadoc a
   */
  int a; // after a on the same line
  // after b
  
  // between b and c
  
  // before c
  /**
   * javadoc c
   */
  int c;// after c on the same line
  /**
   * source comment for a()
   * this method should be added to target
   */
  void a() 
  {
    // source line comment inside a()
  }

  // after e
  
  // between e and f
  
  // before f
  /**
   * javadoc f
   */
  int f;// after f on the same line
  // line after f 
  
  /*
   * hanging block after f
   */   
  
  // line comment before a()
  /**
   * javadoc for a()
   * this commented method should not be removed
   */
//  public void a()
//  {
//    int a = 1;
//  }
  // line comment after a()
  
  // hanging comment between a() and b()
  // line after c 
  
  /*
   * hanging block after c
   */  

  // before d
  /**
   * javadoc d
   */
  int d; // after d on the same line
  // after d
  
  // between d and e
  
  
  // line comment after b()
  
  // hanging comment between b() and c()
  // could be another method here, these comments will be removed
  
  // line comment after c()
  
  // hanging comment between c() and d()
  
  // line comment before d()  
  /**
   * javadoc for d()
   */
  public void d()
  {
    
  } // line comment after d() on the same line
  // line comment after d()
  
  // hanging comment between d() and e()
  
  // line comment after e(). Note that if this comment follows e() immediately, new members that are added after f() will not have empty line between them
  
  // hanging comment between e() and f()
  
  // line comment before f()  
  /**
   * javadoc for f()
   */
  public void f()
  {
    
  } // line comment after f() on the same line

  /**
   * source javadoc 
   * for InnerClass2
   *
   */
  public class InnerClass2
  {
    int a 
      = 1;
    /**
     * 
     * source javadoc line 1
     * source javadoc line 2
     */
    int b   = 2;
  }

  /**
   * source comment for newMethodB()
   */
  public static void newMethodB()
  {
    // first line comment
    int a;
    if (true)
    {
      a = 0;
    }
  }
  // line comment after f()
  
  // hanging comment after f() 
}

/**
 * source javadoc 
 * for AnotherClass 
 *
 */
public class AnotherClass
{
  int a 
    = 1;
  /**
   * 
   * source javadoc line 1
   * source javadoc line 2
   */
  int b   = 2;
}

/**
 * target comment for TopLevelClass2
 */
class TopLevelClass2
{
}