[exo-jcr-commits] exo-jcr SVN: r1126 - in jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: impl/core and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Dec 18 03:45:37 EST 2009
Author: tolusha
Date: 2009-12-18 03:45:36 -0500 (Fri, 18 Dec 2009)
New Revision: 1126
Modified:
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedItemData.java
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedNodeData.java
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientNodeData.java
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientPropertyData.java
Log:
EXOJCR-300: javadoc added, removed deprecated methods
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedItemData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedItemData.java 2009-12-17 16:38:45 UTC (rev 1125)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedItemData.java 2009-12-18 08:45:36 UTC (rev 1126)
@@ -97,14 +97,6 @@
}
/**
- * Creates transient copy of this persistent ItemData.
- *
- * @throws RepositoryException if ValueData IOException occurs.
- */
- @Deprecated
- public abstract TransientItemData createTransientCopy() throws RepositoryException;
-
- /**
* @see java.lang.Object#equals(java.lang.Object)
*/
public boolean equals(Object obj)
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedNodeData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedNodeData.java 2009-12-17 16:38:45 UTC (rev 1125)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedNodeData.java 2009-12-18 08:45:36 UTC (rev 1126)
@@ -113,21 +113,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
- @Override
- public TransientItemData createTransientCopy()
- {
- // TransientNodeData dataCopy =
- // new TransientNodeData(getQPath(), getIdentifier(), getPersistedVersion(), getPrimaryTypeName(),
- // getMixinTypeNames(), getOrderNumber(), getParentIdentifier() != null ? getParentIdentifier() : null,
- // getACL());
- //
- // return dataCopy;
- throw new IllegalStateException("createTransientCopy deprecated");
- }
-
// ----------------- Externalizable
public PersistedNodeData()
{
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java 2009-12-17 16:38:45 UTC (rev 1125)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java 2009-12-18 08:45:36 UTC (rev 1126)
@@ -104,28 +104,6 @@
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
- @Override
- @Deprecated
- public TransientItemData createTransientCopy() throws RepositoryException
- {
- // List<ValueData> copyValues = new ArrayList<ValueData>();
- // for (ValueData vdata : getValues())
- // {
- // copyValues.add(((PersistedValueData)vdata).createTransientCopy());
- // }
- //
- // TransientPropertyData dataCopy =
- // new TransientPropertyData(getQPath(), getIdentifier(), getPersistedVersion(), getType(),
- // getParentIdentifier(), isMultiValued(), copyValues);
- //
- // return dataCopy;
-
- throw new IllegalStateException("createTransientCopy deprecated");
- }
-
// ----------------- Externalizable
public PersistedPropertyData()
{
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-12-17 16:38:45 UTC (rev 1125)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-12-18 08:45:36 UTC (rev 1126)
@@ -2568,7 +2568,11 @@
int state = 0;
if (mergeFailed != null)
{
- mergeFailed = mergeFailed.createTransientCopy();
+ mergeFailed =
+ new TransientPropertyData(mergeFailed.getQPath(), mergeFailed.getIdentifier(), mergeFailed
+ .getPersistedVersion(), mergeFailed.getType(), mergeFailed.getParentIdentifier(), mergeFailed
+ .isMultiValued(), mergeFailed.getValues());
+
mergeFailedRefs = mergeFailed.getValues();
state = ItemState.UPDATED;
}
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientNodeData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientNodeData.java 2009-12-17 16:38:45 UTC (rev 1125)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientNodeData.java 2009-12-18 08:45:36 UTC (rev 1126)
@@ -161,6 +161,8 @@
* @param parent NodeData
* @param name InternalQName
* @param primaryTypeName InternalQName
+ * @param mixinTypeNames InteralnQName[]
+ * @param identifier String
* @return TransientNodeData
*/
public static TransientNodeData createNodeData(NodeData parent, InternalQName name, InternalQName primaryTypeName,
@@ -195,9 +197,10 @@
/**
* Factory method.
*
- * @param parent
- * @param name
- * @param primaryTypeName
+ * @param parent NodeData
+ * @param name InternalQName
+ * @param primaryTypeName InternalQName
+ * @param mixinTypesName InternalQName[]
* @return
*/
public static TransientNodeData createNodeData(NodeData parent, InternalQName name, InternalQName primaryTypeName,
@@ -214,9 +217,10 @@
/**
* Factory method
*
- * @param parent
- * @param name
- * @param primaryTypeName
+ * @param parent NodeData
+ * @param name InternalQName
+ * @param primaryTypeName InternalQName
+ * @param index int
* @return
*/
public static TransientNodeData createNodeData(NodeData parent, InternalQName name, InternalQName primaryTypeName,
@@ -233,9 +237,11 @@
/**
* Factory method
*
- * @param parent
- * @param name
- * @param primaryTypeName
+ * @param parent NodeData
+ * @param name InternalQName
+ * @param primaryTypeName InternalQName
+ * @param index int
+ * @param orderNumber int
* @return
*/
public static TransientNodeData createNodeData(NodeData parent, InternalQName name, InternalQName primaryTypeName,
@@ -252,9 +258,10 @@
/**
* Factory method
*
- * @param parent
- * @param name
- * @param primaryTypeName
+ * @param parent NodeData
+ * @param name InternalQName
+ * @param primaryTypeName InternalQName
+ * @param identifier String
* @return
*/
public static TransientNodeData createNodeData(NodeData parent, InternalQName name, InternalQName primaryTypeName,
@@ -374,33 +381,4 @@
// ------------------ [ END ] ------------------
- // ------------ Cloneable ------------------
-
- @Override
- @Deprecated
- public TransientNodeData clone()
- {
- TransientNodeData dataCopy =
- new TransientNodeData(getQPath(), getIdentifier(), getPersistedVersion(), getPrimaryTypeName(),
- getMixinTypeNames(), getOrderNumber(), getParentIdentifier() != null ? getParentIdentifier() : null,
- getACL());
-
- return dataCopy;
- }
-
- @Deprecated
- public TransientNodeData cloneAsSibling(int index) throws PathNotFoundException, IllegalPathException
- {
-
- QPath siblingPath = QPath.makeChildPath(getQPath().makeParentPath(), getQPath().getName(), index);
-
- TransientNodeData dataCopy =
- new TransientNodeData(siblingPath, getIdentifier(), getPersistedVersion(), getPrimaryTypeName(),
- getMixinTypeNames(), getOrderNumber(), getParentIdentifier() != null ? getParentIdentifier() : null,
- getACL());
-
- return dataCopy;
- }
-
- // -----------------------------------------
}
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientPropertyData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientPropertyData.java 2009-12-17 16:38:45 UTC (rev 1125)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientPropertyData.java 2009-12-18 08:45:36 UTC (rev 1126)
@@ -166,6 +166,15 @@
values.add(value);
}
+ /**
+ * Factory method.
+ *
+ * @param parent NodeData
+ * @param name InternalQName
+ * @param type int
+ * @param multiValued boolean
+ * @return TransientPropertyData
+ */
public static TransientPropertyData createPropertyData(NodeData parent, InternalQName name, int type,
boolean multiValued)
{
@@ -176,6 +185,16 @@
return propData;
}
+ /**
+ * Factory method.
+ *
+ * @param parent NodeData
+ * @param name InternalQName
+ * @param type int
+ * @param multiValued boolean
+ * @param value ValueData
+ * @return TransientPropertyData
+ */
public static TransientPropertyData createPropertyData(NodeData parent, InternalQName name, int type,
boolean multiValued, ValueData value)
{
@@ -186,6 +205,16 @@
return propData;
}
+ /**
+ * Factory method.
+ *
+ * @param parent NodeData
+ * @param name InternalQName
+ * @param type int
+ * @param multiValued boolean
+ * @param values List<ValueData>
+ * @return TransientPropertyData
+ */
public static TransientPropertyData createPropertyData(NodeData parent, InternalQName name, int type,
boolean multiValued, List<ValueData> values)
{
@@ -201,27 +230,6 @@
visitor.visit(this);
}
- // ------------ Cloneable ------------------
-
- /**
- * Clone node data without value data!!!
- */
- @Deprecated
- public TransientPropertyData createTransientCopy()
- {
- List<ValueData> copyValues = new ArrayList<ValueData>();
- for (ValueData vdata : getValues())
- {
- copyValues.add(vdata);
- }
-
- TransientPropertyData dataCopy =
- new TransientPropertyData(getQPath(), getIdentifier(), getPersistedVersion(), getType(),
- getParentIdentifier(), isMultiValued(), copyValues);
-
- return dataCopy;
- }
-
// ----------------- Externalizable
public TransientPropertyData()
{
More information about the exo-jcr-commits
mailing list