Author: gvanmatre
Date: Sat Dec 3 10:02:33 2005
New Revision: 351993
URL: http://svn.apache.org/viewcvs?rev=351993&view=rev
Log:
Removed tab alignment
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java?rev=351993&r1=351992&r2=351993&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/AbstractCommand.java
Sat Dec 3 10:02:33 2005
@@ -109,30 +109,30 @@
break replace;
next: while (i > -1 && i <= (buff.length() - key.length())) {
-
- int n = -1;
- indexOf: for (int s = i; s <= (buff.length() -
key.length()); s++) {
- for (int c = 0; c < key.length(); c++) {
- char skey =
Character.toLowerCase(key.charAt(c));
- char tkey =
Character.toLowerCase(buff.charAt(s + c));
- if (skey != tkey)
- continue indexOf;
- }
- //match found
- n = s;
- break indexOf;
- }
-
+
+ int n = -1;
+ indexOf: for (int s = i; s <= (buff.length() - key.length());
s++) {
+ for (int c = 0; c < key.length(); c++) {
+ char skey = Character.toLowerCase(key.charAt(c));
+ char tkey = Character.toLowerCase(buff.charAt(s + c));
+ if (skey != tkey)
+ continue indexOf;
+ }
+ // match found
+ n = s;
+ break indexOf;
+ }
+
if (n > -1) {
buff.delete(n, n + key.length());
buff.insert(n, value);
i = n + value.length();
wasReplacementMade = true;
- } else {
+ } else {
break next;
- }
+ }
}
-
+
e = null;
key = null;
value = null;
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java?rev=351993&r1=351992&r2=351993&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/CreateComponentCommand.java
Sat Dec 3 10:02:33 2005
@@ -125,26 +125,26 @@
new Object[] { id, displayElement.getJsfid(), new
Integer(clayContext.getChildIndex()) }));
}
- // create a new scoped symbol table
+ // create a new scoped symbol table
Map symbolTable = new TreeMap();
- // inherit the parents symbols
+ // inherit the parents symbols
symbolTable.putAll(clayContext.getSymbols());
- // override config (XML, HTML) symbols
+ // override config (XML, HTML) symbols
symbolTable.putAll(displayElement.getSymbols());
- //if target is a Clay component it might contain symbols
+ // if target is a Clay component it might contain symbols
if (child instanceof Clay) {
- //override symbols from nested clay component
+ // override symbols from nested clay component
symbolTable.putAll(((Clay) child).getSymbols());
- //capture current symbols for the root of the nested
component
- ((Clay) child).getSymbols().putAll(symbolTable);
+ // capture current symbols for the root of the nested component
+ ((Clay) child).getSymbols().putAll(symbolTable);
}
- //push to context
+ // push to context
clayContext.setSymbols(symbolTable);
-
+
// reassign the child to the converter for the
// AssignPropertiesCommand
clayContext.setChild(child);
-
+
return isFinal;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
