git-svn-id: https://svn.coded.pt/svn/SIPRP@1008 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/SIPRPSoft/src/siprp/Main.java

@@ -121,7 +121,7 @@ public class Main implements com.evolute.utils.ui.window.Connector
 //		new IBookDataLoader().load();
 		
 		dbase = (String)Singleton.getInstance( SingletonConstants.LOCAL_DB_NAME );
-//		dbase = "siprp_local3";
+		dbase = "siprp_local3";
 /*		Calendar cal = Calendar.getInstance();
 		cal.set( 2004, 06, 14 );
 		if( cal.before( Calendar.getInstance() ) )
@@ -215,7 +215,7 @@ public class Main implements com.evolute.utils.ui.window.Connector
 			{
 				//server = "192.168.1.191";
 				server = (String)Singleton.getInstance( SingletonConstants.LOCAL_URL );
-//				server = "storage";
+				server = "storage";
 //				server = "ws_fpalma";
 			}
 			String prefix = (String)Singleton.getInstance( SingletonConstants.LOCAL_URL_PREFIX );

trunk/SIPRPSoft/src/siprp/ficha/FichaAptidaoCreator.java

@@ -9,14 +9,13 @@
 
 package siprp.ficha;
 
-import com.evolute.utils.fop.FOPCreator;
-import com.evolute.utils.fop.FOPPrinter;
-import com.evolute.utils.fop.PDFCreator;
-import com.evolute.utils.strings.UnicodeChecker;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.util.HashMap;
+
+import siprp.util.fop.FOPCreator;
+import siprp.util.fop.FOPPrinter;
+import siprp.util.fop.PDFCreator;
 
 /**
  *

trunk/SIPRPSoft/src/siprp/medicina/presencas/RegistarPresencasWindow.java

@@ -9,14 +9,6 @@
 
 package siprp.medicina.presencas;
 
-import com.evolute.utils.data.IDObject;
-import com.evolute.utils.data.MappableObject;
-import com.evolute.utils.fop.FOPCreator;
-import com.evolute.utils.fop.FOPPrinter;
-import com.evolute.utils.tracker.TrackableWindow;
-import com.evolute.utils.ui.DialogException;
-import com.evolute.utils.ui.calendar.JCalendarPanel;
-import com.evolute.utils.ui.panel.multipleactionlist.MultipleActionListPanel;
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
@@ -34,12 +26,33 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Locale;
 import java.util.Vector;
-import javax.swing.*;
+
-import org.jdom.*;
+import javax.swing.JButton;
-import org.jdom.output.*;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.output.XMLOutputter;
+
 import siprp.clientes.ClientesDataProvider;
 import siprp.medicina.MedicinaDataProvider;
 import siprp.medicina.prestadores.PrestadoresDataProvider;
+import siprp.util.fop.FOPCreator;
+import siprp.util.fop.FOPPrinter;
+
+import com.evolute.utils.data.IDObject;
+import com.evolute.utils.data.MappableObject;
+import com.evolute.utils.tracker.TrackableWindow;
+import com.evolute.utils.ui.DialogException;
+import com.evolute.utils.ui.calendar.JCalendarPanel;
+import com.evolute.utils.ui.panel.multipleactionlist.MultipleActionListPanel;
 
 /**
  *

trunk/SIPRPSoft/src/siprp/util/fop/PDFCreator.java

@@ -28,7 +28,6 @@ import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
 import org.apache.xmlgraphics.util.MimeConstants;
 
-import com.evolute.utils.fop.FOPCreator;
 
 /**
  * PDFCreator creates PDF's using FO.