diff --git a/trunk/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/siprp/companydataloaders/SIPRPDataLoader.java index 06f1dace..933cb741 100644 --- a/trunk/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/siprp/companydataloaders/SIPRPDataLoader.java @@ -90,19 +90,19 @@ public class SIPRPDataLoader implements CompanyDataLoader Singleton.setInstance( SingletonConstants.WEB_DB_NAME, "siprp" ); Singleton.setInstance( SingletonConstants.WEB_DRIVER_NAME, "org.postgresql.Driver" ); -// Singleton.setInstance( SingletonConstants.LOCAL_USER, "root" ); -// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "UNIXLuvsU" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:mysql://" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "com.mysql.jdbc.Driver" ); + Singleton.setInstance( SingletonConstants.LOCAL_USER, "root" ); + Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "UNIXLuvsU" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:mysql://" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost" ); + Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp" ); + Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "com.mysql.jdbc.Driver" ); - Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); - Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost:5432" ); - Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "shst" ); - Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); +// Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); +// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost:5432" ); +// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp" ); +// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); } } diff --git a/trunk/siprp/ficha/FichaWindow.java b/trunk/siprp/ficha/FichaWindow.java index 618d8268..ea236fd3 100644 --- a/trunk/siprp/ficha/FichaWindow.java +++ b/trunk/siprp/ficha/FichaWindow.java @@ -157,21 +157,21 @@ public class FichaWindow extends TabbedWindow "Apagar Fichas Anteriores", null, 0, false ); - registerAction( new ActionHandler(){ - public void execute() - { - excel(); - } - - public boolean activate( boolean newAction, boolean editAction, - boolean cancelAction, boolean saveAction, - boolean deleteAction, boolean selectAction ) - { - return saveAction; - } - }, "Importar", - "Importar de Excel", "excel", - 0, true ); +// registerAction( new ActionHandler(){ +// public void execute() +// { +// excel(); +// } +// +// public boolean activate( boolean newAction, boolean editAction, +// boolean cancelAction, boolean saveAction, +// boolean deleteAction, boolean selectAction ) +// { +// return saveAction; +// } +// }, "Importar", +// "Importar de Excel", "excel", +// 0, true ); } public boolean save( int index ) @@ -295,7 +295,7 @@ public class FichaWindow extends TabbedWindow // { // search = new SearchDialog( fdpProvider, null, true, null, true ); // } - search = new SearchDialog( fdpProvider, null, true, null, true ); + search = new SearchDialog( fdpProvider, null, false, null, true ); empresaID = ( Integer )search.getSelected(); if( empresaID == null ) @@ -332,7 +332,7 @@ public class FichaWindow extends TabbedWindow // { // search = new SearchDialog( fdpProvider, null, true, null, true ); // } - search = new SearchDialog( fdpProvider, null, true, null, true ); + search = new SearchDialog( fdpProvider, null, false, null, true ); estabelecimentoID = ( Integer )search.getSelected(); if( estabelecimentoID == null ) @@ -351,7 +351,7 @@ public class FichaWindow extends TabbedWindow fdpProvider.setSearch( FichaDataProvider.SEARCH_TRABALHADORES ); fdpProvider.setSearchID( FichaDataProvider.SEARCH_ESTABELECIMENTOS, estabelecimentoID.intValue() ); - search = new SearchDialog( fdpProvider, null, true, null, true ); + search = new SearchDialog( fdpProvider, null, false, null, true ); trabalhadorID = ( Integer )search.getSelected(); if( trabalhadorID == null )