Thread: [Gridarta-commit] SF.net SVN: gridarta: [4022] trunk (Page 58)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4022
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4022&view=rev
Author:   akirschbaum
Date:     2008-05-17 04:55:25 -0700 (Sat, 17 May 2008)

Log Message:
-----------
Move FilterFaceProvider to common code base.

Modified Paths:
--------------
    trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gameobject/face/FilterFaceProvider.java

Removed Paths:
-------------
    trunk/daimonin/src/daieditor/gameobject/face/FilterFaceProvider.java

Modified: trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java
===================================================================

--- trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2008-05-17 11:54:05 UTC (rev 4021)
+++ trunk/daimonin/src/daieditor/gameobject/face/FaceObjects.java	2008-05-17 11:55:25 UTC (rev 4022)
@@ -41,6 +41,7 @@
 import net.sf.gridarta.gameobject.face.CollectedFaceProvider;
 import net.sf.gridarta.gameobject.face.DuplicateFaceException;
 import net.sf.gridarta.gameobject.face.FaceProvider;
+import net.sf.gridarta.gameobject.face.FilterFaceProvider;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.misc.Progress;
 import org.apache.log4j.Logger;

Deleted: trunk/daimonin/src/daieditor/gameobject/face/FilterFaceProvider.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/face/FilterFaceProvider.java	2008-05-17 11:54:05 UTC (rev 4021)
+++ trunk/daimonin/src/daieditor/gameobject/face/FilterFaceProvider.java	2008-05-17 11:55:25 UTC (rev 4022)
@@ -1,91 +0,0 @@
-/*
- * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
- * Copyright (C) 2000-2007 The Gridarta Developers.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package daieditor.gameobject.face;
-
-import java.awt.Toolkit;
-import java.awt.image.FilteredImageSource;
-import java.awt.image.ImageFilter;
-import javax.swing.ImageIcon;
-import net.sf.gridarta.gameobject.face.AbstractFaceProvider;
-import net.sf.gridarta.gameobject.face.FaceProvider;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A FilterFaceProvider provides modified versions of icons provided by another FaceProvider by applying a Filter.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- */
-public final class FilterFaceProvider extends AbstractFaceProvider {
-
-    /** The FaceProvider to get the original icon from. */
-    @Nullable private FaceProvider parent = null;
-
-    /** The Filter to apply. */
-    @NotNull private final ImageFilter filter;
-
-    /**
-     * Create a FilterFaceProvider.
-     * The parent is unset.
-     * The parent must be set with {@link #setParent(FaceProvider)} bevore invoking {@link #getImageIconForFacename(String)} or {@link #createImage(String)} or getting
-     * a face resp. creating an image will throw an IllegalStateException.
-     * @param filter ImageFilter to apply for creating the images
-     */
-    public FilterFaceProvider(@NotNull final ImageFilter filter) {
-        this.filter = filter;
-    }
-
-    /**
-     * Create a FilterFaceProvider.
-     * @param parent parent provider to get unfiltered images from
-     * @param filter ImageFilter to apply for creating the images
-     */
-    public FilterFaceProvider(@NotNull final FaceProvider parent, @NotNull final ImageFilter filter) {
-        this.parent = parent;
-        this.filter = filter;
-    }
-
-    /**
-     * Sets a new provider as parent.
-     * @param parent parent provider to get unfiltered images from
-     */
-    public void setParent(@NotNull final FaceProvider parent) {
-        this.parent = parent;
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override protected ImageIcon createImage(@NotNull final String faceName) {
-        if (parent == null) {
-            return null;
-        }
-        final ImageIcon imageIcon = parent.getImageIconForFacename(faceName);
-        if (imageIcon == null) {
-            return null;
-        }
-        try {
-            return new ImageIcon(Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(imageIcon.getImage().getSource(), filter)));
-        } catch (final Exception e) {
-            if (parent == null) {
-                throw new IllegalStateException("FilterFaceProvider in use but parent not set.");
-            }
-            return null;
-        }
-    }
-
-} // class FilterFaceProdiver

Copied: trunk/src/app/net/sf/gridarta/gameobject/face/FilterFaceProvider.java (from rev 4019, trunk/daimonin/src/daieditor/gameobject/face/FilterFaceProvider.java)
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/face/FilterFaceProvider.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gameobject/face/FilterFaceProvider.java	2008-05-17 11:55:25 UTC (rev 4022)
@@ -0,0 +1,89 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2007 The Gridarta Developers.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gameobject.face;
+
+import java.awt.Toolkit;
+import java.awt.image.FilteredImageSource;
+import java.awt.image.ImageFilter;
+import javax.swing.ImageIcon;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A FilterFaceProvider provides modified versions of icons provided by another FaceProvider by applying a Filter.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ */
+public final class FilterFaceProvider extends AbstractFaceProvider {
+
+    /** The FaceProvider to get the original icon from. */
+    @Nullable private FaceProvider parent = null;
+
+    /** The Filter to apply. */
+    @NotNull private final ImageFilter filter;
+
+    /**
+     * Create a FilterFaceProvider.
+     * The parent is unset.
+     * The parent must be set with {@link #setParent(FaceProvider)} bevore invoking {@link #getImageIconForFacename(String)} or {@link #createImage(String)} or getting
+     * a face resp. creating an image will throw an IllegalStateException.
+     * @param filter ImageFilter to apply for creating the images
+     */
+    public FilterFaceProvider(@NotNull final ImageFilter filter) {
+        this.filter = filter;
+    }
+
+    /**
+     * Create a FilterFaceProvider.
+     * @param parent parent provider to get unfiltered images from
+     * @param filter ImageFilter to apply for creating the images
+     */
+    public FilterFaceProvider(@NotNull final FaceProvider parent, @NotNull final ImageFilter filter) {
+        this.parent = parent;
+        this.filter = filter;
+    }
+
+    /**
+     * Sets a new provider as parent.
+     * @param parent parent provider to get unfiltered images from
+     */
+    public void setParent(@NotNull final FaceProvider parent) {
+        this.parent = parent;
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override protected ImageIcon createImage(@NotNull final String faceName) {
+        if (parent == null) {
+            return null;
+        }
+        final ImageIcon imageIcon = parent.getImageIconForFacename(faceName);
+        if (imageIcon == null) {
+            return null;
+        }
+        try {
+            return new ImageIcon(Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(imageIcon.getImage().getSource(), filter)));
+        } catch (final Exception e) {
+            if (parent == null) {
+                throw new IllegalStateException("FilterFaceProvider in use but parent not set.");
+            }
+            return null;
+        }
+    }
+
+} // class FilterFaceProdiver


Property changes on: trunk/src/app/net/sf/gridarta/gameobject/face/FilterFaceProvider.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + LF


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Gridarta-commit] SF.net SVN: gridarta: [4022] trunk (Page 58)

gridarta-commit