[pal-cvs 2353] [87] used PagerCondition of s2dao.

svnno****@sourc***** svnno****@sourc*****
2007年 5月 1日 (火) 07:01:35 JST


Revision: 87
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=87
Author:   shinsuke
Date:     2007-05-01 07:01:35 +0900 (Tue, 01 May 2007)

Log Message:
-----------
used PagerCondition of s2dao. removed Pager interface.

Modified Paths:
--------------
    libraries/common-utils/trunk/.classpath
    libraries/common-utils/trunk/pom.xml
    libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/pager/DefaultPager.java
    libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/util/PagerUtil.java

Removed Paths:
-------------
    libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/pager/Pager.java


-------------- next part --------------
Modified: libraries/common-utils/trunk/.classpath
===================================================================
--- libraries/common-utils/trunk/.classpath	2007-04-26 09:03:38 UTC (rev 86)
+++ libraries/common-utils/trunk/.classpath	2007-04-30 22:01:35 UTC (rev 87)
@@ -4,8 +4,8 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.11/s2-extension-2.4.11.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.6/teeda-core-1.0.6.jar"/>
@@ -14,8 +14,9 @@
   <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.7/ognl-2.6.7.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/rhino/rhino/1.6r2/rhino-1.6r2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.11/s2-framework-2.4.11.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/dao/s2-dao/1.0.42/s2-dao-1.0.42.jar"/>
 </classpath>
\ No newline at end of file

Modified: libraries/common-utils/trunk/pom.xml
===================================================================
--- libraries/common-utils/trunk/pom.xml	2007-04-26 09:03:38 UTC (rev 86)
+++ libraries/common-utils/trunk/pom.xml	2007-04-30 22:01:35 UTC (rev 87)
@@ -88,6 +88,11 @@
       <name>Maven2 Repository on marevol.com</name>
       <url>http://www.marevol.com/maven2</url>
     </repository>
+    <repository>
+      <id>maven.seasar.org</id>
+      <name>The Seasar Foundation Maven2 Repository</name>
+      <url>http://maven.seasar.org/maven2</url>
+    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -148,5 +153,11 @@
       <version>1.0.6</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.seasar.dao</groupId>
+      <artifactId>s2-dao</artifactId>
+      <version>1.0.42</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/pager/DefaultPager.java
===================================================================
--- libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/pager/DefaultPager.java	2007-04-26 09:03:38 UTC (rev 86)
+++ libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/pager/DefaultPager.java	2007-04-30 22:01:35 UTC (rev 87)
@@ -16,7 +16,9 @@
  */
 package jp.sf.pal.common.pager;
 
-public class DefaultPager implements Pager {
+import org.seasar.dao.pager.PagerCondition;
+
+public class DefaultPager implements PagerCondition {
     public static int DEFAULT_PAGER_LIMIT_SIZE = 25;
 
     private int offset;

Deleted: libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/pager/Pager.java
===================================================================
--- libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/pager/Pager.java	2007-04-26 09:03:38 UTC (rev 86)
+++ libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/pager/Pager.java	2007-04-30 22:01:35 UTC (rev 87)
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-package jp.sf.pal.common.pager;
-
-public interface Pager {
-
-    /**
-     * @return the limit
-     */
-    public abstract int getLimit();
-
-    /**
-     * @param limit
-     *            the limit to set
-     */
-    public abstract void setLimit(int limit);
-
-    /**
-     * @return the count
-     */
-    public abstract int getCount();
-
-    /**
-     * @param count
-     *            the count to set
-     */
-    public abstract void setCount(int count);
-
-    /**
-     * @return the offset
-     */
-    public abstract int getOffset();
-
-    /**
-     * @param offset
-     *            the offset to set
-     */
-    public abstract void setOffset(int offset);
-
-}
\ No newline at end of file

Modified: libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/util/PagerUtil.java
===================================================================
--- libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/util/PagerUtil.java	2007-04-26 09:03:38 UTC (rev 86)
+++ libraries/common-utils/trunk/src/main/java/jp/sf/pal/common/util/PagerUtil.java	2007-04-30 22:01:35 UTC (rev 87)
@@ -22,8 +22,9 @@
 
 import jp.sf.pal.common.web.PagerPage;
 import jp.sf.pal.common.web.TwoPagerPage;
-import jp.sf.pal.common.pager.Pager;
 
+import org.seasar.dao.pager.PagerCondition;
+
 public class PagerUtil {
     /**
      * @return the facesContext
@@ -32,7 +33,7 @@
         return FacesContext.getCurrentInstance();
     }
 
-    public static void updatePageNumber(Pager pager, String prevKey,
+    public static void updatePageNumber(PagerCondition pager, String prevKey,
             String nextKey) {
         Map requestMap = getFacesContext().getExternalContext()
                 .getRequestParameterMap();
@@ -52,7 +53,7 @@
         }
     }
 
-    public static void updatePagerPage(PagerPage page, Pager pager) {
+    public static void updatePagerPage(PagerPage page, PagerCondition pager) {
         // update page
         page.setCount(new Integer(pager.getCount()));
         page.setMaxPageNumber(new Integer((pager.getCount() - 1)
@@ -74,8 +75,8 @@
         }
     }
 
-    public static void updatePagerPage(TwoPagerPage page, Pager pager1,
-            Pager pager2) {
+    public static void updatePagerPage(TwoPagerPage page, PagerCondition pager1,
+            PagerCondition pager2) {
         // update page
         page.setCount1(new Integer(pager1.getCount()));
         page.setMaxPageNumber1(new Integer((pager1.getCount() - 1)


pal-cvs メーリングリストの案内