You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2005/02/23 21:40:06 UTC
cvs commit: jakarta-tapestry/contrib build.xml
hlship 2005/02/23 12:40:06
Modified: . status.xml .classpath
config common.properties
framework/src/descriptor/META-INF tapestry.enhance.xml
framework build.xml
examples/Workbench build.xml
contrib/src/java/org/apache/tapestry/contrib/table/model/simple
SimpleTableColumn.java
contrib build.xml
Removed: framework/src/java/org/apache/tapestry/services/impl
ClassObjectProvider.java
Log:
Upgrade to HiveMind 1.1-alpha-2.
Revision Changes Path
1.75 +5 -5 jakarta-tapestry/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/status.xml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- status.xml 21 Feb 2005 14:30:13 -0000 1.74
+++ status.xml 23 Feb 2005 20:40:06 -0000 1.75
@@ -54,7 +54,7 @@
</todo>
<changes>
<release version="3.1-alpha-2" date="unreleased">
-
+ <action type="update" dev="HLS"> Upgrade to HiveMind 1.1-alpha-2. </action>
</release>
<release version="3.1-alpha-1" date="Feb 21 2005">
<action type="update" dev="HLS"> Remove dependencies on Jakarta digester, collections and beanutils. Add dependency on Jakarta HiveMind. </action>
@@ -64,16 +64,16 @@
<action type="update" dev="HLS"> Changed to Form to prevent collisions between query parameters supplied by services (in an ILink) and form element ids. </action>
<action type="update" dev="HLS"> Change Form (and WML Go) to have the direct and action services injected. </action>
<action type="update" dev="HLS"> Refactoring to move application state object management out of IEngine and generalize it. </action>
- <action type="update" dev="HLS"> Add <inject-state> element to specifications. </action>
- <action type="update" dev="HLS"> Add property attribute to <component>, <bean> and <asset> and add enhancement workers to inject these objects as properties. </action>
- <action type="update" dev="HLS"> Add hivemind: binding prefix. </action>
+ <action type="add" dev="HLS"> Add <inject-state> element to specifications. </action>
+ <action type="add" dev="HLS"> Add property attribute to <component>, <bean> and <asset> and add enhancement workers to inject these objects as properties. </action>
+ <action type="add" dev="HLS"> Add hivemind: binding prefix. </action>
<action type="update" dev="HLS"> Make the Body component output initializations in a script block at the end of the page (just before the close tag), rather than in a window.onload event handler. </action>
<action type="update" dev="HLS" fixes-bug="TAPESTRY-262"> Support more boolean values. </action>
<action type="update" dev="HLS"> Inject Messages into components; this means that all Tapestry page and component classes are abstract. </action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-242"> Allow namespaces to define localized messages, providing defaults for pages and components within the namespace. </action>
<action type="update" dev="HLS"> Change handling of initial values for properties to be based on injected logic. </action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-265" due-to="Michael Frericks"> Fix bad link in UsersGuide/spec.xml. </action>
- <action type="update" dev="HLS"> Add new ComponentPropertySource service for accessing component meta-data properties. </action>
+ <action type="add" dev="HLS"> Add new ComponentPropertySource service for accessing component meta-data properties. </action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-165"> Allow control over attribute name for components in templates. </action>
<action type="update" dev="HLS"> Inject specification into components. </action>
<action type="update" dev="HLS"> Use enhancement to inject page event registration into components. </action>
1.70 +2 -2 jakarta-tapestry/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-tapestry/.classpath,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .classpath 16 Feb 2005 18:40:51 -0000 1.69
+++ .classpath 23 Feb 2005 20:40:06 -0000 1.70
@@ -28,7 +28,7 @@
<classpathentry kind="lib" path="ext-package/lib/jCharts-0.6.0.jar"/>
<classpathentry kind="lib" path="ext-package/lib/cglib-full-2.0.2.jar"/>
<classpathentry kind="lib" path="ext-package/lib/easymockclassextension-1.1.jar"/>
- <classpathentry sourcepath="ext-package/hivemind-1.1-alpha-1.zip" kind="lib" path="ext-package/lib/hivemind-1.1-alpha-1.jar"/>
- <classpathentry kind="lib" path="ext-package/lib/hivemind-lib-1.1-alpha-1.jar"/>
+ <classpathentry kind="lib" path="ext-package/lib/hivemind-1.1-alpha-2.jar"/>
+ <classpathentry kind="lib" path="ext-package/lib/hivemind-lib-1.1-alpha-2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.37 +10 -1 jakarta-tapestry/config/common.properties
Index: common.properties
===================================================================
RCS file: /home/cvs/jakarta-tapestry/config/common.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- common.properties 5 Jan 2005 23:17:31 -0000 1.36
+++ common.properties 23 Feb 2005 20:40:06 -0000 1.37
@@ -12,5 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-hivemind.version=1.1-alpha-1
+hivemind.version=1.1-alpha-2
javassist.version=3.0-rc-1
+ognl.version=2.6.7
+codec.version=1.3
+lang.version=2.0
+fileupload.version=1.0
+bsf.version=2.3.0
+logging.version=1.0.4
+oro.version=2.0.8
+servlet.version=2.3
+log4j.version=1.2.8
\ No newline at end of file
1.14 +0 -13 jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.enhance.xml
Index: tapestry.enhance.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/descriptor/META-INF/tapestry.enhance.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tapestry.enhance.xml 17 Feb 2005 15:53:00 -0000 1.13
+++ tapestry.enhance.xml 23 Feb 2005 20:40:06 -0000 1.14
@@ -267,17 +267,4 @@
</invoke-factory>
</service-point>
-
- <service-point id="ClassObjectProvider" interface="org.apache.hivemind.service.ObjectProvider">
-
- Provides the "class:" object prefix. This should be moved to
- HiveMind proper.
-
- <create-instance class="org.apache.tapestry.services.impl.ClassObjectProvider"/>
-
- </service-point>
-
- <contribution configuration-id="hivemind.ObjectProviders">
- <provider prefix="class" service-id="ClassObjectProvider"/>
- </contribution>
</module>
\ No newline at end of file
1.46 +9 -9 jakarta-tapestry/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/build.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- build.xml 16 Feb 2005 18:40:51 -0000 1.45
+++ build.xml 23 Feb 2005 20:40:06 -0000 1.46
@@ -31,19 +31,19 @@
<import file="${hivebuild.dir}/hivedoc-report.xml"/>
<target name="compile">
- <ibiblio-dependency artifact="bsf" version="2.3.0" group="bsf"/>
- <ibiblio-dependency artifact="commons-codec" version="1.3" group="commons-codec"/>
- <ibiblio-dependency artifact="commons-fileupload" version="1.0" group="commons-fileupload"/>
- <ibiblio-dependency artifact="commons-lang" version="2.0" group="commons-lang"/>
- <ibiblio-dependency artifact="commons-logging" version="1.0.4" group="commons-logging"/>
+ <ibiblio-dependency artifact="bsf" version="${bsf.version}" group="bsf"/>
+ <ibiblio-dependency artifact="commons-codec" version="${codec.version}" group="commons-codec"/>
+ <ibiblio-dependency artifact="commons-fileupload" version="${fileupload.version}" group="commons-fileupload"/>
+ <ibiblio-dependency artifact="commons-lang" version="${lang.version}" group="commons-lang"/>
+ <ibiblio-dependency artifact="commons-logging" version="${logging.version}" group="commons-logging"/>
<ibiblio-dependency artifact="hivemind" version="${hivemind.version}" group="hivemind"/>
<ibiblio-dependency artifact="hivemind-lib" version="${hivemind.version}" group="hivemind"/>
- <ibiblio-dependency artifact="oro" version="2.0.8" group="oro"/>
+ <ibiblio-dependency artifact="oro" version="${oro.version}" group="oro"/>
<ibiblio-dependency artifact="javassist" version="${javassist.version}" group="javassist"/>
- <ibiblio-dependency artifact="servletapi" version="2.3" group="servletapi"/>
- <ibiblio-dependency artifact="ognl" version="2.6.7" group="ognl"/>
+ <ibiblio-dependency artifact="servletapi" version="${servlet.version}" group="servletapi"/>
+ <ibiblio-dependency artifact="ognl" version="${ognl.version}" group="ognl"/>
- <ibiblio-dependency artifact="log4j" version="1.2.8" group="log4j" use="test"/>
+ <ibiblio-dependency artifact="log4j" version="${log4j.version}" group="log4j" use="test"/>
<ibiblio-dependency artifact="easymock" version="1.1" group="easymock" use="test"/>
<ibiblio-dependency artifact="easymockclassextension" version="1.1" group="easymock" use="test"/>
<ibiblio-dependency artifact="cglib-full" version="2.0.2" group="cglib" use="test"/>
1.13 +9 -9 jakarta-tapestry/examples/Workbench/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 2 Nov 2004 22:34:23 -0000 1.12
+++ build.xml 23 Feb 2005 20:40:06 -0000 1.13
@@ -30,19 +30,19 @@
<project-dependency artifact="tapestry" use="run"/>
<project-dependency artifact="tapestry-contrib" use="run"/>
- <ibiblio-dependency artifact="bsf" version="2.3.0" group="bsf" use="run"/>
- <ibiblio-dependency artifact="commons-codec" version="1.2" group="commons-codec" use="run"/>
- <ibiblio-dependency artifact="commons-fileupload" version="1.0" group="commons-fileupload" use="run"/>
- <ibiblio-dependency artifact="commons-lang" version="2.0" group="commons-lang" use="run"/>
- <ibiblio-dependency artifact="commons-logging" version="1.0.4" group="commons-logging" use="run"/>
+ <ibiblio-dependency artifact="bsf" version="${bsf.version}" group="bsf" use="run"/>
+ <ibiblio-dependency artifact="commons-codec" version="${codec.version}" group="commons-codec" use="run"/>
+ <ibiblio-dependency artifact="commons-fileupload" version="${fileupload.version}" group="commons-fileupload" use="run"/>
+ <ibiblio-dependency artifact="commons-lang" version="${lang.version}" group="commons-lang" use="run"/>
+ <ibiblio-dependency artifact="commons-logging" version="${logging.version}" group="commons-logging" use="run"/>
<ibiblio-dependency artifact="hivemind" version="${hivemind.version}" group="hivemind" use="run"/>
<ibiblio-dependency artifact="hivemind-lib" version="${hivemind.version}" group="hivemind" use="run"/>
<ibiblio-dependency artifact="javassist" version="${javassist.version}" group="jboss" use="run"/>
- <ibiblio-dependency artifact="log4j" version="1.2.7" group="log4j" use="test"/>
- <ibiblio-dependency artifact="ognl" version="2.6.3" group="ognl" use="run"/>
- <ibiblio-dependency artifact="oro" version="2.0.6" group="oro" use="run"/>
- <ibiblio-dependency artifact="servletapi" version="2.3" group="servletapi"/>
+ <ibiblio-dependency artifact="log4j" version="${log4j.version}" group="log4j" use="test"/>
+ <ibiblio-dependency artifact="ognl" version="${ognl.version}" group="ognl"/>
+ <ibiblio-dependency artifact="oro" version="${oro.version}" group="oro" use="run"/>
+ <ibiblio-dependency artifact="servletapi" version="${servlet.version}" group="servletapi"/>
<!-- This isn't actually uploaded to Maven yet! -->
1.5 +199 -174 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java
Index: SimpleTableColumn.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/model/simple/SimpleTableColumn.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleTableColumn.java 6 Jan 2005 02:17:22 -0000 1.4
+++ SimpleTableColumn.java 23 Feb 2005 20:40:06 -0000 1.5
@@ -17,209 +17,234 @@
import java.io.Serializable;
import java.util.Comparator;
+import org.apache.hivemind.HiveMind;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.contrib.table.model.ITableRendererSource;
import org.apache.tapestry.contrib.table.model.common.AbstractTableColumn;
/**
- * A simple minimal implementation of the
- * {@link org.apache.tapestry.contrib.table.model.ITableColumn} interface that
- * provides all the basic services for displaying a column.
+ * A simple minimal implementation of the
+ * {@link org.apache.tapestry.contrib.table.model.ITableColumn}interface that provides all the
+ * basic services for displaying a column.
*
* @author mindbridge
*/
public class SimpleTableColumn extends AbstractTableColumn
{
- public static final ITableRendererSource DEFAULT_COLUMN_RENDERER_SOURCE =
- new SimpleTableColumnRendererSource();
+ public static final ITableRendererSource DEFAULT_COLUMN_RENDERER_SOURCE = new SimpleTableColumnRendererSource();
- public static final ITableRendererSource FORM_COLUMN_RENDERER_SOURCE =
- new SimpleTableColumnFormRendererSource();
+ public static final ITableRendererSource FORM_COLUMN_RENDERER_SOURCE = new SimpleTableColumnFormRendererSource();
- public static final ITableRendererSource DEFAULT_VALUE_RENDERER_SOURCE =
- new SimpleTableValueRendererSource();
+ public static final ITableRendererSource DEFAULT_VALUE_RENDERER_SOURCE = new SimpleTableValueRendererSource();
- private String m_strDisplayName;
- private ITableColumnEvaluator m_objEvaluator;
-
- /**
- * Creates a SimpleTableColumn
- * @param strColumnName the identifying name and display name of the column
- */
- public SimpleTableColumn(String strColumnName)
- {
- this(strColumnName, strColumnName);
- }
-
- /**
- * Creates a SimpleTableColumn
- * @param strColumnName the identifying name and display name of the column
- * @param bSortable whether the column is sortable
- */
- public SimpleTableColumn(String strColumnName, boolean bSortable)
- {
- this(strColumnName, strColumnName, bSortable);
- }
-
- /**
- * Creates a SimpleTableColumn
- * @param strColumnName the identifying name and display name of the column
- * @param bSortable whether the column is sortable
- * @param objEvaluator the evaluator to extract the column value from the row
- */
- public SimpleTableColumn(
- String strColumnName,
- ITableColumnEvaluator objEvaluator,
- boolean bSortable)
- {
- this(strColumnName, strColumnName, objEvaluator, bSortable);
- }
-
- /**
- * Creates a SimpleTableColumn
- * @param strColumnName the identifying name of the column
- * @param strDisplayName the display name of the column
- */
- public SimpleTableColumn(String strColumnName, String strDisplayName)
- {
- this(strColumnName, strDisplayName, false);
- }
-
- /**
- * Creates a SimpleTableColumn
- * @param strColumnName the identifying name of the column
- * @param strDisplayName the display name of the column
- * @param bSortable whether the column is sortable
- */
- public SimpleTableColumn(
- String strColumnName,
- String strDisplayName,
- boolean bSortable)
- {
- this(strColumnName, strDisplayName, null, bSortable);
- }
-
- /**
- * Creates a SimpleTableColumn
- * @param strColumnName the identifying name of the column
- * @param strDisplayName the display name of the column
- * @param bSortable whether the column is sortable
- * @param objEvaluator the evaluator to extract the column value from the row
- */
- public SimpleTableColumn(
- String strColumnName,
- String strDisplayName,
- ITableColumnEvaluator objEvaluator,
- boolean bSortable)
- {
- super(strColumnName, bSortable, null);
- setComparator(new DefaultTableComparator());
- setDisplayName(strDisplayName);
- setColumnRendererSource(DEFAULT_COLUMN_RENDERER_SOURCE);
- setValueRendererSource(DEFAULT_VALUE_RENDERER_SOURCE);
- setEvaluator(objEvaluator);
- }
-
- /**
- * Returns the display name of the column that will be used
- * in the table header.
- * Override for internationalization.
- * @return String the display name of the column
- */
- public String getDisplayName()
- {
- return m_strDisplayName;
- }
-
- /**
- * Sets the displayName.
- * @param displayName The displayName to set
- */
- public void setDisplayName(String displayName)
- {
- m_strDisplayName = displayName;
- }
-
- /**
- * Returns the evaluator.
- * @return ITableColumnEvaluator
- */
- public ITableColumnEvaluator getEvaluator()
- {
- return m_objEvaluator;
- }
-
- /**
- * Sets the evaluator.
- * @param evaluator The evaluator to set
- */
- public void setEvaluator(ITableColumnEvaluator evaluator)
- {
- m_objEvaluator = evaluator;
- }
-
- /**
- * Sets a comparator that compares the values of this column rather than
- * the objects representing the full rows. <br>
- * This method allows easier use of standard comparators for sorting
- * the column. It simply wraps the provided comparator with a row-to-column
- * convertor and invokes the setComparator() method.
- * @param comparator The column value comparator
+ private String m_strDisplayName;
+
+ private ITableColumnEvaluator m_objEvaluator;
+
+ /**
+ * Creates a SimpleTableColumn
+ *
+ * @param strColumnName
+ * the identifying name and display name of the column
+ */
+ public SimpleTableColumn(String strColumnName)
+ {
+ this(strColumnName, strColumnName);
+ }
+
+ /**
+ * Creates a SimpleTableColumn
+ *
+ * @param strColumnName
+ * the identifying name and display name of the column
+ * @param bSortable
+ * whether the column is sortable
+ */
+ public SimpleTableColumn(String strColumnName, boolean bSortable)
+ {
+ this(strColumnName, strColumnName, bSortable);
+ }
+
+ /**
+ * Creates a SimpleTableColumn
+ *
+ * @param strColumnName
+ * the identifying name and display name of the column
+ * @param bSortable
+ * whether the column is sortable
+ * @param objEvaluator
+ * the evaluator to extract the column value from the row
+ */
+ public SimpleTableColumn(String strColumnName, ITableColumnEvaluator objEvaluator,
+ boolean bSortable)
+ {
+ this(strColumnName, strColumnName, objEvaluator, bSortable);
+ }
+
+ /**
+ * Creates a SimpleTableColumn
+ *
+ * @param strColumnName
+ * the identifying name of the column
+ * @param strDisplayName
+ * the display name of the column
+ */
+ public SimpleTableColumn(String strColumnName, String strDisplayName)
+ {
+ this(strColumnName, strDisplayName, false);
+ }
+
+ /**
+ * Creates a SimpleTableColumn
+ *
+ * @param strColumnName
+ * the identifying name of the column
+ * @param strDisplayName
+ * the display name of the column
+ * @param bSortable
+ * whether the column is sortable
+ */
+ public SimpleTableColumn(String strColumnName, String strDisplayName, boolean bSortable)
+ {
+ this(strColumnName, strDisplayName, null, bSortable);
+ }
+
+ /**
+ * Creates a SimpleTableColumn
+ *
+ * @param strColumnName
+ * the identifying name of the column
+ * @param strDisplayName
+ * the display name of the column
+ * @param bSortable
+ * whether the column is sortable
+ * @param objEvaluator
+ * the evaluator to extract the column value from the row
+ */
+ public SimpleTableColumn(String strColumnName, String strDisplayName,
+ ITableColumnEvaluator objEvaluator, boolean bSortable)
+ {
+ super(strColumnName, bSortable, null);
+ setComparator(new DefaultTableComparator());
+ setDisplayName(strDisplayName);
+ setColumnRendererSource(DEFAULT_COLUMN_RENDERER_SOURCE);
+ setValueRendererSource(DEFAULT_VALUE_RENDERER_SOURCE);
+ setEvaluator(objEvaluator);
+ }
+
+ /**
+ * Returns the display name of the column that will be used in the table header. Override for
+ * internationalization.
+ *
+ * @return String the display name of the column
+ */
+ public String getDisplayName()
+ {
+ return m_strDisplayName;
+ }
+
+ /**
+ * Sets the displayName.
+ *
+ * @param displayName
+ * The displayName to set
+ */
+ public void setDisplayName(String displayName)
+ {
+ m_strDisplayName = displayName;
+ }
+
+ /**
+ * Returns the evaluator.
+ *
+ * @return ITableColumnEvaluator
+ */
+ public ITableColumnEvaluator getEvaluator()
+ {
+ return m_objEvaluator;
+ }
+
+ /**
+ * Sets the evaluator.
+ *
+ * @param evaluator
+ * The evaluator to set
+ */
+ public void setEvaluator(ITableColumnEvaluator evaluator)
+ {
+ m_objEvaluator = evaluator;
+ }
+
+ /**
+ * Sets a comparator that compares the values of this column rather than the objects
+ * representing the full rows. <br>
+ * This method allows easier use of standard comparators for sorting the column. It simply wraps
+ * the provided comparator with a row-to-column convertor and invokes the setComparator()
+ * method.
+ *
+ * @param comparator
+ * The column value comparator
*/
public void setColumnComparator(Comparator comparator)
{
setComparator(new ColumnComparator(this, comparator));
}
- /**
- * Extracts the value of the column from the row object
- * @param objRow the row object
- * @return Object the column value
- */
- public Object getColumnValue(Object objRow)
- {
- ITableColumnEvaluator objEvaluator = getEvaluator();
- if (objEvaluator != null)
- return objEvaluator.getColumnValue(this, objRow);
-
- // default fallback
- return objRow.toString();
- }
-
- /**
- * Use the column name to get the display name, as well as
- * the column and value renderer sources from the provided component.
- *
- * @param objSettingsContainer the component from which to get the settings
+ /**
+ * Extracts the value of the column from the row object
+ *
+ * @param objRow
+ * the row object
+ * @return Object the column value
+ */
+ public Object getColumnValue(Object objRow)
+ {
+ ITableColumnEvaluator objEvaluator = getEvaluator();
+ if (objEvaluator != null)
+ return objEvaluator.getColumnValue(this, objRow);
+
+ // default fallback
+ return objRow.toString();
+ }
+
+ /**
+ * Use the column name to get the display name, as well as the column and value renderer sources
+ * from the provided component.
+ *
+ * @param objSettingsContainer
+ * the component from which to get the settings
*/
public void loadSettings(IComponent objSettingsContainer)
{
- String strDisplayName = objSettingsContainer.getMessages().getMessage(getColumnName(), null);
- if (strDisplayName != null)
+ String strDisplayName = objSettingsContainer.getMessages().getMessage(getColumnName());
+
+ // Hack! the Messages inteface needs to restore the getMessage(key, default), or needs
+ // to add a containsKey(key) method. Looking for the '[' used with invalid/unknown keys.
+
+ if (!strDisplayName.startsWith("["))
setDisplayName(strDisplayName);
-
+
super.loadSettings(objSettingsContainer);
}
-
- public class DefaultTableComparator implements Comparator, Serializable
- {
- public int compare(Object objRow1, Object objRow2)
- {
- Object objValue1 = getColumnValue(objRow1);
- Object objValue2 = getColumnValue(objRow2);
+ public class DefaultTableComparator implements Comparator, Serializable
+ {
+ public int compare(Object objRow1, Object objRow2)
+ {
+ Object objValue1 = getColumnValue(objRow1);
+ Object objValue2 = getColumnValue(objRow2);
if (objValue1 == objValue2)
return 0;
boolean bComparable1 = objValue1 instanceof Comparable;
boolean bComparable2 = objValue2 instanceof Comparable;
-
- // non-comparable values are considered equal
- if (!bComparable1 && !bComparable2)
- return 0;
- // non-comparable values (null included) are considered smaller
+ // non-comparable values are considered equal
+ if (!bComparable1 && !bComparable2)
+ return 0;
+
+ // non-comparable values (null included) are considered smaller
// than the comparable ones
if (!bComparable1)
return -1;
@@ -227,8 +252,8 @@
if (!bComparable2)
return 1;
- return ((Comparable) objValue1).compareTo(objValue2);
- }
- }
+ return ((Comparable) objValue1).compareTo(objValue2);
+ }
+ }
-}
+}
\ No newline at end of file
1.26 +4 -4 jakarta-tapestry/contrib/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 28 Oct 2004 22:24:50 -0000 1.25
+++ build.xml 23 Feb 2005 20:40:06 -0000 1.26
@@ -30,13 +30,13 @@
<target name="compile">
<project-dependency artifact="tapestry"/>
- <ibiblio-dependency artifact="commons-logging" version="1.0.4" group="commons-logging"/>
+ <ibiblio-dependency artifact="commons-logging" version="${logging.version}" group="commons-logging"/>
<ibiblio-dependency artifact="hivemind" version="${hivemind.version}" group="hivemind"/>
<ibiblio-dependency artifact="hivemind-lib" version="${hivemind.version}" group="hivemind"/>
- <ibiblio-dependency artifact="commons-codec" version="1.2" group="commons-codec"/>
- <ibiblio-dependency artifact="ognl" version="2.6.3" group="ognl"/>
+ <ibiblio-dependency artifact="commons-codec" version="${codec.version}" group="commons-codec"/>
+ <ibiblio-dependency artifact="ognl" version="${ognl.version}" group="ognl"/>
<ibiblio-dependency artifact="jboss-j2ee" version="3.2.1" group="jboss"/>
- <ibiblio-dependency artifact="commons-lang" version="2.0" group="commons-lang"/>
+ <ibiblio-dependency artifact="commons-lang" version="${lang.version}" group="commons-lang"/>
<!--
<ibiblio-dependency artifact="bsf" version="2.3.0" group="bsf"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org