inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/java/org/alfresco/util/schemacomp/model/AbstractDbObject.java
View File

@@ -44,8 +44,8 @@ public abstract class AbstractDbObject implements DbObject
/**
* Instantiate, giving the object a parent and a name.
*
* @param parent
* @param name
* @param parent DbObject
* @param name String
*/
public AbstractDbObject(DbObject parent, String name)
{
@@ -158,14 +158,14 @@ public abstract class AbstractDbObject implements DbObject
sb.append("]");
return sb.toString();
}
/**
* Provides an implementation of {@link DbObject#diff(DbObject, DiffContext)}. The template
* method {@link #doDiff(DbObject, DiffContext)} provides the subclass specific diffing logic,
* whilst this method handles the workflow required in most cases: set the path's prefix that will be
* used to explain where differences occur; compare the name fields of the two objects; delegate to the
* subclass specific diffing (if any); remove the last path addition ready for the next object to perform
}
/**
* Provides an implementation of {@link DbObject#diff(DbObject, DiffContext)}. The template
* method {@link #doDiff(DbObject, DiffContext)} provides the subclass specific diffing logic,
* whilst this method handles the workflow required in most cases: set the path's prefix that will be
* used to explain where differences occur; compare the name fields of the two objects; delegate to the
* subclass specific diffing (if any); remove the last path addition ready for the next object to perform
* its diff correctly.
*/
@Override
@@ -194,13 +194,13 @@ public abstract class AbstractDbObject implements DbObject
/**
* Override this method to provide subclass specific diffing logic.
*
* @param right
* @param ctx
*/
protected void doDiff(DbObject right, DiffContext ctx)
{
* Override this method to provide subclass specific diffing logic.
*
* @param right DbObject
* @param ctx DiffContext
*/
protected void doDiff(DbObject right, DiffContext ctx)
{
}