svn commit: r918105 - /myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java

[lo...@apache.org]

Author: lofwyr
Date: Tue Mar  2 16:39:07 2010
New Revision: 918105

URL: http://svn.apache.org/viewvc?rev=918105&view=rev
Log:
TOBAGO-811: Doublicate ID with Facelets and JSF RI 1.1
 - Changes in the version 1.0.x will be rolled back, because it seems there is no issue with Facelets and Sun RI 1.1.
 - If there still is any, please report it, and link it to this bug.

Modified:
    myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java

Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java?rev=918105&r1=918104&r2=918105&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java Tue Mar  2 16:39:07 2010
@@ -47,8 +47,6 @@
 
   private ClientProperties clientProperties;
 
-  private int nextUniqueId;
-
   /**
    * <p>Create a new {@link UIViewRoot} instance with default property
    * values.</p>
@@ -223,37 +221,4 @@
     }
     return events;
   }
-
-  @Override
-  public Object saveState(FacesContext facesContext) {
-    if (FacesVersion.supports12()) {
-      return super.saveState(facesContext);
-    } else {
-      Object[] state = new Object[2];
-      state[0] = super.saveState(facesContext);
-      state[1] = nextUniqueId;
-      return state;
-    }
-  }
-
-  @Override
-  public void restoreState(FacesContext facesContext, Object o) {
-    if (FacesVersion.supports12()) {
-      super.restoreState(facesContext, o);
-    } else {
-      Object[] state = (Object[]) o;
-      super.restoreState(facesContext, state[0]);
-      nextUniqueId = (Integer) state[1];
-    }
-  }
-
-  @Override
-  public String createUniqueId() {
-    if (FacesVersion.supports12()) {
-      return super.createUniqueId();
-    } else {
-      ExternalContext extCtx = FacesContext.getCurrentInstance().getExternalContext();
-      return extCtx.encodeNamespace(UNIQUE_ID_PREFIX + nextUniqueId++);
-    }
-  }
 }