LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-29 18:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

format code

Browse Source
This commit is contained in:
honfika@gmail.com
2014-11-08 00:14:11 +01:00
parent e6cd239cc7
commit c88b30997b
6 changed files with 115 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java
View File

@@ -62,86 +62,83 @@ public class FolderPreviewPanel extends JPanel {
private static final ExecutorService executor;
private List<TreeItem> items;
private int selectedIndex = -1;
public Map<Integer,TreeItem> selectedItems = new HashMap<>();
private Cache<Integer,SerializableImage> cachedPreviews;
private static final int PREVIEW_SIZE = 150;
public Map<Integer, TreeItem> selectedItems = new HashMap<>();
private Cache<Integer, SerializableImage> cachedPreviews;
private static final int PREVIEW_SIZE = 150;
private static final int BORDER_SIZE = 5;
private static final int LABEL_HEIGHT=20;
private static final int CELL_HEIGHT = 2*BORDER_SIZE + PREVIEW_SIZE + LABEL_HEIGHT;
private static final int CELL_WIDTH = 2*BORDER_SIZE + PREVIEW_SIZE;
private static final SerializableImage noImage = new SerializableImage(PREVIEW_SIZE,PREVIEW_SIZE,BufferedImage.TYPE_INT_ARGB);
static{
private static final int LABEL_HEIGHT = 20;
private static final int CELL_HEIGHT = 2 * BORDER_SIZE + PREVIEW_SIZE + LABEL_HEIGHT;
private static final int CELL_WIDTH = 2 * BORDER_SIZE + PREVIEW_SIZE;
private static final SerializableImage noImage = new SerializableImage(PREVIEW_SIZE, PREVIEW_SIZE, BufferedImage.TYPE_INT_ARGB);
static {
noImage.fillTransparent();
executor = Executors.newFixedThreadPool(Configuration.parallelSpeedUp.get() ? Configuration.parallelThreadCount.get() : 1);
}
public FolderPreviewPanel(final MainPanel mainPanel, List<TreeItem> items) {
this.items = items;
cachedPreviews = Cache.getInstance(false);
addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
if(e.getClickCount() >1){
if(selectedIndex>-1){
if (e.getClickCount() > 1) {
if (selectedIndex > -1) {
mainPanel.setTagTreeSelectedNode(FolderPreviewPanel.this.items.get(selectedIndex));
}
}
}
@Override
public void mousePressed(MouseEvent e) {
int width = getWidth();
int cols = width / CELL_WIDTH;
int rows = (int)Math.ceil(FolderPreviewPanel.this.items.size() / (float)cols);
int rows = (int) Math.ceil(FolderPreviewPanel.this.items.size() / (float) cols);
int x = e.getX() / CELL_WIDTH;
int y = e.getY() / CELL_HEIGHT;
int index=y*cols+x;
if(index>=FolderPreviewPanel.this.items.size()){
int index = y * cols + x;
if (index >= FolderPreviewPanel.this.items.size()) {
return;
}
if(e.getButton() == MouseEvent.BUTTON1 || selectedItems.isEmpty()){
if(!e.isControlDown()){
selectedItems.clear();
}
int oldSelectedIndex = selectedIndex;
selectedIndex = index;
if(e.isShiftDown() && oldSelectedIndex>-1){
int minindex=Math.min(selectedIndex, oldSelectedIndex);
int maxindex=Math.max(selectedIndex, oldSelectedIndex);
for(int i=minindex;i<=maxindex;i++){
selectedItems.put(i, FolderPreviewPanel.this.items.get(i));
if (e.getButton() == MouseEvent.BUTTON1 || selectedItems.isEmpty()) {
if (!e.isControlDown()) {
selectedItems.clear();
}
selectedIndex = oldSelectedIndex;
}else{
TreeItem ti=FolderPreviewPanel.this.items.get(index);
if(!selectedItems.containsKey(selectedIndex)){
selectedItems.put(selectedIndex,ti);
}else{
selectedItems.remove(selectedIndex);
selectedIndex = -1;
int oldSelectedIndex = selectedIndex;
selectedIndex = index;
if (e.isShiftDown() && oldSelectedIndex > -1) {
int minindex = Math.min(selectedIndex, oldSelectedIndex);
int maxindex = Math.max(selectedIndex, oldSelectedIndex);
for (int i = minindex; i <= maxindex; i++) {
selectedItems.put(i, FolderPreviewPanel.this.items.get(i));
}
selectedIndex = oldSelectedIndex;
} else {
TreeItem ti = FolderPreviewPanel.this.items.get(index);
if (!selectedItems.containsKey(selectedIndex)) {
selectedItems.put(selectedIndex, ti);
} else {
selectedItems.remove(selectedIndex);
selectedIndex = -1;
}
}
}
}
if(e.getButton() == MouseEvent.BUTTON3){
if (e.getButton() == MouseEvent.BUTTON3) {
mainPanel.tagTree.updateContextMenu(mainPanel.tagTree.swfs, new ArrayList<>(selectedItems.values()));
mainPanel.tagTree.contextPopupMenu.show(FolderPreviewPanel.this, e.getX(),e.getY());
mainPanel.tagTree.contextPopupMenu.show(FolderPreviewPanel.this, e.getX(), e.getY());
}
repaint();
}
});
});
}
public synchronized void setItems(List<TreeItem> items) {
@@ -152,76 +149,71 @@ public class FolderPreviewPanel extends JPanel {
selectedItems.clear();
selectedIndex = -1;
}
@Override
public Dimension getPreferredSize() {
int width = getParent().getSize().width-20;
int width = getParent().getSize().width - 20;
int cols = width / CELL_WIDTH;
int rows = (int)Math.ceil(items.size() / (float)cols);
int height = rows*CELL_HEIGHT;
return (new Dimension(width,height));
int rows = (int) Math.ceil(items.size() / (float) cols);
int height = rows * CELL_HEIGHT;
return (new Dimension(width, height));
}
@Override
public void paint(Graphics g) {
super.paint(g);
Rectangle r = getVisibleRect();
int width = getWidth();
int cols = width / CELL_WIDTH;
int rows = (int)Math.ceil(items.size() / (float)cols);
int height = rows*CELL_HEIGHT;
int start_y = r.y / CELL_HEIGHT;
int rows = (int) Math.ceil(items.size() / (float) cols);
int height = rows * CELL_HEIGHT;
int start_y = r.y / CELL_HEIGHT;
JLabel l = new JLabel();
Font f = l.getFont().deriveFont(AffineTransform.getScaleInstance(0.8, 0.8));
int finish_y = (int)Math.ceil((r.y + r.height) / (float)CELL_HEIGHT);
g.setColor(Color.black);
for(int y=start_y;y<=finish_y;y++){
for(int x=0;x<cols;x++){
int finish_y = (int) Math.ceil((r.y + r.height) / (float) CELL_HEIGHT);
g.setColor(Color.black);
for (int y = start_y; y <= finish_y; y++) {
for (int x = 0; x < cols; x++) {
int index = y * cols + x;
if(index<items.size()){
g.setColor(new Color(0xd9,0xe8,0xfb));
if(selectedItems.containsKey(index)){
g.setColor(new Color(0xfe,0xca,0x81));
if (index < items.size()) {
g.setColor(new Color(0xd9, 0xe8, 0xfb));
if (selectedItems.containsKey(index)) {
g.setColor(new Color(0xfe, 0xca, 0x81));
}
g.fillRect(x*CELL_WIDTH,y*CELL_HEIGHT, CELL_WIDTH,CELL_HEIGHT);
if(cachedPreviews.contains(index)){
BufferedImage img=cachedPreviews.get(index).getBufferedImage();
g.drawImage(img, x*CELL_WIDTH+BORDER_SIZE+PREVIEW_SIZE/2-img.getWidth()/2, y*CELL_HEIGHT+BORDER_SIZE+PREVIEW_SIZE/2-img.getHeight()/2, null);
}else{
g.fillRect(x * CELL_WIDTH, y * CELL_HEIGHT, CELL_WIDTH, CELL_HEIGHT);
if (cachedPreviews.contains(index)) {
BufferedImage img = cachedPreviews.get(index).getBufferedImage();
g.drawImage(img, x * CELL_WIDTH + BORDER_SIZE + PREVIEW_SIZE / 2 - img.getWidth() / 2, y * CELL_HEIGHT + BORDER_SIZE + PREVIEW_SIZE / 2 - img.getHeight() / 2, null);
} else {
cachedPreviews.put(index, noImage);
renderImageTask(index,items.get(index));
renderImageTask(index, items.get(index));
}
String s;
TreeItem treeItem = items.get(index);
if (treeItem instanceof Tag) {
s = ((Tag) treeItem).getTagName();
if (treeItem instanceof CharacterTag) {
s = s + " (" + ((CharacterTag) treeItem).getCharacterId() + ")";
}
} else {
s = treeItem.toString();
}
String s;
TreeItem treeItem = items.get(index);
if (treeItem instanceof Tag) {
s = ((Tag) treeItem).getTagName();
if (treeItem instanceof CharacterTag) {
s = s + " (" + ((CharacterTag) treeItem).getCharacterId() + ")";
}
} else {
s = treeItem.toString();
}
g.setFont(f);
g.setColor(Color.black);
g.drawLine( x*CELL_WIDTH,y*CELL_HEIGHT+BORDER_SIZE+PREVIEW_SIZE, x*CELL_WIDTH+CELL_WIDTH, y*CELL_HEIGHT+BORDER_SIZE+PREVIEW_SIZE);
g.drawString(s, x*CELL_WIDTH+BORDER_SIZE,y*CELL_HEIGHT+BORDER_SIZE+PREVIEW_SIZE+LABEL_HEIGHT);
g.drawRect(x*CELL_WIDTH,y*CELL_HEIGHT, CELL_WIDTH,CELL_HEIGHT);
g.drawLine(x * CELL_WIDTH, y * CELL_HEIGHT + BORDER_SIZE + PREVIEW_SIZE, x * CELL_WIDTH + CELL_WIDTH, y * CELL_HEIGHT + BORDER_SIZE + PREVIEW_SIZE);
g.drawString(s, x * CELL_WIDTH + BORDER_SIZE, y * CELL_HEIGHT + BORDER_SIZE + PREVIEW_SIZE + LABEL_HEIGHT);
g.drawRect(x * CELL_WIDTH, y * CELL_HEIGHT, CELL_WIDTH, CELL_HEIGHT);
}
}
}
setSize(new Dimension(width,height));
}
private synchronized void renderImageTask(final int index,final TreeItem treeItem) {
setSize(new Dimension(width, height));
}
private synchronized void renderImageTask(final int index, final TreeItem treeItem) {
executor.submit(new Callable<Void>() {
@Override
@@ -241,7 +233,7 @@ public class FolderPreviewPanel extends JPanel {
});
}
private SerializableImage renderImage(SWF swf, TreeItem treeItem) {
int width = 0;

2
src/com/jpexs/decompiler/flash/gui/ImagePanel.java
View File

@@ -426,7 +426,7 @@ public final class ImagePanel extends JPanel implements ActionListener, MediaDis
}
return (double) w / (double) w1;
}
return 1;
}

4
src/com/jpexs/decompiler/flash/gui/Main.java
View File

@@ -919,8 +919,8 @@ public class Main {
UIManager.put("ColorChooser.swatchesNameText", AppStrings.translate("ColorChooser.swatchesNameText"));
UIManager.put("ColorChooser.swatchesRecentText", AppStrings.translate("ColorChooser.swatchesRecentText"));
UIManager.put("ColorChooser.sampleText", AppStrings.translate("ColorChooser.sampleText"));
Helper.decompilationErrorAdd = AppStrings.translate(Configuration.autoDeobfuscate.get()?"deobfuscation.comment.failed":"deobfuscation.comment.tryenable");
Helper.decompilationErrorAdd = AppStrings.translate(Configuration.autoDeobfuscate.get() ? "deobfuscation.comment.failed" : "deobfuscation.comment.tryenable");
}
/**

8
src/com/jpexs/decompiler/flash/gui/MainPanel.java
View File

@@ -352,7 +352,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
private JPanel createFolderPreviewCard() {
JPanel folderPreviewCard = new JPanel(new BorderLayout());
folderPreviewPanel = new FolderPreviewPanel(this,new ArrayList<TreeItem>());
folderPreviewPanel = new FolderPreviewPanel(this, new ArrayList<TreeItem>());
folderPreviewCard.add(new JScrollPane(folderPreviewPanel), BorderLayout.CENTER);
return folderPreviewCard;
@@ -989,7 +989,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
public List<File> exportSelection(AbortRetryIgnoreHandler handler, String selFile, ExportDialog export) throws IOException {
List<File> ret = new ArrayList<>();
List<TreeItem> sel = folderPreviewPanel.selectedItems.isEmpty()?tagTree.getAllSelected(tagTree):new ArrayList<>(folderPreviewPanel.selectedItems.values());
List<TreeItem> sel = folderPreviewPanel.selectedItems.isEmpty() ? tagTree.getAllSelected(tagTree) : new ArrayList<>(folderPreviewPanel.selectedItems.values());
List<SWF> allSwfs = new ArrayList<>();
for (SWFList swfList : swfs) {
@@ -1316,7 +1316,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
}
public void autoDeobfuscateChanged() {
Helper.decompilationErrorAdd = AppStrings.translate(Configuration.autoDeobfuscate.get()?"deobfuscation.comment.failed":"deobfuscation.comment.tryenable");
Helper.decompilationErrorAdd = AppStrings.translate(Configuration.autoDeobfuscate.get() ? "deobfuscation.comment.failed" : "deobfuscation.comment.tryenable");
clearCache();
if (abcPanel != null) {
abcPanel.reload();
@@ -2460,8 +2460,6 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
previewPanel.showTextPanel(textTag);
}
private void showFolderPreview(TreeItem treeNode) {
List<TreeItem> folderPreviewItems = new ArrayList<>();
FolderItem item = (FolderItem) treeNode;

6
src/com/jpexs/decompiler/flash/gui/tagtree/TagIdClassMap.java
View File

@@ -107,7 +107,7 @@ public class TagIdClassMap {
private static final Map<Integer, Class> tagIdClassMap = new HashMap<>();
private static final Map<Class, Integer> classTagIdMap = new HashMap<>();
static {
addTag(CSMTextSettingsTag.ID, CSMTextSettingsTag.class);
addTag(DebugIDTag.ID, DebugIDTag.class);
@@ -189,12 +189,12 @@ public class TagIdClassMap {
addTag(ExporterInfo.ID, ExporterInfo.class);
addTag(FontTextureInfo.ID, FontTextureInfo.class);
}
private static void addTag(int tagId, Class cl) {
tagIdClassMap.put(tagId, cl);
classTagIdMap.put(cl, tagId);
}
public static Class getClassByTagId(int tagId) {
return tagIdClassMap.get(tagId);
}

34
src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
View File

@@ -389,14 +389,14 @@ public class TagTree extends JTree implements ActionListener {
ret = new ArrayList<>();
break;
case TagTreeModel.FOLDER_OTHERS:
ret = Arrays.asList(CSMTextSettingsTag.ID, DebugIDTag.ID, DefineButtonCxformTag.ID, DefineButtonSoundTag.ID,
DefineFontAlignZonesTag.ID, DefineFontInfoTag.ID, DefineFontInfo2Tag.ID, DefineFontNameTag.ID,
DefineScalingGridTag.ID, DefineSceneAndFrameLabelDataTag.ID,
DoABCDefineTag.ID, DoABCTag.ID, DoActionTag.ID, DoInitActionTag.ID,
EnableDebuggerTag.ID, EnableDebugger2Tag.ID, EnableTelemetryTag.ID,
ExportAssetsTag.ID, FileAttributesTag.ID, ImportAssetsTag.ID, ImportAssets2Tag.ID,
JPEGTablesTag.ID, MetadataTag.ID, ProductInfoTag.ID, ProtectTag.ID, ScriptLimitsTag.ID,
SetBackgroundColorTag.ID, SetTabIndexTag.ID, SymbolClassTag.ID);
ret = Arrays.asList(CSMTextSettingsTag.ID, DebugIDTag.ID, DefineButtonCxformTag.ID, DefineButtonSoundTag.ID,
DefineFontAlignZonesTag.ID, DefineFontInfoTag.ID, DefineFontInfo2Tag.ID, DefineFontNameTag.ID,
DefineScalingGridTag.ID, DefineSceneAndFrameLabelDataTag.ID,
DoABCDefineTag.ID, DoABCTag.ID, DoActionTag.ID, DoInitActionTag.ID,
EnableDebuggerTag.ID, EnableDebugger2Tag.ID, EnableTelemetryTag.ID,
ExportAssetsTag.ID, FileAttributesTag.ID, ImportAssetsTag.ID, ImportAssets2Tag.ID,
JPEGTablesTag.ID, MetadataTag.ID, ProductInfoTag.ID, ProtectTag.ID, ScriptLimitsTag.ID,
SetBackgroundColorTag.ID, SetTabIndexTag.ID, SymbolClassTag.ID);
break;
}
@@ -409,7 +409,7 @@ public class TagTree extends JTree implements ActionListener {
StartSoundTag.ID, StartSound2Tag.ID, VideoFrameTag.ID,
SoundStreamBlockTag.ID, SoundStreamHeadTag.ID, SoundStreamHead2Tag.ID);
}
JMenuItem expandRecursiveMenuItem;
JMenuItem removeMenuItem;
JMenuItem removeWithDependenciesMenuItem;
@@ -592,15 +592,15 @@ public class TagTree extends JTree implements ActionListener {
try {
SWF swf = item.getSwf();
Tag t = (Tag) cl.getDeclaredConstructor(SWF.class).newInstance(new Object[]{swf});
boolean isDefineSprite = item instanceof DefineSpriteTag;
Timelined timelined = isDefineSprite ? (DefineSpriteTag) item : swf;
boolean isDefineSprite = item instanceof DefineSpriteTag;
Timelined timelined = isDefineSprite ? (DefineSpriteTag) item : swf;
t.setTimelined(timelined);
if (isDefineSprite) {
((DefineSpriteTag) item).subTags.add(t);
} else {
swf.tags.add(t);
}
timelined.getTimeline().reset();
if (isDefineSprite) {
((DefineSpriteTag) item).subTags.add(t);
} else {
swf.tags.add(t);
}
timelined.getTimeline().reset();
swf.updateCharacters();
mainPanel.refreshTree();
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | SecurityException | IllegalArgumentException | InvocationTargetException ex) {