myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1569249 - in /myfaces/tobago/branches/tobago-3.0.x: tobago-core/src/main/java/org/apache/myfaces/tobago/context/ tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ tobago-example/tobago-ex...
Date Tue, 18 Feb 2014 10:08:22 GMT
Author: lofwyr
Date: Tue Feb 18 10:08:21 2014
New Revision: 1569249

URL: http://svn.apache.org/r1569249
Log:
TOBAGO-1367: Remove debugMode from ClientProperties

Removed:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DebugModePhaseListener.java
Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/demo.js
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
Tue Feb 18 10:08:21 2014
@@ -56,6 +56,9 @@ public class ClientProperties implements
   private String contentType = "html";
   private Theme theme;
   private UserAgent userAgent = UserAgent.DEFAULT;
+
+  /** @deprecated since Tobago 3.0 */
+  @Deprecated
   private boolean debugMode;
 
   private Measure verticalScrollbarWeight;
@@ -129,10 +132,14 @@ public class ClientProperties implements
     reset();
   }
 
+  /** @deprecated since Tobago 3.0 */
+  @Deprecated
   public boolean isDebugMode() {
     return debugMode;
   }
 
+  /** @deprecated since Tobago 3.0 */
+  @Deprecated
   public void setDebugMode(final boolean debugMode) {
     this.debugMode = debugMode;
   }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
Tue Feb 18 10:08:21 2014
@@ -92,18 +92,12 @@ public class ClientConfigController {
 // ///////////////////////////////////////////// logic
 
   public void storeInClientProperties() {
-    final ClientProperties client
-        = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance());
-
-    client.setDebugMode(debugMode);
+    final ClientProperties client = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance());
     client.setTheme(theme);
   }
 
   public void loadFromClientProperties() {
-    final ClientProperties client
-        = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance());
-
-    debugMode = client.isDebugMode();
+    final ClientProperties client = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance());
     theme = client.getTheme();
   }
 
@@ -145,14 +139,6 @@ public class ClientConfigController {
         .getVariableResolver().resolveVariable(facesContext, beanName);
   }
 
-  public boolean isDebugMode() {
-    return debugMode;
-  }
-
-  public void setDebugMode(final boolean debugMode) {
-    this.debugMode = debugMode;
-  }
-
   public Theme getTheme() {
     return theme;
   }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
Tue Feb 18 10:08:21 2014
@@ -42,10 +42,6 @@
                 <f:selectItems value="#{clientConfigController.localeItems}"/>
               </tx:menuRadio>
             </tc:menu>
-            <%-- todo: may have something like immediate="true", but in this case, the
value will not switched --%>
-            <tx:menuCheckbox action="#{clientConfigController.submit}"
-                             label="#{overviewBundle.menu_debug}"
-                             value="#{clientConfigController.debugMode}"/>
             <tc:menuCommand action="#{demo.resetSession}" label="Reset"/>
           </tc:menu>
 
@@ -54,8 +50,6 @@
                 onclick="alert('#{overviewBundle.pageTitle}' + String.fromCharCode(10) +
'#{info.version}' + String.fromCharCode(10) + '#{overviewBundle.tobago_url}' + String.fromCharCode(10))"
                 label="#{overviewBundle.menu_about}"/>
             <tc:menuCommand link="http://myfaces.apache.org/tobago" label="Tobago in the
Web"/>
-            <tc:menuCommand onclick="LOG.show();" label="#{overviewBundle.menu_showLog}"
-                            rendered="#{clientConfigController.debugMode}"/>
             <tc:menuCommand action="server-info" immediate="true"
                             label="Server Info" disabled="#{! info.enabled}"/>
           </tc:menu>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
Tue Feb 18 10:08:21 2014
@@ -44,10 +44,6 @@
                   <f:selectItems value="#{clientConfigController.localeItems}"/>
                 </tx:menuRadio>
               </tc:menu>
-              <!-- todo: may have something like immediate="true", but in this case, the
value will not switched -->
-              <tx:menuCheckbox action="#{clientConfigController.submit}"
-                               label="#{overviewBundle.menu_debug}"
-                               value="#{clientConfigController.debugMode}"/>
               <tc:menuCommand action="#{demo.resetSession}" label="Reset"/>
             </tc:menu>
 
@@ -57,10 +53,6 @@
                                   value="#{overviewBundle.pageTitle} - #{info.version} -
#{overviewBundle.tobago_url}"/>
               </tc:menuCommand>
               <tc:menuCommand link="http://myfaces.apache.org/tobago" label="Tobago in
the Web"/>
-              <tc:menuCommand label="#{overviewBundle.menu_showLog}" omit="true"
-                              rendered="#{clientConfigController.debugMode}">
-                <tc:dataAttribute name="show-log" value="true"/>
-              </tc:menuCommand>
               <tc:menuCommand action="server-info" immediate="true"
                               label="Server Info"
                               disabled="#{! info.enabled}"/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml
Tue Feb 18 10:08:21 2014
@@ -52,9 +52,5 @@
           <tc:button action="#{clientConfigController2.submit}" label="#{overviewBundle.locale_submit}"/>
         </tc:panel>
       </tc:panel>
-      
-      <tx:selectBooleanCheckbox label="#{overviewBundle.menu_debug}" 
-                                value="#{clientConfigController2.debugMode}" />
-
   </tc:panel>
 </ui:composition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/demo.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/demo.js?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/demo.js
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/demo.js
Tue Feb 18 10:08:21 2014
@@ -26,20 +26,10 @@
       });
     }
   });
-  $.widget("demo.show", {
-    _create: function () {
-      this._on({
-        click: function (event) {
-          LOG.show();
-        }
-      });
-    }
-  });
 }(jQuery));
 
 var initAlert = function () {
   jQuery("[data-alert-text]").alert();
-  jQuery("[data-show-log]").show();
 };
 
 Tobago.registerListener(initAlert, Tobago.Phase.DOCUMENT_READY);

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
Tue Feb 18 10:08:21 2014
@@ -32,9 +32,7 @@
   <entry key="menu_help">_Help</entry>
   <entry key="menu_themes">_Themes</entry>
   <entry key="menu_locale">_Locale</entry>
-  <entry key="menu_debug">Debug Mode</entry>
   <entry key="menu_about">About</entry>
-  <entry key="menu_showLog">Show log Panel</entry>
 
 <!-- navigate -->
   <entry key="overview">Overview</entry>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
Tue Feb 18 10:08:21 2014
@@ -28,9 +28,7 @@
   <entry key="menu_help">_Hilfe</entry>
   <entry key="menu_themes">_Themes</entry>
   <entry key="menu_locale">_Sprachen</entry>
-  <entry key="menu_debug">Debug Modus</entry>
   <entry key="menu_about">Über</entry>
-  <entry key="menu_showLog">Zeige Log Panel</entry>
 
 <!--  navigate -->
   <entry key="overview">Übersicht</entry>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java
Tue Feb 18 10:08:21 2014
@@ -74,16 +74,11 @@ public class ClientConfigController {
 
   public void storeInClientProperties() {
     final ClientProperties client = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance());
-
-    client.setDebugMode(debugMode);
     client.setTheme(theme);
   }
 
   public void loadFromClientProperties() {
-    final ClientProperties client
-        = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance());
-
-    debugMode = client.isDebugMode();
+    final ClientProperties client = VariableResolverUtils.resolveClientProperties(FacesContext.getCurrentInstance());
     theme = client.getTheme();
   }
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1569249&r1=1569248&r2=1569249&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
Tue Feb 18 10:08:21 2014
@@ -23,12 +23,6 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
     version="2.0">
 
-  <lifecycle>
-    <phase-listener>
-      org.apache.myfaces.tobago.example.test.DebugModePhaseListener
-    </phase-listener>
-  </lifecycle>
-
   <factory>
     <exception-handler-factory>
       org.apache.myfaces.tobago.example.test.TestExceptionHandlerFactory



Mime
View raw message