From do-not-reply at jboss.org Tue Sep 13 02:16:51 2011
Content-Type: multipart/mixed; boundary="===============5860985321486130021=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r7369 - in components/mop/trunk:
 core/src/test/java/org/gatein/mop/core/api/workspace and 1 other directory.
Date: Tue, 13 Sep 2011 02:16:50 -0400
Message-ID: <201109130616.p8D6GoVj005320@svn01.web.mwc.hst.phx2.redhat.com>

--===============5860985321486130021==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien_viet
Date: 2011-09-13 02:16:50 -0400 (Tue, 13 Sep 2011)
New Revision: 7369

Modified:
   components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Obje=
ctType.java
   components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspac=
e/ObjectTypeTestCase.java
Log:
GTNMOP-43 : ObjectType should implement java.io.Serializable


Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspa=
ce/ObjectType.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Obj=
ectType.java	2011-09-13 05:57:01 UTC (rev 7368)
+++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Obj=
ectType.java	2011-09-13 06:16:50 UTC (rev 7369)
@@ -25,6 +25,8 @@
 import org.gatein.mop.api.workspace.link.PageLink;
 import org.gatein.mop.api.workspace.link.URLLink;
 =

+import java.io.InvalidObjectException;
+import java.io.Serializable;
 import java.util.Set;
 import java.util.HashSet;
 =

@@ -34,58 +36,80 @@
  * @author <a href=3D"mailto:julien.viet(a)exoplatform.com">Julien Viet</a>
  * @version $Revision$
  */
-public class ObjectType<O extends WorkspaceObject>
+public class ObjectType<O extends WorkspaceObject> implements Serializable
 {
 =

    /** . */
-   public static final ObjectType<WorkspaceObject> ANY =3D new ObjectType<=
WorkspaceObject>(WorkspaceObject.class);
+   public static final ObjectType<WorkspaceObject> ANY =3D new ObjectType<=
WorkspaceObject>(0, WorkspaceObject.class);
 =

    /** . */
-   public static final ObjectType<Workspace> WORKSPACE =3D new ObjectType<=
Workspace>(Workspace.class);
+   public static final ObjectType<Workspace> WORKSPACE =3D new ObjectType<=
Workspace>(1, Workspace.class);
 =

    /** . */
-   public static final ObjectType<Site> SITE =3D new ObjectType<Site>(Site=
.class);
+   public static final ObjectType<Site> SITE =3D new ObjectType<Site>(2, S=
ite.class);
 =

    /** . */
-   public static final ObjectType<Site> PORTAL_SITE =3D new ObjectType<Sit=
e>(Site.class, SITE);
+   public static final ObjectType<Site> PORTAL_SITE =3D new ObjectType<Sit=
e>(3, Site.class, SITE);
 =

    /** . */
-   public static final ObjectType<Site> GROUP_SITE =3D new ObjectType<Site=
>(Site.class, SITE);
+   public static final ObjectType<Site> GROUP_SITE =3D new ObjectType<Site=
>(4, Site.class, SITE);
 =

    /** . */
-   public static final ObjectType<Site> USER_SITE =3D new ObjectType<Site>=
(Site.class, SITE);
+   public static final ObjectType<Site> USER_SITE =3D new ObjectType<Site>=
(5, Site.class, SITE);
 =

    /** . */
-   public static final ObjectType<Page> PAGE =3D new ObjectType<Page>(Page=
.class);
+   public static final ObjectType<Page> PAGE =3D new ObjectType<Page>(6, P=
age.class);
 =

    /** . */
-   public static final ObjectType<Navigation> NAVIGATION =3D new ObjectTyp=
e<Navigation>(Navigation.class);
+   public static final ObjectType<Navigation> NAVIGATION =3D new ObjectTyp=
e<Navigation>(7, Navigation.class);
 =

    /** . */
-   public static final ObjectType<UIComponent> COMPONENT =3D new ObjectTyp=
e<UIComponent>(UIComponent.class);
+   public static final ObjectType<UIComponent> COMPONENT =3D new ObjectTyp=
e<UIComponent>(8, UIComponent.class);
 =

    /** . */
-   public static final ObjectType<UIBody> BODY =3D new ObjectType<UIBody>(=
UIBody.class, COMPONENT);
+   public static final ObjectType<UIBody> BODY =3D new ObjectType<UIBody>(=
9, UIBody.class, COMPONENT);
 =

    /** . */
-   public static final ObjectType<UIContainer> CONTAINER =3D new ObjectTyp=
e<UIContainer>(UIContainer.class, COMPONENT);
+   public static final ObjectType<UIContainer> CONTAINER =3D new ObjectTyp=
e<UIContainer>(10, UIContainer.class, COMPONENT);
 =

    /** . */
-   public static final ObjectType<UIWindow> WINDOW =3D new ObjectType<UIWi=
ndow>(UIWindow.class, COMPONENT);
+   public static final ObjectType<UIWindow> WINDOW =3D new ObjectType<UIWi=
ndow>(11, UIWindow.class, COMPONENT);
 =

    /** . */
-   public static final ObjectType<PageLink> PAGE_LINK =3D new ObjectType<P=
ageLink>(PageLink.class);
+   public static final ObjectType<PageLink> PAGE_LINK =3D new ObjectType<P=
ageLink>(12, PageLink.class);
 =

    /** . */
-   public static final ObjectType<URLLink> URL_LINK =3D new ObjectType<URL=
Link>(URLLink.class);
+   public static final ObjectType<URLLink> URL_LINK =3D new ObjectType<URL=
Link>(13, URLLink.class);
 =

    /** . */
-   private final Class<O> javaType;
+   private static final ObjectType[] ENUMERATION =3D
+   {
+      ANY,
+      WORKSPACE,
+      SITE,
+      PORTAL_SITE,
+      GROUP_SITE,
+      USER_SITE,
+      PAGE,
+      NAVIGATION,
+      COMPONENT,
+      BODY,
+      CONTAINER,
+      WINDOW,
+      PAGE_LINK,
+      URL_LINK
+   };
 =

    /** . */
-   private final Set<ObjectType<?>> superTypes;
+   private final int ordinal;
 =

-   private ObjectType(Class<O> javaType, ObjectType<?>... superTypes)
+   /** . */
+   private final transient Class<O> javaType;
+
+   /** . */
+   private final transient Set<ObjectType<?>> superTypes;
+
+   private ObjectType(int ordinal, Class<O> javaType, ObjectType<?>... sup=
erTypes)
    {
       for (ObjectType<?> superType : superTypes)
       {
@@ -103,6 +127,7 @@
       }
 =

       //
+      this.ordinal =3D ordinal;
       this.javaType =3D javaType;
       this.superTypes =3D tmp;
    }
@@ -141,6 +166,18 @@
       }
    }
 =

+   private Object readResolve () throws java.io.ObjectStreamException
+   {
+      if (ordinal >=3D 0 || ordinal < ENUMERATION.length)
+      {
+         return ENUMERATION[ordinal];
+      }
+      else
+      {
+         throw new InvalidObjectException("Corrupted ordinal value" + ordi=
nal);
+      }
+   }
+
    @Override
    public String toString()
    {

Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/w=
orkspace/ObjectTypeTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspa=
ce/ObjectTypeTestCase.java	2011-09-13 05:57:01 UTC (rev 7368)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspa=
ce/ObjectTypeTestCase.java	2011-09-13 06:16:50 UTC (rev 7369)
@@ -21,6 +21,11 @@
 import junit.framework.TestCase;
 import org.gatein.mop.api.workspace.ObjectType;
 =

+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
 /**
  * @author <a href=3D"mailto:julien.viet(a)exoplatform.com">Julien Viet</a>
  * @version $Revision$
@@ -44,4 +49,16 @@
       assertTrue(ObjectType.SITE.isAssignableFrom(ObjectType.GROUP_SITE));
       assertFalse(ObjectType.GROUP_SITE.isAssignableFrom(ObjectType.SITE));
    }
+
+   public void testSerialization() throws Exception
+   {
+      ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
+      ObjectOutputStream out =3D new ObjectOutputStream(baos);
+      out.writeObject(ObjectType.PAGE);
+      out.close();
+      ByteArrayInputStream bais =3D new ByteArrayInputStream(baos.toByteAr=
ray());
+      ObjectInputStream in =3D new ObjectInputStream(bais);
+      Object o =3D in.readObject();
+      assertSame(ObjectType.PAGE, o);
+   }
 }


--===============5860985321486130021==--