You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2008/09/08 15:56:53 UTC
svn commit: r693098 - in
/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp:
controls/PhoneInputControl.java tags/InputControlTag.java
tags/TableHeadRowTag.java tags/TableRowTag.java
Author: doebele
Date: Mon Sep 8 06:56:51 2008
New Revision: 693098
URL: http://svn.apache.org/viewvc?rev=693098&view=rev
Log:
EMPIREDB-10
Modified:
incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/controls/PhoneInputControl.java
incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/InputControlTag.java
incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableHeadRowTag.java
incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableRowTag.java
Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/controls/PhoneInputControl.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/controls/PhoneInputControl.java?rev=693098&r1=693097&r2=693098&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/controls/PhoneInputControl.java (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/controls/PhoneInputControl.java Mon Sep 8 06:56:51 2008
@@ -149,9 +149,9 @@
{
// Landeskennzahl
lkz = lkz.trim();
- // replace all '-' with '§'
+ // replace dashes
if (lkz.indexOf('-') >= 0)
- lkz = lkz.replace('-', '§');
+ lkz = lkz.replace('-', '$');
// replace leading '00' with '+'
if (lkz.startsWith("00"))
{
@@ -172,9 +172,9 @@
if (okz != null && okz.length() > 0)
{
okz = okz.trim();
- // replace all '-' with '§'
+ // replace all '-' with '$'
if (okz.indexOf('-') >= 0)
- okz = okz.replace('-', '§');
+ okz = okz.replace('-', '$');
// append okz
buf.append(okz);
}
Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/InputControlTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/InputControlTag.java?rev=693098&r1=693097&r2=693098&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/InputControlTag.java (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/InputControlTag.java Mon Sep 8 06:56:51 2008
@@ -131,7 +131,7 @@
comp.setLabelClass( this.labelClass );
comp.setLabelStyle( this.labelStyle );
comp.setRequired( isRequired() ? "true" : "false" );
- comp.setReadOnly( isReadOnly() ); // berücksichtigt disabled!
+ comp.setReadOnly( isReadOnly() );
comp.setRenderType(render);
comp.setDisabledMode(disabledMode);
Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableHeadRowTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableHeadRowTag.java?rev=693098&r1=693097&r2=693098&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableHeadRowTag.java (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableHeadRowTag.java Mon Sep 8 06:56:51 2008
@@ -62,13 +62,13 @@
protected String sortColumnParam;
protected String sortOrderParam;
protected String currentClass;
- // Overridable column defaults
+ // Overrideable column defaults
protected String columnClass;
protected String columnStyle;
protected String columnAlign;
protected String columnWrap;
- // Temporäry Information
+ // Temporary Information
private Object oldHeadRowInfo;
/*
@@ -105,7 +105,6 @@
log.error("Illegal Method call");
}
- @SuppressWarnings("unchecked")
@Override
public int doStartTag() throws JspException
{
@@ -145,7 +144,6 @@
return EVAL_BODY_INCLUDE;
}
- @SuppressWarnings("unchecked")
@Override
public int doEndTag() throws JspException
{
Modified: incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableRowTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableRowTag.java?rev=693098&r1=693097&r2=693098&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableRowTag.java (original)
+++ incubator/empire-db/trunk/struts2-ext/Empire-struts2-ext/src/org/apache/empire/struts2/jsp/tags/TableRowTag.java Mon Sep 8 06:56:51 2008
@@ -51,7 +51,7 @@
// Common UI
protected String cssOddClass;
protected String cssOddStyle;
- // Overridable column defaults
+ // Overrideable column defaults
protected ColumnExpr currentColumn;
protected String currentClass;
protected String columnClass;
@@ -59,7 +59,7 @@
protected String columnAlign;
protected String columnWrap;
- // Temporäry Information
+ // Temporary Information
private Object oldRowInfo;
/*