myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r600823 - in /myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago: application/ component/ model/ renderkit/fo/standard/standard/tag/ renderkit/html/scarborough/standard/tag/ renderkit/wml/standard/standard/tag/ taglib/sand...
Date Tue, 04 Dec 2007 07:53:54 GMT
Author: bommel
Date: Mon Dec  3 23:53:51 2007
New Revision: 600823

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

Modified:
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractWizard.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/TreeModel.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoUtils.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/Layout.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/RichTextEditorTagDeclaration.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/application/FoViewHandlerImpl.java Mon Dec  3 23:53:51 2007
@@ -49,50 +49,50 @@
   }
 
   public void renderView(FacesContext facesContext, UIViewRoot viewRoot)
-       throws IOException, FacesException {
-     String requestUri = viewRoot.getViewId();
+      throws IOException, FacesException {
+    String requestUri = viewRoot.getViewId();
 
-     String contentType
-         = ClientProperties.getInstance(viewRoot).getContentType();
-     if (LOG.isDebugEnabled()) {
-       LOG.debug("contentType = '" + contentType + "'");
-     }
-     if (contentType.indexOf("fo") == -1) {
-       // standard
-       super.renderView(facesContext, viewRoot);
-     } else {
-       try {
-       // TODO PortletResponse ??
-         if (facesContext.getExternalContext().getResponse() instanceof TobagoResponse) {
-           ((TobagoResponse) facesContext.getExternalContext().getResponse()).setBuffering();
-           // own dispatch
-           HttpServletRequest request = (HttpServletRequest)
-               facesContext.getExternalContext().getRequest();
-           HttpServletResponse response = (HttpServletResponse)
-               facesContext.getExternalContext().getResponse();
-           RequestDispatcher requestDispatcher
-               = request.getRequestDispatcher(requestUri);
-           requestDispatcher.include(request, response);
-           response.setContentType("application/pdf");
-           String buffer =
-               ((TobagoResponse) facesContext.getExternalContext().getResponse()).getBufferedString();
-           ServletResponse servletResponse = (ServletResponse)
-               facesContext.getExternalContext().getResponse();
-           if (LOG.isDebugEnabled()) {
-             LOG.debug("fo buffer: " + buffer);
-           }
-           FopConverter.fo2Pdf(servletResponse, buffer);
-         }
-       } catch (ServletException e) {
-         IOException ex = new IOException();
-         ex.initCause(e);
-         throw ex;
-       }
-     }
-     if (LOG.isDebugEnabled()) {
-       LOG.debug("VIEW");
-       LOG.debug(ComponentUtil.toString(facesContext.getViewRoot(), 0));
-     }
-   }
+    String contentType
+        = ClientProperties.getInstance(viewRoot).getContentType();
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("contentType = '" + contentType + "'");
+    }
+    if (contentType.indexOf("fo") == -1) {
+      // standard
+      super.renderView(facesContext, viewRoot);
+    } else {
+      try {
+        // TODO PortletResponse ??
+        if (facesContext.getExternalContext().getResponse() instanceof TobagoResponse) {
+          ((TobagoResponse) facesContext.getExternalContext().getResponse()).setBuffering();
+          // own dispatch
+          HttpServletRequest request = (HttpServletRequest)
+              facesContext.getExternalContext().getRequest();
+          HttpServletResponse response = (HttpServletResponse)
+              facesContext.getExternalContext().getResponse();
+          RequestDispatcher requestDispatcher
+              = request.getRequestDispatcher(requestUri);
+          requestDispatcher.include(request, response);
+          response.setContentType("application/pdf");
+          String buffer =
+              ((TobagoResponse) facesContext.getExternalContext().getResponse()).getBufferedString();
+          ServletResponse servletResponse = (ServletResponse)
+              facesContext.getExternalContext().getResponse();
+          if (LOG.isDebugEnabled()) {
+            LOG.debug("fo buffer: " + buffer);
+          }
+          FopConverter.fo2Pdf(servletResponse, buffer);
+        }
+      } catch (ServletException e) {
+        IOException ex = new IOException();
+        ex.initCause(e);
+        throw ex;
+      }
+    }
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("VIEW");
+      LOG.debug(ComponentUtil.toString(facesContext.getViewRoot(), 0));
+    }
+  }
 
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeData.java Mon Dec  3 23:53:51 2007
@@ -56,7 +56,6 @@
   // XXX hack: fix this if there is a Listener
   private Object marker;
 
-
 //  @Override public void processDecodes(FacesContext facesContext) {
 //    LOG.info("processDecodes for nodes");
 //    LOG.warn("todo"); // todo

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java Mon Dec  3 23:53:51 2007
@@ -116,11 +116,11 @@
     markup = (String[]) values[1];
     marked = (Boolean) values[2];
     expanded = (Boolean) values[3];
-   }
+  }
 
   @Override
   public Object saveState(FacesContext context) {
-    Object[] values  = new Object[4];
+    Object[] values = new Object[4];
     values[0] = super.saveState(context);
     values[1] = markup;
     values[2] = marked;

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java Mon Dec  3 23:53:51 2007
@@ -25,245 +25,251 @@
 
 public abstract class AbstractCrudController implements Crud {
 
-    private static final Log LOG = LogFactory.getLog(AbstractCrudController.class);
+  private static final Log LOG = LogFactory.getLog(AbstractCrudController.class);
 
-    private String defaultOutcome;
+  private String defaultOutcome;
 
-    private boolean showDetail;
+  private boolean showDetail;
 
-    private String filterExpression;
+  private String filterExpression;
 
-    private boolean initialized;
-
-    private boolean itemEditable;
-
-    /**
-     * @see Crud#getShowDetail()
-     */
-    public final boolean getShowDetail() {
-        return showDetail;
-    }
-
-    /**
-     * @see org.apache.myfaces.tobago.model.Crud#isInitialized()
-     */
-    public final boolean isInitialized() {
-        return initialized;
-    }
-
-    /**
-     * @see Crud#isItemEditable()
-     */
-    public boolean isItemEditable() {
-        return itemEditable;
-    }
-
-    /**
-     * @see Crud#initialize()
-     */
-    public final String initialize() {
-        if (!initialized) {
-            reset();
-
-            boolean success = doInitialization();
-            if (success) {
-                initialized = true;
-            } else {
-                FacesContext.getCurrentInstance().addMessage("",
-                        new FacesMessage(FacesMessage.SEVERITY_ERROR, "CRUD component not successfully initalized.", "Please see log for more details."));
-            }
-        }
-        return getDefaultOutcome();
-    }
-
-    /**
-     * <p>
-     * Hook for the implementation of business logic, after invoking the action {@link AbstractCrudController#initialize()}.
-     * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
-     * Otherwise the method has to return <i>false</i>.
-     * </p>
-     *
-     * @return true if the method completed sucessfully, false if not
-     */
-    protected abstract boolean doInitialization();
-
-    /**
-     * @see Crud#deleteItem()
-     */
-    public final String deleteItem() {
-        if (initialized) {
-            doDeleteItem();
-        }
-        return getDefaultOutcome();
-    }
-
-    /**
-     * <p>
-     * Hook for the implementation of business logic, after invoking the action {@link AbstractCrudController#deleteItem()}.
-     * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
-     * Otherwise the method has to return <i>false</i>.
-     * </p>
-     *
-     * @return true if the method completed sucessfully, false if not
-     */
-    protected abstract boolean doDeleteItem();
-
-    /**
-     * @see Crud#showItem()
-     */
-    public final String showItem() {
-        if (initialized) {
-            itemEditable = false;
-            showDetail = doShowItem(itemEditable) ? true : false;
-        }
-        return getDefaultOutcome();
-    }
-
-    /**
-     * @see Crud#editItem()
-     */
-    public final String editItem() {
-        if (initialized) {
-            itemEditable = true;
-            showDetail = doShowItem(itemEditable) ? true : false;
-        }
-        return getDefaultOutcome();
-    }
-
-    /**
-     * <p>
-     * Hook for the implementation of business logic, after invoking the action {@link AbstractCrudController#showItem()}.
-     * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
-     * Otherwise the method has to return <i>false</i>.
-     * </p>
-     * @param isEditAble Indicator if the Item is editable
-     * 
-     * @return true if the method completed sucessfully, false if not
-     */
-    protected abstract boolean doShowItem(boolean isEditAble);
-
-    /**
-     * @see Crud#createItem()
-     */
-    public final String createItem() {
-        if (initialized) {
-            itemEditable = true;
-            showDetail = doCreateItem() ? true : false;
-        }
-        return getDefaultOutcome();
-    }
-
-    /**
-     * <p>
-     * Hook for the implementation of business logic, after invoking the action {@link AbstractCrudController#createItem()}.
-     * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
-     * Otherwise the method has to return <i>false</i>.
-     * </p>
-     *
-     * @return true if the method completed sucessfully, false if not
-     */
-    protected abstract boolean doCreateItem();
-
-    /**
-     * @see Crud#saveItem()
-     */
-    public final String saveItem() {
-        showDetail = doSaveItem() ? false : true;
-        return getDefaultOutcome();
-    }
-
-    /**
-     * <p>
-     * Hook for the implementation of business logic, after invoking the action {@link AbstractCrudController#saveItem()}.
-     * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
-     * Otherwise the method has to return <i>false</i>.
-     * </p>
-     *
-     * @return true if the method completed sucessfully, false if not
-     */
-    protected abstract boolean doSaveItem();
-
-    /**
-     * @see Crud#cancelItem()
-     */
-    public final String cancelItem() {
-        showDetail = doCancelItem() ? false : true;
-        return getDefaultOutcome();
-    }
-
-    /**
-     * <p>
-     * Hook for the implementation of business logic, after invoking the action {@link AbstractCrudController#cancelItem()}.
-     * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
-     * Otherwise the method has to return <i>false</i>.
-     * </p>
-     *
-     * @return true if the method completed sucessfully, false if not
-     */
-    protected abstract boolean doCancelItem();
-
-    /**
-     * @see Crud#filter()
-     */
-    public String filter() {
-        if (initialized) {
-            doFilter(filterExpression);
-        }
-        return defaultOutcome;
-    }
-
-    /**
-     * <p>
-     * Hook for the implementation of business logic, after invoking the action {@link AbstractCrudController#filter()}.
-     * </p>
-     * 
-     * @param filterExpression The expression to use for searching/narrowing the items to show in the crud master view
-     */
-    public abstract void doFilter(String filterExpression);
-
-    /**
-     * @see Crud#getFilterExpression()
-     * 
-     * @return The filterExpression to use for the action search
-     */
-    public String getFilterExpression() {
-        return this.filterExpression;
-    }
-
-    /**
-     * Set the filter expression to use when executing the action filter in order to narrow
-     * the items to show on the crud master view. @see Crud#setFilterExpression(String)
-     * 
-     * @param filterExpression The expression to use for searching
-     */
-    public void setFilterExpression(String filterExpression) {
-        this.filterExpression = filterExpression;
-    }
-
-    /**
-     * @return The outcome for the actions of the crud component
-     */
-    private final String getDefaultOutcome() {
-        return this.defaultOutcome;
-    }
-
-    /**
-     * Set the outcome for all actions of the crud component.
-     * 
-     * @param defaultOutcome The outcome for all actions of the crud component
-     */
-    public final void setDefaultOutcome(String defaultOutcome) {
-        this.defaultOutcome = defaultOutcome;
-    }
-
-    /**
-     * Helper mehtod to reset the controllers attributes.
-     */
-    protected void reset() {
-        showDetail = false;
-        filterExpression = null;
-        initialized = false;
-        itemEditable = false;
-    }
+  private boolean initialized;
+
+  private boolean itemEditable;
+
+  /**
+   * @see Crud#getShowDetail()
+   */
+  public final boolean getShowDetail() {
+    return showDetail;
+  }
+
+  /**
+   * @see org.apache.myfaces.tobago.model.Crud#isInitialized()
+   */
+  public final boolean isInitialized() {
+    return initialized;
+  }
+
+  /**
+   * @see Crud#isItemEditable()
+   */
+  public boolean isItemEditable() {
+    return itemEditable;
+  }
+
+  /**
+   * @see Crud#initialize()
+   */
+  public final String initialize() {
+    if (!initialized) {
+      reset();
+
+      boolean success = doInitialization();
+      if (success) {
+        initialized = true;
+      } else {
+        FacesContext.getCurrentInstance().addMessage("",
+            new FacesMessage(FacesMessage.SEVERITY_ERROR, "CRUD component not successfully initalized.",
+                "Please see log for more details."));
+      }
+    }
+    return getDefaultOutcome();
+  }
+
+  /**
+   * <p>
+   * Hook for the implementation of business logic,
+   * after invoking the action {@link AbstractCrudController#initialize()}.
+   * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
+   * Otherwise the method has to return <i>false</i>.
+   * </p>
+   *
+   * @return true if the method completed sucessfully, false if not
+   */
+  protected abstract boolean doInitialization();
+
+  /**
+   * @see Crud#deleteItem()
+   */
+  public final String deleteItem() {
+    if (initialized) {
+      doDeleteItem();
+    }
+    return getDefaultOutcome();
+  }
+
+  /**
+   * <p>
+   * Hook for the implementation of business logic,
+   * after invoking the action {@link AbstractCrudController#deleteItem()}.
+   * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
+   * Otherwise the method has to return <i>false</i>.
+   * </p>
+   *
+   * @return true if the method completed sucessfully, false if not
+   */
+  protected abstract boolean doDeleteItem();
+
+  /**
+   * @see Crud#showItem()
+   */
+  public final String showItem() {
+    if (initialized) {
+      itemEditable = false;
+      showDetail = doShowItem(itemEditable);
+    }
+    return getDefaultOutcome();
+  }
+
+  /**
+   * @see Crud#editItem()
+   */
+  public final String editItem() {
+    if (initialized) {
+      itemEditable = true;
+      showDetail = doShowItem(itemEditable);
+    }
+    return getDefaultOutcome();
+  }
+
+  /**
+   * <p>
+   * Hook for the implementation of business logic,
+   * after invoking the action {@link AbstractCrudController#showItem()}.
+   * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
+   * Otherwise the method has to return <i>false</i>.
+   * </p>
+   *
+   * @param isEditAble Indicator if the Item is editable
+   * @return true if the method completed sucessfully, false if not
+   */
+  protected abstract boolean doShowItem(boolean isEditAble);
+
+  /**
+   * @see Crud#createItem()
+   */
+  public final String createItem() {
+    if (initialized) {
+      itemEditable = true;
+      showDetail = doCreateItem();
+    }
+    return getDefaultOutcome();
+  }
+
+  /**
+   * <p>
+   * Hook for the implementation of business logic,
+   * after invoking the action {@link AbstractCrudController#createItem()}.
+   * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
+   * Otherwise the method has to return <i>false</i>.
+   * </p>
+   *
+   * @return true if the method completed sucessfully, false if not
+   */
+  protected abstract boolean doCreateItem();
+
+  /**
+   * @see Crud#saveItem()
+   */
+  public final String saveItem() {
+    showDetail = !doSaveItem();
+    return getDefaultOutcome();
+  }
+
+  /**
+   * <p>
+   * Hook for the implementation of business logic,
+   * after invoking the action {@link AbstractCrudController#saveItem()}.
+   * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
+   * Otherwise the method has to return <i>false</i>.
+   * </p>
+   *
+   * @return true if the method completed sucessfully, false if not
+   */
+  protected abstract boolean doSaveItem();
+
+  /**
+   * @see Crud#cancelItem()
+   */
+  public final String cancelItem() {
+    showDetail = !doCancelItem();
+    return getDefaultOutcome();
+  }
+
+  /**
+   * <p>
+   * Hook for the implementation of business logic,
+   * after invoking the action {@link AbstractCrudController#cancelItem()}.
+   * If the execution of the business logic completed successfully, the method has to return <i>true</i>.
+   * Otherwise the method has to return <i>false</i>.
+   * </p>
+   *
+   * @return true if the method completed sucessfully, false if not
+   */
+  protected abstract boolean doCancelItem();
+
+  /**
+   * @see Crud#filter()
+   */
+  public String filter() {
+    if (initialized) {
+      doFilter(filterExpression);
+    }
+    return defaultOutcome;
+  }
+
+  /**
+   * <p>
+   * Hook for the implementation of business logic, after invoking the action {@link AbstractCrudController#filter()}.
+   * </p>
+   *
+   * @param filterExpression The expression to use for searching/narrowing the items to show in the crud master view
+   */
+  public abstract void doFilter(String filterExpression);
+
+  /**
+   * @return The filterExpression to use for the action search
+   * @see Crud#getFilterExpression()
+   */
+  public String getFilterExpression() {
+    return this.filterExpression;
+  }
+
+  /**
+   * Set the filter expression to use when executing the action filter in order to narrow
+   * the items to show on the crud master view. @see Crud#setFilterExpression(String)
+   *
+   * @param filterExpression The expression to use for searching
+   */
+  public void setFilterExpression(String filterExpression) {
+    this.filterExpression = filterExpression;
+  }
+
+  /**
+   * @return The outcome for the actions of the crud component
+   */
+  private String getDefaultOutcome() {
+    return this.defaultOutcome;
+  }
+
+  /**
+   * Set the outcome for all actions of the crud component.
+   *
+   * @param defaultOutcome The outcome for all actions of the crud component
+   */
+  public final void setDefaultOutcome(String defaultOutcome) {
+    this.defaultOutcome = defaultOutcome;
+  }
+
+  /**
+   * Helper mehtod to reset the controllers attributes.
+   */
+  protected void reset() {
+    showDetail = false;
+    filterExpression = null;
+    initialized = false;
+    itemEditable = false;
+  }
 
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractWizard.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractWizard.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractWizard.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractWizard.java Mon Dec  3 23:53:51 2007
@@ -350,27 +350,28 @@
   public final void resetSize(int size) {
     this.size = size;
   }
-/*
-  public final boolean isDynamicContent() {
-    return dynamicContent;
-  }
 
-  public final void setDynamicContent() {
-    this.dynamicContent = true;
-    this.staticContentSource = null;
-  }
+  /*
+    public final boolean isDynamicContent() {
+      return dynamicContent;
+    }
 
-  public final void setStaticContent(String staticContentSource) {
-    this.dynamicContent = false;
-    this.staticContentSource = staticContentSource;
-  }
+    public final void setDynamicContent() {
+      this.dynamicContent = true;
+      this.staticContentSource = null;
+    }
 
-  public final String getStaticContentSource() {
-    return staticContentSource;
-  }
+    public final void setStaticContent(String staticContentSource) {
+      this.dynamicContent = false;
+      this.staticContentSource = staticContentSource;
+    }
 
-  public abstract void makeContentDecision(int indexToShow);
-*/
+    public final String getStaticContentSource() {
+      return staticContentSource;
+    }
+
+    public abstract void makeContentDecision(int indexToShow);
+  */
   /*
   * Helper method to reset all attributes
   */

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java Mon Dec  3 23:53:51 2007
@@ -19,103 +19,105 @@
 
 public interface Crud {
 
-    //    String getDefaultOutcome();
+  //    String getDefaultOutcome();
 
-    /**
-     * Indicates if the crud component should show the crud detail view otherwise the crud master view is shown
-     * 
-     * @return True if the detail view should be shown, false if the master view should be shown
-     */
-    boolean getShowDetail();
-
-    /**
-     * Managed bean (controller) method to execute to initialize or set up the CRUD component.
-     * 
-     * @return The outcome after the method was executed
-     */
-    String initialize();
-
-    /**
-     * Managed bean (controller) method to delete an selected item.
-     * 
-     * @return The outcome after the method was executed
-     */
-    String deleteItem();
-
-    /**
-     * Managed bean (controller) method to show an selected item on the CRUD detail view.
-     * 
-     * @return The outcome after the method was executed
-     */
-    String showItem();
-
-    /**
-     * Managed bean (controller) method to show and edit an selected item on the CRUD detail view.
-     * 
-     * @return The outcome after the method was executed
-     */
-    String editItem();
-
-    /**
-     * Managed bean (controller) method to create a new item on the CRUD detail view.
-     * 
-     * @return The outcome after the method was executed
-     */
-    String createItem();
-
-    /**
-     * Managed bean (controller) method to save changes to a existing item or save a newly created item on the crud detail view.
-     * 
-     * @return The outcome after the method was executed
-     */
-    String saveItem();
-
-    /**
-     * Managed bean (controller) method to exit the crud detail view without saving.
-     * 
-     * @return The outcome after the method was executed
-     */
-    String cancelItem();
-
-    /**
-     * Managed bean (controller) method to apply a filter/narrow the items to show in the CRUD component.
-     * 
-     * @return The outcome after the method was executed
-     */
-    String filter();
-
-    /**
-     * @return The filter expression to use for the action filter
-     */
-    String getFilterExpression();
-
-    /**
-     * Set the filter expression to use when executing the action search in order to narrow
-     * the items to show on the CRUD master view.
-     * 
-     * @param filterExpression The expression to use for filtering
-     */
-    void setFilterExpression(String filterExpression);
-
-    /**
-     * <p>
-     * Indicates whether the CRUD component is successfully initialized or not.
-     * </p>
-     * <p>
-     * <b>Note: </b>If the CRUD component is not successfully initialized, all actions
-     * of the CRUD component should be ignored or disabled, expect the initialization action.
-     * <p>
-     * @return True if the CRUD component is successfully initialized, otherwise false
-     */
-    boolean isInitialized();
-
-    /**
-     * Indicates wether an item shown in the CRUD detail view is editable.
-     * 
-     * @return true if the shown item is editable, false if not
-     */
-    boolean isItemEditable();
+  /**
+   * Indicates if the crud component should show the crud detail view otherwise the crud master view is shown
+   *
+   * @return True if the detail view should be shown, false if the master view should be shown
+   */
+  boolean getShowDetail();
+
+  /**
+   * Managed bean (controller) method to execute to initialize or set up the CRUD component.
+   *
+   * @return The outcome after the method was executed
+   */
+  String initialize();
+
+  /**
+   * Managed bean (controller) method to delete an selected item.
+   *
+   * @return The outcome after the method was executed
+   */
+  String deleteItem();
+
+  /**
+   * Managed bean (controller) method to show an selected item on the CRUD detail view.
+   *
+   * @return The outcome after the method was executed
+   */
+  String showItem();
+
+  /**
+   * Managed bean (controller) method to show and edit an selected item on the CRUD detail view.
+   *
+   * @return The outcome after the method was executed
+   */
+  String editItem();
+
+  /**
+   * Managed bean (controller) method to create a new item on the CRUD detail view.
+   *
+   * @return The outcome after the method was executed
+   */
+  String createItem();
+
+  /**
+   * Managed bean (controller) method to save changes to a existing item or
+   * save a newly created item on the crud detail view.
+   *
+   * @return The outcome after the method was executed
+   */
+  String saveItem();
+
+  /**
+   * Managed bean (controller) method to exit the crud detail view without saving.
+   *
+   * @return The outcome after the method was executed
+   */
+  String cancelItem();
+
+  /**
+   * Managed bean (controller) method to apply a filter/narrow the items to show in the CRUD component.
+   *
+   * @return The outcome after the method was executed
+   */
+  String filter();
+
+  /**
+   * @return The filter expression to use for the action filter
+   */
+  String getFilterExpression();
+
+  /**
+   * Set the filter expression to use when executing the action search in order to narrow
+   * the items to show on the CRUD master view.
+   *
+   * @param filterExpression The expression to use for filtering
+   */
+  void setFilterExpression(String filterExpression);
+
+  /**
+   * <p>
+   * Indicates whether the CRUD component is successfully initialized or not.
+   * </p>
+   * <p/>
+   * <b>Note: </b>If the CRUD component is not successfully initialized, all actions
+   * of the CRUD component should be ignored or disabled, expect the initialization action.
+   * <p/>
+   *
+   * @return True if the CRUD component is successfully initialized, otherwise false
+   */
+  boolean isInitialized();
+
+  /**
+   * Indicates wether an item shown in the CRUD detail view is editable.
+   *
+   * @return true if the shown item is editable, false if not
+   */
+  boolean isItemEditable();
 
-    //    boolean showControllView();
+  //    boolean showControllView();
 
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/TreeModel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/TreeModel.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/TreeModel.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/TreeModel.java Mon Dec  3 23:53:51 2007
@@ -29,6 +29,7 @@
 import java.util.Collections;
 
 // todo: make more general (e.g. support other trees)
+
 // todo: Should be the model for the whole tree, (also for tc:treeNode on the JSP)
 public class TreeModel {
 

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java Mon Dec  3 23:53:51 2007
@@ -45,10 +45,10 @@
     int width = layout.getWidth();
     int x = 0;
     int y = 0;
-    int boxHeight = height+padding*2+borderWidth;
-    int height2 = layout.getHeight()-boxHeight;
-    int width2 =  layout.getWidth();
-    int x2= 0;
+    int boxHeight = height + padding * 2 + borderWidth;
+    int height2 = layout.getHeight() - boxHeight;
+    int width2 = layout.getWidth();
+    int x2 = 0;
     int y2 = boxHeight;
 
 
@@ -73,10 +73,7 @@
     Layout.putLayout(component, layout);
 
 
-
   }
-
-
 
 
   public void encodeEnd(FacesContext facesContext,

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoUtils.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoUtils.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoUtils.java Mon Dec  3 23:53:51 2007
@@ -59,6 +59,7 @@
     writer.writeAttribute("text-align", "start", null);
     writeEndTextBlock(writer, text);
   }
+
   public static void writeTextBlockAlignLeft(ResponseWriter writer,
       UIComponent component, String text) throws IOException {
     writeStartTextBlock(writer, component);
@@ -75,10 +76,11 @@
 
 
   }
+
   private static void writeEndTextBlock(ResponseWriter writer,
       String text) throws IOException {
     writer.writeText(text, null);
     writer.endElement("fo:block");
   }
-  
+
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java Mon Dec  3 23:53:51 2007
@@ -86,7 +86,7 @@
     }
   }
 
-  public void layoutBegin(FacesContext facesContext, UIComponent component)  {
+  public void layoutBegin(FacesContext facesContext, UIComponent component) {
   }
 
   private void layoutEnd(FacesContext facesContext, UIComponent component) {
@@ -96,8 +96,8 @@
           + component.getParent().getClientId(facesContext));
     }
     layout.setOrientation(Layout.TOP_ORIENTATION);
-    if (component.getAttributes().get("columns")!=null) {
-       layout.setOrientation(Layout.LEFT_ORIENTATION);
+    if (component.getAttributes().get("columns") != null) {
+      layout.setOrientation(Layout.LEFT_ORIENTATION);
     }
     Layout.putLayout(component, layout);
     LOG.error(layout);
@@ -110,41 +110,41 @@
     ResponseWriter writer = facesContext.getResponseWriter();
     LOG.error("parent is " + component.getParent() + "|"
         + component.getParent().getClientId(facesContext) + " component is "
-        + component + "|"+component.getClientId(facesContext));
+        + component + "|" + component.getClientId(facesContext));
     if (children.size() > 0) {
-      int incrementX = layout.getWidth()/children.size();
-      int incrementY = layout.getHeight()/children.size();
+      int incrementX = layout.getWidth() / children.size();
+      int incrementY = layout.getHeight() / children.size();
       int height = layout.getHeight();
       int width = layout.getWidth();
       int x = layout.getX();
       int y = layout.getY();
 
-    for (int i = 0; i < children.size(); i++) {
-      LOG.error("i = " + i + " size = " + children.size());
+      for (int i = 0; i < children.size(); i++) {
+        LOG.error("i = " + i + " size = " + children.size());
 
-      UIComponent cell = (UIComponent) children.get(i);
-      //LOG.error(cell+ " | "+cell.getClientId(facesContext));
-      if (!(cell instanceof UIMessages || cell instanceof UIGridLayout)) {
-      try {
-        FoUtils.startBlockContainer(writer, component);
-        if (layout.getOrientation() == Layout.TOP_ORIENTATION) {
-
-          FoUtils.layoutBlockContainer(writer, incrementY,
-              width, x, y+incrementY*i);
-        } else {
-          FoUtils.layoutBlockContainer(writer, height,
-              incrementY, x+incrementX*i, y);
+        UIComponent cell = (UIComponent) children.get(i);
+        //LOG.error(cell+ " | "+cell.getClientId(facesContext));
+        if (!(cell instanceof UIMessages || cell instanceof UIGridLayout)) {
+          try {
+            FoUtils.startBlockContainer(writer, component);
+            if (layout.getOrientation() == Layout.TOP_ORIENTATION) {
+
+              FoUtils.layoutBlockContainer(writer, incrementY,
+                  width, x, y + incrementY * i);
+            } else {
+              FoUtils.layoutBlockContainer(writer, height,
+                  incrementY, x + incrementX * i, y);
+            }
+            Layout.setInLayout(cell, true);
+
+            encodeSuppe(facesContext, cell);
+
+            FoUtils.endBlockContainer(writer);
+          } catch (IOException e) {
+            LOG.error("", e);
+          }
         }
-        Layout.setInLayout(cell, true);
-        
-        encodeSuppe(facesContext, cell);
-
-        FoUtils.endBlockContainer(writer);
-      } catch (IOException e) {
-        LOG.error("", e);
       }
-      }
-    }
     }
 
   }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java Mon Dec  3 23:53:51 2007
@@ -39,9 +39,8 @@
   private static final Log LOG = LogFactory.getLog(InRenderer.class);
 
 
-
   public void encodeEnd(FacesContext facesContext,
-        UIComponent component) throws IOException {
+      UIComponent component) throws IOException {
     UIComponent label = component.getFacet(FACET_LABEL);
 
     ResponseWriter writer = facesContext.getResponseWriter();
@@ -53,7 +52,7 @@
       if (!Layout.isInLayout(component)) {
         FoUtils.startBlockContainer(writer, component);
         FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT,
-            layout.getWidth()/2, layout.getX(), layout.getY());
+            layout.getWidth() / 2, layout.getX(), layout.getY());
       }
       RenderUtil.encode(facesContext, label);
       if (!Layout.isInLayout(component)) {
@@ -68,8 +67,8 @@
     }
     if (!Layout.isInLayout(component)) {
       FoUtils.startBlockContainer(writer, component);
-      FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT, 
-          layout.getWidth()/2, layout.getX()+layout.getWidth()/2, layout.getY());
+      FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT,
+          layout.getWidth() / 2, layout.getX() + layout.getWidth() / 2, layout.getY());
     }
     FoUtils.writeTextBlockAlignLeft(writer, component, "TextBox");
     if (!Layout.isInLayout(component)) {
@@ -78,7 +77,7 @@
     if (!Layout.isInLayout(component)) {
       layout.addMargin(200, 0, 0, 0);
     }
-    }
+  }
 
   public boolean getRendersChildren() {
     return false;

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/Layout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/Layout.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/Layout.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/Layout.java Mon Dec  3 23:53:51 2007
@@ -36,6 +36,7 @@
   private int width;
   private int height;
   private int orientation = NONE_ORIENTATION;
+
   public Layout(int x, int y, int width, int height) {
     this.x = x;
     this.y = y;
@@ -58,9 +59,11 @@
   public Layout getParent() {
     return parent;
   }
+
   public static String getMM(int value) {
-    return DecimalFormat.getNumberInstance(Locale.US).format(value/10.0)+"mm";
+    return DecimalFormat.getNumberInstance(Locale.US).format(value / 10.0) + "mm";
   }
+
   public void setParent(Layout parent) {
     this.parent = parent;
   }
@@ -68,18 +71,23 @@
   public int getX() {
     return x;
   }
+
   public String getXMM() {
     return getMM(getX());
   }
+
   public String getYMM() {
     return getMM(getX());
   }
+
   public String getHeightMM() {
     return getMM(getHeight());
   }
+
   public String getWidthMM() {
     return getMM(getWidth());
   }
+
   public void setX(int x) {
     this.x = x;
   }
@@ -107,29 +115,32 @@
   public void setHeight(int height) {
     this.height = height;
   }
+
   public void addMargin(int top, int bottom, int left, int right) {
-    if (!(orientation==TOP_ORIENTATION)) {
-      x +=left;
-      width -=(left+right);
+    if (!(orientation == TOP_ORIENTATION)) {
+      x += left;
+      width -= (left + right);
     }
-    if (!(orientation==LEFT_ORIENTATION)) {
-      height -=(top+bottom);
-      y +=top;
+    if (!(orientation == LEFT_ORIENTATION)) {
+      height -= (top + bottom);
+      y += top;
     }
 
   }
+
   public boolean hasParent() {
     return parent != null;
   }
 
   public Layout createWithMargin(int top, int bottom, int left, int right) {
-    return new Layout(getX()+left, getY()+top, getWidth()-(left+right), getHeight()-(top+bottom));
+    return new Layout(getX() + left, getY() + top, getWidth() - (left + right), getHeight() - (top + bottom));
   }
 
   public String toInnerString() {
     return
-    "[x=" + x + ",y=" + y + ",width=" + width + ",height=" + height + "]";
+        "[x=" + x + ",y=" + y + ",width=" + width + ",height=" + height + "]";
   }
+
   public StringBuilder append(StringBuilder builder) {
     if (hasParent()) {
       getParent().append(builder);
@@ -139,18 +150,23 @@
 
     return builder;
   }
+
   public String toString() {
     return append(new StringBuilder()).toString();
   }
+
   public static void putLayout(UIComponent component, Layout layout) {
     component.getAttributes().put("fo:layout", layout);
   }
+
   public static void setInLayout(UIComponent component, boolean layout) {
     component.getAttributes().put("fo:layoutMode", "LayoutMode");
   }
+
   public static boolean isInLayout(UIComponent component) {
     return component.getAttributes().containsKey("fo:layoutMode");
   }
+
   public static Layout getLayout(UIComponent component) {
     return (Layout) component.getAttributes().get("fo:layout");
   }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java Mon Dec  3 23:53:51 2007
@@ -45,7 +45,7 @@
   private static final String MASTER_NAME = "master-name";
 
   public void encodeChildren(FacesContext facesContext, UIComponent component)
-       throws IOException {
+      throws IOException {
     LOG.error("Encode Children");
     super.encodeChildren(facesContext, component);
   }
@@ -58,7 +58,7 @@
     UIPage page = (UIPage) component;
     Layout layout = new Layout(2100, 2970);
     int margin = 60;
-    Layout in = layout.createWithMargin(margin*2, margin*2, margin, margin);
+    Layout in = layout.createWithMargin(margin * 2, margin * 2, margin, margin);
     in.setParent(layout);
 
 
@@ -104,7 +104,6 @@
 
     writer.flush();
   }
-
 
 
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java Mon Dec  3 23:53:51 2007
@@ -18,6 +18,7 @@
  */
 
 //import static org.apache.myfaces.tobago.TobagoConstants.ATTR_BODY_CONTENT;
+
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import java.io.IOException;
@@ -30,14 +31,15 @@
   public boolean getRendersChildren() {
     return true;
   }
+
   public void encodeBegin(FacesContext facesContext,
-       UIComponent uiComponent) throws IOException {
+      UIComponent uiComponent) throws IOException {
     Layout.putLayout(uiComponent, Layout.getLayout(uiComponent.getParent()));
     super.encodeBegin(facesContext, uiComponent);
   }
 
   public void encodeEnd(FacesContext facesContext,
-       UIComponent uiComponent) throws IOException {
+      UIComponent uiComponent) throws IOException {
 
   }
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java Mon Dec  3 23:53:51 2007
@@ -37,28 +37,29 @@
   public boolean getRendersChildren() {
     return false;
   }
-  public void encodeEnd(FacesContext facesContext,
-        UIComponent component) throws IOException {
-      String text = ComponentUtil.currentValue(component);
-      if (text == null) {
-        text = "";
-      }
-      Layout layout = Layout.getLayout(component.getParent());
-      //layout.addMargin(200, 0, 0, 0);
 
-      ResponseWriter writer = facesContext.getResponseWriter();
-     if (!Layout.isInLayout(component)) {
-        FoUtils.startBlockContainer(writer, component);
-        FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT, layout.getWidth(), layout.getX(), layout.getY());
-      }
-      FoUtils.writeTextBlockAlignLeft(writer, component, "TextArea");
-      if (!Layout.isInLayout(component)) {
-        FoUtils.endBlockContainer(writer);
-      }
-      if (!Layout.isInLayout(component)) {
-        layout.addMargin(200, 0, 0, 0);
-      }
+  public void encodeEnd(FacesContext facesContext,
+      UIComponent component) throws IOException {
+    String text = ComponentUtil.currentValue(component);
+    if (text == null) {
+      text = "";
+    }
+    Layout layout = Layout.getLayout(component.getParent());
+    //layout.addMargin(200, 0, 0, 0);
 
+    ResponseWriter writer = facesContext.getResponseWriter();
+    if (!Layout.isInLayout(component)) {
+      FoUtils.startBlockContainer(writer, component);
+      FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT, layout.getWidth(), layout.getX(), layout.getY());
     }
+    FoUtils.writeTextBlockAlignLeft(writer, component, "TextArea");
+    if (!Layout.isInLayout(component)) {
+      FoUtils.endBlockContainer(writer);
+    }
+    if (!Layout.isInLayout(component)) {
+      layout.addMargin(200, 0, 0, 0);
+    }
+
+  }
 
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Mon Dec  3 23:53:51 2007
@@ -271,13 +271,13 @@
 
       String gif = expanded
           ? (depth == 0
-            ? "Rminus.gif"
-            : (hasNextSibling ? "Tminus.gif" : "Lminus.gif"))
+          ? "Rminus.gif"
+          : (hasNextSibling ? "Tminus.gif" : "Lminus.gif"))
           : ((depth == 0)
-            ? "Rplus.gif"
-            : (hasNextSibling)
-              ? (isFolder ? "Tplus.gif" : "T.gif")
-              : (isFolder ? "Lplus.gif" : "L.gif")
+          ? "Rplus.gif"
+          : (hasNextSibling)
+          ? (isFolder ? "Tplus.gif" : "T.gif")
+          : (isFolder ? "Lplus.gif" : "L.gif")
       );
 
       String src = ResourceManagerUtil.getImageWithPath(facesContext, "image/" + gif);
@@ -321,13 +321,13 @@
 
   private String createOnclickForToggle(FacesContext facesContext, String treeId, String image) {
     String openImage = image;
-      if (image == null) {
-        openImage = "image/openfoldericon.gif";
-        image = "image/foldericon.gif";
-      }
+    if (image == null) {
+      openImage = "image/openfoldericon.gif";
+      image = "image/foldericon.gif";
+    }
     return "tobagoTreeNodeToggle(this.parentNode, '" + treeId + "', '"
-          + ResourceManagerUtil.getImageWithPath(facesContext, openImage) + "', '"
-          + ResourceManagerUtil.getImageWithPath(facesContext, image) + "', null, null)";
+        + ResourceManagerUtil.getImageWithPath(facesContext, openImage) + "', '"
+        + ResourceManagerUtil.getImageWithPath(facesContext, image) + "', null, null)";
   }
 
 /*

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java Mon Dec  3 23:53:51 2007
@@ -42,7 +42,7 @@
     //UIPanel panel = (UIPanel) component;
 
     //TobagoResponseWriter writer
-      //  = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+    //  = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
 
     //BodyContentHandler bodyContentHandler = (BodyContentHandler)
     //    panel.getAttributes().get(ATTR_BODY_CONTENT);

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java Mon Dec  3 23:53:51 2007
@@ -52,11 +52,11 @@
     UIPage page = ComponentUtil.findPage(facesContext, command);
 
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
-     // TODO
+    // TODO
     //String action = (String) command.getAttributes().get(ATTR_ACTION);
 
-    if (command.getAttributes().get(ATTR_ACTION_LINK)==null
-        &&command.getAttributes().get(ATTR_ACTION_ONCLICK)==null) {
+    if (command.getAttributes().get(ATTR_ACTION_LINK) == null
+        && command.getAttributes().get(ATTR_ACTION_ONCLICK) == null) {
       ValueHolder labelComponent
           = (ValueHolder) command.getFacet(FACET_LABEL);
       String label = (String) labelComponent.getValue();

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java Mon Dec  3 23:53:51 2007
@@ -47,7 +47,7 @@
 
     UIPage uiPage = ComponentUtil.findPage(facesContext, component);
 
-    if (uiPage != null){
+    if (uiPage != null) {
       uiPage.getPostfields().add(new DefaultKeyValue(clientId, clientId));
     }
 

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/RichTextEditorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/RichTextEditorTagDeclaration.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/RichTextEditorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/RichTextEditorTagDeclaration.java Mon Dec  3 23:53:51 2007
@@ -36,6 +36,7 @@
 // TODO: switched off @Tag(name="richTextEditor")
 public interface RichTextEditorTagDeclaration extends TextInputTagDeclaration,
     HasIdBindingAndRendered, HasValue, HasLabelAndAccessKey, HasDeprecatedWidth {
-  @TagAttribute @UIComponentTagAttribute(type = "java.lang.Boolean")
+  @TagAttribute
+  @UIComponentTagAttribute(type = "java.lang.Boolean")
   void setStatePreview(String statePreview);
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java Mon Dec  3 23:53:51 2007
@@ -43,7 +43,7 @@
     uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
     rendererType = "TreeNode",
     facets = {
-      @Facet(name="addendum", description = "Displays an additional component to a node.")})
+    @Facet(name = "addendum", description = "Displays an additional component to a node.")})
 public interface TreeNodeTagDeclaration
     extends HasIdBindingAndRendered, HasLabel, HasValue, HasMarkup, AbstractCommandTagDeclaration, HasTip, HasTarget,
     HasImage, IsDisabled {

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java Mon Dec  3 23:53:51 2007
@@ -29,7 +29,7 @@
 
 /**
  * Renders a tree view.
- *
+ * <p/>
  * Date: 11.02.2006 13:28:14
  */
 @Tag(name = "tree")
@@ -37,7 +37,7 @@
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UITree",
     rendererType = "Tree")
-public interface TreeTagDeclaration 
+public interface TreeTagDeclaration
     extends TobagoTagDeclaration, HasIdBindingAndRendered, HasTreeNodeValue, IsRequired {
 
   /**
@@ -77,13 +77,13 @@
   @UIComponentTagAttribute(type = "java.lang.Boolean",
       defaultValue = "false")
   void setShowRoot(String showRoot);
-  
+
   /**
    * Display option: Normal tree or menu.
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "tree",
-  allowedValues = {"tree", "menu"})
+      allowedValues = {"tree", "menu"})
   void setMode(String mode);
 
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java?rev=600823&r1=600822&r2=600823&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java Mon Dec  3 23:53:51 2007
@@ -17,7 +17,11 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.apt.annotation.*;
+import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
+import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 import org.apache.myfaces.tobago.model.Wizard;
 import org.apache.myfaces.tobago.taglib.component.TobagoTagDeclaration;
 import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;



Mime
View raw message