[Equanda-svn-commit] SF.net SVN: equanda:[1209] trunk/equanda-tapestry5/src/main/java/org/ equanda/tapestry5

[<tri...@us...>]

Revision: 1209
          http://equanda.svn.sourceforge.net/equanda/?rev=1209&view=rev
Author:   triathlon98
Date:     2010-04-14 07:58:38 +0000 (Wed, 14 Apr 2010)

Log Message:
-----------
small improvements

Modified Paths:
--------------
    trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java
    trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java

Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java	2010-03-25 23:09:46 UTC (rev 1208)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java	2010-04-14 07:58:38 UTC (rev 1209)
@@ -27,7 +27,8 @@
 import org.apache.tapestry5.json.JSONObject;
 
 /**
- * Configuration bean for {@link org.equanda.tapestry5.components.JSPager}
+ * Configuration bean for {@link org.equanda.tapestry5.components.JSPager}.
+ *
  * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
  */
 public class PagerConfig
@@ -49,9 +50,7 @@
     private String name;
 
     public PagerConfig()
-    {
-        
-    }
+    {}
 
     public PagerConfig( int range, int maxPages, int rowsPerPage, int lastIndex, int currentPage, int rowCount,
         int addedRowCount, int additionalRowCount, String currentPageFieldName, String addedRowFieldName,

Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java	2010-03-25 23:09:46 UTC (rev 1208)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java	2010-04-14 07:58:38 UTC (rev 1209)
@@ -24,8 +24,20 @@
 
 package org.equanda.tapestry5.components;
 
-import org.apache.tapestry5.*;
-import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ClientElement;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.PrimaryKeyEncoder;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.SetupRender;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
 import org.apache.tapestry5.corelib.components.Delegate;
 import org.apache.tapestry5.corelib.components.Loop;
 import org.apache.tapestry5.ioc.annotations.Inject;
@@ -313,11 +325,18 @@
 
     public String getDisplayStyle()
     {
-        if ( getConfig() == null )
+        PagerConfig config = getConfig();
+        if ( null == config )
         {
-            setConfig( internalPager.getConfig() );
+            config = internalPager.getConfig();
+            setConfig( config );
         }
-        PagerConfig config = getConfig();
+        if ( null == config )
+        {
+            log.error( "no pager configuration" );
+            return "display:none;";
+        }
+
         int availableRows = config.getRowCount() - config.getAdditionalRowCount() + config.getAddedRowCount();
 
         config.setMaxPages( ( ( availableRows - 1 ) / config.getRowsPerPage() ) + 1 );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.