[tiled] r720 - in branches/adam: . src/tiled/io/xml src/tiled/mapeditor src/tiled/mapeditor/util

[tiled-svn at biggeruniverse.com]

Author: aturk
Date: 2007-01-24 04:34:55 -0600 (Wed, 24 Jan 2007)
New Revision: 720

Added:
   branches/adam/src/tiled/mapeditor/util/BasicFileFilter.java
Modified:
   branches/adam/build.xml
   branches/adam/src/tiled/io/xml/XMLMapTransformer.java
   branches/adam/src/tiled/mapeditor/MapEditor.java
Log:
+ Modified "Save As Image" file chooser now gives you a list of possible extensions that can be written
+ Modified Save As Image now saves as RGB (without alpha component) so that jpegs look decent.
+ core build target (tiled-core.jar) now has all the classes necessary to actually use it to load TMX maps
+ updated TMX plugin copyright date

Modified: branches/adam/build.xml
===================================================================
--- branches/adam/build.xml	2007-01-13 13:11:56 UTC (rev 719)
+++ branches/adam/build.xml	2007-01-24 10:34:55 UTC (rev 720)
@@ -76,7 +76,7 @@
   <target name="core" depends="compile"
     description="Generate a core I/O distribution for use in games, etc.">
     <jar jarfile="${dist}/tiled-core.jar"
-      basedir="${build}" includes="tiled/core/**/*.class,tiled/io/**"/>
+      basedir="${build}" includes="tiled/core/**/*.class,tiled/io/**,tiled/mapeditor/util/cutter/**,tiled/util/Util.class,tiled/util/Base64.class,tiled/util/NumberedSet.class,tiled/mapeditor/util/TransparentImageFilter.class"/>
   </target>
 
   <target name="dist_dep" depends="compile_dep"

Modified: branches/adam/src/tiled/io/xml/XMLMapTransformer.java
===================================================================
--- branches/adam/src/tiled/io/xml/XMLMapTransformer.java	2007-01-13 13:11:56 UTC (rev 719)
+++ branches/adam/src/tiled/io/xml/XMLMapTransformer.java	2007-01-24 10:34:55 UTC (rev 720)
@@ -792,7 +792,7 @@
     public String getDescription() {
         return "This is the core Tiled TMX format reader\n" +
             "\n" +
-            "Tiled Map Editor, (c) 2004-2006\n" +
+            "Tiled Map Editor, (c) 2004-2007\n" +
             "Adam Turk\n" +
             "Bjorn Lindeijer";
     }

Modified: branches/adam/src/tiled/mapeditor/MapEditor.java
===================================================================
--- branches/adam/src/tiled/mapeditor/MapEditor.java	2007-01-13 13:11:56 UTC (rev 719)
+++ branches/adam/src/tiled/mapeditor/MapEditor.java	2007-01-24 10:34:55 UTC (rev 720)
@@ -1930,9 +1930,18 @@
      */
     public void saveMapImage(String filename) {
         if (filename == null) {
+            
             JFileChooser chooser = new JFileChooser();
             chooser.setDialogTitle("Save as image");
 
+            //make sure the user knows what they can use
+            ImageIO.scanForPlugins();
+            String[] list = ImageIO.getWriterFormatNames();
+            for(int i=0;i<list.length;i++) {
+                if(list[i].matches("[A-Z].*"))
+                    chooser.addChoosableFileFilter(new BasicFileFilter(list[i], list[i].toLowerCase()));
+            }
+            
             if (chooser.showSaveDialog(appFrame) ==
                     JFileChooser.APPROVE_OPTION) {
                 filename = chooser.getSelectedFile().getAbsolutePath();
@@ -1948,13 +1957,15 @@
 
             try {
                 BufferedImage img = new BufferedImage(
-                        imgSize.width, imgSize.height, BufferedImage.TYPE_INT_ARGB);
+                        imgSize.width, imgSize.height, BufferedImage.TYPE_INT_RGB);
                 Graphics2D g = img.createGraphics();
+                g.setBackground(Color.pink);
+                g.clearRect(0, 0, imgSize.width, imgSize.height);
                 g.setClip(0, 0, imgSize.width, imgSize.height);
                 myView.paint(g);
 
                 int lastDot = filename.lastIndexOf('.');
-                String format = filename.substring(lastDot + 1);
+                String format = filename.substring(lastDot + 1).toUpperCase();
 
                 try {
                     ImageIO.write(img, format, new File(filename));

Added: branches/adam/src/tiled/mapeditor/util/BasicFileFilter.java
===================================================================
--- branches/adam/src/tiled/mapeditor/util/BasicFileFilter.java	2007-01-13 13:11:56 UTC (rev 719)
+++ branches/adam/src/tiled/mapeditor/util/BasicFileFilter.java	2007-01-24 10:34:55 UTC (rev 720)
@@ -0,0 +1,27 @@
+package tiled.mapeditor.util;
+
+import java.io.File;
+
+public class BasicFileFilter extends ConfirmableFileFilter {
+
+    private String ext, desc;
+    
+    public BasicFileFilter(String desc, String ext) {
+        this.desc = desc;
+        this.ext = ext;
+    }
+    
+    public String getDefaultExtension() {
+        return ext;
+    }
+
+    public boolean accept(File f) {
+        String fileName = f.getPath().toLowerCase();
+        return fileName.endsWith("."+ext);
+    }
+
+    public String getDescription() {
+        return desc+" (*."+ext+")";
+    }
+
+}