|
@@ -1,37 +1,32 @@ |
1 |
1 |
|
package org.litesoft.datt.server; |
2 |
2 |
|
|
3 |
|
- |
import org.litesoft.commonfoundation.base.*; |
4 |
|
- |
import org.litesoft.commonfoundation.typeutils.*; |
5 |
|
- |
|
6 |
|
- |
import java.util.*; |
7 |
|
- |
|
8 |
3 |
|
import org.litesoft.GWT.server.*; |
9 |
4 |
|
import org.litesoft.bo.views.communication.*; |
|
5 |
+ |
import org.litesoft.commonfoundation.base.*; |
|
6 |
+ |
import org.litesoft.commonfoundation.typeutils.*; |
10 |
7 |
|
import org.litesoft.configuration.*; |
11 |
8 |
|
import org.litesoft.core.util.*; |
12 |
9 |
|
import org.litesoft.orsup.*; |
13 |
10 |
|
import org.litesoft.orsup.base.*; |
14 |
11 |
|
import org.litesoft.sql.*; |
15 |
12 |
|
|
16 |
|
- |
public class DATT_Servlet extends AbstractVoServerApp |
17 |
|
- |
{ |
|
13 |
+ |
import java.util.*; |
|
14 |
+ |
|
|
15 |
+ |
public class DATT_Servlet extends AbstractVoServerApp { |
18 |
16 |
|
private static final DATT_MetaDataRegistry REGISTRY = DATT_MetaDataRegistry.INSTANCE; |
19 |
17 |
|
|
20 |
18 |
|
@Override |
21 |
|
- |
protected String getApplicationVersion() |
22 |
|
- |
{ |
|
19 |
+ |
protected String getApplicationVersion() { |
23 |
20 |
|
return "0.90"; |
24 |
21 |
|
} |
25 |
22 |
|
|
26 |
|
- |
public DATT_Servlet() |
27 |
|
- |
{ |
|
23 |
+ |
public DATT_Servlet() { |
28 |
24 |
|
super( "DATT", null, REGISTRY ); |
29 |
25 |
|
} |
30 |
26 |
|
|
31 |
27 |
|
// Called 2nd |
32 |
28 |
|
@Override |
33 |
|
- |
protected void startUpApplication() |
34 |
|
- |
{ |
|
29 |
+ |
protected void startUpApplication() { |
35 |
30 |
|
System.out.println( "DATT_Servlet.startUpApplication" ); |
36 |
31 |
|
|
37 |
32 |
|
// register( new MedicationTrackingReportServerFactory() ); |
|
@@ -39,8 +34,7 @@ |
39 |
34 |
|
DataStore zMasterDataStore = new DataStoreBaseSQL( REGISTRY ); |
40 |
35 |
|
DataStoreLocator.initialize( zMasterDataStore ); |
41 |
36 |
|
|
42 |
|
- |
if ( Configuration.getBoolean( "populateDatabase", false ) ) |
43 |
|
- |
{ |
|
37 |
+ |
if ( Configuration.getBoolean( "populateDatabase", false ) ) { |
44 |
38 |
|
zMasterDataStore.dropAllTables(); |
45 |
39 |
|
zMasterDataStore.createAllTables(); |
46 |
40 |
|
DataLoader.INSTANCE.loadData(); |
|
@@ -49,8 +43,7 @@ |
49 |
43 |
|
} |
50 |
44 |
|
|
51 |
45 |
|
@Override |
52 |
|
- |
public AppInitializationResult initialize() |
53 |
|
- |
{ |
|
46 |
+ |
public AppInitializationResult initialize() { |
54 |
47 |
|
return new AppInitializationResult( getApplicationVersion(), Configuration.getCompleteConfigMap() ); |
55 |
48 |
|
} |
56 |
49 |
|
|
|
@@ -61,11 +54,9 @@ |
61 |
54 |
|
private Map<String, String> mIdentifierToMessages = Maps.createHashMap( IDENTIFIER_MESSAGES ); |
62 |
55 |
|
|
63 |
56 |
|
@Override |
64 |
|
- |
protected String resolve( String pIdentifier, String[] pParams ) |
65 |
|
- |
{ |
|
57 |
+ |
protected String resolve( String pIdentifier, String[] pParams ) { |
66 |
58 |
|
String zResolved = mIdentifierToMessages.get( pIdentifier ); |
67 |
|
- |
if ( zResolved == null ) |
68 |
|
- |
{ |
|
59 |
+ |
if ( zResolved == null ) { |
69 |
60 |
|
zResolved = DeCamelizer.resolve( pIdentifier ); |
70 |
61 |
|
} |
71 |
62 |
|
return ExternalizationHelper.injectParameters( zResolved, (Object[]) pParams ); |