weaver 2003/08/01 13:06:32
Modified: commons/src/java/org/apache/jetspeed/om/common/window
PortletWindowImpl.java
commons/src/java/org/apache/jetspeed/om/common/servlet
WebApplicationDefinitionImpl.java
Log:
- changed id's from longs to ints
- Using the JetspeedObjectID class
Revision Changes Path
1.2 +11 -5
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/window/PortletWindowImpl.java
Index: PortletWindowImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/window/PortletWindowImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletWindowImpl.java 28 Jul 2003 23:46:41 -0000 1.1
+++ PortletWindowImpl.java 1 Aug 2003 20:06:32 -0000 1.2
@@ -74,7 +74,8 @@
public class PortletWindowImpl implements PortletWindow, PortletWindowCtrl,
Serializable
{
private ObjectID objectId = null;
- private String id = null;
+ private int id;
+ private int portletEntityId;
private PortletEntity portletEntity = null;
//counter used to generate unique id's
@@ -82,7 +83,7 @@
public PortletWindowImpl(String id)
{
- this.id = id;
+ this.id = JetspeedObjectID.createFromString(id).intValue();
}
public PortletWindowImpl(ObjectID oid)
@@ -90,6 +91,11 @@
this.objectId = oid;
}
+ public PortletWindowImpl()
+ {
+ super();
+ }
+
/**
* Returns the identifier of this portlet instance window as object id
*
@@ -99,7 +105,7 @@
{
if (objectId == null)
{
- objectId = JetspeedObjectID.createFromString(id);
+ objectId = new JetspeedObjectID(id);
}
return objectId;
}
@@ -121,7 +127,7 @@
*/
public void setId(String id)
{
- this.id = id;
+ this.id = JetspeedObjectID.createFromString(id).intValue();
objectId = null;
}
1.2 +5 -7
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/servlet/WebApplicationDefinitionImpl.java
Index: WebApplicationDefinitionImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/servlet/WebApplicationDefinitionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebApplicationDefinitionImpl.java 30 Jul 2003 18:30:15 -0000 1.1
+++ WebApplicationDefinitionImpl.java 1 Aug 2003 20:06:32 -0000 1.2
@@ -66,7 +66,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.util.JetspeedObjectID;
import org.apache.pluto.om.common.Description;
import org.apache.pluto.om.common.DescriptionSet;
import org.apache.pluto.om.common.DisplayName;
@@ -86,7 +86,7 @@
public class WebApplicationDefinitionImpl implements MutableWebApplication,
Serializable
{
- private long id;
+ private int id;
private MutableDisplayNameSet displayNames;
private MutableDescriptionSet descriptions;
private String contextRoot;
@@ -97,9 +97,7 @@
*/
public ObjectID getId()
{
- ObjectIDImpl oid = new ObjectIDImpl();
- oid.setValue(id);
- return oid;
+ return new JetspeedObjectID(id);
}
/**
@@ -168,7 +166,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]
