From e4e511bf3d60cb64b361078914b8c9df5ec8561f Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 3 Nov 2022 02:59:58 -0700 Subject: [PATCH 01/24] Fix FernFlower "Rename ambiguous classes and class elements". --- .../decompilers/impl/FernFlowerDecompiler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java index 124f51f2..8faf4d0d 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java @@ -118,7 +118,12 @@ public class FernFlowerDecompiler extends InternalDecompiler tempClass.delete(); - final File outputJava = new File(start + ".java"); + String javaDir = start; + if (BytecodeViewer.viewer.ren.isSelected()) { + javaDir = tempDirectory + "class_0"; + } + + final File outputJava = new File(javaDir + ".java"); if (outputJava.exists()) { String s; try { From 8a3fbcf86a8045dded63814385fdafd06823fcd5 Mon Sep 17 00:00:00 2001 From: Nick Botticelli Date: Sat, 10 Dec 2022 00:19:51 -0700 Subject: [PATCH 02/24] Update dependencies as of this commit date Updated dependencies due to IntelliJ complaining about various (transitive) dependency vulnerabilities; did not update ANTLR dependency. Initial testing with JADX and Fernflower decompilers as well as APKs works fine. --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c5d62d6e..cda1d5cd 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 23.0.0 4.9.3 - 2.6.1 + 2.7.0 9.4 0.2.0 1.0bcv @@ -23,20 +23,20 @@ 1.9.12 1.5.0 1.15 - 3.1.8 + 3.1.9 1.21 2.11.0 3.12.0 1.10.0 3.0.2 0.4.1 - 6.0.0.Final + 6.1.0.Final v56 e0d44f4 - 2.9.1 + 2.10 31.1-jre 4.2 - 1.4.4 + 1.4.5 1.6.6bcv 3.4.1.3 21.2.0 @@ -45,7 +45,7 @@ 0.6.0 3.3.0 2.1.1 - 2.0.3 + 2.0.5 2.5.2 1.33 1.0.3 From 2b342143ef2ea7c1e3342ca4dbca9d92705a24a9 Mon Sep 17 00:00:00 2001 From: Konloch Date: Tue, 13 Dec 2022 21:03:14 -0800 Subject: [PATCH 03/24] Update pom.xml Co-authored-by: Nico Mexis --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cda1d5cd..26d0d31b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 23.0.0 + 23.1.0 4.9.3 2.7.0 9.4 From bc7c9fb7d4bbe5fa8d303fd4968e62b8a13c5b64 Mon Sep 17 00:00:00 2001 From: Konloch Date: Tue, 13 Dec 2022 21:03:18 -0800 Subject: [PATCH 04/24] Update pom.xml Co-authored-by: Nico Mexis --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26d0d31b..54acf3ef 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 1.5.0 1.15 3.1.9 - 1.21 + 1.22 2.11.0 3.12.0 1.10.0 From 035ed40de9246bc3735a3c8628348816be458e3c Mon Sep 17 00:00:00 2001 From: Konloch Date: Tue, 13 Dec 2022 21:03:25 -0800 Subject: [PATCH 05/24] Update pom.xml Co-authored-by: Nico Mexis --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54acf3ef..cf746c2f 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 3.0.2 0.4.1 6.1.0.Final - v56 + v57 e0d44f4 2.10 31.1-jre From 218de052e0693a8b857f13c816b410467fafd838 Mon Sep 17 00:00:00 2001 From: Cody Date: Mon, 23 Jan 2023 22:43:48 -0800 Subject: [PATCH 06/24] Enabled tabs to be rearranged. Did not add functionality for a tab to be dropped out. We could possibly add it at a later time, also add a setting to toggle it on/off? Recommend to gather feedback to see if that is something wanted. --- .../club/bytecodeviewer/BytecodeViewer.java | 2 +- .../resourceviewer/CloseButtonComponent.java | 39 ++ .../resourceviewer/DraggableTabbedPane.java | 613 ++++++++++++++++++ .../gui/resourceviewer/TabExitButton.java | 34 +- .../gui/resourceviewer/TabbedPane.java | 343 +++++----- .../gui/resourceviewer/Workspace.java | 68 +- 6 files changed, 881 insertions(+), 218 deletions(-) create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java create mode 100644 src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java index 4210f384..7126ea9a 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java @@ -130,7 +130,7 @@ import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory; public class BytecodeViewer { //TODO fix this for tab dragging & better tab controls - public static boolean EXPERIMENTAL_TAB_CODE = false; + public static boolean EXPERIMENTAL_TAB_CODE = true; //the launch args called on BCV public static String[] launchArgs; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java new file mode 100644 index 00000000..277834b8 --- /dev/null +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java @@ -0,0 +1,39 @@ +package the.bytecode.club.bytecodeviewer.gui.resourceviewer; + +import com.android.tools.r8.internal.Cl; +import com.github.weisj.darklaf.components.CloseButton; + +import javax.swing.*; +import java.awt.*; + +public class CloseButtonComponent extends JPanel { + + private final JTabbedPane pane; + + public CloseButtonComponent(final JTabbedPane pane) { + super(new FlowLayout(FlowLayout.LEFT, 0, 0)); + if (pane == null) { + throw new NullPointerException("TabbedPane is null"); + } + + this.pane = pane; + setOpaque(false); + JLabel label = new JLabel() { + public String getText() { + int i = pane.indexOfTabComponent(CloseButtonComponent.this); + if (i != -1) { + return pane.getTitleAt(i); + } + + return null; + } + }; + + add(label); + label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); + JButton button = new CloseButton(); + add(button); + setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0)); + } + +} diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java new file mode 100644 index 00000000..3afcbfd8 --- /dev/null +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java @@ -0,0 +1,613 @@ +package the.bytecode.club.bytecodeviewer.gui.resourceviewer; + +import com.github.weisj.darklaf.components.CloseButton; +import the.bytecode.club.bytecodeviewer.BytecodeViewer; + +import javax.swing.*; +import java.awt.*; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.dnd.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionAdapter; +import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; + +public class DraggableTabbedPane extends JTabbedPane { + + public static final long serialVersionUID = 1L; + private static final int LINEWIDTH = 3; + private static final String NAME = "TabTransferData"; + private final DataFlavor FLAVOR = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType, NAME); + private static GhostGlassPane s_glassPane = new GhostGlassPane(); + + private boolean m_isDrawRect = false; + private final Rectangle2D m_lineRect = new Rectangle2D.Double(); + + private final Color m_lineColor = new Color(0, 100, 255); + private TabAcceptor m_acceptor = null; + + public DraggableTabbedPane() { + super(SwingConstants.TOP, SCROLL_TAB_LAYOUT); + + final DragSourceListener dsl = new DragSourceListener() { + public void dragEnter(DragSourceDragEvent e) { + e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop); + } + + public void dragExit(DragSourceEvent e) { + e.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop); + m_lineRect.setRect(0, 0, 0, 0); + m_isDrawRect = false; + s_glassPane.setPoint(new Point(-1000, -1000)); + s_glassPane.repaint(); + } + + public void dragOver(DragSourceDragEvent e) { + //e.getLocation() + //This method returns a Point indicating the cursor location in screen coordinates at the moment + + TabTransferData data = getTabTransferData(e); + if (data == null) { + e.getDragSourceContext().setCursor( + DragSource.DefaultMoveNoDrop); + return; + } // if + + /* + Point tabPt = e.getLocation(); + SwingUtilities.convertPointFromScreen(tabPt, DnDTabbedPane.this); + if (DnDTabbedPane.this.contains(tabPt)) { + int targetIdx = getTargetTabIndex(tabPt); + int sourceIndex = data.getTabIndex(); + if (getTabAreaBound().contains(tabPt) + && (targetIdx >= 0) + && (targetIdx != sourceIndex) + && (targetIdx != sourceIndex + 1)) { + e.getDragSourceContext().setCursor( + DragSource.DefaultMoveDrop); + + return; + } // if + + e.getDragSourceContext().setCursor( + DragSource.DefaultMoveNoDrop); + return; + } // if + */ + + e.getDragSourceContext().setCursor( + DragSource.DefaultMoveDrop); + } + + public void dragDropEnd(DragSourceDropEvent e) { + m_isDrawRect = false; + m_lineRect.setRect(0, 0, 0, 0); + // m_dragTabIndex = -1; + + if (hasGhost()) { + s_glassPane.setVisible(false); + s_glassPane.setImage(null); + } + } + + public void dropActionChanged(DragSourceDragEvent e) { + } + }; + + final DragGestureListener dgl = e -> { + // System.out.println("dragGestureRecognized"); + + Point tabPt = e.getDragOrigin(); + int dragTabIndex = indexAtLocation(tabPt.x, tabPt.y); + if (dragTabIndex < 0) { + return; + } // if + + initGlassPane(e.getComponent(), e.getDragOrigin(), dragTabIndex); + try { + e.startDrag(DragSource.DefaultMoveDrop, + new TabTransferable(DraggableTabbedPane.this, dragTabIndex), dsl); + } catch (InvalidDnDOperationException idoe) { + idoe.printStackTrace(); + } + }; + + //dropTarget = + new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, + new CDropTargetListener(), true); + new DragSource().createDefaultDragGestureRecognizer(this, + DnDConstants.ACTION_COPY_OR_MOVE, dgl); + m_acceptor = (a_component, a_index) -> true; + } + + public TabAcceptor getAcceptor() { + return m_acceptor; + } + + public void setAcceptor(TabAcceptor a_value) { + m_acceptor = a_value; + } + + private TabTransferData getTabTransferData(DropTargetDropEvent a_event) { + try { + return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR); + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + + private TabTransferData getTabTransferData(DropTargetDragEvent a_event) { + try { + return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR); + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + + private TabTransferData getTabTransferData(DragSourceDragEvent a_event) { + try { + return (TabTransferData) a_event.getDragSourceContext().getTransferable().getTransferData(FLAVOR); + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + + class TabTransferable implements Transferable { + + private TabTransferData m_data = null; + + public TabTransferable(DraggableTabbedPane a_tabbedPane, int a_tabIndex) { + m_data = new TabTransferData(a_tabbedPane, a_tabIndex); + } + + public Object getTransferData(DataFlavor flavor) { + return m_data; + // return DnDTabbedPane.this; + } + + public DataFlavor[] getTransferDataFlavors() { + DataFlavor[] f = new DataFlavor[1]; + f[0] = FLAVOR; + return f; + } + + public boolean isDataFlavorSupported(DataFlavor flavor) { + return flavor.getHumanPresentableName().equals(NAME); + } + } + + static class TabTransferData { + + private DraggableTabbedPane m_tabbedPane = null; + private int m_tabIndex = -1; + + public TabTransferData() { + } + + public TabTransferData(DraggableTabbedPane a_tabbedPane, int a_tabIndex) { + m_tabbedPane = a_tabbedPane; + m_tabIndex = a_tabIndex; + } + + public DraggableTabbedPane getTabbedPane() { + return m_tabbedPane; + } + + public void setTabbedPane(DraggableTabbedPane pane) { + m_tabbedPane = pane; + } + + public int getTabIndex() { + return m_tabIndex; + } + + public void setTabIndex(int index) { + m_tabIndex = index; + } + } + + private Point buildGhostLocation(Point a_location) { + Point retval = new Point(a_location); + + switch (getTabPlacement()) { + case JTabbedPane.TOP: { + retval.y = 1; + retval.x -= s_glassPane.getGhostWidth() / 2; + } + break; + + case JTabbedPane.BOTTOM: { + retval.y = getHeight() - 1 - s_glassPane.getGhostHeight(); + retval.x -= s_glassPane.getGhostWidth() / 2; + } + break; + + case JTabbedPane.LEFT: { + retval.x = 1; + retval.y -= s_glassPane.getGhostHeight() / 2; + } + break; + + case JTabbedPane.RIGHT: { + retval.x = getWidth() - 1 - s_glassPane.getGhostWidth(); + retval.y -= s_glassPane.getGhostHeight() / 2; + } + break; + } // switch + + retval = SwingUtilities.convertPoint(DraggableTabbedPane.this, + retval, s_glassPane); + return retval; + } + + class CDropTargetListener implements DropTargetListener { + + public void dragEnter(DropTargetDragEvent e) { + // System.out.println("DropTarget.dragEnter: " + DnDTabbedPane.this); + + if (isDragAcceptable(e)) { + e.acceptDrag(e.getDropAction()); + } else { + e.rejectDrag(); + } // if + } + + public void dragExit(DropTargetEvent e) { + // System.out.println("DropTarget.dragExit: " + DnDTabbedPane.this); + m_isDrawRect = false; + } + + public void dropActionChanged(DropTargetDragEvent e) { + } + + public void dragOver(final DropTargetDragEvent e) { + TabTransferData data = getTabTransferData(e); + + if (getTabPlacement() == JTabbedPane.TOP + || getTabPlacement() == JTabbedPane.BOTTOM) { + initTargetLeftRightLine(getTargetTabIndex(e.getLocation()), data); + } else { + initTargetTopBottomLine(getTargetTabIndex(e.getLocation()), data); + } // if-else + + repaint(); + if (hasGhost()) { + s_glassPane.setPoint(buildGhostLocation(e.getLocation())); + s_glassPane.repaint(); + } + } + + public void drop(DropTargetDropEvent a_event) { + // System.out.println("DropTarget.drop: " + DnDTabbedPane.this); + + if (isDropAcceptable(a_event)) { + convertTab(getTabTransferData(a_event), getTargetTabIndex(a_event.getLocation())); + a_event.dropComplete(true); + } else { + a_event.dropComplete(false); + } // if-else + + m_isDrawRect = false; + repaint(); + + BytecodeViewer.viewer.workPane.tabs.setTabComponentAt(getSelectedIndex(), new CloseButtonComponent(DraggableTabbedPane.this)); + } + + public boolean isDragAcceptable(DropTargetDragEvent e) { + Transferable t = e.getTransferable(); + if (t == null) { + return false; + } // if + + DataFlavor[] flavor = e.getCurrentDataFlavors(); + if (!t.isDataFlavorSupported(flavor[0])) { + return false; + } // if + + TabTransferData data = getTabTransferData(e); + + if (DraggableTabbedPane.this == data.getTabbedPane() + && data.getTabIndex() >= 0) { + return true; + } // if + + if (DraggableTabbedPane.this != data.getTabbedPane()) { + if (m_acceptor != null) { + return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex()); + } // if + } // if + + return false; + } + + public boolean isDropAcceptable(DropTargetDropEvent e) { + Transferable t = e.getTransferable(); + if (t == null) { + return false; + } // if + + DataFlavor[] flavor = e.getCurrentDataFlavors(); + if (!t.isDataFlavorSupported(flavor[0])) { + return false; + } // if + + TabTransferData data = getTabTransferData(e); + + if (DraggableTabbedPane.this == data.getTabbedPane() + && data.getTabIndex() >= 0) { + return true; + } // if + + if (DraggableTabbedPane.this != data.getTabbedPane()) { + if (m_acceptor != null) { + return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex()); + } // if + } // if + + return false; + } + } + + private boolean m_hasGhost = true; + + public void setPaintGhost(boolean flag) { + m_hasGhost = flag; + } + + public boolean hasGhost() { + return m_hasGhost; + } + + /** + * returns potential index for drop. + * + * @param a_point point given in the drop site component's coordinate + * @return returns potential index for drop. + */ + private int getTargetTabIndex(Point a_point) { + boolean isTopOrBottom = getTabPlacement() == JTabbedPane.TOP + || getTabPlacement() == JTabbedPane.BOTTOM; + + // if the pane is empty, the target index is always zero. + if (getTabCount() == 0) { + return 0; + } // if + + for (int i = 0; i < getTabCount(); i++) { + Rectangle r = getBoundsAt(i); + if (isTopOrBottom) { + r.setRect(r.x - r.width / 2, r.y, r.width, r.height); + } else { + r.setRect(r.x, r.y - r.height / 2, r.width, r.height); + } // if-else + + if (r.contains(a_point)) { + return i; + } // if + } // for + + Rectangle r = getBoundsAt(getTabCount() - 1); + if (isTopOrBottom) { + int x = r.x + r.width / 2; + r.setRect(x, r.y, getWidth() - x, r.height); + } else { + int y = r.y + r.height / 2; + r.setRect(r.x, y, r.width, getHeight() - y); + } // if-else + + return r.contains(a_point) ? getTabCount() : -1; + } + + private void convertTab(TabTransferData a_data, int a_targetIndex) { + DraggableTabbedPane source = a_data.getTabbedPane(); + int sourceIndex = a_data.getTabIndex(); + if (sourceIndex < 0) { + return; + } // if + + Component cmp = source.getComponentAt(sourceIndex); + String str = source.getTitleAt(sourceIndex); + if (this != source) { + source.remove(sourceIndex); + + if (a_targetIndex == getTabCount()) { + addTab(str, cmp); + } else { + if (a_targetIndex < 0) { + a_targetIndex = 0; + } // if + + insertTab(str, null, cmp, null, a_targetIndex); + + } // if + + setSelectedComponent(cmp); + // System.out.println("press="+sourceIndex+" next="+a_targetIndex); + return; + } // if + + if (a_targetIndex < 0 || sourceIndex == a_targetIndex) { + //System.out.println("press="+prev+" next="+next); + return; + } // if + + if (a_targetIndex == getTabCount()) { + //System.out.println("last: press="+prev+" next="+next); + source.remove(sourceIndex); + addTab(str, cmp); + setSelectedIndex(getTabCount() - 1); + } else if (sourceIndex > a_targetIndex) { + //System.out.println(" >: press="+prev+" next="+next); + source.remove(sourceIndex); + insertTab(str, null, cmp, null, a_targetIndex); + setSelectedIndex(a_targetIndex); + } else { + //System.out.println(" <: press="+prev+" next="+next); + source.remove(sourceIndex); + insertTab(str, null, cmp, null, a_targetIndex - 1); + setSelectedIndex(a_targetIndex - 1); + } + } + + private void initTargetLeftRightLine(int next, TabTransferData a_data) { + if (next < 0) { + m_lineRect.setRect(0, 0, 0, 0); + m_isDrawRect = false; + return; + } // if + + if ((a_data.getTabbedPane() == this) + && (a_data.getTabIndex() == next + || next - a_data.getTabIndex() == 1)) { + m_lineRect.setRect(0, 0, 0, 0); + m_isDrawRect = false; + } else if (getTabCount() == 0) { + m_lineRect.setRect(0, 0, 0, 0); + m_isDrawRect = false; + return; + } else if (next == 0) { + Rectangle rect = getBoundsAt(0); + m_lineRect.setRect(-LINEWIDTH / 2, rect.y, LINEWIDTH, rect.height); + m_isDrawRect = true; + } else if (next == getTabCount()) { + Rectangle rect = getBoundsAt(getTabCount() - 1); + m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2, rect.y, + LINEWIDTH, rect.height); + m_isDrawRect = true; + } else { + Rectangle rect = getBoundsAt(next - 1); + m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2, rect.y, + LINEWIDTH, rect.height); + m_isDrawRect = true; + } + } + + private void initTargetTopBottomLine(int next, TabTransferData a_data) { + if (next < 0) { + m_lineRect.setRect(0, 0, 0, 0); + m_isDrawRect = false; + return; + } // if + + if ((a_data.getTabbedPane() == this) + && (a_data.getTabIndex() == next + || next - a_data.getTabIndex() == 1)) { + m_lineRect.setRect(0, 0, 0, 0); + m_isDrawRect = false; + } else if (getTabCount() == 0) { + m_lineRect.setRect(0, 0, 0, 0); + m_isDrawRect = false; + return; + } else if (next == getTabCount()) { + Rectangle rect = getBoundsAt(getTabCount() - 1); + m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2, + rect.width, LINEWIDTH); + m_isDrawRect = true; + } else if (next == 0) { + Rectangle rect = getBoundsAt(0); + m_lineRect.setRect(rect.x, -LINEWIDTH / 2, rect.width, LINEWIDTH); + m_isDrawRect = true; + } else { + Rectangle rect = getBoundsAt(next - 1); + m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2, + rect.width, LINEWIDTH); + m_isDrawRect = true; + } + } + + private void initGlassPane(Component c, Point tabPt, int a_tabIndex) { + //Point p = (Point) pt.clone(); + getRootPane().setGlassPane(s_glassPane); + if (hasGhost()) { + Rectangle rect = getBoundsAt(a_tabIndex); + BufferedImage image = new BufferedImage(c.getWidth(), + c.getHeight(), BufferedImage.TYPE_INT_ARGB); + Graphics g = image.getGraphics(); + c.paint(g); + image = image.getSubimage(rect.x, rect.y, rect.width, rect.height); + s_glassPane.setImage(image); + } // if + + s_glassPane.setPoint(buildGhostLocation(tabPt)); + s_glassPane.setVisible(true); + } + + private Rectangle getTabAreaBound() { + Rectangle lastTab = getUI().getTabBounds(this, getTabCount() - 1); + return new Rectangle(0, 0, getWidth(), lastTab.y + lastTab.height); + } + + public void paintComponent(Graphics g) { + super.paintComponent(g); + + if (m_isDrawRect) { + Graphics2D g2 = (Graphics2D) g; + g2.setPaint(m_lineColor); + g2.fill(m_lineRect); + } // if + } + + public interface TabAcceptor { + + boolean isDropAcceptable(DraggableTabbedPane a_component, int a_index); + } +} + +class GhostGlassPane extends JPanel { + + public static final long serialVersionUID = 1L; + private final AlphaComposite m_composite; + + private Point m_location = new Point(0, 0); + + private BufferedImage m_draggingGhost = null; + + public GhostGlassPane() { + setOpaque(false); + m_composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.7f); + } + + public void setImage(BufferedImage draggingGhost) { + m_draggingGhost = draggingGhost; + } + + public void setPoint(Point a_location) { + m_location.x = a_location.x; + m_location.y = a_location.y; + } + + public int getGhostWidth() { + if (m_draggingGhost == null) { + return 0; + } // if + + return m_draggingGhost.getWidth(this); + } + + public int getGhostHeight() { + if (m_draggingGhost == null) { + return 0; + } // if + + return m_draggingGhost.getHeight(this); + } + + public void paintComponent(Graphics g) { + if (m_draggingGhost == null) { + return; + } // if + + Graphics2D g2 = (Graphics2D) g; + g2.setComposite(m_composite); + g2.drawImage(m_draggingGhost, (int) m_location.getX(), (int) m_location.getY(), null); + } +} diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabExitButton.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabExitButton.java index 75ca650b..07828705 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabExitButton.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabExitButton.java @@ -35,14 +35,13 @@ import javax.swing.plaf.basic.BasicButtonUI; * Using CloseButton of darklaf instead. 4/17/2022 */ @Deprecated -public class TabExitButton extends JButton implements ActionListener -{ +public class TabExitButton extends JButton implements ActionListener { + private final TabbedPane tabbedPane; private final int tabIndex; private final String tabWorkingName; - public TabExitButton(TabbedPane tabbedPane, int tabIndex, String tabWorkingName) - { + public TabExitButton(TabbedPane tabbedPane, int tabIndex, String tabWorkingName) { this.tabbedPane = tabbedPane; this.tabIndex = tabIndex; this.tabWorkingName = tabWorkingName; @@ -65,29 +64,26 @@ public class TabExitButton extends JButton implements ActionListener addActionListener(this); } - public int getTabIndex() - { + public int getTabIndex() { return tabIndex; } @Override - public void actionPerformed(final ActionEvent e) - { + public void actionPerformed(final ActionEvent e) { final int i = tabbedPane.tabs.indexOfTabComponent(tabbedPane); - if (i != -1) - { + if (i != -1) { tabbedPane.tabs.remove(i); } } // we don't want to update UI for this button @Override - public void updateUI() { } + public void updateUI() { + } // paint the cross @Override - protected void paintComponent(final Graphics g) - { + protected void paintComponent(final Graphics g) { super.paintComponent(g); final Graphics2D g2 = (Graphics2D) g.create(); // shift the image for pressed buttons @@ -97,8 +93,9 @@ public class TabExitButton extends JButton implements ActionListener g2.setStroke(new BasicStroke(2)); g2.setColor(Color.BLACK); - if (getModel().isRollover()) + if (getModel().isRollover()) { g2.setColor(Color.MAGENTA); + } final int delta = 6; g2.drawLine(delta, delta, getWidth() - delta - 1, getHeight() - delta - 1); @@ -106,18 +103,15 @@ public class TabExitButton extends JButton implements ActionListener g2.dispose(); } - public TabbedPane getTabbedPane() - { + public TabbedPane getTabbedPane() { return tabbedPane; } - public String getTabWorkingName() - { + public String getTabWorkingName() { return tabWorkingName; } - public static long getSerialVersionUID() - { + public static long getSerialVersionUID() { return serialVersionUID; } diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java index d054c8ff..4f491e09 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java @@ -7,14 +7,7 @@ import java.awt.Rectangle; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JTabbedPane; -import javax.swing.SwingUtilities; +import javax.swing.*; import com.github.weisj.darklaf.components.CloseButton; import the.bytecode.club.bytecodeviewer.BytecodeViewer; @@ -50,85 +43,82 @@ import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings; * @author WaterWolf * @since 09/26/2011 */ -public class TabbedPane extends JPanel -{ - public final JTabbedPane tabs; - public final JLabel label; - private DelayTabbedPaneThread probablyABadIdea; - private long startedDragging = 0; - public final String tabName; - public final String fileContainerName; - public final ResourceViewer resource; - private static long lastMouseClick = System.currentTimeMillis(); - public final static MouseListener buttonHoverAnimation = new ButtonHoverAnimation(); - public static final Color BLANK_COLOR = new Color(0, 0, 0, 0); - - public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName, String name, final JTabbedPane existingTabs, ResourceViewer resource) - { - // unset default FlowLayout' gaps - super(new FlowLayout(FlowLayout.LEFT, 0, 0)); +public class TabbedPane extends JPanel { - this.tabName = name; - this.fileContainerName = fileContainerName; - this.resource = resource; - - if (existingTabs == null) - throw new NullPointerException("TabbedPane is null"); + public final JTabbedPane tabs; + public final JLabel label; + private DelayTabbedPaneThread probablyABadIdea; + private long startedDragging = 0; + public final String tabName; + public final String fileContainerName; + public final ResourceViewer resource; + private static long lastMouseClick = System.currentTimeMillis(); + public final static MouseListener buttonHoverAnimation = new ButtonHoverAnimation(); + public static final Color BLANK_COLOR = new Color(0, 0, 0, 0); - this.tabs = existingTabs; - setOpaque(false); + public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName, String name, final DraggableTabbedPane existingTabs, ResourceViewer resource) { + // unset default FlowLayout' gaps + super(new FlowLayout(FlowLayout.LEFT, 0, 0)); - // make JLabel read titles from JTabbedPane - label = new MaxWidthJLabel(tabName, 400, 20); + this.tabName = name; + this.fileContainerName = fileContainerName; + this.resource = resource; - this.add(label); - // add more space between the label and the button - label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); - // tab button - JButton exitButton = new CloseButton(); - this.add(exitButton); - // add more space to the top of the component - setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0)); - - //define the right click pop-up menu - JPopupMenu rightClickMenu = new JPopupMenu(); - JMenuItem closeAllTabs = new JMenuItem(TranslatedStrings.CLOSE_ALL_BUT_THIS + ": " + name); - JMenuItem closeTab = new JMenuItem(TranslatedStrings.CLOSE_TAB + ": " + name); - - rightClickMenu.add(closeAllTabs); - rightClickMenu.add(closeTab); - //setComponentPopupMenu(rightClickMenu); - - exitButton.setComponentPopupMenu(rightClickMenu); - exitButton.addMouseListener(new MouseClickedListener(e -> - { - if (this.getTabIndex() != -1) - existingTabs.remove(this.getTabIndex()); - })); - - closeTab.addActionListener(e -> - { - if (this.getTabIndex() != -1) - existingTabs.remove(this.getTabIndex()); - }); - closeAllTabs.addActionListener(e -> - { + if (existingTabs == null) + throw new NullPointerException("TabbedPane is null"); - while (true) - { - if (existingTabs.getTabCount() <= 1) - return; - - if (this.getTabIndex() != 0) - existingTabs.remove(0); - else - existingTabs.remove(1); - } - }); - - //tab dragging - if(BytecodeViewer.EXPERIMENTAL_TAB_CODE) - { + this.tabs = existingTabs; + setOpaque(false); + + // make JLabel read titles from JTabbedPane + label = new MaxWidthJLabel(tabName, 400, 20); + + this.add(label); + // add more space between the label and the button + label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); + // tab button + JButton exitButton = new CloseButton(); + // add more space to the top of the component + setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0)); + + //define the right click pop-up menu + JPopupMenu rightClickMenu = new JPopupMenu(); + this.putClientProperty("index", this.getTabIndex()); + JMenuItem closeAllTabs = new JMenuItem(TranslatedStrings.CLOSE_ALL_BUT_THIS + ": " + name); + JMenuItem closeTab = new JMenuItem(TranslatedStrings.CLOSE_TAB + ": " + name); + + rightClickMenu.add(closeAllTabs); + rightClickMenu.add(closeTab); + //setComponentPopupMenu(rightClickMenu); + + exitButton.setComponentPopupMenu(rightClickMenu); + exitButton.addMouseListener(new MouseClickedListener(e -> + { + if (this.getTabIndex() != -1) + existingTabs.remove(this.getTabIndex()); + })); + + closeTab.addActionListener(e -> + { + if (this.getTabIndex() != -1) + existingTabs.remove(this.getTabIndex()); + }); + closeAllTabs.addActionListener(e -> + { + + while (true) { + if (existingTabs.getTabCount() <= 1) + return; + + if (this.getTabIndex() != 0) + existingTabs.remove(0); + else + existingTabs.remove(1); + } + }); + + //tab dragging + if (BytecodeViewer.EXPERIMENTAL_TAB_CODE) { /*label.addMouseListener(new MouseListener() { @Override public void mouseClicked(MouseEvent e) {} @Override public void mouseEntered(MouseEvent arg0) { @@ -142,82 +132,112 @@ public class TabbedPane extends JPanel stopDragging(e.getX(), e.getY()); } });*/ - - this.addMouseListener(new MouseListener() { - @Override public void mouseClicked(MouseEvent e) {} - @Override public void mouseEntered(MouseEvent arg0) {} - @Override public void mouseExited(MouseEvent arg0) {} - @Override public void mousePressed(MouseEvent e) { - onMousePressed(e); - } - @Override public void mouseReleased(MouseEvent e) { - stopDragging(e.getX(), e.getY()); - } - }); - } - - //middle click close - if(BytecodeViewer.EXPERIMENTAL_TAB_CODE) - { - this.addMouseListener(new MouseAdapter() - { - @Override - public void mouseReleased(MouseEvent e) - { - if (e.getButton() != MouseEvent.BUTTON2) - return; - - final int i = existingTabs.indexOfTabComponent(TabbedPane.this); - if (i != -1) - existingTabs.remove(i); - } - }); - } - } - private void stopDragging(int mouseX, int mouseY) - { - if (System.currentTimeMillis() - startedDragging >= 210) - { - Rectangle bounds = new Rectangle(1, 1, mouseX, mouseY); - System.out.println("debug-5: " + mouseX + ", " + mouseY); - - int totalTabs = BytecodeViewer.viewer.workPane.tabs.getTabCount(); - int index = -1; - for (int i = 0; i < totalTabs; i++) - { - Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); - - if (c != null && bounds.intersects(c.getBounds())) - index = i; //replace this tabs position - } + this.addMouseListener(new MouseListener() { + @Override + public void mouseClicked(MouseEvent e) { + } - if (index == -1) - { - for (int i = 0; i < totalTabs; i++) - { - Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); - //do some check to see if it's past the X or Y - if (c != null) { - System.out.println("debug-6: " + c.getBounds()); - } - } - } + @Override + public void mouseEntered(MouseEvent arg0) { + } + + @Override + public void mouseExited(MouseEvent arg0) { + } + + @Override + public void mousePressed(MouseEvent e) { + onMousePressed(e); + } + + @Override + public void mouseReleased(MouseEvent e) { + } + }); + } + + //middle click close + if (BytecodeViewer.EXPERIMENTAL_TAB_CODE) { + this.addMouseListener(new MouseAdapter() { + @Override + public void mouseReleased(MouseEvent e) { + if (e.getButton() != MouseEvent.BUTTON2) + return; + + final int i = existingTabs.indexOfTabComponent(TabbedPane.this); + if (i != -1) + existingTabs.remove(i); + } + }); + } + } + + private void stopDragging(int mouseX, int mouseY) { + if (System.currentTimeMillis() - startedDragging >= 210) { + if (mouseX < 0) { + mouseX = 0; + } + Rectangle bounds = new Rectangle(1, 1, mouseX, mouseY); + System.out.println("debug-5: " + mouseX + ", " + mouseY); + + int totalTabs = BytecodeViewer.viewer.workPane.tabs.getTabCount(); + int curIndex = getTabIndex(); + int toIndex = -1; + + //Set up the indexes of our tabs. + for (int i = 0; i < totalTabs; i++) { + Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); + System.err.println("Our bounds: " + bounds + " component: " + c.getBounds() + " intersects: " + bounds.intersects(c.getBounds())); + if (bounds.intersects(c.getBounds()) && c != this) { + toIndex = i; + } + } + + System.err.println(totalTabs + " " + curIndex + " " + toIndex); + + if (toIndex == totalTabs) { + System.err.println("here"); + } else if (curIndex > toIndex) { + if (toIndex == -1) { + toIndex = 0; + } + // [tab0=index0][tab1=index1] + // ---> == remove(tab0) + // [tab1=index0] + // add(tab0) + // [tab1=index0][tab0=index1] + + Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(toIndex + 1); + System.err.println("here1"); +// BytecodeViewer.viewer.workPane.tabs.remove(curIndex - 1); // 0 +// BytecodeViewer.viewer.workPane.tabs.add(BytecodeViewer.viewer.workPane.op); +// BytecodeViewer.viewer.workPane.tabs.setTabComponentAt(curIndex, BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(curIndex - 1)); + } else { + BytecodeViewer.viewer.workPane.tabs.remove(curIndex); // 0 + BytecodeViewer.viewer.workPane.tabs.add(resource); + BytecodeViewer.viewer.workPane.tabs.setTabComponentAt(toIndex, this); + } + + if (toIndex == -1) { + for (int i = 0; i < totalTabs; i++) { + Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); + //do some check to see if it's past the X or Y + if (c != null) { + System.out.println("debug-6: " + c.getBounds()); + } + } + } + + } + + SwingUtilities.invokeLater(() -> + { + label.setBackground(BLANK_COLOR); + label.updateUI(); + }); + } - if (index != -1) - { - BytecodeViewer.viewer.workPane.tabs.remove(this); - BytecodeViewer.viewer.workPane.tabs.setTabComponentAt(index, this); - } - } - - SwingUtilities.invokeLater(() -> - { - label.setBackground(BLANK_COLOR); - label.updateUI(); - }); - } - public void onMousePressed(MouseEvent e) { BytecodeViewer.viewer.workPane.tabs.dispatchEvent(e); @@ -232,8 +252,7 @@ public class TabbedPane extends JPanel probablyABadIdea = new DelayTabbedPaneThread(TabbedPane.this); probablyABadIdea.start(); repaint(); - System.out.println(e.getX()+", "+e.getY()); - Rectangle bounds = new Rectangle(1, 1, e.getX(), e.getY()); + Rectangle bounds = new Rectangle(e.getX(), e.getY(), e.getX() + this.getX(), e.getY()); for(int i = 0; i < BytecodeViewer.viewer.workPane.tabs.getTabCount(); i++) { Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); @@ -246,10 +265,10 @@ public class TabbedPane extends JPanel stopDragging(e.getX(), e.getY()); } } - - private static final long serialVersionUID = -4774885688297538774L; - public int getTabIndex() { - return tabs.indexOfTabComponent(this); - } + private static final long serialVersionUID = -4774885688297538774L; + + public int getTabIndex() { + return tabs.indexOfTabComponent(this); + } } diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java index cf42fe6a..a2ff0647 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java @@ -1,9 +1,6 @@ package the.bytecode.club.bytecodeviewer.gui.resourceviewer; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.FlowLayout; -import java.awt.Rectangle; +import java.awt.*; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.util.HashSet; @@ -12,7 +9,8 @@ import javax.swing.JButton; import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; -import javax.swing.JTabbedPane; + +import com.github.weisj.darklaf.components.CloseButton; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.decompilers.Decompiler; import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer; @@ -45,7 +43,7 @@ import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU; ***************************************************************************/ /** - * The pane that contains all of the resources as tabs. + * This pane contains all the resources, as tabs. * * @author Konloch * @author WaterWolf @@ -54,7 +52,7 @@ import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU; public class Workspace extends TranslatedVisibleComponent { - public final JTabbedPane tabs; + public final DraggableTabbedPane tabs; public final JPanel buttonPanel; public final JButton refreshClass; public final Set openedTabs = new HashSet<>(); @@ -63,8 +61,8 @@ public class Workspace extends TranslatedVisibleComponent { super("Workspace", TranslatedComponents.WORK_SPACE); - this.tabs = new JTabbedPane(); - + this.tabs = new DraggableTabbedPane(); + JPopupMenu popUp = new JPopupMenu(); JMenuItem closeAllTabs = new JMenuItem("Close All But This"); JMenuItem closeTab = new JMenuItem("Close Tab"); @@ -72,28 +70,28 @@ public class Workspace extends TranslatedVisibleComponent { TabExitButton tabExitButton = (TabExitButton) ((JPopupMenu)((JMenuItem) e.getSource()).getParent()).getInvoker(); final int index = tabExitButton.getTabIndex(); - + if (index != -1) tabs.remove(index); }); - + closeAllTabs.addActionListener(e -> { TabExitButton tabExitButton = (TabExitButton) ((JPopupMenu)((JMenuItem) e.getSource()).getParent()).getInvoker(); final int index = tabExitButton.getTabIndex(); - + while (true) { if (tabs.getTabCount() <= 1) return; - + if (index != 0) tabs.remove(0); else tabs.remove(1); } }); - + tabs.addMouseListener(new MouseListener() { @Override @@ -108,11 +106,11 @@ public class Workspace extends TranslatedVisibleComponent { if (BLOCK_TAB_MENU) return; - + if (e.getButton() == 3) { Rectangle bounds = new Rectangle(1, 1, e.getX(), e.getY()); - + for (int i = 0; i < BytecodeViewer.viewer.workPane.tabs.getTabCount(); i++) { Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); @@ -136,7 +134,7 @@ public class Workspace extends TranslatedVisibleComponent popUp.add(closeAllTabs); popUp.add(closeTab); - + if (!BLOCK_TAB_MENU) tabs.setComponentPopupMenu(popUp); @@ -155,7 +153,7 @@ public class Workspace extends TranslatedVisibleComponent buttonPanel.add(refreshClass); buttonPanel.setVisible(false); - + getContentPane().add(buttonPanel, BorderLayout.SOUTH); tabs.addContainerListener(new TabRemovalEvent()); @@ -175,7 +173,7 @@ public class Workspace extends TranslatedVisibleComponent { addResource(container, name, new FileViewer(container, name)); } - + private void addResource(final ResourceContainer container, final String name, final ResourceViewer resourceView) { // Warn user and prevent 'nothing' from opening if no Decompiler is selected @@ -186,12 +184,12 @@ public class Workspace extends TranslatedVisibleComponent BytecodeViewer.showMessage(TranslatedStrings.SUGGESTED_FIX_NO_DECOMPILER_WARNING.toString()); return; } - + //unlock the refresh button BytecodeViewer.viewer.workPane.refreshClass.setEnabled(true); - + final String workingName = container.getWorkingName(name); - + //create a new tab if the resource isn't opened currently if (!openedTabs.contains(workingName)) { @@ -200,7 +198,7 @@ public class Workspace extends TranslatedVisibleComponent else //if the resource is already opened select this tab as the active one { //TODO openedTabs could be changed to a HashMap for faster lookups - + //search through each tab for(int i = 0; i < tabs.getTabCount(); i++) { @@ -214,33 +212,33 @@ public class Workspace extends TranslatedVisibleComponent } } } - + public void addResourceToTab(ResourceViewer resourceView, String workingName, String containerName, String name) { //start processing the resource to be viewed if(resourceView instanceof ClassViewer) resourceView.refresh(null); - + //add the resource view to the tabs tabs.add(resourceView); - + //get the resource view index final int tabIndex = tabs.indexOfComponent(resourceView); - + //create a new tabbed pane - TabbedPane tabbedPane = new TabbedPane(tabIndex, workingName, containerName, name, tabs, resourceView); - resourceView.tabbedPane = tabbedPane; + resourceView.tabbedPane = new TabbedPane(tabIndex, workingName, containerName, name, tabs, resourceView); resourceView.resource.workingName = workingName; - + //set the tabs index - tabs.setTabComponentAt(tabIndex, tabbedPane); - +// tabs.setTabComponentAt(tabIndex, tabbedPane); + tabs.setTabComponentAt(tabIndex, new CloseButtonComponent(tabs)); + //open the tab that was just added tabs.setSelectedIndex(tabIndex); - + //set resource as opened in a tab openedTabs.add(workingName); - + //refresh the tab title resourceView.refreshTitle(); } @@ -258,6 +256,6 @@ public class Workspace extends TranslatedVisibleComponent tabs.removeAll(); tabs.updateUI(); } - + private static final long serialVersionUID = 6542337997679487946L; } From ae6911658ca14099d3e3445354088b349ce7caf7 Mon Sep 17 00:00:00 2001 From: Cody Date: Mon, 23 Jan 2023 23:13:36 -0800 Subject: [PATCH 07/24] Enabled tabs to be rearranged. Did not add functionality for a tab to be dropped out. We could possibly add it at a later time, also add a setting to toggle it on/off? Recommend to gather feedback to see if that is something wanted. --- .../club/bytecodeviewer/BytecodeViewer.java | 2 - .../resourceviewer/CloseButtonComponent.java | 43 +++++ .../resourceviewer/DraggableTabbedPane.java | 5 - .../gui/resourceviewer/TabbedPane.java | 166 +----------------- .../gui/resourceviewer/Workspace.java | 1 - 5 files changed, 45 insertions(+), 172 deletions(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java index 7126ea9a..a1e36460 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java @@ -129,8 +129,6 @@ import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory; public class BytecodeViewer { - //TODO fix this for tab dragging & better tab controls - public static boolean EXPERIMENTAL_TAB_CODE = true; //the launch args called on BCV public static String[] launchArgs; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java index 277834b8..50c983d2 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java @@ -2,14 +2,23 @@ package the.bytecode.club.bytecodeviewer.gui.resourceviewer; import com.android.tools.r8.internal.Cl; import com.github.weisj.darklaf.components.CloseButton; +import com.github.weisj.darklaf.listener.MouseClickListener; +import the.bytecode.club.bytecodeviewer.gui.components.listeners.MouseClickedListener; +import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings; import javax.swing.*; import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; public class CloseButtonComponent extends JPanel { private final JTabbedPane pane; + String title = ""; + public CloseButtonComponent(final JTabbedPane pane) { super(new FlowLayout(FlowLayout.LEFT, 0, 0)); if (pane == null) { @@ -33,6 +42,40 @@ public class CloseButtonComponent extends JPanel { label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); JButton button = new CloseButton(); add(button); + + JPopupMenu rightClickMenu = new JPopupMenu(); + JMenuItem closeAllTabs = new JMenuItem(String.valueOf(TranslatedStrings.CLOSE_ALL_BUT_THIS)); + JMenuItem closeTab = new JMenuItem(String.valueOf(TranslatedStrings.CLOSE_TAB)); + + rightClickMenu.add(closeAllTabs); + rightClickMenu.add(closeTab); + button.setComponentPopupMenu(rightClickMenu); + + button.addMouseListener(new MouseClickedListener(e -> + { + if (pane.indexOfTabComponent(CloseButtonComponent.this) != -1) + pane.remove(pane.indexOfTabComponent(CloseButtonComponent.this)); + })); + + closeTab.addActionListener(e -> + { + if (pane.indexOfTabComponent(CloseButtonComponent.this) != -1) + pane.remove(pane.indexOfTabComponent(CloseButtonComponent.this)); + }); + closeAllTabs.addActionListener(e -> + { + + while (true) { + if (pane.getTabCount() <= 1) + return; + + if (pane.indexOfTabComponent(CloseButtonComponent.this) != 0) + pane.remove(0); + else + pane.remove(1); + } + }); + setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0)); } diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java index 3afcbfd8..14048d52 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java @@ -1,6 +1,5 @@ package the.bytecode.club.bytecodeviewer.gui.resourceviewer; -import com.github.weisj.darklaf.components.CloseButton; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import javax.swing.*; @@ -8,10 +7,6 @@ import java.awt.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.dnd.*; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionAdapter; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java index 4f491e09..6e69083a 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java @@ -76,166 +76,8 @@ public class TabbedPane extends JPanel { this.add(label); // add more space between the label and the button label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); - // tab button - JButton exitButton = new CloseButton(); // add more space to the top of the component setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0)); - - //define the right click pop-up menu - JPopupMenu rightClickMenu = new JPopupMenu(); - this.putClientProperty("index", this.getTabIndex()); - JMenuItem closeAllTabs = new JMenuItem(TranslatedStrings.CLOSE_ALL_BUT_THIS + ": " + name); - JMenuItem closeTab = new JMenuItem(TranslatedStrings.CLOSE_TAB + ": " + name); - - rightClickMenu.add(closeAllTabs); - rightClickMenu.add(closeTab); - //setComponentPopupMenu(rightClickMenu); - - exitButton.setComponentPopupMenu(rightClickMenu); - exitButton.addMouseListener(new MouseClickedListener(e -> - { - if (this.getTabIndex() != -1) - existingTabs.remove(this.getTabIndex()); - })); - - closeTab.addActionListener(e -> - { - if (this.getTabIndex() != -1) - existingTabs.remove(this.getTabIndex()); - }); - closeAllTabs.addActionListener(e -> - { - - while (true) { - if (existingTabs.getTabCount() <= 1) - return; - - if (this.getTabIndex() != 0) - existingTabs.remove(0); - else - existingTabs.remove(1); - } - }); - - //tab dragging - if (BytecodeViewer.EXPERIMENTAL_TAB_CODE) { - /*label.addMouseListener(new MouseListener() { - @Override public void mouseClicked(MouseEvent e) {} - @Override public void mouseEntered(MouseEvent arg0) { - } - @Override public void mouseExited(MouseEvent arg0) { - } - @Override public void mousePressed(MouseEvent e) { - onMousePressed(e); - } - @Override public void mouseReleased(MouseEvent e) { - stopDragging(e.getX(), e.getY()); - } - });*/ - - this.addMouseListener(new MouseListener() { - @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mouseEntered(MouseEvent arg0) { - } - - @Override - public void mouseExited(MouseEvent arg0) { - } - - @Override - public void mousePressed(MouseEvent e) { - onMousePressed(e); - } - - @Override - public void mouseReleased(MouseEvent e) { - } - }); - } - - //middle click close - if (BytecodeViewer.EXPERIMENTAL_TAB_CODE) { - this.addMouseListener(new MouseAdapter() { - @Override - public void mouseReleased(MouseEvent e) { - if (e.getButton() != MouseEvent.BUTTON2) - return; - - final int i = existingTabs.indexOfTabComponent(TabbedPane.this); - if (i != -1) - existingTabs.remove(i); - } - }); - } - } - - private void stopDragging(int mouseX, int mouseY) { - if (System.currentTimeMillis() - startedDragging >= 210) { - if (mouseX < 0) { - mouseX = 0; - } - Rectangle bounds = new Rectangle(1, 1, mouseX, mouseY); - System.out.println("debug-5: " + mouseX + ", " + mouseY); - - int totalTabs = BytecodeViewer.viewer.workPane.tabs.getTabCount(); - int curIndex = getTabIndex(); - int toIndex = -1; - - //Set up the indexes of our tabs. - for (int i = 0; i < totalTabs; i++) { - Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); - System.err.println("Our bounds: " + bounds + " component: " + c.getBounds() + " intersects: " + bounds.intersects(c.getBounds())); - if (bounds.intersects(c.getBounds()) && c != this) { - toIndex = i; - } - } - - System.err.println(totalTabs + " " + curIndex + " " + toIndex); - - if (toIndex == totalTabs) { - System.err.println("here"); - } else if (curIndex > toIndex) { - if (toIndex == -1) { - toIndex = 0; - } - // [tab0=index0][tab1=index1] - // ---> == remove(tab0) - // [tab1=index0] - // add(tab0) - // [tab1=index0][tab0=index1] - - Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(toIndex + 1); - System.err.println("here1"); -// BytecodeViewer.viewer.workPane.tabs.remove(curIndex - 1); // 0 -// BytecodeViewer.viewer.workPane.tabs.add(BytecodeViewer.viewer.workPane.op); -// BytecodeViewer.viewer.workPane.tabs.setTabComponentAt(curIndex, BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(curIndex - 1)); - } else { - BytecodeViewer.viewer.workPane.tabs.remove(curIndex); // 0 - BytecodeViewer.viewer.workPane.tabs.add(resource); - BytecodeViewer.viewer.workPane.tabs.setTabComponentAt(toIndex, this); - } - - if (toIndex == -1) { - for (int i = 0; i < totalTabs; i++) { - Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); - //do some check to see if it's past the X or Y - if (c != null) { - System.out.println("debug-6: " + c.getBounds()); - } - } - } - - } - - SwingUtilities.invokeLater(() -> - { - label.setBackground(BLANK_COLOR); - label.updateUI(); - }); } public void onMousePressed(MouseEvent e) @@ -260,15 +102,11 @@ public class TabbedPane extends JPanel { BytecodeViewer.viewer.workPane.tabs.setSelectedIndex(i); } } - else - { - stopDragging(e.getX(), e.getY()); - } } private static final long serialVersionUID = -4774885688297538774L; - public int getTabIndex() { + /*public int getTabIndex() { return tabs.indexOfTabComponent(this); - } + }*/ } diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java index a2ff0647..59df7675 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java @@ -230,7 +230,6 @@ public class Workspace extends TranslatedVisibleComponent resourceView.resource.workingName = workingName; //set the tabs index -// tabs.setTabComponentAt(tabIndex, tabbedPane); tabs.setTabComponentAt(tabIndex, new CloseButtonComponent(tabs)); //open the tab that was just added From aa9b4bacf42bd7d8e758d8d08050005f6f808c75 Mon Sep 17 00:00:00 2001 From: Cody Date: Wed, 25 Jan 2023 21:34:00 -0800 Subject: [PATCH 08/24] Fixed exception when clicking a class that's already open. --- .../gui/resourceviewer/Workspace.java | 321 +++++++++--------- 1 file changed, 154 insertions(+), 167 deletions(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java index 59df7675..503219c7 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java @@ -50,211 +50,198 @@ import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU; * @since 09/26/2011 */ -public class Workspace extends TranslatedVisibleComponent -{ - public final DraggableTabbedPane tabs; - public final JPanel buttonPanel; - public final JButton refreshClass; - public final Set openedTabs = new HashSet<>(); +public class Workspace extends TranslatedVisibleComponent { - public Workspace() - { - super("Workspace", TranslatedComponents.WORK_SPACE); + public final DraggableTabbedPane tabs; + public final JPanel buttonPanel; + public final JButton refreshClass; + public final Set openedTabs = new HashSet<>(); - this.tabs = new DraggableTabbedPane(); + public Workspace() { + super("Workspace", TranslatedComponents.WORK_SPACE); - JPopupMenu popUp = new JPopupMenu(); - JMenuItem closeAllTabs = new JMenuItem("Close All But This"); - JMenuItem closeTab = new JMenuItem("Close Tab"); - closeTab.addActionListener(e -> - { - TabExitButton tabExitButton = (TabExitButton) ((JPopupMenu)((JMenuItem) e.getSource()).getParent()).getInvoker(); - final int index = tabExitButton.getTabIndex(); + this.tabs = new DraggableTabbedPane(); - if (index != -1) - tabs.remove(index); - }); + JPopupMenu popUp = new JPopupMenu(); + JMenuItem closeAllTabs = new JMenuItem("Close All But This"); + JMenuItem closeTab = new JMenuItem("Close Tab"); + closeTab.addActionListener(e -> + { + TabExitButton tabExitButton = (TabExitButton) ((JPopupMenu) ((JMenuItem) e.getSource()).getParent()).getInvoker(); + final int index = tabExitButton.getTabIndex(); - closeAllTabs.addActionListener(e -> - { - TabExitButton tabExitButton = (TabExitButton) ((JPopupMenu)((JMenuItem) e.getSource()).getParent()).getInvoker(); - final int index = tabExitButton.getTabIndex(); + if (index != -1) + tabs.remove(index); + }); - while (true) - { - if (tabs.getTabCount() <= 1) - return; + closeAllTabs.addActionListener(e -> + { + TabExitButton tabExitButton = (TabExitButton) ((JPopupMenu) ((JMenuItem) e.getSource()).getParent()).getInvoker(); + final int index = tabExitButton.getTabIndex(); - if (index != 0) - tabs.remove(0); - else - tabs.remove(1); - } - }); + while (true) { + if (tabs.getTabCount() <= 1) + return; - tabs.addMouseListener(new MouseListener() - { - @Override - public void mouseClicked(MouseEvent e) { } - @Override - public void mouseEntered(MouseEvent arg0) { } - @Override - public void mouseExited(MouseEvent arg0) { } + if (index != 0) + tabs.remove(0); + else + tabs.remove(1); + } + }); - @Override - public void mousePressed(MouseEvent e) - { - if (BLOCK_TAB_MENU) - return; + tabs.addMouseListener(new MouseListener() { + @Override + public void mouseClicked(MouseEvent e) { + } - if (e.getButton() == 3) - { - Rectangle bounds = new Rectangle(1, 1, e.getX(), e.getY()); + @Override + public void mouseEntered(MouseEvent arg0) { + } - for (int i = 0; i < BytecodeViewer.viewer.workPane.tabs.getTabCount(); i++) - { - Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); - if (c != null && bounds.intersects(c.getBounds())) - { - popUp.setVisible(true); - closeAllTabs.setText(TranslatedStrings.CLOSE_TAB + ": " + ((TabbedPane) c).tabName); - closeTab.setText(TranslatedStrings.CLOSE_TAB + ": " + ((TabbedPane) c).tabName); - } - else - { - popUp.setVisible(false); - } - } - } - } + @Override + public void mouseExited(MouseEvent arg0) { + } - @Override - public void mouseReleased(MouseEvent e) { } - }); + @Override + public void mousePressed(MouseEvent e) { + if (BLOCK_TAB_MENU) + return; - popUp.add(closeAllTabs); - popUp.add(closeTab); + if (e.getButton() == 3) { + Rectangle bounds = new Rectangle(1, 1, e.getX(), e.getY()); - if (!BLOCK_TAB_MENU) - tabs.setComponentPopupMenu(popUp); + for (int i = 0; i < BytecodeViewer.viewer.workPane.tabs.getTabCount(); i++) { + Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); + if (c != null && bounds.intersects(c.getBounds())) { + popUp.setVisible(true); + closeAllTabs.setText(TranslatedStrings.CLOSE_TAB + ": " + ((TabbedPane) c).tabName); + closeTab.setText(TranslatedStrings.CLOSE_TAB + ": " + ((TabbedPane) c).tabName); + } else { + popUp.setVisible(false); + } + } + } + } - getContentPane().setLayout(new BorderLayout()); - getContentPane().add(tabs, BorderLayout.CENTER); + @Override + public void mouseReleased(MouseEvent e) { + } + }); - buttonPanel = new JPanel(new FlowLayout()); + popUp.add(closeAllTabs); + popUp.add(closeTab); - refreshClass = new TranslatedJButton("Refresh", TranslatedComponents.REFRESH); - refreshClass.addActionListener((event)-> - { - refreshClass.setEnabled(false); - Thread t = new Thread(() -> new WorkspaceRefresh(event).run(), "Refresh"); - t.start(); - }); + if (!BLOCK_TAB_MENU) + tabs.setComponentPopupMenu(popUp); - buttonPanel.add(refreshClass); - buttonPanel.setVisible(false); + getContentPane().setLayout(new BorderLayout()); + getContentPane().add(tabs, BorderLayout.CENTER); - getContentPane().add(buttonPanel, BorderLayout.SOUTH); + buttonPanel = new JPanel(new FlowLayout()); - tabs.addContainerListener(new TabRemovalEvent()); - tabs.addChangeListener(arg0 -> buttonPanel.setVisible(tabs.getSelectedIndex() != -1)); + refreshClass = new TranslatedJButton("Refresh", TranslatedComponents.REFRESH); + refreshClass.addActionListener((event) -> + { + refreshClass.setEnabled(false); + Thread t = new Thread(() -> new WorkspaceRefresh(event).run(), "Refresh"); + t.start(); + }); - this.setVisible(true); - } + buttonPanel.add(refreshClass); + buttonPanel.setVisible(false); - //load class resources - public void addClassResource(final ResourceContainer container, final String name) - { - addResource(container, name, new ClassViewer(container, name)); - } + getContentPane().add(buttonPanel, BorderLayout.SOUTH); - //Load file resources - public void addFileResource(final ResourceContainer container, final String name) - { - addResource(container, name, new FileViewer(container, name)); - } + tabs.addContainerListener(new TabRemovalEvent()); + tabs.addChangeListener(arg0 -> buttonPanel.setVisible(tabs.getSelectedIndex() != -1)); - private void addResource(final ResourceContainer container, final String name, final ResourceViewer resourceView) - { - // Warn user and prevent 'nothing' from opening if no Decompiler is selected - if(BytecodeViewer.viewer.viewPane1.getSelectedDecompiler() == Decompiler.NONE && - BytecodeViewer.viewer.viewPane2.getSelectedDecompiler() == Decompiler.NONE && - BytecodeViewer.viewer.viewPane3.getSelectedDecompiler() == Decompiler.NONE) - { - BytecodeViewer.showMessage(TranslatedStrings.SUGGESTED_FIX_NO_DECOMPILER_WARNING.toString()); - return; - } + this.setVisible(true); + } - //unlock the refresh button - BytecodeViewer.viewer.workPane.refreshClass.setEnabled(true); + //load class resources + public void addClassResource(final ResourceContainer container, final String name) { + addResource(container, name, new ClassViewer(container, name)); + } - final String workingName = container.getWorkingName(name); + //Load file resources + public void addFileResource(final ResourceContainer container, final String name) { + addResource(container, name, new FileViewer(container, name)); + } - //create a new tab if the resource isn't opened currently - if (!openedTabs.contains(workingName)) - { - addResourceToTab(resourceView, workingName, container.name, name); - } - else //if the resource is already opened select this tab as the active one - { - //TODO openedTabs could be changed to a HashMap for faster lookups + private void addResource(final ResourceContainer container, final String name, final ResourceViewer resourceView) { + // Warn user and prevent 'nothing' from opening if no Decompiler is selected + if (BytecodeViewer.viewer.viewPane1.getSelectedDecompiler() == Decompiler.NONE && + BytecodeViewer.viewer.viewPane2.getSelectedDecompiler() == Decompiler.NONE && + BytecodeViewer.viewer.viewPane3.getSelectedDecompiler() == Decompiler.NONE) { + BytecodeViewer.showMessage(TranslatedStrings.SUGGESTED_FIX_NO_DECOMPILER_WARNING.toString()); + return; + } - //search through each tab - for(int i = 0; i < tabs.getTabCount(); i++) - { - //find the matching resource and open it - ResourceViewer tab = ((TabbedPane)tabs.getTabComponentAt(i)).resource; - if(tab.resource.workingName.equals(workingName)) - { - tabs.setSelectedIndex(i); - break; - } - } - } - } + //unlock the refresh button + BytecodeViewer.viewer.workPane.refreshClass.setEnabled(true); - public void addResourceToTab(ResourceViewer resourceView, String workingName, String containerName, String name) - { - //start processing the resource to be viewed - if(resourceView instanceof ClassViewer) - resourceView.refresh(null); + final String workingName = container.getWorkingName(name); - //add the resource view to the tabs - tabs.add(resourceView); + //create a new tab if the resource isn't opened currently + if (!openedTabs.contains(workingName)) { + addResourceToTab(resourceView, workingName, container.name, name); + } else //if the resource is already opened select this tab as the active one + { + //TODO openedTabs could be changed to a HashMap for faster lookups - //get the resource view index - final int tabIndex = tabs.indexOfComponent(resourceView); + //search through each tab + for (int i = 0; i < tabs.getTabCount(); i++) { + //find the matching resource and open it + ResourceViewer tab = (ResourceViewer) tabs.getComponentAt(i); + if (tab.resource.workingName.equals(workingName)) { + tabs.setSelectedIndex(i); + break; + } + } + } + } - //create a new tabbed pane - resourceView.tabbedPane = new TabbedPane(tabIndex, workingName, containerName, name, tabs, resourceView); - resourceView.resource.workingName = workingName; + public void addResourceToTab(ResourceViewer resourceView, String workingName, String containerName, String name) { + //start processing the resource to be viewed + if (resourceView instanceof ClassViewer) + resourceView.refresh(null); - //set the tabs index - tabs.setTabComponentAt(tabIndex, new CloseButtonComponent(tabs)); + //add the resource view to the tabs + tabs.add(resourceView); - //open the tab that was just added - tabs.setSelectedIndex(tabIndex); + //get the resource view index + final int tabIndex = tabs.indexOfComponent(resourceView); - //set resource as opened in a tab - openedTabs.add(workingName); + //create a new tabbed pane + resourceView.tabbedPane = new TabbedPane(tabIndex, workingName, containerName, name, tabs, resourceView); + resourceView.resource.workingName = workingName; - //refresh the tab title - resourceView.refreshTitle(); - } + //set the tabs index + tabs.setTabComponentAt(tabIndex, new CloseButtonComponent(tabs)); - public ResourceViewer getActiveResource() { - return (ResourceViewer) tabs.getSelectedComponent(); - } + //open the tab that was just added + tabs.setSelectedIndex(tabIndex); - public Component[] getLoadedViewers() { - return tabs.getComponents(); - } + //set resource as opened in a tab + openedTabs.add(workingName); - public void resetWorkspace() - { - tabs.removeAll(); - tabs.updateUI(); - } + //refresh the tab title + resourceView.refreshTitle(); + } - private static final long serialVersionUID = 6542337997679487946L; + public ResourceViewer getActiveResource() { + return (ResourceViewer) tabs.getSelectedComponent(); + } + + public Component[] getLoadedViewers() { + return tabs.getComponents(); + } + + public void resetWorkspace() { + tabs.removeAll(); + tabs.updateUI(); + } + + private static final long serialVersionUID = 6542337997679487946L; } From 5c0afb0fd0f42bfaf62da0df31ea4238c099268f Mon Sep 17 00:00:00 2001 From: Konloch Date: Mon, 20 Feb 2023 17:30:15 -0700 Subject: [PATCH 09/24] Update Dex2Jar --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf746c2f..69783ce4 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 3.0.2 0.4.1 6.1.0.Final - v57 + v59 e0d44f4 2.10 31.1-jre From 425772555e599f274c84db1f57f4da5d4e30c23e Mon Sep 17 00:00:00 2001 From: Konloch Date: Mon, 20 Feb 2023 17:54:03 -0700 Subject: [PATCH 10/24] Update HTTPRequest Library --- pom.xml | 6 + .../me/konloch/kontainer/io/HTTPRequest.java | 276 ------------------ .../club/bytecodeviewer/bootloader/Boot.java | 3 +- .../bootloader/UpdateCheck.java | 4 +- .../club/bytecodeviewer/util/PingBack.java | 2 +- 5 files changed, 10 insertions(+), 281 deletions(-) delete mode 100644 src/main/java/me/konloch/kontainer/io/HTTPRequest.java diff --git a/pom.xml b/pom.xml index 69783ce4..52bcd733 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,7 @@ e0d44f4 2.10 31.1-jre + 2.1.0 4.2 1.4.5 1.6.6bcv @@ -73,6 +74,11 @@ + + com.konloch + HTTPRequest + ${httprequest.version} + org.jetbrains annotations diff --git a/src/main/java/me/konloch/kontainer/io/HTTPRequest.java b/src/main/java/me/konloch/kontainer/io/HTTPRequest.java deleted file mode 100644 index c3b1798b..00000000 --- a/src/main/java/me/konloch/kontainer/io/HTTPRequest.java +++ /dev/null @@ -1,276 +0,0 @@ -package me.konloch.kontainer.io; - -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.Proxy; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; - -/** - * A wrapper for Java SE classes to write/read an HTTP Request - * - * @author Konloch - */ - -public class HTTPRequest { - - public URL url; - private int timeout = 30000; - private String cookie; - private String referer; - private String postData; - private String useragent = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0"; - private Proxy proxy; - private boolean setFollowRedirects = true; - private BufferedReader reader; - private DataOutputStream writer; - private HttpURLConnection connection; - private Set>> lastConnectionHeaders; - private int statusCode; - - /** - * Creates a new HTTPRequest object - * - * @param url - */ - public HTTPRequest(URL url) { - this.url = url; - } - - /** - * Sets a referer to send to the web server - */ - public void setReferer(String referer) { - this.referer = referer; - } - - /** - * Set a cookie string to send to the web server - */ - public void setCookie(String cookie) { - this.cookie = cookie; - } - - /** - * Sets post data to send to the web server - */ - public void setPostData(String postData) { - this.postData = postData; - } - - /** - * Sets a custom useragent, default 'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:25.0) Gecko/20100101 Firefox/25.0' - */ - public void setUseragent(String useragent) { - this.useragent = useragent; - } - - /** - * Sets the seconds till timeout, default 30,000 milliseconds - */ - public void setTimeout(int timeout) { - this.timeout = timeout; - } - - /** - * Sets a proxy to connect through - */ - public void setProxy(Proxy proxy) { - this.proxy = proxy; - } - - /** - * Used to get the headers the webserver sent on our last connection - */ - public Set>> getLastConnectionHeaders() { - return lastConnectionHeaders; - } - - public int getStatusCode() - { - return statusCode; - } - - /** - * By default, follow redirects are enabled - */ - public void setFollowRedirects(boolean setFollowRedirects) { - this.setFollowRedirects = setFollowRedirects; - } - - /** - * Used to set up the connection to read the content. - */ - private void setup() throws Exception { - if (proxy != null) - connection = (HttpURLConnection) url.openConnection(proxy); - else - connection = (HttpURLConnection) url.openConnection(); - - if (cookie != null) - connection.setRequestProperty("Cookie", cookie); - if (referer != null) - connection.addRequestProperty("Referer", referer); - - connection.setRequestProperty("User-Agent", useragent); - connection.setReadTimeout(timeout); - connection.setConnectTimeout(timeout); - connection.setUseCaches(false); - HttpURLConnection.setFollowRedirects(setFollowRedirects); - - if (postData != null) { - connection.setRequestMethod("POST"); - connection.setDoOutput(true); - connection.setDoInput(true); - writer = new DataOutputStream(connection.getOutputStream()); - writer.writeBytes(postData); - writer.flush(); - } - - reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); - } - - /** - * Reads the entire page and returns a string array - * - * @return - * @throws Exception - */ - public String[] read() throws Exception { - List st; - - try { - setup(); - - st = new ArrayList<>(); - String s; - while ((s = reader.readLine()) != null) - st.add(s); - - lastConnectionHeaders = connection.getHeaderFields().entrySet(); - statusCode = connection.getResponseCode(); - } catch (Exception e) { - cleanup(); - throw e; - } finally { - cleanup(); - } - - return st.toArray(new String[0]); - } - - /** - * Reads as many lines as expected unless it reaches the end. - * - * @param linesToRead - * @return - * @throws Exception - */ - public String[] read(int linesToRead) throws Exception { - List st; - - try { - setup(); - - st = new ArrayList<>(); - for (int i = 0; i < linesToRead; i++) { - String s = reader.readLine(); - if (s != null) - st.add(s); - } - - lastConnectionHeaders = connection.getHeaderFields().entrySet(); - statusCode = connection.getResponseCode(); - } catch (Exception e) { - cleanup(); - throw e; - } finally { - cleanup(); - } - - return st.toArray(new String[0]); - } - - /** - * Only reads the first line - * - * @return - * @throws Exception - */ - public String readSingle() throws Exception { - String s; - - try { - setup(); - - s = reader.readLine(); - - lastConnectionHeaders = connection.getHeaderFields().entrySet(); - statusCode = connection.getResponseCode(); - } catch (Exception e) { - cleanup(); - throw e; - } finally { - cleanup(); - } - - return s; - } - - /** - * Reads until it reaches the expected line then it returns it. - * - * @param linesToRead - * @return - * @throws Exception - */ - public String readSingle(int linesToRead) throws Exception { - String s; - - try { - setup(); - - for (int i = 0; i < linesToRead - 1; i++) - reader.readLine(); - - s = reader.readLine(); - - lastConnectionHeaders = connection.getHeaderFields().entrySet(); - statusCode = connection.getResponseCode(); - } catch (Exception e) { - cleanup(); - throw e; - } finally { - cleanup(); - } - - return s; - } - - /** - * Used to clean up the connection, closes the connections and nulls the objects - */ - private void cleanup() { - try { - reader.close(); - } catch (Exception ignored) { - } - try { - writer.close(); - } catch (Exception ignored) { - } - try { - connection.disconnect(); - } catch (Exception ignored) { - } - reader = null; - writer = null; - connection = null; - } - -} diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/bootloader/Boot.java b/src/main/java/the/bytecode/club/bytecodeviewer/bootloader/Boot.java index d12676e5..5ea76081 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/bootloader/Boot.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/bootloader/Boot.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Objects; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; -import me.konloch.kontainer.io.HTTPRequest; +import com.konloch.httprequest.HTTPRequest; import org.apache.commons.io.FileUtils; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.Configuration; @@ -277,7 +277,6 @@ public class Boot { public static void populateUrlList() throws Exception { HTTPRequest req = new HTTPRequest(new URL("https://github.com/Konloch/bytecode-viewer/tree/master/libs")); - req.setTimeout(30000); for (String s : req.read()) if (s.contains("href=\"/Konloch/bytecode-viewer/blob/master/libs/")) { urlList.add("https://github.com" + s.split("href=")[1].split("\"")[1]); diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/bootloader/UpdateCheck.java b/src/main/java/the/bytecode/club/bytecodeviewer/bootloader/UpdateCheck.java index babd9c81..62f8f0ec 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/bootloader/UpdateCheck.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/bootloader/UpdateCheck.java @@ -10,7 +10,7 @@ import java.io.InputStream; import java.net.URI; import java.net.URL; import javax.swing.JFileChooser; -import me.konloch.kontainer.io.HTTPRequest; +import com.konloch.httprequest.HTTPRequest; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.Configuration; import the.bytecode.club.bytecodeviewer.api.BCV; @@ -256,7 +256,7 @@ public class UpdateCheck implements Runnable { HTTPRequest request = new HTTPRequest(new URL(url)); request.readSingle(); - return request.getStatusCode() == 200; + return request.getLastStatusCode() == 200; } private static void download(String url, File saveTo, Runnable onFinish) throws Exception diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/PingBack.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/PingBack.java index fe99733f..5176bf8d 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/PingBack.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/PingBack.java @@ -1,7 +1,7 @@ package the.bytecode.club.bytecodeviewer.util; import java.net.URL; -import me.konloch.kontainer.io.HTTPRequest; +import com.konloch.httprequest.HTTPRequest; import the.bytecode.club.bytecodeviewer.Configuration; /*************************************************************************** From 91755f8268abcf20bac4b0f064e9a6ff013d42ea Mon Sep 17 00:00:00 2001 From: Konloch Date: Mon, 20 Feb 2023 16:56:57 -0800 Subject: [PATCH 11/24] Update maven.yml --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 40db89e2..6388a574 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,6 +23,7 @@ jobs: with: java-version: ${{ matrix.java }} distribution: 'temurin' + cache: maven - name: Build with Maven run: mvn -B package --file pom.xml - name: Extract Maven project version From c5c947f739c9557d48def1cf6b034c05cf8dd88d Mon Sep 17 00:00:00 2001 From: Konloch Date: Mon, 20 Feb 2023 22:41:24 -0700 Subject: [PATCH 12/24] Delete LICENSE --- LICENSE | 674 -------------------------------------------------------- 1 file changed, 674 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index b966d674..00000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - Bytecode Viewer - Java & Android Reverse Engineering Suite - Copyright (C) 2014 Kalen "Konloch" Kinloch - http://bytecodeviewer.com - http://the.bytecode.club - - 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 . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Bytecode Viewer(BCV) Copyright (C) 2014 Kalen "Konloch" Kinloch - http://bytecodeviewer.com - http://the.bytecode.club - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file From 2639d7b45f308fad2179f79a77d20b0867d49194 Mon Sep 17 00:00:00 2001 From: Konloch Date: Mon, 20 Feb 2023 22:41:36 -0700 Subject: [PATCH 13/24] Minify GPL-3 License --- LICENSE | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..8d94ba60 --- /dev/null +++ b/LICENSE @@ -0,0 +1,15 @@ +Bytecode Viewer - Java & Android Reverse Engineering Suite +Copyright (C) 2014 Kalen "Konloch" Kinloch - http://bytecodeviewer.com - http://the.bytecode.club + +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 . \ No newline at end of file From 4629cda855835fe5f4cd56c1aa4b77fa76b16ffd Mon Sep 17 00:00:00 2001 From: Konloch Date: Mon, 20 Feb 2023 22:42:29 -0700 Subject: [PATCH 14/24] Update LICENSE --- LICENSE | 657 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 645 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index 8d94ba60..5a43ba9f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,648 @@ -Bytecode Viewer - Java & Android Reverse Engineering Suite -Copyright (C) 2014 Kalen "Konloch" Kinloch - http://bytecodeviewer.com - http://the.bytecode.club + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -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. + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -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. + Preamble -You should have received a copy of the GNU General Public License -along with this program. If not, see . \ No newline at end of file + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + Bytecode Viewer - Java & Android Reverse Engineering Suite + Copyright (C) 2014 Kalen "Konloch" Kinloch - http://bytecodeviewer.com - http://the.bytecode.club + + 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 . \ No newline at end of file From 91858a74b5ccf74bb8a6744b91b79f0370f6a9e8 Mon Sep 17 00:00:00 2001 From: Konloch Date: Tue, 21 Feb 2023 19:10:54 -0700 Subject: [PATCH 15/24] Swap to SafeYAML For more information read https://bitbucket.org/snakeyaml/snakeyaml/issues/561/cve-2022-1471-vulnerability-in --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 52bcd733..85a6ec87 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 2.1.1 2.0.5 2.5.2 - 1.33 + 1.34.0 1.0.3 0.2.2 1.1.4c @@ -95,8 +95,8 @@ ${apktool.version} - org.yaml - snakeyaml + com.konloch + safeyaml @@ -287,9 +287,9 @@ ${smali.version} - org.yaml - snakeyaml - ${snakeyaml.version} + com.konloch + safeyaml + ${safeyaml.version} xpp3 From a68ff1674fc43ad262dbeeddf0b1ddae0bb7a462 Mon Sep 17 00:00:00 2001 From: Konloch Date: Tue, 21 Feb 2023 20:18:00 -0700 Subject: [PATCH 16/24] Downgrade SafeYAML to v1.33 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 85a6ec87..c2f41edd 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 2.1.1 2.0.5 2.5.2 - 1.34.0 + 1.33.0 1.0.3 0.2.2 1.1.4c From def596a5e8830640ac84ea405ae69f3b7e137829 Mon Sep 17 00:00:00 2001 From: Nico Mexis Date: Wed, 22 Feb 2023 10:19:06 +0100 Subject: [PATCH 17/24] Improve POM --- pom.xml | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index c2f41edd..f3310a68 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 23.1.0 + 24.0.0 4.9.3 2.7.0 9.4 @@ -30,10 +30,10 @@ 1.10.0 3.0.2 0.4.1 - 6.1.0.Final + 6.1.2.Final v59 e0d44f4 - 2.10 + 2.10.1 31.1-jre 2.1.0 4.2 @@ -44,10 +44,10 @@ 3.3 0.2.0 0.6.0 - 3.3.0 + 3.3.2 2.1.1 - 2.0.5 - 2.5.2 + 2.0.6 + 403e90375e 1.33.0 1.0.3 0.2.2 @@ -95,8 +95,8 @@ ${apktool.version} - com.konloch - safeyaml + org.yaml + snakeyaml @@ -277,12 +277,12 @@ ${slf4j.version} - org.smali + com.github.iBotPeaches.smali smali ${smali.version} - org.smali + com.github.iBotPeaches.smali baksmali ${smali.version} @@ -320,11 +320,23 @@ io.github.skylot jadx-dex-input ${jadx.version} + + + org.smali + baksmali + + io.github.skylot jadx-smali-input ${jadx.version} + + + org.smali + smali + + com.github.ThexXTURBOXx From f006a3a0e64fe8661be764e473b73136c5ba02be Mon Sep 17 00:00:00 2001 From: Nico Mexis Date: Wed, 22 Feb 2023 10:40:35 +0100 Subject: [PATCH 18/24] Fix many DnD errors related to #462 --- .../resourceviewer/DraggableTabbedPane.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java index 14048d52..b6cc821b 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java @@ -127,8 +127,11 @@ public class DraggableTabbedPane extends JTabbedPane { } private TabTransferData getTabTransferData(DropTargetDropEvent a_event) { + Transferable t = a_event.getTransferable(); + if (!t.isDataFlavorSupported(FLAVOR)) return null; + try { - return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR); + return (TabTransferData) t.getTransferData(FLAVOR); } catch (Exception e) { e.printStackTrace(); } @@ -137,8 +140,11 @@ public class DraggableTabbedPane extends JTabbedPane { } private TabTransferData getTabTransferData(DropTargetDragEvent a_event) { + Transferable t = a_event.getTransferable(); + if (!t.isDataFlavorSupported(FLAVOR)) return null; + try { - return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR); + return (TabTransferData) t.getTransferData(FLAVOR); } catch (Exception e) { e.printStackTrace(); } @@ -147,8 +153,11 @@ public class DraggableTabbedPane extends JTabbedPane { } private TabTransferData getTabTransferData(DragSourceDragEvent a_event) { + Transferable t = a_event.getDragSourceContext().getTransferable(); + if (!t.isDataFlavorSupported(FLAVOR)) return null; + try { - return (TabTransferData) a_event.getDragSourceContext().getTransferable().getTransferData(FLAVOR); + return (TabTransferData) t.getTransferData(FLAVOR); } catch (Exception e) { e.printStackTrace(); } @@ -266,6 +275,7 @@ public class DraggableTabbedPane extends JTabbedPane { public void dragOver(final DropTargetDragEvent e) { TabTransferData data = getTabTransferData(e); + if (data == null) return; if (getTabPlacement() == JTabbedPane.TOP || getTabPlacement() == JTabbedPane.BOTTOM) { @@ -309,6 +319,7 @@ public class DraggableTabbedPane extends JTabbedPane { } // if TabTransferData data = getTabTransferData(e); + if (data == null) return false; if (DraggableTabbedPane.this == data.getTabbedPane() && data.getTabIndex() >= 0) { @@ -336,6 +347,7 @@ public class DraggableTabbedPane extends JTabbedPane { } // if TabTransferData data = getTabTransferData(e); + if (data == null) return false; if (DraggableTabbedPane.this == data.getTabbedPane() && data.getTabIndex() >= 0) { @@ -403,6 +415,7 @@ public class DraggableTabbedPane extends JTabbedPane { } private void convertTab(TabTransferData a_data, int a_targetIndex) { + if (a_data == null) return; DraggableTabbedPane source = a_data.getTabbedPane(); int sourceIndex = a_data.getTabIndex(); if (sourceIndex < 0) { @@ -459,6 +472,7 @@ public class DraggableTabbedPane extends JTabbedPane { m_isDrawRect = false; return; } // if + if (a_data == null) return; if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next @@ -492,6 +506,7 @@ public class DraggableTabbedPane extends JTabbedPane { m_isDrawRect = false; return; } // if + if (a_data == null) return; if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next From 5c1be3d9339ea1ca872e0c3cd146949b9d005f8f Mon Sep 17 00:00:00 2001 From: Nico Mexis Date: Wed, 22 Feb 2023 10:40:46 +0100 Subject: [PATCH 19/24] Should we do this? --- .../java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java index a1e36460..44f44335 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java @@ -196,7 +196,7 @@ public class BytecodeViewer //setup swing components viewer = new MainViewerGUI(); - SwingUtilities.updateComponentTreeUI(viewer); + //SwingUtilities.updateComponentTreeUI(viewer); //load settings and set swing components state SettingsSerializer.loadSettings(); From e6cdd92baec6282b352a42de1d4c1f952caf0fff Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 9 Apr 2023 17:17:37 -0700 Subject: [PATCH 20/24] Removed last version of dnd. Added dnd support from weisJ theme. Also, I fixed a problem not being able to scroll when a class is open and switching themes. Not sure if it was happening to just me or not. --- .../resourceviewer/CloseButtonComponent.java | 8 - .../resourceviewer/DraggableTabbedPane.java | 263 +++++++----------- .../gui/resourceviewer/TabbedPane.java | 47 +--- .../gui/resourceviewer/Workspace.java | 22 +- 4 files changed, 120 insertions(+), 220 deletions(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java index 50c983d2..70c41c37 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/CloseButtonComponent.java @@ -1,24 +1,16 @@ package the.bytecode.club.bytecodeviewer.gui.resourceviewer; -import com.android.tools.r8.internal.Cl; import com.github.weisj.darklaf.components.CloseButton; -import com.github.weisj.darklaf.listener.MouseClickListener; import the.bytecode.club.bytecodeviewer.gui.components.listeners.MouseClickedListener; import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings; import javax.swing.*; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; public class CloseButtonComponent extends JPanel { private final JTabbedPane pane; - String title = ""; - public CloseButtonComponent(final JTabbedPane pane) { super(new FlowLayout(FlowLayout.LEFT, 0, 0)); if (pane == null) { diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java index b6cc821b..97a62943 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/DraggableTabbedPane.java @@ -1,5 +1,6 @@ package the.bytecode.club.bytecodeviewer.gui.resourceviewer; +import com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneUI; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import javax.swing.*; @@ -16,106 +17,75 @@ public class DraggableTabbedPane extends JTabbedPane { private static final int LINEWIDTH = 3; private static final String NAME = "TabTransferData"; private final DataFlavor FLAVOR = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType, NAME); - private static GhostGlassPane s_glassPane = new GhostGlassPane(); + private static final GhostGlassPane s_glassPane = new GhostGlassPane(); private boolean m_isDrawRect = false; private final Rectangle2D m_lineRect = new Rectangle2D.Double(); private final Color m_lineColor = new Color(0, 100, 255); - private TabAcceptor m_acceptor = null; + private TabAcceptor m_acceptor; public DraggableTabbedPane() { super(SwingConstants.TOP, SCROLL_TAB_LAYOUT); + this.putClientProperty(DarkTabbedPaneUI.KEY_DND, true); - final DragSourceListener dsl = new DragSourceListener() { - public void dragEnter(DragSourceDragEvent e) { - e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop); - } - - public void dragExit(DragSourceEvent e) { - e.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop); - m_lineRect.setRect(0, 0, 0, 0); - m_isDrawRect = false; - s_glassPane.setPoint(new Point(-1000, -1000)); - s_glassPane.repaint(); - } - - public void dragOver(DragSourceDragEvent e) { - //e.getLocation() - //This method returns a Point indicating the cursor location in screen coordinates at the moment - - TabTransferData data = getTabTransferData(e); - if (data == null) { - e.getDragSourceContext().setCursor( - DragSource.DefaultMoveNoDrop); - return; - } // if - - /* - Point tabPt = e.getLocation(); - SwingUtilities.convertPointFromScreen(tabPt, DnDTabbedPane.this); - if (DnDTabbedPane.this.contains(tabPt)) { - int targetIdx = getTargetTabIndex(tabPt); - int sourceIndex = data.getTabIndex(); - if (getTabAreaBound().contains(tabPt) - && (targetIdx >= 0) - && (targetIdx != sourceIndex) - && (targetIdx != sourceIndex + 1)) { - e.getDragSourceContext().setCursor( - DragSource.DefaultMoveDrop); - - return; - } // if - - e.getDragSourceContext().setCursor( - DragSource.DefaultMoveNoDrop); - return; - } // if - */ - - e.getDragSourceContext().setCursor( - DragSource.DefaultMoveDrop); - } - - public void dragDropEnd(DragSourceDropEvent e) { - m_isDrawRect = false; - m_lineRect.setRect(0, 0, 0, 0); - // m_dragTabIndex = -1; - - if (hasGhost()) { - s_glassPane.setVisible(false); - s_glassPane.setImage(null); + /*if (!Configuration.showDarkLAFComponentIcons) { + final DragSourceListener dsl = new DragSourceListener() { + public void dragEnter(DragSourceDragEvent e) { + e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop); } - } - public void dropActionChanged(DragSourceDragEvent e) { - } - }; + public void dragExit(DragSourceEvent e) { + e.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop); + m_lineRect.setRect(0, 0, 0, 0); + m_isDrawRect = false; + s_glassPane.setPoint(new Point(-1000, -1000)); + s_glassPane.repaint(); + } - final DragGestureListener dgl = e -> { - // System.out.println("dragGestureRecognized"); + public void dragOver(DragSourceDragEvent e) { + TabTransferData data = getTabTransferData(e); + if (data == null) { + e.getDragSourceContext().setCursor( + DragSource.DefaultMoveNoDrop); + return; + } - Point tabPt = e.getDragOrigin(); - int dragTabIndex = indexAtLocation(tabPt.x, tabPt.y); - if (dragTabIndex < 0) { - return; - } // if + e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop); + } - initGlassPane(e.getComponent(), e.getDragOrigin(), dragTabIndex); - try { - e.startDrag(DragSource.DefaultMoveDrop, - new TabTransferable(DraggableTabbedPane.this, dragTabIndex), dsl); - } catch (InvalidDnDOperationException idoe) { - idoe.printStackTrace(); - } - }; + public void dragDropEnd(DragSourceDropEvent e) { + m_isDrawRect = false; + m_lineRect.setRect(0, 0, 0, 0); + if (hasGhost()) { + s_glassPane.setVisible(false); + s_glassPane.setImage(null); + } + } - //dropTarget = - new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, - new CDropTargetListener(), true); - new DragSource().createDefaultDragGestureRecognizer(this, - DnDConstants.ACTION_COPY_OR_MOVE, dgl); - m_acceptor = (a_component, a_index) -> true; + public void dropActionChanged(DragSourceDragEvent e) { + } + }; + + final DragGestureListener dgl = e -> { + Point tabPt = e.getDragOrigin(); + int dragTabIndex = indexAtLocation(tabPt.x, tabPt.y); + if (dragTabIndex < 0) { + return; + } + + initGlassPane(e.getComponent(), e.getDragOrigin(), dragTabIndex); + try { + e.startDrag(DragSource.DefaultMoveDrop, new TabTransferable(DraggableTabbedPane.this, dragTabIndex), dsl); + } catch (InvalidDnDOperationException idoe) { + idoe.printStackTrace(); + } + }; + + new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, new CDropTargetListener(), true); + new DragSource().createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY_OR_MOVE, dgl); + m_acceptor = (a_component, a_index) -> true; + }*/ } public TabAcceptor getAcceptor() { @@ -131,7 +101,7 @@ public class DraggableTabbedPane extends JTabbedPane { if (!t.isDataFlavorSupported(FLAVOR)) return null; try { - return (TabTransferData) t.getTransferData(FLAVOR); + return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR); } catch (Exception e) { e.printStackTrace(); } @@ -144,7 +114,7 @@ public class DraggableTabbedPane extends JTabbedPane { if (!t.isDataFlavorSupported(FLAVOR)) return null; try { - return (TabTransferData) t.getTransferData(FLAVOR); + return (TabTransferData) a_event.getTransferable().getTransferData(FLAVOR); } catch (Exception e) { e.printStackTrace(); } @@ -157,7 +127,7 @@ public class DraggableTabbedPane extends JTabbedPane { if (!t.isDataFlavorSupported(FLAVOR)) return null; try { - return (TabTransferData) t.getTransferData(FLAVOR); + return (TabTransferData) a_event.getDragSourceContext().getTransferable().getTransferData(FLAVOR); } catch (Exception e) { e.printStackTrace(); } @@ -175,7 +145,6 @@ public class DraggableTabbedPane extends JTabbedPane { public Object getTransferData(DataFlavor flavor) { return m_data; - // return DnDTabbedPane.this; } public DataFlavor[] getTransferDataFlavors() { @@ -246,27 +215,23 @@ public class DraggableTabbedPane extends JTabbedPane { retval.y -= s_glassPane.getGhostHeight() / 2; } break; - } // switch + } - retval = SwingUtilities.convertPoint(DraggableTabbedPane.this, - retval, s_glassPane); + retval = SwingUtilities.convertPoint(DraggableTabbedPane.this, retval, s_glassPane); return retval; } class CDropTargetListener implements DropTargetListener { public void dragEnter(DropTargetDragEvent e) { - // System.out.println("DropTarget.dragEnter: " + DnDTabbedPane.this); - if (isDragAcceptable(e)) { e.acceptDrag(e.getDropAction()); } else { e.rejectDrag(); - } // if + } } public void dragExit(DropTargetEvent e) { - // System.out.println("DropTarget.dragExit: " + DnDTabbedPane.this); m_isDrawRect = false; } @@ -282,7 +247,7 @@ public class DraggableTabbedPane extends JTabbedPane { initTargetLeftRightLine(getTargetTabIndex(e.getLocation()), data); } else { initTargetTopBottomLine(getTargetTabIndex(e.getLocation()), data); - } // if-else + } repaint(); if (hasGhost()) { @@ -292,14 +257,12 @@ public class DraggableTabbedPane extends JTabbedPane { } public void drop(DropTargetDropEvent a_event) { - // System.out.println("DropTarget.drop: " + DnDTabbedPane.this); - if (isDropAcceptable(a_event)) { convertTab(getTabTransferData(a_event), getTargetTabIndex(a_event.getLocation())); a_event.dropComplete(true); } else { a_event.dropComplete(false); - } // if-else + } m_isDrawRect = false; repaint(); @@ -311,12 +274,12 @@ public class DraggableTabbedPane extends JTabbedPane { Transferable t = e.getTransferable(); if (t == null) { return false; - } // if + } DataFlavor[] flavor = e.getCurrentDataFlavors(); if (!t.isDataFlavorSupported(flavor[0])) { return false; - } // if + } TabTransferData data = getTabTransferData(e); if (data == null) return false; @@ -324,13 +287,13 @@ public class DraggableTabbedPane extends JTabbedPane { if (DraggableTabbedPane.this == data.getTabbedPane() && data.getTabIndex() >= 0) { return true; - } // if + } if (DraggableTabbedPane.this != data.getTabbedPane()) { if (m_acceptor != null) { return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex()); - } // if - } // if + } + } return false; } @@ -339,12 +302,12 @@ public class DraggableTabbedPane extends JTabbedPane { Transferable t = e.getTransferable(); if (t == null) { return false; - } // if + } DataFlavor[] flavor = e.getCurrentDataFlavors(); if (!t.isDataFlavorSupported(flavor[0])) { return false; - } // if + } TabTransferData data = getTabTransferData(e); if (data == null) return false; @@ -352,13 +315,13 @@ public class DraggableTabbedPane extends JTabbedPane { if (DraggableTabbedPane.this == data.getTabbedPane() && data.getTabIndex() >= 0) { return true; - } // if + } if (DraggableTabbedPane.this != data.getTabbedPane()) { if (m_acceptor != null) { return m_acceptor.isDropAcceptable(data.getTabbedPane(), data.getTabIndex()); - } // if - } // if + } + } return false; } @@ -387,20 +350,20 @@ public class DraggableTabbedPane extends JTabbedPane { // if the pane is empty, the target index is always zero. if (getTabCount() == 0) { return 0; - } // if + } for (int i = 0; i < getTabCount(); i++) { Rectangle r = getBoundsAt(i); if (isTopOrBottom) { - r.setRect(r.x - r.width / 2, r.y, r.width, r.height); + r.setRect(r.x - r.width / 2D, r.y, r.width, r.height); } else { - r.setRect(r.x, r.y - r.height / 2, r.width, r.height); - } // if-else + r.setRect(r.x, r.y - r.height / 2D, r.width, r.height); + } if (r.contains(a_point)) { return i; - } // if - } // for + } + } Rectangle r = getBoundsAt(getTabCount() - 1); if (isTopOrBottom) { @@ -409,18 +372,19 @@ public class DraggableTabbedPane extends JTabbedPane { } else { int y = r.y + r.height / 2; r.setRect(r.x, y, r.width, getHeight() - y); - } // if-else + } return r.contains(a_point) ? getTabCount() : -1; } private void convertTab(TabTransferData a_data, int a_targetIndex) { if (a_data == null) return; + DraggableTabbedPane source = a_data.getTabbedPane(); int sourceIndex = a_data.getTabIndex(); if (sourceIndex < 0) { return; - } // if + } Component cmp = source.getComponentAt(sourceIndex); String str = source.getTitleAt(sourceIndex); @@ -432,34 +396,28 @@ public class DraggableTabbedPane extends JTabbedPane { } else { if (a_targetIndex < 0) { a_targetIndex = 0; - } // if + } insertTab(str, null, cmp, null, a_targetIndex); - - } // if + } setSelectedComponent(cmp); - // System.out.println("press="+sourceIndex+" next="+a_targetIndex); return; - } // if + } if (a_targetIndex < 0 || sourceIndex == a_targetIndex) { - //System.out.println("press="+prev+" next="+next); return; - } // if + } if (a_targetIndex == getTabCount()) { - //System.out.println("last: press="+prev+" next="+next); source.remove(sourceIndex); addTab(str, cmp); setSelectedIndex(getTabCount() - 1); } else if (sourceIndex > a_targetIndex) { - //System.out.println(" >: press="+prev+" next="+next); source.remove(sourceIndex); insertTab(str, null, cmp, null, a_targetIndex); setSelectedIndex(a_targetIndex); } else { - //System.out.println(" <: press="+prev+" next="+next); source.remove(sourceIndex); insertTab(str, null, cmp, null, a_targetIndex - 1); setSelectedIndex(a_targetIndex - 1); @@ -471,31 +429,27 @@ public class DraggableTabbedPane extends JTabbedPane { m_lineRect.setRect(0, 0, 0, 0); m_isDrawRect = false; return; - } // if - if (a_data == null) return; + } - if ((a_data.getTabbedPane() == this) - && (a_data.getTabIndex() == next - || next - a_data.getTabIndex() == 1)) { + if (a_data == null) return; + + if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next || next - a_data.getTabIndex() == 1)) { m_lineRect.setRect(0, 0, 0, 0); m_isDrawRect = false; } else if (getTabCount() == 0) { m_lineRect.setRect(0, 0, 0, 0); m_isDrawRect = false; - return; } else if (next == 0) { Rectangle rect = getBoundsAt(0); - m_lineRect.setRect(-LINEWIDTH / 2, rect.y, LINEWIDTH, rect.height); + m_lineRect.setRect(-LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height); m_isDrawRect = true; } else if (next == getTabCount()) { Rectangle rect = getBoundsAt(getTabCount() - 1); - m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2, rect.y, - LINEWIDTH, rect.height); + m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height); m_isDrawRect = true; } else { Rectangle rect = getBoundsAt(next - 1); - m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2, rect.y, - LINEWIDTH, rect.height); + m_lineRect.setRect(rect.x + rect.width - LINEWIDTH / 2D, rect.y, LINEWIDTH, rect.height); m_isDrawRect = true; } } @@ -505,12 +459,11 @@ public class DraggableTabbedPane extends JTabbedPane { m_lineRect.setRect(0, 0, 0, 0); m_isDrawRect = false; return; - } // if + } + if (a_data == null) return; - if ((a_data.getTabbedPane() == this) - && (a_data.getTabIndex() == next - || next - a_data.getTabIndex() == 1)) { + if ((a_data.getTabbedPane() == this) && (a_data.getTabIndex() == next || next - a_data.getTabIndex() == 1)) { m_lineRect.setRect(0, 0, 0, 0); m_isDrawRect = false; } else if (getTabCount() == 0) { @@ -519,33 +472,29 @@ public class DraggableTabbedPane extends JTabbedPane { return; } else if (next == getTabCount()) { Rectangle rect = getBoundsAt(getTabCount() - 1); - m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2, - rect.width, LINEWIDTH); + m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2D, rect.width, LINEWIDTH); m_isDrawRect = true; } else if (next == 0) { Rectangle rect = getBoundsAt(0); - m_lineRect.setRect(rect.x, -LINEWIDTH / 2, rect.width, LINEWIDTH); + m_lineRect.setRect(rect.x, -LINEWIDTH / 2D, rect.width, LINEWIDTH); m_isDrawRect = true; } else { Rectangle rect = getBoundsAt(next - 1); - m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2, - rect.width, LINEWIDTH); + m_lineRect.setRect(rect.x, rect.y + rect.height - LINEWIDTH / 2D, rect.width, LINEWIDTH); m_isDrawRect = true; } } private void initGlassPane(Component c, Point tabPt, int a_tabIndex) { - //Point p = (Point) pt.clone(); getRootPane().setGlassPane(s_glassPane); if (hasGhost()) { Rectangle rect = getBoundsAt(a_tabIndex); - BufferedImage image = new BufferedImage(c.getWidth(), - c.getHeight(), BufferedImage.TYPE_INT_ARGB); + BufferedImage image = new BufferedImage(c.getWidth(), c.getHeight(), BufferedImage.TYPE_INT_ARGB); Graphics g = image.getGraphics(); c.paint(g); image = image.getSubimage(rect.x, rect.y, rect.width, rect.height); s_glassPane.setImage(image); - } // if + } s_glassPane.setPoint(buildGhostLocation(tabPt)); s_glassPane.setVisible(true); @@ -563,7 +512,7 @@ public class DraggableTabbedPane extends JTabbedPane { Graphics2D g2 = (Graphics2D) g; g2.setPaint(m_lineColor); g2.fill(m_lineRect); - } // if + } } public interface TabAcceptor { @@ -577,7 +526,7 @@ class GhostGlassPane extends JPanel { public static final long serialVersionUID = 1L; private final AlphaComposite m_composite; - private Point m_location = new Point(0, 0); + private final Point m_location = new Point(0, 0); private BufferedImage m_draggingGhost = null; @@ -598,7 +547,7 @@ class GhostGlassPane extends JPanel { public int getGhostWidth() { if (m_draggingGhost == null) { return 0; - } // if + } return m_draggingGhost.getWidth(this); } @@ -606,7 +555,7 @@ class GhostGlassPane extends JPanel { public int getGhostHeight() { if (m_draggingGhost == null) { return 0; - } // if + } return m_draggingGhost.getHeight(this); } @@ -614,7 +563,7 @@ class GhostGlassPane extends JPanel { public void paintComponent(Graphics g) { if (m_draggingGhost == null) { return; - } // if + } Graphics2D g2 = (Graphics2D) g; g2.setComposite(m_composite); diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java index 6e69083a..a0215fd0 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/TabbedPane.java @@ -1,22 +1,13 @@ package the.bytecode.club.bytecodeviewer.gui.resourceviewer; -import java.awt.Color; -import java.awt.Component; -import java.awt.FlowLayout; -import java.awt.Rectangle; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import javax.swing.*; - -import com.github.weisj.darklaf.components.CloseButton; -import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.gui.components.ButtonHoverAnimation; import the.bytecode.club.bytecodeviewer.gui.components.MaxWidthJLabel; -import the.bytecode.club.bytecodeviewer.gui.components.listeners.MouseClickedListener; import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer; import the.bytecode.club.bytecodeviewer.gui.util.DelayTabbedPaneThread; -import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseListener; /*************************************************************************** * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite * @@ -56,7 +47,7 @@ public class TabbedPane extends JPanel { public final static MouseListener buttonHoverAnimation = new ButtonHoverAnimation(); public static final Color BLANK_COLOR = new Color(0, 0, 0, 0); - public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName, String name, final DraggableTabbedPane existingTabs, ResourceViewer resource) { + public TabbedPane(int tabIndex, String tabWorkingName, String fileContainerName, String name, final JTabbedPane existingTabs, ResourceViewer resource) { // unset default FlowLayout' gaps super(new FlowLayout(FlowLayout.LEFT, 0, 0)); @@ -80,33 +71,5 @@ public class TabbedPane extends JPanel { setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0)); } - public void onMousePressed(MouseEvent e) - { - BytecodeViewer.viewer.workPane.tabs.dispatchEvent(e); - - if(e.getButton() == 1) - { - startedDragging = System.currentTimeMillis(); - //dragging = true; - if (probablyABadIdea != null) - probablyABadIdea.stopped = true; - - probablyABadIdea = new DelayTabbedPaneThread(TabbedPane.this); - probablyABadIdea.start(); - repaint(); - Rectangle bounds = new Rectangle(e.getX(), e.getY(), e.getX() + this.getX(), e.getY()); - for(int i = 0; i < BytecodeViewer.viewer.workPane.tabs.getTabCount(); i++) - { - Component c = BytecodeViewer.viewer.workPane.tabs.getTabComponentAt(i); - if(c != null && bounds.intersects(c.getBounds())) - BytecodeViewer.viewer.workPane.tabs.setSelectedIndex(i); - } - } - } - private static final long serialVersionUID = -4774885688297538774L; - - /*public int getTabIndex() { - return tabs.indexOfTabComponent(this); - }*/ } diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java index 503219c7..7ed91343 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java @@ -1,16 +1,5 @@ package the.bytecode.club.bytecodeviewer.gui.resourceviewer; -import java.awt.*; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.util.HashSet; -import java.util.Set; -import javax.swing.JButton; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; - -import com.github.weisj.darklaf.components.CloseButton; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.decompilers.Decompiler; import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer; @@ -22,6 +11,13 @@ import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings; import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJButton; import the.bytecode.club.bytecodeviewer.translation.components.TranslatedVisibleComponent; +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.util.HashSet; +import java.util.Set; + import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU; /*************************************************************************** @@ -52,7 +48,7 @@ import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU; public class Workspace extends TranslatedVisibleComponent { - public final DraggableTabbedPane tabs; + public JTabbedPane tabs; public final JPanel buttonPanel; public final JButton refreshClass; public final Set openedTabs = new HashSet<>(); @@ -193,7 +189,7 @@ public class Workspace extends TranslatedVisibleComponent { //search through each tab for (int i = 0; i < tabs.getTabCount(); i++) { //find the matching resource and open it - ResourceViewer tab = (ResourceViewer) tabs.getComponentAt(i); + ResourceViewer tab = (ResourceViewer) tabs.getComponentAt(i); if (tab.resource.workingName.equals(workingName)) { tabs.setSelectedIndex(i); break; From c932596d1ad1d85d49cc387b54ba159d8f899fd5 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 9 Apr 2023 17:22:04 -0700 Subject: [PATCH 21/24] Removed last version of dnd. Added dnd support from weisJ theme. Also, I fixed a problem not being able to scroll when a class is open and switching themes. Not sure if it was happening to just me or not. --- .../bytecodeviewer/gui/MainViewerGUI.java | 8 +- .../components/SearchableRSyntaxTextArea.java | 152 ++++++++---------- 2 files changed, 75 insertions(+), 85 deletions(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java index d9f5ac2f..a7e177fb 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java @@ -116,7 +116,7 @@ public class MainViewerGUI extends JFrame public final SearchBoxPane searchBoxPane = new SearchBoxPane(); public JSplitPane splitPane1; public JSplitPane splitPane2; - + //the root menu bar public final JMenuBar rootMenu = new JMenuBar(); @@ -351,9 +351,12 @@ public class MainViewerGUI extends JFrame searchBoxPane.setPreferredSize(new Dimension(200, 50)); searchBoxPane.setMinimumSize(new Dimension(200, 50)); searchBoxPane.setMaximumSize(new Dimension(200, 2147483647)); - + + workPane.setPreferredSize(new Dimension(1500, 1000)); + splitPane1 = new JSplitPane(JSplitPane.VERTICAL_SPLIT, resourcePane, searchBoxPane); splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, splitPane1, workPane); + getContentPane().add(splitPane2); splitPane2.setResizeWeight(0.05); splitPane1.setResizeWeight(0.5); @@ -361,6 +364,7 @@ public class MainViewerGUI extends JFrame uiComponents.add(resourcePane); uiComponents.add(searchBoxPane); uiComponents.add(workPane); +// uiComponents.add(hierarchy); viewPane1.setDefault(); viewPane2.setDefault(); diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java index 5c47163b..ae87a662 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java @@ -5,6 +5,7 @@ import java.awt.Color; import java.awt.Font; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; +import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -13,6 +14,7 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.SwingUtilities; import javax.swing.text.BadLocationException; + import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rtextarea.RTextScrollPane; import the.bytecode.club.bytecodeviewer.BytecodeViewer; @@ -50,9 +52,9 @@ import the.bytecode.club.bytecodeviewer.util.JTextAreaUtils; * @author Konloch * @since 6/25/2021 */ -public class SearchableRSyntaxTextArea extends RSyntaxTextArea -{ - private final RTextScrollPane scrollPane = new RTextScrollPane(this); +public class SearchableRSyntaxTextArea extends RSyntaxTextArea { + + private RTextScrollPane scrollPane = new RTextScrollPane(this); private final JPanel searchPanel = new JPanel(new BorderLayout()); private final JTextField searchInput = new JTextField(); private final JCheckBox caseSensitiveSearch = new TranslatedJCheckBox("Match case", TranslatedComponents.MATCH_CASE); @@ -62,30 +64,26 @@ public class SearchableRSyntaxTextArea extends RSyntaxTextArea private final Color blackScrollBackground = new Color(0x232323); private final Color blackScrollForeground = new Color(0x575859); private Runnable onCtrlS; - - public SearchableRSyntaxTextArea() - { - if(Configuration.lafTheme == LAFTheme.HIGH_CONTRAST_DARK) - { + + public SearchableRSyntaxTextArea() { + if (Configuration.lafTheme == LAFTheme.HIGH_CONTRAST_DARK) { //this fixes the white border on the jScrollBar panes scrollPane.getHorizontalScrollBar().setBackground(blackScrollBackground); scrollPane.getHorizontalScrollBar().setForeground(blackScrollForeground); scrollPane.getVerticalScrollBar().setBackground(blackScrollBackground); scrollPane.getVerticalScrollBar().setForeground(blackScrollForeground); - } - else if(Configuration.lafTheme.isDark()) - { + } else if (Configuration.lafTheme.isDark()) { //this fixes the white border on the jScrollBar panes scrollPane.getHorizontalScrollBar().setBackground(darkScrollBackground); scrollPane.getHorizontalScrollBar().setForeground(darkScrollForeground); scrollPane.getVerticalScrollBar().setBackground(darkScrollBackground); scrollPane.getVerticalScrollBar().setForeground(darkScrollForeground); } - + setAntiAliasingEnabled(true); - + scrollPane.setColumnHeaderView(searchPanel); - + JButton searchNext = new JButton(); JButton searchPrev = new JButton(); JPanel buttonPane = new JPanel(new BorderLayout()); @@ -96,90 +94,84 @@ public class SearchableRSyntaxTextArea extends RSyntaxTextArea searchPanel.add(buttonPane, BorderLayout.WEST); searchPanel.add(searchInput, BorderLayout.CENTER); searchPanel.add(caseSensitiveSearch, BorderLayout.EAST); - + searchNext.addActionListener(arg0 -> search(searchInput.getText(), true, caseSensitiveSearch.isSelected())); searchPrev.addActionListener(arg0 -> search(searchInput.getText(), false, caseSensitiveSearch.isSelected())); - + searchInput.addKeyListener(new ReleaseKeyListener(keyEvent -> { if (keyEvent.getKeyCode() == KeyEvent.VK_ENTER) search(searchInput.getText(), true, caseSensitiveSearch.isSelected()); })); - + addKeyListener(new PressKeyListener(keyEvent -> { if ((keyEvent.getKeyCode() == KeyEvent.VK_F) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0)) searchInput.requestFocus(); - - if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0)) - { + + if (onCtrlS != null && (keyEvent.getKeyCode() == KeyEvent.VK_S) && ((keyEvent.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0)) { onCtrlS.run(); return; } - + GlobalHotKeys.keyPressed(keyEvent); })); - + final Font newFont = getFont().deriveFont((float) BytecodeViewer.viewer.getFontSize()); - + //set number-bar font setFont(newFont); - - SwingUtilities.invokeLater(()-> { + + SwingUtilities.invokeLater(() -> { //attach CTRL + Mouse Wheel Zoom attachCtrlMouseWheelZoom(); - + //set text font setFont(newFont); }); - + } - - public void search(String search, boolean forwardSearchDirection, boolean caseSensitiveSearch) - { + + public void search(String search, boolean forwardSearchDirection, boolean caseSensitiveSearch) { JTextAreaUtils.search(this, search, forwardSearchDirection, caseSensitiveSearch); } - - public void highlight(String pattern, boolean caseSensitiveSearch) - { + + public void highlight(String pattern, boolean caseSensitiveSearch) { JTextAreaUtils.highlight(this, pattern, caseSensitiveSearch); } - - public void attachCtrlMouseWheelZoom() - { - //get the existing scroll event - MouseWheelListener ogListener = scrollPane.getMouseWheelListeners().length > 0 ? - scrollPane.getMouseWheelListeners()[0] : null; - - //remove the existing event - if(ogListener != null) - scrollPane.removeMouseWheelListener(ogListener); - - //add a new event - scrollPane.addMouseWheelListener(e -> - { - if (getText().isEmpty()) - return; - - if ((e.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0) - { + + public void attachCtrlMouseWheelZoom() { + scrollPane.addMouseWheelListener(e -> { + if (getText().isEmpty()) return; + if ((e.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0) { Font font = getFont(); int size = font.getSize(); - - if (e.getWheelRotation() > 0) //Up + if (e.getWheelRotation() > 0) setFont(new Font(font.getName(), font.getStyle(), --size >= 2 ? --size : 2)); - else //Down + else setFont(new Font(font.getName(), font.getStyle(), ++size)); - + e.consume(); } - else if(ogListener != null) - { - ogListener.mouseWheelMoved(e); - } }); + + scrollPane = new RTextScrollPane() { + @Override + protected void processMouseWheelEvent(MouseWheelEvent event) { + if (!isWheelScrollingEnabled()) { + if (getParent() != null) { + getParent().dispatchEvent(SwingUtilities.convertMouseEvent(this, event, getParent())); + return; + } + } + + super.processMouseWheelEvent(event); + } + }; + + scrollPane.setWheelScrollingEnabled(false); } - + public String getLineText(int line) { try { if (line < getLineCount()) { @@ -187,42 +179,36 @@ public class SearchableRSyntaxTextArea extends RSyntaxTextArea int end = getLineEndOffset(line); return getText(start, end - start).trim(); } - } catch (BadLocationException ignored) { } + } catch (BadLocationException ignored) { + } return ""; } - - public void setOnCtrlS(Runnable onCtrlS) - { + + public void setOnCtrlS(Runnable onCtrlS) { this.onCtrlS = onCtrlS; } - - public RTextScrollPane getScrollPane() - { + + public RTextScrollPane getScrollPane() { return scrollPane; } - - public JPanel getSearchPanel() - { + + public JPanel getSearchPanel() { return searchPanel; } - - public JTextField getSearchInput() - { + + public JTextField getSearchInput() { return searchInput; } - - public JCheckBox getCaseSensitiveSearch() - { + + public JCheckBox getCaseSensitiveSearch() { return caseSensitiveSearch; } - - public JLabel getTitleHeader() - { + + public JLabel getTitleHeader() { return titleHeader; } - - public Runnable getOnCtrlS() - { + + public Runnable getOnCtrlS() { return onCtrlS; } } From 555d68ab422fffe934aaea8abd24d346d9f642b8 Mon Sep 17 00:00:00 2001 From: Nico Mexis Date: Thu, 20 Jul 2023 21:57:53 +0200 Subject: [PATCH 22/24] Fix unchecked operations --- .../searching/impl/MemberWithAnnotationSearch.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/MemberWithAnnotationSearch.java b/src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/MemberWithAnnotationSearch.java index ec572948..ec7da6e4 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/MemberWithAnnotationSearch.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/MemberWithAnnotationSearch.java @@ -14,6 +14,7 @@ import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJLabel; import javax.swing.*; import java.awt.*; +import java.util.Arrays; import java.util.List; /*************************************************************************** @@ -67,11 +68,13 @@ public class MemberWithAnnotationSearch implements SearchPanel { if (srchText.isEmpty()) return; - node.fields.stream().filter(fn -> hasAnnotation(srchText, fn.invisibleAnnotations, fn.visibleAnnotations)).forEach(fn -> BytecodeViewer.viewer.searchBoxPane.treeRoot.add(new LDCSearchTreeNodeResult(container, resourceWorkingName, node, null, fn, fn.name + " " + fn.desc, ""))); - node.methods.stream().filter(mn -> hasAnnotation(srchText, mn.invisibleAnnotations, mn.visibleAnnotations)).forEach(mn -> BytecodeViewer.viewer.searchBoxPane.treeRoot.add(new LDCSearchTreeNodeResult(container, resourceWorkingName, node, mn, null, mn.name + mn.desc, ""))); + node.fields.stream().filter(fn -> hasAnnotation(srchText, Arrays.asList(fn.invisibleAnnotations, fn.visibleAnnotations))) + .forEach(fn -> BytecodeViewer.viewer.searchBoxPane.treeRoot.add(new LDCSearchTreeNodeResult(container, resourceWorkingName, node, null, fn, fn.name + " " + fn.desc, ""))); + node.methods.stream().filter(mn -> hasAnnotation(srchText, Arrays.asList(mn.invisibleAnnotations, mn.visibleAnnotations))) + .forEach(mn -> BytecodeViewer.viewer.searchBoxPane.treeRoot.add(new LDCSearchTreeNodeResult(container, resourceWorkingName, node, mn, null, mn.name + mn.desc, ""))); } - public static boolean hasAnnotation(String annotation, List... annoLists) { + public static boolean hasAnnotation(String annotation, List> annoLists) { if (annoLists == null) return false; for (List annos : annoLists) { if (annos == null) continue; From ebdf3897248a986f53c682258b29b00e75f61fd2 Mon Sep 17 00:00:00 2001 From: Nico Mexis Date: Thu, 20 Jul 2023 21:58:04 +0200 Subject: [PATCH 23/24] Add dex2jar exception handler --- .../club/bytecodeviewer/util/Dex2Jar.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/Dex2Jar.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/Dex2Jar.java index 74d742d9..7632b088 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/Dex2Jar.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/Dex2Jar.java @@ -1,6 +1,10 @@ package the.bytecode.club.bytecodeviewer.util; import com.googlecode.d2j.dex.Dex2jar; +import com.googlecode.d2j.dex.DexExceptionHandler; +import com.googlecode.d2j.Method; +import com.googlecode.d2j.node.DexMethodNode; +import org.objectweb.asm.MethodVisitor; import java.io.File; import the.bytecode.club.bytecodeviewer.BytecodeViewer; @@ -38,7 +42,16 @@ public class Dex2Jar { */ public static synchronized void dex2Jar(File input, File output) { try { - Dex2jar d2Jar = Dex2jar.from(input); + Dex2jar d2Jar = Dex2jar.from(input) + .withExceptionHandler(new DexExceptionHandler() { + public void handleFileException(Exception e) { + e.printStackTrace(); + } + + public void handleMethodTranslateException(Method method, DexMethodNode methodNode, MethodVisitor mv, Exception e) { + e.printStackTrace(); + } + }); d2Jar.to(output.toPath()); } catch (com.googlecode.d2j.DexException e) { e.printStackTrace(); From 9447f4ee2f921ff891a7c234ae2cd2e1eb8815cc Mon Sep 17 00:00:00 2001 From: Nico Mexis Date: Thu, 20 Jul 2023 21:58:19 +0200 Subject: [PATCH 24/24] Update dependencies --- pom.xml | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index f3310a68..0db6b3d5 100644 --- a/pom.xml +++ b/pom.xml @@ -13,42 +13,42 @@ UTF-8 - 24.0.0 + 24.0.1 4.9.3 - 2.7.0 - 9.4 + 2.8.0 + 9.5 0.2.0 1.0bcv 0.152 1.9.12 1.5.0 - 1.15 - 3.1.9 - 1.22 - 2.11.0 + 1.16.0 + 3.1.10 + 1.23.0 + 2.13.0 3.12.0 1.10.0 3.0.2 0.4.1 - 6.1.2.Final - v59 + 6.2.5.Final + v64 e0d44f4 2.10.1 - 31.1-jre - 2.1.0 + 32.1.1-jre + 2.2.0 4.2 - 1.4.5 + 1.4.7 1.6.6bcv 3.4.1.3 21.2.0 3.3 0.2.0 0.6.0 - 3.3.2 + 3.3.3 2.1.1 - 2.0.6 - 403e90375e - 1.33.0 + 2.0.7 + 3.0.3 + 1.34.1 1.0.3 0.2.2 1.1.4c @@ -277,13 +277,13 @@ ${slf4j.version} - com.github.iBotPeaches.smali + com.android.tools.smali smali ${smali.version} - com.github.iBotPeaches.smali - baksmali + com.android.tools.smali + smali-baksmali ${smali.version} @@ -398,7 +398,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 ${maven.compiler.source} ${maven.compiler.target} @@ -408,7 +408,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.5.0 ${maven.compiler.source} @@ -416,7 +416,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.3.0 + 3.4.1 package @@ -437,6 +437,7 @@ META-INF/*LICENSE* META-INF/*NOTICE* META-INF/MANIFEST.MF + LICENSE