[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/servlets IdFactory.java,1.1,1.2 NodeDrawData.java,1.1,1.2 TreeServlet.java,1.6,1.7

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/servlets
In directory sc8-pr-cvs1:/tmp/cvs-serv6333

Modified Files:
	IdFactory.java NodeDrawData.java TreeServlet.java 
Log Message:
Passed astyle all files

Index: IdFactory.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/servlets/IdFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IdFactory.java	21 Aug 2003 18:57:17 -0000	1.1
--- IdFactory.java	11 Sep 2003 16:41:47 -0000	1.2
***************
*** 35,55 ****
      private static int _num = 0;
  
!     public String createTextId()
!     {
! 	String var = new String ("text" + (_num++));
! 	return var;
      }
  
!     public String createSubstId()
!     {
! 	String var = new String("subst" + (_num++));
! 	return var;
      }
!     
!     public String createTransitionId()
!     {
! 	String var = new String("trans" + (_num++));
! 	return var;
      }
!     
  } // IdFactory
--- 35,52 ----
      private static int _num = 0;
  
!     public String createTextId() {
!         String var = new String ("text" + (_num++));
!         return var;
      }
  
!     public String createSubstId() {
!         String var = new String("subst" + (_num++));
!         return var;
      }
! 
!     public String createTransitionId() {
!         String var = new String("trans" + (_num++));
!         return var;
      }
! 
  } // IdFactory

Index: NodeDrawData.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/servlets/NodeDrawData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NodeDrawData.java	30 Jul 2003 20:12:49 -0000	1.1
--- NodeDrawData.java	11 Sep 2003 16:41:47 -0000	1.2
***************
*** 4,16 ****
  import java.awt.Point;
  
! public class NodeDrawData 
! {
      public Dimension size;
      public Point origin;
  
!     public NodeDrawData(Point originPoint, Dimension sizeBox)
!     {
! 	origin = originPoint;
! 	size = sizeBox;
      }
  }
--- 4,14 ----
  import java.awt.Point;
  
! public class NodeDrawData {
      public Dimension size;
      public Point origin;
  
!     public NodeDrawData(Point originPoint, Dimension sizeBox) {
!         origin = originPoint;
!         size = sizeBox;
      }
  }

Index: TreeServlet.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/servlets/TreeServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TreeServlet.java	19 Aug 2003 19:22:36 -0000	1.6
--- TreeServlet.java	11 Sep 2003 16:41:47 -0000	1.7
***************
*** 44,95 ****
   * @web.servlet-mapping url-pattern="*.tree"
   */
! public class TreeServlet extends HttpServlet
! {
      public void doGet(HttpServletRequest request,
! 		      HttpServletResponse response)
! 	throws ServletException, IOException
!     {
  
! 	// locates session attribute
! 	HttpSession session = request.getSession(true);
! 	CurrentStateBean bean = (CurrentStateBean)session.getAttribute("prologData");
! 	
! 	String format = request.getParameter("format");
  
! 	SvgBean data = (SvgBean)session.getAttribute("tree");
! 	if (data==null || data.getSvg() == null) {
! 	    //FIXME send basic image
! 	    //out.println("You have only a query loaded. Try to do an step");
! 	    return;
! 	}
  
- 	if (format == null || format.equals("svg"))
- 	{
- 	    response.setContentType("image/svg+xml");
- 	    PrintWriter out = response.getWriter();
- 	    out.println(data.getSvg());
- 	}
- 	else {
- 	    OutputStream out = response.getOutputStream();
- 	    response.setContentType("image/jpeg");
- 	    SvgGenerator comeOn = new SvgGenerator();
- 	    JPEGTranscoder transcoder = new JPEGTranscoder();
- 	    transcoder.addTranscodingHint(transcoder.KEY_QUALITY,
- 					  new Float(1));
- 	    transcoder.addTranscodingHint(transcoder.KEY_XML_PARSER_CLASSNAME,"org.apache.xerces.parsers.SAXParser");
- 	    transcoder.addTranscodingHint(transcoder.KEY_WIDTH,
- 					  new Float(data.getWidth()));
- 	    transcoder.addTranscodingHint(transcoder.KEY_HEIGHT,
- 					  new Float(data.getHeight()));
- 	    TranscoderInput input = new TranscoderInput(new StringReader(data.getSvg()));
- 	    TranscoderOutput output = new TranscoderOutput(out);
- 	    try	{
- 		transcoder.transcode(input,output);
- 	    }catch (TranscoderException te) {
- 		//FIXME
- 		throw new IOException("Error in svg to jpeg transformation");
- 	    }
- 	}
- 	
      }
  }
--- 44,96 ----
   * @web.servlet-mapping url-pattern="*.tree"
   */
! public class TreeServlet extends HttpServlet {
      public void doGet(HttpServletRequest request,
!                       HttpServletResponse response)
!     throws ServletException, IOException {
  
!         // locates session attribute
!         HttpSession session = request.getSession(true);
  
!         // FIXME: No used!!!! Why take this bean????
!         CurrentStateBean bean = (CurrentStateBean)session.getAttribute("prologData");
! 
!         String format = request.getParameter("format");
! 
!         SvgBean data = (SvgBean)session.getAttribute("tree");
!         if (data==null || data.getSvg() == null) {
!             //FIXME send basic image
!             //out.println("You have only a query loaded. Try to do an step");
!             return;
!         }
! 
!         if (format == null || format.equals("svg")) {
!             response.setContentType("image/svg+xml");
!             PrintWriter out = response.getWriter();
!             out.println(data.getSvg());
!         } else {
!             OutputStream out = response.getOutputStream();
!             response.setContentType("image/jpeg");
! 
!             //FIXME: UNUSED anymore.
!             SvgGenerator comeOn = new SvgGenerator();
! 
!             JPEGTranscoder transcoder = new JPEGTranscoder();
!             transcoder.addTranscodingHint(transcoder.KEY_QUALITY,
!                                           new Float(1));
!             transcoder.addTranscodingHint(transcoder.KEY_XML_PARSER_CLASSNAME,"org.apache.xerces.parsers.SAXParser");
!             transcoder.addTranscodingHint(transcoder.KEY_WIDTH,
!                                           new Float(data.getWidth()));
!             transcoder.addTranscodingHint(transcoder.KEY_HEIGHT,
!                                           new Float(data.getHeight()));
!             TranscoderInput input = new TranscoderInput(new StringReader(data.getSvg()));
!             TranscoderOutput output = new TranscoderOutput(out);
!             try	{
!                 transcoder.transcode(input,output);
!             } catch (TranscoderException te) {
!                 //FIXME
!                 throw new IOException("Error in svg to jpeg transformation");
!             }
!         }
  
      }
  }