From 2f28e47b09fb280d1b1b498e43f14375aa0cd497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Wed, 17 Dec 2008 11:27:12 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@845 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../higiene/relatorio/PanelRelatorio.java | 14 ++++++- trunk/WebImages/WEB-INF/web.xml | 18 +++++++++ trunk/WebImages/src/SIPRPNode.driver.xml | 6 +++ .../siprp/images/servlet/ImagesServlet.java | 37 +++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 trunk/WebImages/WEB-INF/web.xml create mode 100644 trunk/WebImages/src/SIPRPNode.driver.xml create mode 100644 trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java index 9b5ff560..ed12f577 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java @@ -1,8 +1,10 @@ package siprp.higiene.relatorio; +import static com.evolute.utils.strings.UnicodeLatin1Map.aacute; import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; import static com.evolute.utils.strings.UnicodeLatin1Map.eacute; +import static com.evolute.utils.strings.UnicodeLatin1Map.iacute; import static com.evolute.utils.strings.UnicodeLatin1Map.oacute; import static com.evolute.utils.strings.UnicodeLatin1Map.otilde; import info.clearthought.layout.TableLayout; @@ -18,6 +20,7 @@ import java.util.EventObject; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JTabbedPane; @@ -193,11 +196,19 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe @Override public void actionPerformed( ActionEvent e ) { - submit(); + if( JOptionPane.OK_OPTION == confirmSubmit() ) + { + submit(); + } } } ); } + private int confirmSubmit() + { + return JOptionPane.showConfirmDialog( this, "Ao submeter o Plano de Actua"+ccedil+atilde+"o n"+atilde+"o ser"+aacute+" mais poss"+iacute+"vel alter"+aacute+"-lo. Deseja continuar?" ); + } + private void submit() { if( relatorio != null ) @@ -205,6 +216,7 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe relatorio.setIsSubmetido( new Date() ); relatorio.save(); refresh(); + setRelatorio( relatorio, false ); } } diff --git a/trunk/WebImages/WEB-INF/web.xml b/trunk/WebImages/WEB-INF/web.xml new file mode 100644 index 00000000..11816d59 --- /dev/null +++ b/trunk/WebImages/WEB-INF/web.xml @@ -0,0 +1,18 @@ + + + + + + + siprp.images.servlet.ImagesServlet + Some dummy name + + + + Some dummy name + /image + + + diff --git a/trunk/WebImages/src/SIPRPNode.driver.xml b/trunk/WebImages/src/SIPRPNode.driver.xml new file mode 100644 index 00000000..3c75ecb8 --- /dev/null +++ b/trunk/WebImages/src/SIPRPNode.driver.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java b/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java new file mode 100644 index 00000000..0a1034da --- /dev/null +++ b/trunk/WebImages/src/siprp/images/servlet/ImagesServlet.java @@ -0,0 +1,37 @@ +package siprp.images.servlet; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import siprp.database.cayenne.objects.Image; +import siprp.database.cayenne.providers.ImageDAO; + +public final class ImagesServlet extends HttpServlet +{ + private static final long serialVersionUID = 999506147931075031L; + + private static final String PARAMETER_ID = "id"; + + public void doGet( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException + { + response.setContentType( "image/png" ); + ServletOutputStream out = response.getOutputStream(); + String param = request.getParameter( PARAMETER_ID ); + System.out.println(param); + try + { + Integer id = new Integer(param); + Image img = new ImageDAO().getImageForID( id ); + out.write( img.getImageData() ); + } + catch (Exception e) { + e.printStackTrace(); + } + } + +}