mpoeschl 2002/11/19 08:34:09
Modified: src/java/org/apache/torque/om ComboKey.java
Log:
o checkstyle fixes
Revision Changes Path
1.9 +26 -14
jakarta-turbine-torque/src/java/org/apache/torque/om/ComboKey.java
Index: ComboKey.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/ComboKey.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ComboKey.java 23 Sep 2002 06:15:40 -0000 1.8
+++ ComboKey.java 19 Nov 2002 16:34:09 -0000 1.9
@@ -55,7 +55,6 @@
*/
import java.util.ArrayList;
-
import org.apache.commons.lang.ObjectUtils;
/**
@@ -134,7 +133,8 @@
public void setValue(String[] keys)
{
this.key = new SimpleKey[keys.length];
- for ( int i = 0; i < keys.length; i++ ) {
+ for (int i = 0; i < keys.length; i++)
+ {
this.key[i] = new StringKey(keys[i]);
}
}
@@ -158,9 +158,10 @@
{
char keyType = keys.charAt(startPtr);
String keyString = keys.substring(startPtr + 1, indexOfSep);
-
+
SimpleKey newKey = null;
- switch(keyType){
+ switch(keyType)
+ {
case 'N':
newKey = new NumberKey(keyString);
break;
@@ -168,9 +169,12 @@
newKey = new StringKey(keyString);
break;
case 'D':
- try{
+ try
+ {
newKey = new DateKey(keyString);
- }catch(NumberFormatException nfe){
+ }
+ catch (NumberFormatException nfe)
+ {
newKey = new DateKey();
}
break;
@@ -180,13 +184,13 @@
tmpKeys.add(newKey);
}
startPtr = indexOfSep + 1;
- indexOfSep = keys.indexOf(SEPARATOR,startPtr);
+ indexOfSep = keys.indexOf(SEPARATOR, startPtr);
}
this.key = new SimpleKey[tmpKeys.size()];
- for ( int i = 0; i < this.key.length; i++ )
+ for (int i = 0; i < this.key.length; i++)
{
- this.key[i] = (SimpleKey)tmpKeys.get(i);
+ this.key[i] = (SimpleKey) tmpKeys.get(i);
}
}
@@ -296,13 +300,21 @@
{
if (keys[i] != null)
{
- if(keys[i] instanceof StringKey){
+ if (keys[i] instanceof StringKey)
+ {
sb.append("S");
- }else if(keys[i] instanceof NumberKey){
+ }
+ else if (keys[i] instanceof NumberKey)
+ {
sb.append("N");
- }else if(keys[i] instanceof DateKey){
+ }
+ else if (keys[i] instanceof DateKey)
+ {
sb.append("D");
- }else{ // unknown type
+ }
+ else
+ {
+ // unknown type
sb.append("U");
}
keys[i].appendTo(sb);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
