myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r590920 - in /myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago: component/UIWizard.java model/BeanItem.java taglib/sandbox/WizardTag.java
Date Thu, 01 Nov 2007 07:35:31 GMT
Author: bommel
Date: Thu Nov  1 00:35:27 2007
New Revision: 590920

URL: http://svn.apache.org/viewvc?rev=590920&view=rev
Log:
checkstyle

Modified:
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIWizard.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/BeanItem.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTag.java

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIWizard.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIWizard.java?rev=590920&r1=590919&r2=590920&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIWizard.java
(original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIWizard.java
Thu Nov  1 00:35:27 2007
@@ -1,9 +1,5 @@
 package org.apache.myfaces.tobago.component;
 
-import org.apache.myfaces.tobago.model.Wizard;
-
-import javax.faces.el.ValueBinding;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,6 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import org.apache.myfaces.tobago.model.Wizard;
+
+import javax.faces.el.ValueBinding;
 
 public class UIWizard extends UIPanel {
 

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/BeanItem.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/BeanItem.java?rev=590920&r1=590919&r2=590920&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/BeanItem.java
(original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/BeanItem.java
Thu Nov  1 00:35:27 2007
@@ -1,9 +1,22 @@
 package org.apache.myfaces.tobago.model;
 
-/**
- * User: lofwyr
- * Date: 23.10.2007 16:46:48
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 public class BeanItem {
 
   private String type;

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTag.java?rev=590920&r1=590919&r2=590920&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTag.java
(original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTag.java
Thu Nov  1 00:35:27 2007
@@ -88,94 +88,80 @@
 
     facetTag.doEndTag();
 
-    {
-      CellTag cell = new CellTag();
-      cell.setPageContext(pageContext);
-      cell.setParent(panelTag);
-      cell.setSpanX("5");
-      cell.doStartTag();
-
-      {
-        Object bean = VariableResolverUtil.resolveVariable(FacesContext.getCurrentInstance(),
"controller");
-        int index = 0;
-        try {
-          Wizard wizard = (Wizard) PropertyUtils.getProperty(bean, "wizard");
-          index = wizard.getIndex();
-        } catch (Exception e) {
-          LOG.error("", e);
-        }
-
-        if (index < 2) {
-          IncludeTag content = new IncludeTag();
-          content.setPageContext(pageContext);
-          content.setParent(cell);
-          content.setValue("snip-" + index + ".jsp");
-          content.doStartTag();
-          content.doEndTag();
-        } else {
-          PanelTag content = new PanelTag();
-          content.setPageContext(pageContext);
-          content.setParent(cell);
-          content.setBinding(controller.replace("}", ".currentComponent}"));
-          content.doStartTag();
-          content.doEndTag();
-        }
-      }
-
-      cell.doEndTag();
-    }
-
-    {
-      CellTag spacer = new CellTag();
-      spacer.setPageContext(pageContext);
-      spacer.setParent(panelTag);
-      spacer.doStartTag();
-      spacer.doEndTag();
-    }
-
-    {
-      ButtonTag start = new ButtonTag();
-      start.setPageContext(pageContext);
-      start.setParent(panelTag);
-      start.setLabel("Start");
-      start.setAction(controller.replace("}", ".start}"));
-      start.setDisabled(controller.replace("}", ".startAvailable}").replace("#{", "#{!"));
-      start.doStartTag();
-      start.doEndTag();
-    }
-
-    {
-      ButtonTag previous = new ButtonTag();
-      previous.setPageContext(pageContext);
-      previous.setParent(panelTag);
-      previous.setLabel("Previous");
-      previous.setAction(controller.replace("}", ".previous}"));
-      previous.setDisabled(controller.replace("}", ".previousAvailable}").replace("#{", "#{!"));
-      previous.doStartTag();
-      previous.doEndTag();
-    }
-
-    {
-      ButtonTag next = new ButtonTag();
-      next.setPageContext(pageContext);
-      next.setParent(panelTag);
-      next.setLabel("Next");
-      next.setAction(controller.replace("}", ".next}"));
-      next.setDisabled(controller.replace("}", ".nextAvailable}").replace("#{", "#{!"));
-      next.doStartTag();
-      next.doEndTag();
-    }
-
-    {
-      ButtonTag finish = new ButtonTag();
-      finish.setPageContext(pageContext);
-      finish.setParent(panelTag);
-      finish.setLabel("Finish");
-      finish.setAction(controller.replace("}", ".finish}"));
-      finish.setDisabled(controller.replace("}", ".finishAvailable}").replace("#{", "#{!"));
-      finish.doStartTag();
-      finish.doEndTag();
-    }
+    CellTag cell = new CellTag();
+    cell.setPageContext(pageContext);
+    cell.setParent(panelTag);
+    cell.setSpanX("5");
+    cell.doStartTag();
+
+    Object bean = VariableResolverUtil.resolveVariable(FacesContext.getCurrentInstance(),
"controller");
+    int index = 0;
+    try {
+      Wizard wizard = (Wizard) PropertyUtils.getProperty(bean, "wizard");
+      index = wizard.getIndex();
+    } catch (Exception e) {
+      LOG.error("", e);
+    }
+
+    if (index < 2) {
+      IncludeTag content = new IncludeTag();
+      content.setPageContext(pageContext);
+      content.setParent(cell);
+      content.setValue("snip-" + index + ".jsp");
+      content.doStartTag();
+      content.doEndTag();
+    } else {
+      PanelTag content = new PanelTag();
+      content.setPageContext(pageContext);
+      content.setParent(cell);
+      content.setBinding(controller.replace("}", ".currentComponent}"));
+      content.doStartTag();
+      content.doEndTag();
+    }
+
+    cell.doEndTag();
+
+    CellTag spacer = new CellTag();
+    spacer.setPageContext(pageContext);
+    spacer.setParent(panelTag);
+    spacer.doStartTag();
+    spacer.doEndTag();
+
+    ButtonTag start = new ButtonTag();
+    start.setPageContext(pageContext);
+    start.setParent(panelTag);
+    start.setLabel("Start");
+    start.setAction(controller.replace("}", ".start}"));
+    start.setDisabled(controller.replace("}", ".startAvailable}").replace("#{", "#{!"));
+    start.doStartTag();
+    start.doEndTag();
+
+    ButtonTag previous = new ButtonTag();
+    previous.setPageContext(pageContext);
+    previous.setParent(panelTag);
+    previous.setLabel("Previous");
+    previous.setAction(controller.replace("}", ".previous}"));
+    previous.setDisabled(controller.replace("}", ".previousAvailable}").replace("#{", "#{!"));
+    previous.doStartTag();
+    previous.doEndTag();
+
+    ButtonTag next = new ButtonTag();
+    next.setPageContext(pageContext);
+    next.setParent(panelTag);
+    next.setLabel("Next");
+    next.setAction(controller.replace("}", ".next}"));
+    next.setDisabled(controller.replace("}", ".nextAvailable}").replace("#{", "#{!"));
+    next.doStartTag();
+    next.doEndTag();
+
+    ButtonTag finish = new ButtonTag();
+    finish.setPageContext(pageContext);
+    finish.setParent(panelTag);
+    finish.setLabel("Finish");
+    finish.setAction(controller.replace("}", ".finish}"));
+    finish.setDisabled(controller.replace("}", ".finishAvailable}").replace("#{", "#{!"));
+    finish.doStartTag();
+    finish.doEndTag();
 
     return super.doStartTag();
   }



Mime
View raw message