openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r758855 - in /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf: ConversationImpl.java ConversationManager.java WebBeansPhaseListener.java
Date Thu, 26 Mar 2009 21:08:03 GMT
Author: gerdogdu
Date: Thu Mar 26 21:08:02 2009
New Revision: 758855

URL: http://svn.apache.org/viewvc?rev=758855&view=rev
Log:
Clean some unnecessary methods.

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java?rev=758855&r1=758854&r2=758855&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java
Thu Mar 26 21:08:02 2009
@@ -25,8 +25,6 @@
 {
     private String id;
 
-    private String viewId;
-
     private boolean longRunning = false;
 
     private long timeout;
@@ -101,27 +99,12 @@
         return activeTime;
     }
 
-    /**
-     * @return the viewId
-     */
-    public String getViewId()
-    {
-        return viewId;
-    }
 
     public void updateTimeOut()
     {
         this.activeTime = System.currentTimeMillis();
     }
 
-    /**
-     * @param viewId the viewId to set
-     */
-    public void setViewId(String viewId)
-    {
-        this.viewId = viewId;
-    }
-
     /*
      * (non-Javadoc)
      * @see java.lang.Object#hashCode()

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationManager.java?rev=758855&r1=758854&r2=758855&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationManager.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationManager.java
Thu Mar 26 21:08:02 2009
@@ -106,18 +106,9 @@
         }
     }
 
-    public Conversation createNewConversation(String viewId)
+    public Conversation createNewConversation()
     {
-        Asserts.assertNotNull(viewId, "viewId parameter can not be null");
-
         Conversation conversation = getCurrentConversation();
-        ((ConversationImpl) conversation).setViewId(viewId);
-
-        // Create conversation context
-        // ContextFactory.initConversationContext();
-
-        // addConversationContext(conversation,(ConversationContext)
-        // ManagerImpl.getManager().getContext(ConversationScoped.class));
 
         return conversation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java?rev=758855&r1=758854&r2=758855&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
Thu Mar 26 21:08:02 2009
@@ -48,7 +48,7 @@
                 if (cid == null)
                 {
                     logger.info("Create new transitional conversation for non-faces request
with view id : " + JSFUtil.getViewId());
-                    conversation = (ConversationImpl) conversationManager.createNewConversation(JSFUtil.getViewId());
+                    conversation = (ConversationImpl) conversationManager.createNewConversation();
 
                     ContextFactory.initConversationContext(null);
 
@@ -62,7 +62,7 @@
                     if (conversation == null)
                     {
                         logger.info("Propogated conversation can not be restored for view
id : " + JSFUtil.getViewId() + ". Creates new transitional conversation");
-                        conversation = (ConversationImpl) conversationManager.createNewConversation(JSFUtil.getViewId());
+                        conversation = (ConversationImpl) conversationManager.createNewConversation();
 
                         ContextFactory.initConversationContext(null);
                     }
@@ -91,7 +91,7 @@
                 else
                 {
                     logger.info("Create new transient conversation for JSF postback view
id : " + JSFUtil.getViewId());
-                    conversation = (ConversationImpl) conversationManager.createNewConversation(JSFUtil.getViewId());
+                    conversation = (ConversationImpl) conversationManager.createNewConversation();
 
                     ContextFactory.initConversationContext(null);
                 }



Mime
View raw message