From 9b9cba2f4806589012e1e0eb9c13db41e52ed441 Mon Sep 17 00:00:00 2001
From: Steven Cao <ffxbacao@gmail.com>
Date: Sun, 3 Aug 2014 07:02:46 -0500
Subject: [PATCH] export image fiile with classname/export namme

---
 .gitattributes                                |   4 +-
 .../flash/tags/base/CharacterTag.java         | 138 ++++++++++--------
 2 files changed, 81 insertions(+), 61 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index d06884195..80ac20493 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,11 +1,11 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
+#* text=auto
 
 # Explicitly declare text files you want to always be normalized and converted
 # to native line endings on checkout.
 *.c text
 *.h text
-*.java text
+*.java text eol=crlf
 
 # Declare files that will always have CRLF line endings on checkout.
 *.sln text eol=crlf
diff --git a/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java b/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java
index dd9a341c8..9f53bdd50 100644
--- a/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java
+++ b/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java
@@ -1,59 +1,79 @@
-/*
- *  Copyright (C) 2010-2014 JPEXS
- * 
- *  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 3 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, see <http://www.gnu.org/licenses/>.
- */
-package com.jpexs.decompiler.flash.tags.base;
-
-import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.helpers.ByteArrayRange;
-
-/**
- *
- * @author JPEXS
- */
-public abstract class CharacterTag extends CharacterIdTag {
-
-    protected String className;
-
-    public CharacterTag(SWF swf, int id, String name, ByteArrayRange data) {
-        super(swf, id, name, data);
-    }
-
-    public void setClassName(String className) {
-        this.className = className;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    @Override
-    public String getName() {
-        String nameAppend = "";
-        if (exportName != null) {
-            nameAppend = ": " + exportName;
-        }
-        if (className != null) {
-            nameAppend = ": " + className;
-        }
-        if (getCharacterId() != -1) {
-            return tagName + " (" + getCharacterId() + nameAppend + ")";
-        }
-        if (!nameAppend.isEmpty()) {
-            return tagName + " (" + nameAppend + ")";
-        }
-        return tagName;
-    }
-}
+/*
+ *  Copyright (C) 2010-2014 JPEXS
+ * 
+ *  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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+package com.jpexs.decompiler.flash.tags.base;
+
+import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.helpers.ByteArrayRange;
+
+/**
+ *
+ * @author JPEXS
+ */
+public abstract class CharacterTag extends CharacterIdTag {
+
+    protected String className;
+
+    public CharacterTag(SWF swf, int id, String name, ByteArrayRange data) {
+        super(swf, id, name, data);
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    @Override
+    public String getName() {
+        String nameAppend = "";
+        if (exportName != null) {
+            nameAppend = ": " + exportName;
+        }
+        if (className != null) {
+            nameAppend = ": " + className;
+        }
+        if (getCharacterId() != -1) {
+            return tagName + " (" + getCharacterId() + nameAppend + ")";
+        }
+        if (!nameAppend.isEmpty()) {
+            return tagName + " (" + nameAppend + ")";
+        }
+        return tagName;
+    }
+     /*
+    export with classname/export namme
+    */
+    public String getExportFileName2() {
+        String nameAppend = "";
+        if (exportName != null) {
+            nameAppend = ": " + exportName;
+            return exportName;
+        }
+        if (className != null) {
+            nameAppend = ": " + className;
+            return className;
+        }
+        if (getCharacterId() != -1) {
+            return getCharacterId()+"";
+           // return tagName + " (" + getCharacterId() + nameAppend + ")";
+        }
+        
+        return tagName;
+    }
+}