others tag: placeobjects and removeobjcts removed, ui fixed

This commit is contained in:
Honfika
2014-02-01 20:31:00 +01:00
parent 15125afd29
commit 39c005a18d
3 changed files with 20 additions and 6 deletions

View File

@@ -1002,10 +1002,10 @@ public class Main {
Socket sock = new Socket("www.free-decompiler.com", 80);
OutputStream os = sock.getOutputStream();
String currentLoc = Configuration.locale.get("en");
os.write(("GET /flash/update.html?action=check&currentVersion=" + ApplicationInfo.version + " HTTP/1.1\r\n"+
"Host: www.free-decompiler.com\r\n"
os.write(("GET /flash/update.html?action=check&currentVersion=" + ApplicationInfo.version + " HTTP/1.1\r\n"
+ "Host: www.free-decompiler.com\r\n"
+ "User-Agent: " + ApplicationInfo.shortApplicationVerName + "\r\n"
+ "Accept-Language: "+currentLoc+("en".equals(currentLoc)?"":", en;q=0.8") + "\r\n"
+ "Accept-Language: " + currentLoc + ("en".equals(currentLoc) ? "" : ", en;q=0.8") + "\r\n"
+ "Connection: close\r\n"
+ "\r\n").getBytes());
BufferedReader br = new BufferedReader(new InputStreamReader(sock.getInputStream()));

View File

@@ -131,6 +131,7 @@ import java.awt.dnd.DropTarget;
import java.awt.dnd.DropTargetDropEvent;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ComponentListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
@@ -497,10 +498,10 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
private JPanel createGenericTagCard() {
JPanel genericTagCard = new JPanel(new BorderLayout());
JPanel genericTagPanel = new JPanel();
JPanel genericTagPanel = new JPanel(new BorderLayout());
genericTagPropertiesEditorPane = new JEditorPane();
genericTagPropertiesEditorPane.setEditable(false);
genericTagPanel.add(genericTagPropertiesEditorPane);
genericTagPanel.add(new JScrollPane(genericTagPropertiesEditorPane));
genericTagCard.add(genericTagPanel, BorderLayout.CENTER);
return genericTagCard;

View File

@@ -26,6 +26,12 @@ import com.jpexs.decompiler.flash.gui.treenodes.SWFNode;
import com.jpexs.decompiler.flash.gui.treenodes.StringNode;
import com.jpexs.decompiler.flash.gui.treenodes.TagTreeRoot;
import com.jpexs.decompiler.flash.tags.DefineSpriteTag;
import com.jpexs.decompiler.flash.tags.PlaceObject2Tag;
import com.jpexs.decompiler.flash.tags.PlaceObject3Tag;
import com.jpexs.decompiler.flash.tags.PlaceObject4Tag;
import com.jpexs.decompiler.flash.tags.PlaceObjectTag;
import com.jpexs.decompiler.flash.tags.RemoveObject2Tag;
import com.jpexs.decompiler.flash.tags.RemoveObjectTag;
import com.jpexs.decompiler.flash.tags.SoundStreamBlockTag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.tags.base.SoundStreamHeadTypeTag;
@@ -119,7 +125,14 @@ public class TagTreeModel implements TreeModel {
case BINARY_DATA: binaryData.add(new TagNode(t)); break;
default:
if (!actionScriptTags.contains(t)) {
others.add(new TagNode(t));
if (!(t instanceof PlaceObjectTag
|| t instanceof PlaceObject2Tag
|| t instanceof PlaceObject3Tag
|| t instanceof PlaceObject4Tag
|| t instanceof RemoveObjectTag
|| t instanceof RemoveObject2Tag)) {
others.add(new TagNode(t));
}
}
break;
}