Android Open Source - interdroid-vdb Merge Info

• Back to SQLite/database  ↑

From Project

Back to project page interdroid-vdb.

License

The source code is released under:

Copyright (c) 2008-2012 Vrije Universiteit, The Netherlands All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the follo...

Java Source Code

/*
 * Copyright (c) 2008-2012 Vrije Universiteit, The Netherlands All rights
 * reserved./*  w w  w  .j a va2  s  .c  om*/
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
 * Redistributions of source code must retain the above copyright notice, this
 * list of conditions and the following disclaimer.
 *
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 *
 * Neither the name of the Vrije Universiteit nor the names of its contributors
 * may be used to endorse or promote products derived from this software without
 * specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
package interdroid.vdb.persistence.api;

import java.io.Serializable;

/**
 * Container for the information we hold about an ongoing merge.
 * It is written to disc as a marker that a checkout is in merging mode.
 */
public final class MergeInfo implements Serializable {
  /**
   * The serial version UID for this class.
   */
  private static final long serialVersionUID = -3951990737704349098L;

  /**
   * Sha1 commit identifiers for the base revision.
   */
  private String mBase;

  /**
   * Sha1 commit identifier for their commit.
   */
  private String mTheirs;

  /**
   * Sha1 commit identifier for our commit.
   */
  private String mOurs;

  /**
   * Whether the merge is resolved or still in progress.
   */
  private boolean mResolved = false;

  /**
   * Construct a merge info.
   * @param base the base commit SHA1
   * @param theirs their commit SHA1
   * @param ours our commit SHA1
   */
  public MergeInfo(final String base, final String theirs,
      final String ours) {
    mBase = base;
    mTheirs = theirs;
    mOurs = ours;
  }

  @Override
  public MergeInfo clone() {
    MergeInfo copy = new MergeInfo(mBase, mTheirs, mOurs);
    copy.mResolved = mResolved;
    return copy;
  }

  /**
   * @return the mBase
   */
  public String getBase() {
    return mBase;
  }

  /**
   * @return the mTheirs
   */
  public String getTheirs() {
    return mTheirs;
  }

  /**
   * @return the mOurs
   */
  public String getOurs() {
    return mOurs;
  }

  /**
   * @return the mResolved
   */
  public boolean isResolved() {
    return mResolved;
  }

  /**
   * Sets this merge as resolved.
   */
  public void setResolved() {
    this.mResolved = true;
  }
}

Java Source Code List

• Back to SQLite/database  ↑