[tiled] r605 - in trunk/src/tiled/mapeditor: . util

[svn@biggeruniverse.com]

Author: bjorn
Date: 2006-04-09 16:39:52 -0500 (Sun, 09 Apr 2006)
New Revision: 605

Removed:
   trunk/src/tiled/mapeditor/util/MapPrinter.java
Modified:
   trunk/src/tiled/mapeditor/MapEditor.java
Log:
Removed MapPrinter class that was never functional. Map printing is no longer planned, saving as image should be enough as you could always print the saved image.

Modified: trunk/src/tiled/mapeditor/MapEditor.java
===================================================================
--- trunk/src/tiled/mapeditor/MapEditor.java	2006-04-09 21:21:22 UTC (rev 604)
+++ trunk/src/tiled/mapeditor/MapEditor.java	2006-04-09 21:39:52 UTC (rev 605)
@@ -16,7 +16,6 @@
 import java.awt.event.*;
 import java.awt.geom.Area;
 import java.awt.image.BufferedImage;
-import java.awt.print.PrinterException;
 import java.io.*;
 import java.util.Stack;
 import java.util.Vector;
@@ -264,8 +263,6 @@
                 "Save current map as an image", "control shift I");
         JMenuItem close = createMenuItem("Close", null, "Close this map",
                 "control W");
-        JMenuItem print =
-            createMenuItem("Print...", null, "Print the map", "control P");
 
         recentMenu = new JMenu("Open Recent");
 
@@ -273,7 +270,6 @@
         mapEventAdapter.addListener(saveAs);
         mapEventAdapter.addListener(saveAsImage);
         mapEventAdapter.addListener(close);
-        mapEventAdapter.addListener(print);
 
         fileMenu = new JMenu("File");
         fileMenu.add(createMenuItem("New...", null, "Start a new map",
@@ -284,10 +280,6 @@
         fileMenu.add(save);
         fileMenu.add(saveAs);
         fileMenu.add(saveAsImage);
-        // TODO: Re-add print menuitem when printing is functional
-        //fileMenu.addSeparator();
-        //fileMenu.add(print);
-        //mapEventAdapter.addListener(print);
         fileMenu.addSeparator();
         fileMenu.add(close);
         fileMenu.add(createMenuItem("Exit", null, "Exit the map editor",
@@ -1130,6 +1122,8 @@
         }
     }
 
+    // Todo: Most if not all of the below should be moved into action objects,
+    // Todo: and properly internationalized.
     private void handleEvent(ActionEvent event) {
         String command = event.getActionCommand();
 
@@ -1147,13 +1141,6 @@
             if (checkSave()) {
                 newMap();
             }
-        } else if (command.equals("Print...")) {
-            try {
-                MapPrinter mp = new MapPrinter();
-                mp.print(mapView);
-            } catch (PrinterException e) {
-                e.printStackTrace();
-            }
         } else if (command.equals("Brush...")) {
             BrushDialog bd = new BrushDialog(this, appFrame, currentBrush);
             bd.setVisible(true);

Deleted: trunk/src/tiled/mapeditor/util/MapPrinter.java
===================================================================
--- trunk/src/tiled/mapeditor/util/MapPrinter.java	2006-04-09 21:21:22 UTC (rev 604)
+++ trunk/src/tiled/mapeditor/util/MapPrinter.java	2006-04-09 21:39:52 UTC (rev 605)
@@ -1,50 +0,0 @@
-/*
- *  Tiled Map Editor, (c) 2004-2006
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- * 
- *  Adam Turk <aturk at biggeruniverse.com>
- *  Bjorn Lindeijer <b.lindeijer at xs4all.nl>
- */
-package tiled.mapeditor.util;
-
-import java.awt.*;
-import java.awt.print.*;
-
-import javax.swing.JPanel;
-import javax.swing.RepaintManager;
-
-public final class MapPrinter implements Printable {
-
-	private PrinterJob printJob;
-	private JPanel printed;
-	
-	public void print(JPanel p) throws PrinterException {
-		RepaintManager currentManager = 
-					  RepaintManager.currentManager(p);
-		printed = p;
-		currentManager.setDoubleBufferingEnabled(false);
-		printJob = PrinterJob.getPrinterJob();		
-		if(printJob.printDialog()) {			
-			printJob.setPrintable(this,printJob.defaultPage());
-			printJob.print();
-		}
-		currentManager.setDoubleBufferingEnabled(true);
-	}
-
-	public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
-		throws PrinterException {
-					
-			Graphics2D graphics2D = (Graphics2D) graphics;
-			graphics2D.translate(pageFormat.getImageableX(),pageFormat.getImageableY());
-			//graphics2D.scale(graphics2D.getClipBounds().getWidth()/printed.getWidth(),graphics2D.getClipBounds().getHeight()/printed.getHeight());			
-			graphics2D.drawLine(72,72,160,160);
-			printed.paint(graphics2D);
-			
-		return Printable.PAGE_EXISTS;
-	}
-
-}