mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-02 17:35:18 +00:00
of the simplest method, resetLayer is done. Also fixed goofy merge induced bug in DbNodeServiceImpl. Can we make merging a punishment for naughty Alfrescans? git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
124 lines
2.9 KiB
Java
124 lines
2.9 KiB
Java
/*
|
|
* Copyright (C) 2006 Alfresco, Inc.
|
|
*
|
|
* Licensed under the Mozilla Public License version 1.1
|
|
* with a permitted attribution clause. You may obtain a
|
|
* copy of the License at
|
|
*
|
|
* http://www.alfresco.org/legal/license.txt
|
|
*
|
|
* Unless required by applicable law or agreed to in writing,
|
|
* software distributed under the License is distributed on an
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
|
|
* either express or implied. See the License for the specific
|
|
* language governing permissions and limitations under the
|
|
* License.
|
|
*/
|
|
|
|
package org.alfresco.service.cmr.avmsync;
|
|
|
|
import java.io.Serializable;
|
|
|
|
/**
|
|
* Represents the difference between corresponding nodes
|
|
* in parallel avm node trees. It it indicates for the difference
|
|
* whether the source is older, newer, or in conflict with the destination.
|
|
* @author britt
|
|
*/
|
|
public class AVMDifference implements Serializable
|
|
{
|
|
private static final long serialVersionUID = -589722861571724954L;
|
|
|
|
public static final int NEWER = 0;
|
|
public static final int OLDER = 1;
|
|
public static final int CONFLICT = 2;
|
|
|
|
/**
|
|
* Version number of the source node.
|
|
*/
|
|
private int fSourceVersion;
|
|
|
|
/**
|
|
* Path of the source node.
|
|
*/
|
|
private String fSourcePath;
|
|
|
|
/**
|
|
* Version number of the destination node.
|
|
*/
|
|
private int fDestVersion;
|
|
|
|
/**
|
|
* Path of the destination node.
|
|
*/
|
|
private String fDestPath;
|
|
|
|
/**
|
|
* The difference code.
|
|
*/
|
|
private int fDiffCode;
|
|
|
|
/**
|
|
* Make one up.
|
|
* @param srcVersion The source version.
|
|
* @param srcPath the source path.
|
|
* @param dstVersion The destination version.
|
|
* @param dstPath The destination path.
|
|
* @param diffCode The difference code, NEWER, OLDER, CONFLICT
|
|
*/
|
|
public AVMDifference(int srcVersion, String srcPath,
|
|
int dstVersion, String dstPath, int diffCode)
|
|
{
|
|
fSourceVersion = srcVersion;
|
|
fSourcePath = srcPath;
|
|
fDestVersion = dstVersion;
|
|
fDestPath = dstPath;
|
|
fDiffCode = diffCode;
|
|
}
|
|
|
|
/**
|
|
* Get the source version number.
|
|
* @return The source version number.
|
|
*/
|
|
public int getSourceVersion()
|
|
{
|
|
return fSourceVersion;
|
|
}
|
|
|
|
/**
|
|
* Get the source path.
|
|
* @return The source path.
|
|
*/
|
|
public String getSourcePath()
|
|
{
|
|
return fSourcePath;
|
|
}
|
|
|
|
/**
|
|
* Get the destination version number.
|
|
* @return The destination version number.
|
|
*/
|
|
public int getDestinationVersion()
|
|
{
|
|
return fDestVersion;
|
|
}
|
|
|
|
/**
|
|
* Get the destination path.
|
|
* @return The destination path.
|
|
*/
|
|
public String getDestinationPath()
|
|
{
|
|
return fDestPath;
|
|
}
|
|
|
|
/**
|
|
* Get the difference code, NEWER, OLDER, CONFLICT.
|
|
* @return The difference code.
|
|
*/
|
|
public int getDifferenceCode()
|
|
{
|
|
return fDiffCode;
|
|
}
|
|
}
|