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 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; } } 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; 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; 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();