diff --git a/src/com/jpexs/decompiler/flash/gui/dumpview/DumpViewPanel.java b/src/com/jpexs/decompiler/flash/gui/dumpview/DumpViewPanel.java
index 09fdb08b4..5afa7f416 100644
--- a/src/com/jpexs/decompiler/flash/gui/dumpview/DumpViewPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/dumpview/DumpViewPanel.java
@@ -1,195 +1,358 @@
-/*
- * Copyright (C) 2010-2016 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 path = new ArrayList<>();
- while (di != null) {
- path.add(0, di);
- di = di.parent;
- }
- path.add(0, model.getRoot());
- TreePath tp = new TreePath(path.toArray());
- skipNextScroll = true;
- dumpTree.setSelectionPath(tp);
- dumpTree.scrollPathToVisible(tp);
- }
-
- byte[] data = dumpViewHexTable.getData();
- byteMouseMoved(lastAddressUnderCursor, lastAddressUnderCursor == -1 ? 0 : data[lastAddressUnderCursor]);
- }
-
- @Override
- public void byteMouseMoved(int address, byte b) {
- lastAddressUnderCursor = address;
- if (address == -1) {
- address = dumpViewHexTable.getFocusedByteIdx();
- if (address != -1) {
- byte[] data = dumpViewHexTable.getData();
- b = data[address];
- }
- }
-
- if (address != -1) {
- int b2 = b & 0xff;
- selectedByteInfo.setText("Addr: " + String.format("%08X", address)
- + " Hex: " + String.format("%02X", b)
- + " Dec: " + b2
- + " Bin: " + Helper.padZeros(Integer.toBinaryString(b2), 8)
- + " Ascii: " + (char) b2
- );
- } else {
- selectedByteInfo.setText("-");
- }
- }
- });
-
- add(new JScrollPane(dumpViewHexTable), BorderLayout.CENTER);
- }
-
- public void clear() {
- selectedDumpInfo = null;
- }
-
- public void setSelectedNode(DumpInfo dumpInfo) {
- if (this.selectedDumpInfo == dumpInfo) {
- skipNextScroll = false;
- return;
- }
-
- this.selectedDumpInfo = dumpInfo;
- byte[] data = DumpInfoSwfNode.getSwfNode(dumpInfo).getSwf().originalUncompressedData;
- List dumpInfos = new ArrayList<>();
- DumpInfo di = dumpInfo;
- while (di.parent != null) {
- dumpInfos.add(di);
- di = di.parent;
- }
- long[] highlightStarts = new long[dumpInfos.size()];
- long[] highlightEnds = new long[dumpInfos.size()];
- for (int i = 0; i < dumpInfos.size(); i++) {
- DumpInfo di2 = dumpInfos.get(highlightStarts.length - i - 1);
- highlightStarts[i] = di2.startByte;
- highlightEnds[i] = di2.getEndByte();
- }
- dumpViewHexTable.setData(data, highlightStarts, highlightEnds);
- dumpViewHexTable.revalidate();
-
- if (dumpInfo.lengthBytes != 0 || dumpInfo.lengthBits != 0) {
- int selectionStart = (int) dumpInfo.startByte;
- int selectionEnd = (int) dumpInfo.getEndByte();
-
- if (!skipNextScroll) {
- skipValueChange = true;
- dumpViewHexTable.scrollToByte(highlightStarts, highlightEnds);
- skipValueChange = false;
- }
-
- setLabelText("startByte: " + dumpInfo.startByte
- + " startBit: " + dumpInfo.startBit
- + " lengthBytes: " + dumpInfo.lengthBytes
- + " lengthBits: " + dumpInfo.lengthBits
- + " selectionStart: " + selectionStart
- + " selectionEnd: " + selectionEnd);
- }
-
- skipNextScroll = false;
- repaint();
- }
-
- public void setLabelText(String text) {
- dumpViewLabel.setText(text);
- }
-}
+/*
+ * Copyright (C) 2010-2016 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 path = new ArrayList<>();
+ while (di != null) {
+ path.add(0, di);
+ di = di.parent;
+ }
+ path.add(0, model.getRoot());
+ TreePath tp = new TreePath(path.toArray());
+ skipNextScroll = true;
+ dumpTree.setSelectionPath(tp);
+ dumpTree.scrollPathToVisible(tp);
+ }
+
+ byte[] data = dumpViewHexTable.getData();
+ byteMouseMoved(lastAddressUnderCursor, lastAddressUnderCursor == -1 ? 0 : data[lastAddressUnderCursor]);
+ }
+
+ @Override
+ public void byteMouseMoved(int address, byte b) {
+ lastAddressUnderCursor = address;
+ if (address == -1) {
+ address = dumpViewHexTable.getFocusedByteIdx();
+ if (address != -1) {
+ byte[] data = dumpViewHexTable.getData();
+ b = data[address];
+ }
+ }
+
+ if (address != -1) {
+ int b2 = b & 0xff;
+ selectedByteInfo.setText("Addr: " + String.format("%08X", address)
+ + " Hex: " + String.format("%02X", b)
+ + " Dec: " + b2
+ + " Bin: " + Helper.padZeros(Integer.toBinaryString(b2), 8)
+ + " Ascii: " + (char) b2
+ );
+ } else {
+ selectedByteInfo.setText("-");
+ }
+ }
+ });
+
+ searchPanel = new JPanel();
+ searchPanel.setLayout(new BorderLayout());
+ searchPanel.add(filterField, BorderLayout.CENTER);
+ searchPanel.add(new JLabel(View.getIcon("search16")), BorderLayout.WEST);
+ JLabel closeSearchButton = new JLabel(View.getIcon("cancel16"));
+ closeSearchButton.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ closeDumpViewSearch();
+ }
+ });
+ searchPanel.add(closeSearchButton, BorderLayout.EAST);
+ searchPanel.setVisible(false);
+
+ dumpViewHexTable.addKeyListener(new KeyAdapter() {
+ @Override
+ public void keyPressed(KeyEvent e) {
+ if ((e.getKeyCode() == 'F') && (e.isControlDown())) {
+ searchPanel.setVisible(true);
+ filterField.requestFocusInWindow();
+ }
+ }
+ });
+
+ filterField.getDocument().addDocumentListener(new DocumentListener() {
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ warn();
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ warn();
+ }
+
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ warn();
+ }
+
+ public void warn() {
+ doSearch();
+ }
+ });
+
+ add(new JScrollPane(dumpViewHexTable), BorderLayout.CENTER);
+ add(searchPanel, BorderLayout.SOUTH);
+ }
+
+ public void closeDumpViewSearch() {
+ filterField.setText("");
+ doSearch();
+ searchPanel.setVisible(false);
+ }
+
+ private void doSearch() {
+ filterField.setBackground(Color.white);
+
+ String text = filterField.getText();
+ if (text.length() == 0) {
+ dumpViewHexTable.clearSelectedBytes();
+ return;
+ }
+
+ byte[] data = dumpViewHexTable.getData();
+
+ byte[] textBytes = Utf8Helper.getBytes(text);
+ byte[] hex = getAsHex(text);
+ byte[] foundArray = textBytes;
+
+ int pos = textBytes == null ? -1 : findHex(data, textBytes, 0, data.length);
+ int hexPos = hex == null ? -1 : findHex(data, hex, 0, data.length);
+
+ if (pos == -1 || (hexPos != -1 && hexPos < pos)) {
+ pos = hexPos;
+ foundArray = hex;
+ }
+
+ if (pos != -1) {
+ dumpViewHexTable.selectBytes(pos, foundArray.length);
+ } else {
+ dumpViewHexTable.clearSelectedBytes();
+ filterField.setBackground(Color.red);
+ }
+ }
+
+ private int findHex(byte[] data, byte[] searchData, int from, int to) {
+ for (int i = from; i < to; i++) {
+ if (isMatch(data, searchData, i)) {
+ return i;
+ }
+ }
+
+ return -1;
+ }
+
+ private boolean isMatch(byte[] data, byte[] searchData, int pos) {
+ if (pos + searchData.length > data.length) {
+ return false;
+ }
+
+ for (int i = 0; i < searchData.length; i++) {
+ if (data[pos + i] != searchData[i]) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ private byte[] getAsHex(String text) {
+ int charCount = 0;
+ for (int i = 0; i < text.length(); i++) {
+ char ch = Character.toUpperCase(text.charAt(i));
+ boolean whiteSpace = Character.isWhitespace(ch);
+ if (!((ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'F') || whiteSpace)) {
+ return null;
+ }
+
+ if (!whiteSpace) {
+ charCount++;
+ }
+ }
+
+ if (charCount % 2 == 1) {
+ // hex character count should be even
+ return null;
+ }
+
+ byte[] result = new byte[charCount / 2];
+ int cnt = 0;
+ int v0 = 0;
+ for (int i = 0; i < text.length(); i++) {
+ char ch = Character.toUpperCase(text.charAt(i));
+ if (Character.isWhitespace(ch)) {
+ continue;
+ }
+
+ int v = Integer.parseInt(Character.toString(ch), 16);
+
+ if (cnt % 2 == 1) {
+ result[cnt / 2] = (byte) (v0 * 16 + v);
+ } else {
+ v0 = v;
+ }
+
+ cnt++;
+ }
+
+ return result;
+ }
+
+ public void clear() {
+ selectedDumpInfo = null;
+ }
+
+ public void setSelectedNode(DumpInfo dumpInfo) {
+ if (this.selectedDumpInfo == dumpInfo) {
+ skipNextScroll = false;
+ return;
+ }
+
+ this.selectedDumpInfo = dumpInfo;
+ byte[] data = DumpInfoSwfNode.getSwfNode(dumpInfo).getSwf().originalUncompressedData;
+ List dumpInfos = new ArrayList<>();
+ DumpInfo di = dumpInfo;
+ while (di.parent != null) {
+ dumpInfos.add(di);
+ di = di.parent;
+ }
+ long[] highlightStarts = new long[dumpInfos.size()];
+ long[] highlightEnds = new long[dumpInfos.size()];
+ for (int i = 0; i < dumpInfos.size(); i++) {
+ DumpInfo di2 = dumpInfos.get(highlightStarts.length - i - 1);
+ highlightStarts[i] = di2.startByte;
+ highlightEnds[i] = di2.getEndByte();
+ }
+ dumpViewHexTable.setData(data, highlightStarts, highlightEnds);
+ dumpViewHexTable.revalidate();
+
+ if (dumpInfo.lengthBytes != 0 || dumpInfo.lengthBits != 0) {
+ int selectionStart = (int) dumpInfo.startByte;
+ int selectionEnd = (int) dumpInfo.getEndByte();
+
+ if (!skipNextScroll) {
+ skipValueChange = true;
+ dumpViewHexTable.scrollToByte(highlightStarts, highlightEnds);
+ skipValueChange = false;
+ }
+
+ setLabelText("startByte: " + dumpInfo.startByte
+ + " startBit: " + dumpInfo.startBit
+ + " lengthBytes: " + dumpInfo.lengthBytes
+ + " lengthBits: " + dumpInfo.lengthBits
+ + " selectionStart: " + selectionStart
+ + " selectionEnd: " + selectionEnd);
+ }
+
+ skipNextScroll = false;
+ repaint();
+ }
+
+ public void setLabelText(String text) {
+ dumpViewLabel.setText(text);
+ }
+}
diff --git a/src/com/jpexs/decompiler/flash/gui/hexview/HexView.java b/src/com/jpexs/decompiler/flash/gui/hexview/HexView.java
index 704ef3d30..5ec5cdf87 100644
--- a/src/com/jpexs/decompiler/flash/gui/hexview/HexView.java
+++ b/src/com/jpexs/decompiler/flash/gui/hexview/HexView.java
@@ -1,271 +1,296 @@
-/*
- * Copyright (C) 2010-2016 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