weaver 2003/08/01 13:06:09
Modified: commons/src/java/org/apache/jetspeed/om/common/portlet
PortletApplicationDefinitionImpl.java
PortletDefinitionImpl.java
Log:
- changed id's from longs to ints
- Using the JetspeedObjectID class
Revision Changes Path
1.2 +6 -7
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/PortletApplicationDefinitionImpl.java
Index: PortletApplicationDefinitionImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/PortletApplicationDefinitionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletApplicationDefinitionImpl.java 30 Jul 2003 18:30:15 -0000 1.1
+++ PortletApplicationDefinitionImpl.java 1 Aug 2003 20:06:09 -0000 1.2
@@ -56,7 +56,7 @@
import java.io.Serializable;
import java.util.Collection;
-import org.apache.jetspeed.om.common.ObjectIDImpl;
+import org.apache.jetspeed.util.JetspeedObjectID;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.PortletDefinitionList;
@@ -76,7 +76,7 @@
* and in any caching of this object.
*/
// private ObjectID id;
- private long id;
+ private int id;
/** Holds value of property name. */
private String name;
@@ -111,9 +111,8 @@
*/
public ObjectID getId()
{
- ObjectIDImpl oid = new ObjectIDImpl();
- oid.setValue(id);
- return oid;
+
+ return new JetspeedObjectID(id);
}
/**
@@ -186,7 +185,7 @@
public void setId(String objectID)
{
//((ObjectIDImpl) id).setValue(objectID);
- id = new Long(objectID).longValue();
+ id = JetspeedObjectID.createFromString(objectID).intValue();
}
/**
1.2 +8 -8
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionImpl.java
Index: PortletDefinitionImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/portlet/PortletDefinitionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletDefinitionImpl.java 30 Jul 2003 18:30:15 -0000 1.1
+++ PortletDefinitionImpl.java 1 Aug 2003 20:06:09 -0000 1.2
@@ -58,8 +58,10 @@
import java.util.Locale;
import org.apache.jetspeed.util.HashCodeBuilder;
+import org.apache.jetspeed.util.JetspeedObjectID;
import org.apache.jetspeed.om.common.LanguageSetImpl;
import org.apache.jetspeed.om.common.ParameterSetImpl;
+import org.apache.jetspeed.om.common.AbstractPreferenceImpl;
import org.apache.jetspeed.om.common.PreferenceImpl;
import org.apache.jetspeed.om.common.PreferenceSetImpl;
import org.apache.jetspeed.om.common.SecurityRoleRefSetImpl;
@@ -71,7 +73,7 @@
import org.apache.jetspeed.om.common.MutableDescriptionSet;
import org.apache.jetspeed.om.common.MutableDisplayName;
import org.apache.jetspeed.om.common.MutableDisplayNameSet;
-import org.apache.jetspeed.om.common.ObjectIDImpl;
+
import org.apache.jetspeed.om.common.ParameterComposite;
import org.apache.jetspeed.om.common.PreferenceComposite;
import org.apache.jetspeed.om.common.extended.PortletParameterSetImpl;
@@ -101,7 +103,7 @@
*/
public class PortletDefinitionImpl implements PortletDefinitionComposite,
Serializable
{
- private long id;
+ private int id;
private String className;
private String name;
private String portletIdentifier;
@@ -148,10 +150,8 @@
* @see org.apache.pluto.om.portlet.PortletDefinition#getId()
*/
public ObjectID getId()
- {
- ObjectIDImpl oid = new ObjectIDImpl();
- oid.setValue(id);
- return oid;
+ {
+ return new JetspeedObjectID(id);
}
/**
@@ -264,7 +264,7 @@
*/
public void setId(String oid)
{
- id = new Long(oid).longValue();
+ id = JetspeedObjectID.createFromString(oid).intValue();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
