From d5500765c0d5e4b76723c3e49d080a962b51d0c8 Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Wed, 28 Jan 2009 17:01:28 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@926 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../planoactuacao/SingletonConstants.java | 7 ---- .../siprp/planoactuacao/db/DBConstants.java | 6 +-- .../planoactuacao/db/PlanoActuacaoDBInit.java | 38 ++++++++++++++----- .../print/PlanoActuacaoPrintDataProvider.java | 11 +++--- 4 files changed, 36 insertions(+), 26 deletions(-) delete mode 100644 trunk/SIPRPSoft/src/siprp/planoactuacao/SingletonConstants.java diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/SingletonConstants.java b/trunk/SIPRPSoft/src/siprp/planoactuacao/SingletonConstants.java deleted file mode 100644 index 0781d736..00000000 --- a/trunk/SIPRPSoft/src/siprp/planoactuacao/SingletonConstants.java +++ /dev/null @@ -1,7 +0,0 @@ -package siprp.planoactuacao; - -public interface SingletonConstants -{ - public static final String WEB_DBMANAGER = "WEB DBMANAGER"; - public static final String LOCAL_DBMANAGER = "LOCAL DBMANAGER"; -} diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/db/DBConstants.java b/trunk/SIPRPSoft/src/siprp/planoactuacao/db/DBConstants.java index 894032b9..5f85e99b 100644 --- a/trunk/SIPRPSoft/src/siprp/planoactuacao/db/DBConstants.java +++ b/trunk/SIPRPSoft/src/siprp/planoactuacao/db/DBConstants.java @@ -1,8 +1,5 @@ package siprp.planoactuacao.db; -import com.evolute.utils.sql.SQLQuery; -import com.evolute.utils.sql.Update; - public interface DBConstants { public static final String WEB_URL = "jdbc:postgresql://localhost:5436/siprp"; @@ -25,5 +22,6 @@ public interface DBConstants // public static final String LOCAL_USER = "postgres"; // public static final String LOCAL_PASSWORD = "Typein"; - public static final SQLQuery INIT[] = new SQLQuery[]{}; + public static final String WEB_DBMANAGER = "WEB DBMANAGER"; + public static final String LOCAL_DBMANAGER = "LOCAL DBMANAGER"; } diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/db/PlanoActuacaoDBInit.java b/trunk/SIPRPSoft/src/siprp/planoactuacao/db/PlanoActuacaoDBInit.java index cda4be6f..c477e744 100644 --- a/trunk/SIPRPSoft/src/siprp/planoactuacao/db/PlanoActuacaoDBInit.java +++ b/trunk/SIPRPSoft/src/siprp/planoactuacao/db/PlanoActuacaoDBInit.java @@ -1,6 +1,6 @@ package siprp.planoactuacao.db; -import siprp.planoactuacao.SingletonConstants; +import siprp.SingletonConstants; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBManager; @@ -11,17 +11,35 @@ import com.evolute.utils.strings.UnicodeChecker; public class PlanoActuacaoDBInit { - public static void initDB() + public static void initDB( boolean web ) throws Exception { - DBManager webManager = new JDBCManager( DBConstants.WEB_URL, - DBConstants.WEB_USER, DBConstants.WEB_PASSWORD , 10, 8, 8, - DBConstants.INIT ); - DBManager localManager = new JDBCManager( DBConstants.LOCAL_URL, - DBConstants.LOCAL_USER, DBConstants.LOCAL_PASSWORD , 10, 8, 8, - DBConstants.INIT ); - Singleton.setInstance( SingletonConstants.WEB_DBMANAGER, webManager ); - Singleton.setInstance( SingletonConstants.LOCAL_DBMANAGER, localManager ); + if( web ) + { + String url = DBConstants.WEB_URL; + String user = DBConstants.WEB_USER; + String pwd = DBConstants.WEB_PASSWORD; + DBManager webManager = new JDBCManager( url, user, pwd, 10, 8, 8, null ); + Singleton.setInstance( DBConstants.WEB_DBMANAGER, webManager ); + + url = DBConstants.LOCAL_URL; + user = DBConstants.LOCAL_USER; + pwd = DBConstants.LOCAL_PASSWORD; + DBManager localManager = new JDBCManager( url, user, pwd, 10, 8, 8, null ); + Singleton.setInstance( DBConstants.LOCAL_DBMANAGER, localManager ); + } + else + { + String url = ( String ) Singleton.getInstance( SingletonConstants.WEB_URL_PREFIX ); + url += ( String ) Singleton.getInstance( SingletonConstants.WEB_URL ) + "/"; + url += ( String ) Singleton.getInstance( SingletonConstants.WEB_DB_NAME ) + "/"; + String user = ( String ) Singleton.getInstance( SingletonConstants.WEB_USER ); + String pwd = ( String ) Singleton.getInstance( SingletonConstants.WEB_PASSWORD ); + DBManager webManager = new JDBCManager( url, user, pwd, 10, 8, 8, null ); + Singleton.setInstance( DBConstants.WEB_DBMANAGER, webManager ); + Singleton.setInstance( DBConstants.LOCAL_DBMANAGER, Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ) ); + } + Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); UnicodeChecker.setUseDoubleSlash( true ); } diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java index 4a877713..5fec993f 100644 --- a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java @@ -4,7 +4,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Vector; -import siprp.planoactuacao.SingletonConstants; +import siprp.SingletonConstants; +import siprp.planoactuacao.db.DBConstants; import siprp.planoactuacao.db.PlanoActuacaoDBInit; import com.evolute.utils.Singleton; @@ -34,13 +35,13 @@ public class PlanoActuacaoPrintDataProvider throws Exception { this.web = web; - if( Singleton.getInstance( SingletonConstants.WEB_DBMANAGER ) == null ) + if( Singleton.getInstance( DBConstants.WEB_DBMANAGER ) == null ) { - PlanoActuacaoDBInit.initDB(); + PlanoActuacaoDBInit.initDB( web ); } - DBManager WEB_DBMANAGER = ( DBManager ) Singleton.getInstance( SingletonConstants.WEB_DBMANAGER ); + DBManager WEB_DBMANAGER = ( DBManager ) Singleton.getInstance( DBConstants.WEB_DBMANAGER ); WEB_EXECUTER = WEB_DBMANAGER.getSharedExecuter( this ); - DBManager LOCAL_DBMANAGER = ( DBManager ) Singleton.getInstance( SingletonConstants.LOCAL_DBMANAGER ); + DBManager LOCAL_DBMANAGER = ( DBManager ) Singleton.getInstance( DBConstants.LOCAL_DBMANAGER ); LOCAL_EXECUTER = LOCAL_DBMANAGER.getSharedExecuter( this ); }