From ff1404828f7bcfb9305f447f8839ebc52827f25c Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Tue, 21 Feb 2006 00:29:31 +0000 Subject: [PATCH] no message git-svn-id: https://svn.coded.pt/svn/SIPRP@222 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/siprp/companydataloaders/SIPRPDataLoader.java | 1 + trunk/siprp/importer/Importer.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/trunk/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/siprp/companydataloaders/SIPRPDataLoader.java index 792993d2..17c38719 100644 --- a/trunk/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/siprp/companydataloaders/SIPRPDataLoader.java @@ -76,6 +76,7 @@ public class SIPRPDataLoader implements CompanyDataLoader Singleton.setInstance( SingletonConstants.CODIGO_EMPRESA_FORMAT, "2 6 / 2" ); Singleton.setInstance( SingletonConstants.FICHA_MARCA_EXAMES, Boolean.TRUE ); Singleton.setInstance( SingletonConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 } ); + Singleton.setInstance( SingletonConstants.EXCEL_FORMAT_DEMISSAO, new int[]{ 0, 1 } ); Singleton.setInstance( SingletonConstants.MODULE_FICHA, Boolean.TRUE ); Singleton.setInstance( SingletonConstants.MODULE_CLIENTES, Boolean.TRUE ); diff --git a/trunk/siprp/importer/Importer.java b/trunk/siprp/importer/Importer.java index a1460e77..c9b7efdb 100644 --- a/trunk/siprp/importer/Importer.java +++ b/trunk/siprp/importer/Importer.java @@ -88,7 +88,7 @@ public class Importer extends CustomJDialog DEFAULT_SELECTION = selection; } int []selectionDemissao = ( int [] ) Singleton.getInstance( SingletonConstants.EXCEL_FORMAT_DEMISSAO ); - if( selection != null ) + if( selectionDemissao != null ) { DEFAULT_SELECTION_DEMISSAO = selectionDemissao; } @@ -287,7 +287,7 @@ public class Importer extends CustomJDialog { return null; } - dcw = new DataChooserWindow( null, NAMES, vals, DEFAULT_SELECTION_DEMISSAO ); + dcw = new DataChooserWindow( null, NAMES_DEMISSAO, vals, DEFAULT_SELECTION_DEMISSAO ); break; }