litesoft
Diff Revisions
960
vs
961
for /trunk/DeviceDesktopTest/src/org/litesoft/template/Template.java
|
@@ -2,40 +2,32 @@ |
2 |
2 |
|
|
3 |
3 |
|
import java.util.*; |
4 |
4 |
|
|
5 |
|
- |
public class Template implements Chunk |
6 |
|
- |
{ |
|
5 |
+ |
public class Template implements Chunk { |
7 |
6 |
|
public static final String KEY_PREFIX = ".{"; |
8 |
7 |
|
public static final String KEY_POSTFIX = "}."; |
9 |
8 |
|
|
10 |
9 |
|
private final Chunk[] mChunks; |
11 |
10 |
|
|
12 |
|
- |
public Template( Chunk[] pChunks ) |
13 |
|
- |
{ |
|
11 |
+ |
public Template( Chunk[] pChunks ) { |
14 |
12 |
|
mChunks = pChunks; |
15 |
13 |
|
} |
16 |
14 |
|
|
17 |
15 |
|
@Override |
18 |
|
- |
public void dump( Sink pWriter, ValueProvider pValueProvider ) |
19 |
|
- |
{ |
20 |
|
- |
for ( Chunk zChunk : mChunks ) |
21 |
|
- |
{ |
|
16 |
+ |
public void dump( Sink pWriter, ValueProvider pValueProvider ) { |
|
17 |
+ |
for ( Chunk zChunk : mChunks ) { |
22 |
18 |
|
zChunk.dump( pWriter, pValueProvider ); |
23 |
19 |
|
} |
24 |
20 |
|
} |
25 |
21 |
|
|
26 |
|
- |
public static Template from( String pText ) |
27 |
|
- |
{ |
|
22 |
+ |
public static Template from( String pText ) { |
28 |
23 |
|
List<Chunk> zChunks = new ArrayList<>(); |
29 |
24 |
|
|
30 |
25 |
|
int zFrom = 0; |
31 |
|
- |
for ( int zAt; -1 != (zAt = pText.indexOf( KEY_POSTFIX, zFrom )); zFrom = zAt + KEY_POSTFIX.length() ) |
32 |
|
- |
{ |
|
26 |
+ |
for ( int zAt; -1 != (zAt = pText.indexOf( KEY_POSTFIX, zFrom )); zFrom = zAt + KEY_POSTFIX.length() ) { |
33 |
27 |
|
int zPrefixAt = pText.lastIndexOf( KEY_PREFIX, zAt ); |
34 |
|
- |
if ( zPrefixAt != -1 ) |
35 |
|
- |
{ |
|
28 |
+ |
if ( zPrefixAt != -1 ) { |
36 |
29 |
|
int zKeyAt = zPrefixAt + KEY_PREFIX.length(); |
37 |
|
- |
if ( zKeyAt != zAt ) |
38 |
|
- |
{ |
|
30 |
+ |
if ( zKeyAt != zAt ) { |
39 |
31 |
|
addTo( zChunks, pText, zFrom, zPrefixAt ); // Before the Key |
40 |
32 |
|
zChunks.add( new ChunkWithKey( pText.substring( zKeyAt, zAt ) ) ); // the Key |
41 |
33 |
|
continue; |
|
@@ -48,10 +40,8 @@ |
48 |
40 |
|
return new Template( zChunks.toArray( new Chunk[zChunks.size()] ) ); |
49 |
41 |
|
} |
50 |
42 |
|
|
51 |
|
- |
private static void addTo( List<Chunk> pChunks, String pText, int pFrom, int pUpTo ) |
52 |
|
- |
{ |
53 |
|
- |
if ( pFrom != pUpTo ) |
54 |
|
- |
{ |
|
43 |
+ |
private static void addTo( List<Chunk> pChunks, String pText, int pFrom, int pUpTo ) { |
|
44 |
+ |
if ( pFrom != pUpTo ) { |
55 |
45 |
|
pChunks.add( new ChunkForText( pText.substring( pFrom, pUpTo ) ) ); |
56 |
46 |
|
} |
57 |
47 |
|
} |