[exo-jcr-commits] exo-jcr SVN: r1138 - in jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: impl/core and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Dec 21 10:42:47 EST 2009
Author: tolusha
Date: 2009-12-21 10:42:46 -0500 (Mon, 21 Dec 2009)
New Revision: 1138
Removed:
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutableItemData.java
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutableNodeData.java
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutablePropertyData.java
Modified:
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientItemData.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
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportNodeData.java
jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportPropertyData.java
Log:
EXOJCR-300: remove unused Interface: MutableItemData
Deleted: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutableItemData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutableItemData.java 2009-12-21 15:38:27 UTC (rev 1137)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutableItemData.java 2009-12-21 15:42:46 UTC (rev 1138)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.jcr.datamodel;
-
-/**
- * Created by The eXo Platform SAS.
- *
- * @author <a href="mailto:gennady.azarenkov at exoplatform.com">Gennady Azarenkov</a>
- * @version $Id: MutableItemData.java 11907 2008-03-13 15:36:21Z ksm $
- */
-
-public interface MutableItemData extends ItemData
-{
-
- /**
- * Adds 1 to current persistedVersion value. NOT USED.
- */
- @Deprecated
- void increasePersistedVersion();
-}
Deleted: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutableNodeData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutableNodeData.java 2009-12-21 15:38:27 UTC (rev 1137)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutableNodeData.java 2009-12-21 15:42:46 UTC (rev 1138)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.jcr.datamodel;
-
-import org.exoplatform.services.jcr.access.AccessControlList;
-
-/**
- * Created by The eXo Platform SAS.
- *
- * @author <a href="mailto:gennady.azarenkov at exoplatform.com">Gennady Azarenkov</a>
- * @version $Id$
- */
-
-public interface MutableNodeData extends NodeData, MutableItemData
-{
-
- void setOrderNumber(int orderNum);
-
- void setMixinTypeNames(InternalQName[] mixinTypeNames);
-
- void setIdentifier(String identifier);
-
- void setACL(AccessControlList acl);
-}
Deleted: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutablePropertyData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutablePropertyData.java 2009-12-21 15:38:27 UTC (rev 1137)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/MutablePropertyData.java 2009-12-21 15:42:46 UTC (rev 1138)
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.jcr.datamodel;
-
-import java.util.List;
-
-import javax.jcr.RepositoryException;
-
-/**
- * Created by The eXo Platform SAS.
- *
- * @author <a href="mailto:gennady.azarenkov at exoplatform.com">Gennady Azarenkov</a>
- * @version $Id: MutablePropertyData.java 11907 2008-03-13 15:36:21Z ksm $
- */
-
-public interface MutablePropertyData extends PropertyData, MutableItemData
-{
-
- /**
- * @param values
- * @throws RepositoryException
- */
- void setValues(List<ValueData> values) throws RepositoryException;
-
- /**
- * @param type
- */
- void setType(int type);
-}
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2009-12-21 15:38:27 UTC (rev 1137)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2009-12-21 15:42:46 UTC (rev 1138)
@@ -317,6 +317,11 @@
this.primaryTypeName = primaryTypeName;
}
+ public void setMixinTypeNames(InternalQName[] mixinTypeNames)
+ {
+ this.mixinTypeNames = mixinTypeNames;
+ }
+
/**
* Add name of child node.
*
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientItemData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientItemData.java 2009-12-21 15:38:27 UTC (rev 1137)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientItemData.java 2009-12-21 15:42:46 UTC (rev 1138)
@@ -21,7 +21,6 @@
import org.exoplatform.services.jcr.datamodel.IllegalPathException;
import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.ItemData;
-import org.exoplatform.services.jcr.datamodel.MutableItemData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.log.ExoLogger;
@@ -38,7 +37,7 @@
* @author Gennady Azarenkov
* @version $Id: TransientItemData.java 11907 2008-03-13 15:36:21Z ksm $
*/
-public abstract class TransientItemData implements MutableItemData, Externalizable
+public abstract class TransientItemData implements ItemData, Externalizable
{
protected static final Log LOG = ExoLogger.getLogger("jcr.TransientItemData");
@@ -145,16 +144,6 @@
return qpath;
}
- /*
- * (non-Javadoc)
- *
- * @see org.exoplatform.services.jcr.datamodel.MutableItemData#increasePersistedVersion()
- */
- public void increasePersistedVersion()
- {
- this.persistedVersion++;
- }
-
/**
* {@inheritDoc}
*/
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-21 15:38:27 UTC (rev 1137)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientNodeData.java 2009-12-21 15:42:46 UTC (rev 1138)
@@ -30,9 +30,8 @@
import org.exoplatform.services.jcr.access.AccessControlList;
import org.exoplatform.services.jcr.dataflow.ItemDataVisitor;
import org.exoplatform.services.jcr.datamodel.IllegalNameException;
-import org.exoplatform.services.jcr.datamodel.IllegalPathException;
import org.exoplatform.services.jcr.datamodel.InternalQName;
-import org.exoplatform.services.jcr.datamodel.MutableNodeData;
+import org.exoplatform.services.jcr.datamodel.ItemData;
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.impl.Constants;
@@ -46,7 +45,7 @@
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
-public class TransientNodeData extends TransientItemData implements Comparable, MutableNodeData, Externalizable
+public class TransientNodeData extends TransientItemData implements Comparable, NodeData, ItemData, Externalizable
{
private static final long serialVersionUID = -8675118546441306180L;
@@ -113,43 +112,9 @@
return acl;
}
- // ---------------- MutableNodeData
-
/**
* {@inheritDoc}
*/
- public void setOrderNumber(int orderNum)
- {
- this.orderNum = orderNum;
- }
-
- /**
- * {@inheritDoc}
- */
- public void setMixinTypeNames(InternalQName[] mixinTypeNames)
- {
- this.mixinTypeNames = mixinTypeNames;
- }
-
- /**
- * {@inheritDoc}
- */
- public void setIdentifier(String identifier)
- {
- this.identifier = identifier;
- }
-
- /**
- * {@inheritDoc}
- */
- public void setACL(AccessControlList acl)
- {
- this.acl = acl;
- }
-
- /**
- * {@inheritDoc}
- */
public void accept(ItemDataVisitor visitor) throws RepositoryException
{
visitor.visit(this);
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-21 15:38:27 UTC (rev 1137)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientPropertyData.java 2009-12-21 15:42:46 UTC (rev 1138)
@@ -20,8 +20,9 @@
import org.exoplatform.services.jcr.dataflow.ItemDataVisitor;
import org.exoplatform.services.jcr.datamodel.InternalQName;
-import org.exoplatform.services.jcr.datamodel.MutablePropertyData;
+import org.exoplatform.services.jcr.datamodel.ItemData;
import org.exoplatform.services.jcr.datamodel.NodeData;
+import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.datamodel.ValueData;
import org.exoplatform.services.jcr.util.IdGenerator;
@@ -42,7 +43,7 @@
* @version $Id: TransientPropertyData.java 13962 2008-05-07 16:00:48Z pnedonosko $
*/
-public class TransientPropertyData extends TransientItemData implements MutablePropertyData, Externalizable
+public class TransientPropertyData extends TransientItemData implements PropertyData, ItemData, Externalizable
{
private static final long serialVersionUID = -8224902483861330191L;
@@ -140,33 +141,6 @@
}
/**
- * {@inheritDoc}
- */
- public void setValues(List<ValueData> values)
- {
- this.values = values;
- }
-
- /**
- * {@inheritDoc}
- */
- public void setType(int type)
- {
- this.type = type;
- }
-
- /**
- * Shortcut for single-valued property data initialization.
- *
- * @param value
- */
- public void setValue(ValueData value)
- {
- this.values = new ArrayList<ValueData>();
- values.add(value);
- }
-
- /**
* Factory method.
*
* @param parent NodeData
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportNodeData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportNodeData.java 2009-12-21 15:38:27 UTC (rev 1137)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportNodeData.java 2009-12-21 15:42:46 UTC (rev 1138)
@@ -267,6 +267,26 @@
return exoPrivileges != null;
}
+ public void setOrderNumber(int orderNum)
+ {
+ this.orderNum = orderNum;
+ }
+
+ public void setMixinTypeNames(InternalQName[] mixinTypeNames)
+ {
+ this.mixinTypeNames = mixinTypeNames;
+ }
+
+ public void setIdentifier(String identifier)
+ {
+ this.identifier = identifier;
+ }
+
+ public void setACL(AccessControlList acl)
+ {
+ this.acl = acl;
+ }
+
public void setIsNewIdentifer(boolean newIdentifer)
{
this.newIdentifer = newIdentifer;
Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportPropertyData.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportPropertyData.java 2009-12-21 15:38:27 UTC (rev 1137)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportPropertyData.java 2009-12-21 15:42:46 UTC (rev 1138)
@@ -19,10 +19,14 @@
package org.exoplatform.services.jcr.impl.xml.importing.dataflow;
import org.exoplatform.services.jcr.datamodel.QPath;
+import org.exoplatform.services.jcr.datamodel.ValueData;
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Created by The eXo Platform SAS.
*
@@ -88,4 +92,38 @@
this.qpath = path;
}
+ /**
+ * Set property values.
+ *
+ * @param values
+ * values property
+ */
+ public void setValues(List<ValueData> values)
+ {
+ this.values = values;
+ }
+
+ /**
+ * Set type of property
+ *
+ * @param type
+ * property type
+ */
+ public void setType(int type)
+ {
+ this.type = type;
+ }
+
+ /**
+ * Set property value.
+ *
+ * @param value
+ * property value
+ */
+ public void setValue(ValueData value)
+ {
+ this.values = new ArrayList<ValueData>();
+ values.add(value);
+ }
+
}
More information about the exo-jcr-commits
mailing list