diff --git a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/JSplitPaneFile.java b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/JSplitPaneFile.java index 4228772..8abccfe 100644 --- a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/JSplitPaneFile.java +++ b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/JSplitPaneFile.java @@ -27,7 +27,7 @@ import org.freeinternals.commonlib.ui.JPanelForTree; import org.freeinternals.commonlib.ui.JTreeCellRenderer; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * A split panel created from a class file byte array. diff --git a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/Main.java b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/Main.java index d48e615..477b2d9 100644 --- a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/Main.java +++ b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/Main.java @@ -30,7 +30,7 @@ import javax.swing.UIManager; import org.freeinternals.biv.plugin.PluginManager; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/DefaultFileFormat.java b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/DefaultFileFormat.java index ac9f8ab..e8b2f9b 100644 --- a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/DefaultFileFormat.java +++ b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/DefaultFileFormat.java @@ -10,7 +10,7 @@ import java.io.File; import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/PluginManager.java b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/PluginManager.java index 42c4b95..af9e9da 100644 --- a/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/PluginManager.java +++ b/BinaryInternalsViewer/src/main/java/org/freeinternals/biv/plugin/PluginManager.java @@ -21,7 +21,7 @@ import java.util.logging.Logger; import javax.swing.JFileChooser; import javax.swing.filechooser.FileNameExtensionFilter; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/core/BytesTool.java b/CommonLib/src/main/java/org/freeinternals/commonlib/core/BytesTool.java index f2d747e..e26ae62 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/core/BytesTool.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/core/BytesTool.java @@ -18,13 +18,13 @@ import java.util.zip.ZipFile; /** - * Utility Class. + * Utility Class for bytes array (binary data). * * @author Amos Shi */ public final class BytesTool { - public static boolean isByteArrayEmpty(byte[] buff, int startPos, int length) { + public static boolean isByteArrayEmpty(final byte[] buff, final int startPos, final int length) { boolean result = false; if (buff[startPos] == 0x00 || buff[startPos] == ((byte) 0xFF)) { @@ -52,7 +52,7 @@ public static boolean isByteArrayEmpty(byte[] buff, int startPos, int length) { * @param bin2 The second byte array * @return true if the content are the same, else false */ - public static boolean isByteArraySame(byte[] bin1, byte[] bin2) { + public static boolean isByteArraySame(final byte[] bin1, final byte[] bin2) { if (bin1 == null || bin2 == null) { return false; } @@ -83,7 +83,7 @@ public static boolean isByteArraySame(byte[] bin1, byte[] bin2) { * @param start The start position for compare * @return true if the content are the same, else false */ - public static boolean isByteArraySame(byte[] bin1, byte[] bin2, int start) { + public static boolean isByteArraySame(final byte[] bin1, final byte[] bin2, final int start) { if (bin1 == null || bin2 == null) { return false; } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/core/FileFormat.java b/CommonLib/src/main/java/org/freeinternals/commonlib/core/FileFormat.java index ae810ed..d4394ad 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/core/FileFormat.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/core/FileFormat.java @@ -13,7 +13,6 @@ import java.util.SortedMap; import java.util.TreeMap; import javax.swing.tree.DefaultMutableTreeNode; -import org.freeinternals.format.FileFormatException; /** * diff --git a/CommonLib/src/main/java/org/freeinternals/format/FileFormatException.java b/CommonLib/src/main/java/org/freeinternals/commonlib/core/FileFormatException.java similarity index 87% rename from CommonLib/src/main/java/org/freeinternals/format/FileFormatException.java rename to CommonLib/src/main/java/org/freeinternals/commonlib/core/FileFormatException.java index 2538273..493550b 100644 --- a/CommonLib/src/main/java/org/freeinternals/format/FileFormatException.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/core/FileFormatException.java @@ -4,7 +4,7 @@ * Copyright 2011, FreeInternals.org. All rights reserved. * Use is subject to license terms. */ -package org.freeinternals.format; +package org.freeinternals.commonlib.core; /** * @@ -26,7 +26,7 @@ public FileFormatException() { * specified detail message. * @param msg the detail message. */ - public FileFormatException(String msg) { + public FileFormatException(final String msg) { super(msg); } } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/core/PosByteArrayInputStream.java b/CommonLib/src/main/java/org/freeinternals/commonlib/core/PosByteArrayInputStream.java index 7880b0f..6df8604 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/core/PosByteArrayInputStream.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/core/PosByteArrayInputStream.java @@ -12,7 +12,7 @@ * * @author Amos Shi */ -public class PosByteArrayInputStream extends ByteArrayInputStream { +public final class PosByteArrayInputStream extends ByteArrayInputStream { /** * Creates a new instance of PosByteArrayInputStream diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/core/PosDataInputStream.java b/CommonLib/src/main/java/org/freeinternals/commonlib/core/PosDataInputStream.java index 1ffa24d..5445930 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/core/PosDataInputStream.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/core/PosDataInputStream.java @@ -15,7 +15,7 @@ * * @author Amos Shi */ -public class PosDataInputStream extends DataInputStream implements DataInputEx { +public final class PosDataInputStream extends DataInputStream implements DataInputEx { /** * Offset of the 1st byte @@ -235,7 +235,7 @@ public BigInteger readUnsignedLong_LittleEndian() throws IOException { } @Override - public String readASCII(int length) throws IOException { + public String readASCII(final int length) throws IOException { if (length <= 0) { throw new IllegalArgumentException( String.format("Parameter length should be greater than 0. (length = %d)", length)); @@ -261,7 +261,7 @@ public String readASCII() throws IOException { * @throws java.io.IOException */ @Override - public String readASCIIUntil(byte end) throws IOException { + public String readASCIIUntil(final byte end) throws IOException { byte b; StringBuilder sb = new StringBuilder(100); @@ -333,7 +333,7 @@ public ASCIILine readASCIILine() throws IOException { return new ASCIILine(line, nlLen); } - private boolean _contains(byte v, byte[] list) { + private boolean _contains(final byte v, final byte[] list) { boolean result = false; for (int i = 0; i < list.length; i++) { if (list[i] == v) { @@ -382,7 +382,7 @@ public byte[] readBinary() throws IOException { * @see PosByteArrayInputStream */ @Override - public int backward(int i) { + public int backward(final int i) { int result = -1; if (this.in instanceof PosByteArrayInputStream) { @@ -405,7 +405,7 @@ public int backward(int i) { * @return the new position, or -1 if b not found */ @Override - public int backwardTo(byte b) { + public int backwardTo(final byte b) { int result = -1; if (this.in instanceof PosByteArrayInputStream) { @@ -436,7 +436,7 @@ public int backwardTo(byte b) { * @see PosByteArrayInputStream * @return the new position, or -1 if b not found */ - public int forwardTo(byte b) { + public int forwardTo(final byte b) { int result = -1; if (this.in instanceof PosByteArrayInputStream) { @@ -466,7 +466,7 @@ public int forwardTo(byte b) { * @see PosByteArrayInputStream */ @Override - public int backwardTo(byte[] b) { + public int backwardTo(final byte[] b) { int result = -1; if ((b == null) || (b.length == 0)) { @@ -508,14 +508,14 @@ public void skipToEnd() throws IOException { /** * Fly to the specific position. - * + * * This method supports {@link PosByteArrayInputStream} only, nothing will * do for other input stream types. * * @see PosByteArrayInputStream */ @Override - public void flyTo(int position) { + public void flyTo(final int position) { if (this.in instanceof PosByteArrayInputStream) { ((PosByteArrayInputStream) this.in).setPos(position); } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/HTMLKit.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/HTMLKit.java index 25336be..ed636e1 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/HTMLKit.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/HTMLKit.java @@ -1,47 +1,104 @@ package org.freeinternals.commonlib.ui; /** - * HTML Kit for the - * JTextPane control. + * HTML Kit for the JTextPane control. * * @author Amos */ -public class HTMLKit { +public final class HTMLKit { - private static final int FONT_SIZE = 12; + /** + * Font color yellow. + */ public static final String FONT_COLOR_YELLOW = "yellow"; + + /** + * Font color orange. + */ public static final String FONT_COLOR_ORANGE = "#FFA500"; - public static String Start() { + /** + * ASCII code 32. + */ + private static final int ASCII_32 = 32; + /** + * ASCII code 127. + */ + private static final int ASCII_127 = 127; + /** + * ASCII code 160. + */ + private static final int ASCII_160 = 160; + /** + * ASCII code 255. + */ + private static final int ASCII_255 = 255; + + private HTMLKit() { + } + + /** + * HTML start tags. + * + * @return HTML tags for start + */ + public static String start() { return ""; } - public static String End() { + /** + * HTML end tags. + * + * @return HTML tags for end + */ + public static String end() { return "\n\n"; } - public static String NewLine() { + /** + * HTML new line. + * + * @return HTML new line tag + */ + public static String newLine() { return "
"; } - public static String Space() { + /** + * HTML space. + * + * @return HTML space tag + */ + public static String space() { return " "; } /** * Get HTML format for text with new line. + * + * @param text Text inside the span + * @return HTML code of span */ - public static String Span(String text) { + public static String span(final String text) { + // TODO the "\n" is no needed? return String.format("\n%s", - FONT_SIZE, + JBinaryViewer.FONT.getSize() - 2, JBinaryViewer.FONT.getFamily(), text); } - public static String Span(String text, String color) { + /** + * Get HTML format for text with new line and specified color. + * + * @param text Text inside the span + * @param color Color of the text + * @return HTML code of span + */ + public static String span(final String text, final String color) { + // TODO the "\n" is no needed? return String.format("\n%s", color, - FONT_SIZE, + JBinaryViewer.FONT.getSize() - 2, JBinaryViewer.FONT.getFamily(), text); } @@ -50,27 +107,34 @@ public static String Span(String text, String color) { * Get HTML marks for the byte. * * @param b Byte value - * @return HTML mark for the byte value + * @return HTML mark for the byte value * @see HTML Codes - Characters and * symbols */ - static public String getByteText(final byte b) { + public static String getByteText(final byte b) { String s = "."; - if (((b > 32) && (b < 127)) - || ((b > 160) && (b <= 255))) { + if (((b > ASCII_32) && (b < ASCII_127)) + || ((b > ASCII_160) && (b <= ASCII_255))) { s = String.format("&#%d;", b); } return s; } - static public String EscapeFilter(String text) { + /** + * Escape HTML special character > and <. + * + * @param text Input text to process + * @return Escaped result + */ + public static String escapeFilter(final String text) { + String result = null; if (text != null) { - text = text.replaceAll("<", "<"); - text = text.replaceAll(">", ">"); + result = text.replaceAll("<", "<"); + result = result.replaceAll(">", ">"); } - return text; + return result; } } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/JBinaryViewer.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/JBinaryViewer.java index 3ccaded..c0e01ae 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/JBinaryViewer.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/JBinaryViewer.java @@ -24,26 +24,92 @@ import org.freeinternals.commonlib.ui.binviewer.JRowViewer; /** + * Viewer for binary data. It contains three columns: row numbers, data in HEX, + * data in ASCII. * * @author Amos Shi */ -public class JBinaryViewer extends JPanel { +public final class JBinaryViewer extends JPanel { private static final long serialVersionUID = 4876543219876500005L; + + /** + * Default font. + */ public static final Font FONT = new Font(Font.DIALOG_INPUT, Font.PLAIN, 14); - public static final int ITEM_HEIGHT = 22; // 20; + + /** + * Height for each row. + */ + public static final int ITEM_HEIGHT = 22; + + /** + * Number of bytes to be shown in one row. + */ public static final int ROW_ITEM_MAX = 16; + + /** + * 0-based row item index. + */ public static final int ROW_ITEM_MAX_INDEX = ROW_ITEM_MAX - 1; + + /** + * Spare space in bottom. + */ + private static final int ROW_EMPTYROW_COUNT = 10; + + /** + * Constant value for -4. + */ + private static final int MINUS_4 = -4; + + /** + * Column 1: row viewer. + */ private final JRowViewer rowViewer; + + /** + * Column 2: Data viewer in HEX format. + */ private final JRawDataViewer rawViewer; + + /** + * Column 3: Data viewer in ASCII format. + */ private final JAsciiDataViewer asciiViewer; + + /** + * Binary data to be shown. + */ private byte[] data = null; - private static final int ROW_EMPTYROW_COUNT = 10; - private JScrollBar vBar; + + /** + * Vertical scroll bar for paging. + */ + private final JScrollBar vBar; + + /** + * Max number of rows will be shown, due to the {@link #data} size. + */ private int rowMax; + + /** + * Start index to be high-lighted. + * + * @see org.freeinternals.commonlib.ui.binviewer.DataViewer#selectedStartIndex + */ private int selectedStartIndex = 0; + + /** + * Length to be high-lighted. + * + * @see org.freeinternals.commonlib.ui.binviewer.DataViewer#selectedLength + */ private int selectedLength = 0; + /** + * Constructor. + */ public JBinaryViewer() { this.setLayout(new BorderLayout()); // this.setFont(JBinaryViewer.FONT); @@ -54,7 +120,8 @@ public JBinaryViewer() { this.vBar = new JScrollBar(); this.vBar.addAdjustmentListener(new AdjustmentListener() { - public void adjustmentValueChanged(AdjustmentEvent e) { + @Override + public void adjustmentValueChanged(final AdjustmentEvent e) { updateViewContent(); } }); @@ -65,7 +132,8 @@ public void adjustmentValueChanged(AdjustmentEvent e) { // Content Panel final JPanel panel = new JPanel(); final SpringLayout panelLayout = new SpringLayout(); - int left, right; + int left; + int right; panel.setLayout(panelLayout); @@ -81,32 +149,37 @@ public void adjustmentValueChanged(AdjustmentEvent e) { panelLayout.putConstraint(SpringLayout.WEST, this.rowViewer, 2, SpringLayout.WEST, panel); panelLayout.putConstraint(SpringLayout.NORTH, this.rowViewer, 2, SpringLayout.NORTH, panel); - panelLayout.putConstraint(SpringLayout.SOUTH, this.rowViewer, -4, SpringLayout.SOUTH, panel); + panelLayout.putConstraint(SpringLayout.SOUTH, this.rowViewer, MINUS_4, SpringLayout.SOUTH, panel); panelLayout.putConstraint(SpringLayout.EAST, this.rowViewer, JRowViewer.WIDTH_VALUE, SpringLayout.WEST, panel); left = 2 + JRowViewer.WIDTH_VALUE + 2; right = left + JRawDataViewer.WIDTH_VALUE; panelLayout.putConstraint(SpringLayout.WEST, this.rawViewer, left, SpringLayout.WEST, panel); panelLayout.putConstraint(SpringLayout.NORTH, this.rawViewer, 2, SpringLayout.NORTH, panel); - panelLayout.putConstraint(SpringLayout.SOUTH, this.rawViewer, -4, SpringLayout.SOUTH, panel); + panelLayout.putConstraint(SpringLayout.SOUTH, this.rawViewer, MINUS_4, SpringLayout.SOUTH, panel); panelLayout.putConstraint(SpringLayout.EAST, this.rawViewer, right, SpringLayout.WEST, panel); left = right + 2; right = left + JAsciiDataViewer.WIDTH_VALUE; panelLayout.putConstraint(SpringLayout.WEST, this.asciiViewer, left, SpringLayout.WEST, panel); panelLayout.putConstraint(SpringLayout.NORTH, this.asciiViewer, 2, SpringLayout.NORTH, panel); - panelLayout.putConstraint(SpringLayout.SOUTH, this.asciiViewer, -4, SpringLayout.SOUTH, panel); + panelLayout.putConstraint(SpringLayout.SOUTH, this.asciiViewer, MINUS_4, SpringLayout.SOUTH, panel); panelLayout.putConstraint(SpringLayout.EAST, this.asciiViewer, right, SpringLayout.WEST, panel); this.add(panel, BorderLayout.CENTER); } - public void setData(final byte[] data) { - if (data == null) { + /** + * Set the binary data to be displayed. + * + * @param bytes Binary data to be displayed + */ + public void setData(final byte[] bytes) { + if (bytes == null) { return; } - this.data = data.clone(); + this.data = bytes.clone(); // Calc the max row count this.rowMax = this.getRowMax(); @@ -124,12 +197,16 @@ private int getRowMax() { /** * Return 1-based row count number. + * + * @param number to explain + * @return 1-based row number */ - private int getRowCount(int number) { + private int getRowCount(final int number) { int count = 0; - while (number > 0) { + int max = number; + while (max > 0) { count++; - number -= ROW_ITEM_MAX; + max -= ROW_ITEM_MAX; } return count; } @@ -186,7 +263,7 @@ private void updateViewContent() { * Selects the bytes between the specified start position and length. * * @param selectionStart the start position of the bytes - * @param length the length of the bytes + * @param length the length of the bytes */ public void setSelection(final int selectionStart, final int length) { if ((this.data == null) || (selectionStart < 0)) { @@ -209,11 +286,11 @@ private void updateSelection() { int length; if (startPos > 0) { - length = Math.min(this.selectedLength, lengtgMax); // Improve Performance + length = Math.min(this.selectedLength, lengtgMax); // Improve Performance this.rawViewer.setSelection(startPos, length); this.asciiViewer.setSelection(startPos, length); - } else if ((length = startPos + this.selectedLength) > 0) { - length = Math.min(length, lengtgMax); // Improve Performance + } else if ((startPos + this.selectedLength) > 0) { + length = Math.min(startPos + this.selectedLength, lengtgMax); // Improve Performance this.rawViewer.setSelection(0, length); this.asciiViewer.setSelection(0, length); } else { @@ -244,7 +321,7 @@ private void ensureVisible(final int startPos) { class ComponentResizedAdapter extends ComponentAdapter { @Override - public void componentResized(ComponentEvent e) { + public void componentResized(final ComponentEvent e) { super.componentResized(e); updateViewContent(); } @@ -253,8 +330,9 @@ public void componentResized(ComponentEvent e) { @SuppressWarnings("PackageVisibleInnerClass") class MouseWheelAdapter implements MouseWheelListener { - public void mouseWheelMoved(MouseWheelEvent e) { - switch(e.getScrollType()){ + @Override + public void mouseWheelMoved(final MouseWheelEvent e) { + switch (e.getScrollType()) { case MouseWheelEvent.WHEEL_UNIT_SCROLL: JBinaryViewer.this.vBar.setValue( JBinaryViewer.this.vBar.getValue() @@ -271,12 +349,14 @@ public void mouseWheelMoved(MouseWheelEvent e) { @SuppressWarnings("PackageVisibleInnerClass") class KeyboardAdapter implements KeyListener { - public void keyTyped(KeyEvent e) { + @Override + public void keyTyped(final KeyEvent e) { } - public void keyPressed(KeyEvent e) { + @Override + public void keyPressed(final KeyEvent e) { - switch(e.getKeyCode()){ + switch (e.getKeyCode()) { case KeyEvent.VK_HOME: JBinaryViewer.this.vBar.setValue(JBinaryViewer.this.vBar.getMinimum()); break; @@ -307,7 +387,7 @@ public void keyPressed(KeyEvent e) { } } - public void keyReleased(KeyEvent e) { + public void keyReleased(final KeyEvent e) { } } } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/JXMLViewer.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/JXMLViewer.java index 9c47003..bf1542b 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/JXMLViewer.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/JXMLViewer.java @@ -27,15 +27,28 @@ import org.xml.sax.SAXException; /** + * Panel based XML data viewer. * * @author Amos Shi */ public class JXMLViewer extends JPanel { private static final long serialVersionUID = 4876543219876500005L; - public final JTabbedPane tabbedPane; - - public JXMLViewer(InputStream xml){ + /** + * Default font size. + */ + private static final int FONT_SIZE = 16; + /** + * Tabbed Pane for "XML View" and "XML Plain Text". + */ + private final JTabbedPane tabbedPane; + + /** + * Constructor. + * + * @param xml XML data to be displayed + */ + public JXMLViewer(final InputStream xml) { this.tabbedPane = new JTabbedPane(); try { @@ -47,12 +60,12 @@ public JXMLViewer(InputStream xml){ // The title JLabel label = new JLabel("Exception occured when parsing the XML data."); - label.setFont(new Font(Font.DIALOG, Font.BOLD, 16)); + label.setFont(new Font(Font.DIALOG, Font.BOLD, FONT_SIZE)); label.setForeground(Color.red); panel.add(label, BorderLayout.NORTH); // The exception - ByteArrayOutputStream output = new ByteArrayOutputStream(2096); + ByteArrayOutputStream output = new ByteArrayOutputStream(); ex.printStackTrace(new PrintStream(output)); JTextArea textException = new JTextArea(); diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/UITool.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/UITool.java index 2a5c21e..f935c4a 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/UITool.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/UITool.java @@ -22,7 +22,12 @@ * * @author Amos Shi */ -public class UITool { +public final class UITool { + + /** + * Size ratio of the pop-up window and its parent. + */ + private static final float POPUP_RATIO = 0.8f; private UITool() { } @@ -36,27 +41,27 @@ public static void centerJFrame(final JFrame f) { // Set main window size final Dimension d = Toolkit.getDefaultToolkit().getScreenSize(); f.setSize( - (int) (d.getWidth() * 0.7), - (int) (d.getHeight() * 0.7)); + (int) (d.getWidth() * POPUP_RATIO), + (int) (d.getHeight() * POPUP_RATIO)); // Center the main window f.setLocationRelativeTo(null); } - /** + * Generate tree node for difference. * - * @param parentNode - * @param lastEnd - * @param diff - * @param buff - * @param buffStartPos + * @param parentNode Parent tree node + * @param lastEnd Last end + * @param diff Difference + * @param buff Byte array data + * @param buffStartPos Buffer start position */ - public static void generateTreeNode_Diff( - DefaultMutableTreeNode parentNode, - int lastEnd, - int diff, - byte[] buff, int buffStartPos) { + public static void generateTreeNodeDiff( + final DefaultMutableTreeNode parentNode, + final int lastEnd, + final int diff, + final byte[] buff, final int buffStartPos) { String diffStr; if (BytesTool.isByteArrayEmpty(buff, lastEnd - buffStartPos, diff - 1)) { @@ -69,13 +74,23 @@ public static void generateTreeNode_Diff( diff, diffStr))); } - - + + /** + * Get Java system default icon for shortcut. + * + * @return Shortcut icon in Java + */ public static Icon getShortcutIcon() { return UIManager.getIcon("InternalFrame.maximizeIcon"); } - + /** + * Show a popup window with given message. + * + * @param frame Parent window + * @param panel Content in panel + * @param title Popup window title + */ public static void showPopup(final JFrame frame, final JPanel panel, final String title) { if (frame == null || panel == null) { return; @@ -83,8 +98,8 @@ public static void showPopup(final JFrame frame, final JPanel panel, final Strin final JDialog popup = new JDialog(frame, title); popup.setSize( - (int) Math.floor(frame.getWidth() * 0.8), - (int) Math.floor(frame.getHeight() * 0.8)); + (int) Math.floor(frame.getWidth() * POPUP_RATIO), + (int) Math.floor(frame.getHeight() * POPUP_RATIO)); popup.setLayout(new BorderLayout()); popup.add(panel, BorderLayout.CENTER); popup.setLocationRelativeTo(frame); diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JAsciiDataViewer.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JAsciiDataViewer.java index df7fbaf..2d37a73 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JAsciiDataViewer.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JAsciiDataViewer.java @@ -31,7 +31,7 @@ protected void updateContent() { } StringBuilder sb = new StringBuilder(); - sb.append(HTMLKit.Start()); + sb.append(HTMLKit.start()); final int dataLength = data.length; int breakCounter = 0; @@ -39,19 +39,19 @@ protected void updateContent() { if (this.getSelectedLength() > 0 && i >= this.getSelectedStartIndex() && i < this.getSelectedStartIndex() + this.getSelectedLength()) { - sb.append(HTMLKit.Span(HTMLKit.getByteText(data[i]), HTMLKit.FONT_COLOR_YELLOW)); + sb.append(HTMLKit.span(HTMLKit.getByteText(data[i]), HTMLKit.FONT_COLOR_YELLOW)); } else { - sb.append(HTMLKit.Span(HTMLKit.getByteText(data[i]))); + sb.append(HTMLKit.span(HTMLKit.getByteText(data[i]))); } breakCounter++; if (breakCounter > JBinaryViewer.ROW_ITEM_MAX_INDEX) { - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.newLine()); breakCounter = 0; } } - sb.append(HTMLKit.End()); + sb.append(HTMLKit.end()); this.setText(sb.toString()); } } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JRawDataViewer.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JRawDataViewer.java index f070b20..a7dcd1a 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JRawDataViewer.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JRawDataViewer.java @@ -32,28 +32,28 @@ protected void updateContent() { } StringBuilder sb = new StringBuilder(); - sb.append(HTMLKit.Start()); + sb.append(HTMLKit.start()); final int dataLength = data.length; int breakCounter = 0; for (int i = 0; i < dataLength; i++) { - sb.append(HTMLKit.Space()); + sb.append(HTMLKit.space()); if (this.getSelectedLength() > 0 && i >= this.getSelectedStartIndex() && i < this.getSelectedStartIndex() + this.getSelectedLength()) { - sb.append(HTMLKit.Span(String.format("%02X", data[i]), HTMLKit.FONT_COLOR_ORANGE)); + sb.append(HTMLKit.span(String.format("%02X", data[i]), HTMLKit.FONT_COLOR_ORANGE)); } else { - sb.append(HTMLKit.Span(String.format("%02X", data[i]))); + sb.append(HTMLKit.span(String.format("%02X", data[i]))); } breakCounter++; if (breakCounter > JBinaryViewer.ROW_ITEM_MAX_INDEX) { - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.newLine()); breakCounter = 0; } } - sb.append(HTMLKit.End()); + sb.append(HTMLKit.end()); this.setText(sb.toString()); } } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JRowViewer.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JRowViewer.java index 870d8cb..b153f5c 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JRowViewer.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/binviewer/JRowViewer.java @@ -54,18 +54,18 @@ public void setData(final int rowStart, final int rowCount, final int rowMax) { } StringBuilder sb = new StringBuilder(); - sb.append(HTMLKit.Start()); + sb.append(HTMLKit.start()); int rowValue = rowStart * JBinaryViewer.ROW_ITEM_MAX; for (int i = 0; i < rowCount; i++) { if ((rowStart + i) < rowMax) { - sb.append(HTMLKit.Span(String.format("%08Xh\n", rowValue))); - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.span(String.format("%08Xh\n", rowValue))); + sb.append(HTMLKit.newLine()); rowValue += JBinaryViewer.ROW_ITEM_MAX; } } - sb.append(HTMLKit.End()); + sb.append(HTMLKit.end()); this.setText(sb.toString()); } } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/AbstractTreeTableModel.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/AbstractTreeTableModel.java index b969c8f..2587b92 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/AbstractTreeTableModel.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/AbstractTreeTableModel.java @@ -1,22 +1,22 @@ /* * Copyright 1997-1999 Sun Microsystems, Inc. All Rights Reserved. - * + * * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following * conditions are met: - * + * * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * + * notice, this list of conditions and the following disclaimer. + * * - Redistribution in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials - * provided with the distribution. - * + * provided with the distribution. + * * Neither the name of Sun Microsystems, Inc. or the names of * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * This software is provided "AS IS," without a warranty of any * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, @@ -24,49 +24,52 @@ * EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY * DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR * RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE OR - * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE - * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, - * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER - * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF - * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS + * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE + * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, + * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER + * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF + * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS * BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * + * * You acknowledge that this software is not designed, licensed or * intended for use in the design, construction, operation or * maintenance of any nuclear facility. */ package org.freeinternals.commonlib.ui.jtreetable; -import javax.swing.tree.*; -import javax.swing.event.*; - +import javax.swing.event.EventListenerList; +import javax.swing.event.TreeModelEvent; +import javax.swing.event.TreeModelListener; +import javax.swing.tree.TreePath; + /** - * An abstract implementation of the TreeTableModel interface, - * handling the list of listeners. + * An abstract implementation of the TreeTableModel interface, handling the list + * of listeners. * *

- * A little change may be done on formatting, annotation, java doc, etc. + * Created by Philip Milne. Miner change may be done on formatting, + * annotation, java doc, etc, for check style. *

* * @version 1.2 10/27/98 * @author Philip Milne - * @see The Swing HTML Parser + * @see The + * Swing HTML Parser */ - public abstract class AbstractTreeTableModel implements TreeTableModel { + @SuppressWarnings("ProtectedField") - protected Object root; + protected Object root; @SuppressWarnings("ProtectedField") protected EventListenerList listenerList = new EventListenerList(); - + public AbstractTreeTableModel(Object root) { - this.root = root; + this.root = root; } // - // Default implementations for methods in the TreeModel interface. + // Default implementations for methods in the TreeModel interface. // - @Override public Object getRoot() { return root; @@ -74,22 +77,23 @@ public Object getRoot() { @Override public boolean isLeaf(Object node) { - return getChildCount(node) == 0; + return getChildCount(node) == 0; } @Override - public void valueForPathChanged(TreePath path, Object newValue) {} + public void valueForPathChanged(TreePath path, Object newValue) { + } - // This is not called in the JTree's default mode: - // use a naive implementation. + // This is not called in the JTree's default mode: + // use a naive implementation. @Override public int getIndexOfChild(Object parent, Object child) { for (int i = 0; i < getChildCount(parent); i++) { - if (getChild(parent, i).equals(child)) { - return i; - } + if (getChild(parent, i).equals(child)) { + return i; + } } - return -1; + return -1; } @Override @@ -104,136 +108,137 @@ public void removeTreeModelListener(TreeModelListener l) { /* * Notifies all listeners that have registered interest for - * notification on this event type. The event instance - * is lazily created using the parameters passed into + * notification on this event type. The event instance + * is lazily created using the parameters passed into * the fire method. * @see EventListenerList */ - protected void fireTreeNodesChanged(Object source, Object[] path, - int[] childIndices, - Object[] children) { + protected void fireTreeNodesChanged(final Object source, final Object[] path, + final int[] childIndices, + final Object[] children) { // Guaranteed to return a non-null array Object[] listeners = listenerList.getListenerList(); TreeModelEvent e = null; // Process the listeners last to first, notifying // those that are interested in this event - for (int i = listeners.length-2; i>=0; i-=2) { - if (listeners[i]==TreeModelListener.class) { + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == TreeModelListener.class) { // Lazily create the event: if (e == null) { e = new TreeModelEvent(source, path, childIndices, children); } - ((TreeModelListener)listeners[i+1]).treeNodesChanged(e); - } + ((TreeModelListener) listeners[i + 1]).treeNodesChanged(e); + } } } /* * Notifies all listeners that have registered interest for - * notification on this event type. The event instance - * is lazily created using the parameters passed into + * notification on this event type. The event instance + * is lazily created using the parameters passed into * the fire method. * @see EventListenerList */ - protected void fireTreeNodesInserted(Object source, Object[] path, - int[] childIndices, - Object[] children) { + protected void fireTreeNodesInserted(final Object source, final Object[] path, + final int[] childIndices, + final Object[] children) { // Guaranteed to return a non-null array Object[] listeners = listenerList.getListenerList(); TreeModelEvent e = null; // Process the listeners last to first, notifying // those that are interested in this event - for (int i = listeners.length-2; i>=0; i-=2) { - if (listeners[i]==TreeModelListener.class) { + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == TreeModelListener.class) { // Lazily create the event: if (e == null) { e = new TreeModelEvent(source, path, childIndices, children); } - ((TreeModelListener)listeners[i+1]).treeNodesInserted(e); - } + ((TreeModelListener) listeners[i + 1]).treeNodesInserted(e); + } } } /* * Notifies all listeners that have registered interest for - * notification on this event type. The event instance - * is lazily created using the parameters passed into + * notification on this event type. The event instance + * is lazily created using the parameters passed into * the fire method. * @see EventListenerList */ - protected void fireTreeNodesRemoved(Object source, Object[] path, - int[] childIndices, - Object[] children) { + protected void fireTreeNodesRemoved(final Object source, final Object[] path, + final int[] childIndices, + final Object[] children) { // Guaranteed to return a non-null array Object[] listeners = listenerList.getListenerList(); TreeModelEvent e = null; // Process the listeners last to first, notifying // those that are interested in this event - for (int i = listeners.length-2; i>=0; i-=2) { - if (listeners[i]==TreeModelListener.class) { + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == TreeModelListener.class) { // Lazily create the event: if (e == null) { e = new TreeModelEvent(source, path, childIndices, children); } - ((TreeModelListener)listeners[i+1]).treeNodesRemoved(e); - } + ((TreeModelListener) listeners[i + 1]).treeNodesRemoved(e); + } } } /* * Notifies all listeners that have registered interest for - * notification on this event type. The event instance - * is lazily created using the parameters passed into + * notification on this event type. The event instance + * is lazily created using the parameters passed into * the fire method. * @see EventListenerList */ - protected void fireTreeStructureChanged(Object source, Object[] path, - int[] childIndices, - Object[] children) { + protected void fireTreeStructureChanged(final Object source, final Object[] path, + final int[] childIndices, + final Object[] children) { // Guaranteed to return a non-null array Object[] listeners = listenerList.getListenerList(); TreeModelEvent e = null; // Process the listeners last to first, notifying // those that are interested in this event - for (int i = listeners.length-2; i>=0; i-=2) { - if (listeners[i]==TreeModelListener.class) { + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == TreeModelListener.class) { // Lazily create the event: if (e == null) { e = new TreeModelEvent(source, path, childIndices, children); } - ((TreeModelListener)listeners[i+1]).treeStructureChanged(e); - } + ((TreeModelListener) listeners[i + 1]).treeStructureChanged(e); + } } } // - // Default impelmentations for methods in the TreeTableModel interface. + // Default impelmentations for methods in the TreeTableModel interface. // - @Override - public Class getColumnClass(int column) { return Object.class; } + public Class getColumnClass(final int column) { + return Object.class; + } - /** By default, make the column with the Tree in it the only editable one. - * Making this column editable causes the JTable to forward mouse - * and keyboard events in the Tree column to the underlying JTree. - */ + /** + * By default, make the column with the Tree in it the only editable one. + * Making this column editable causes the JTable to forward mouse and + * keyboard events in the Tree column to the underlying JTree. + */ @Override - public boolean isCellEditable(Object node, int column) { - return getColumnClass(column) == TreeTableModel.class; + public boolean isCellEditable(final Object node, final int column) { + return getColumnClass(column) == TreeTableModel.class; } @Override - public void setValueAt(Object aValue, Object node, int column) {} - + public void setValueAt(final Object aValue, final Object node, final int column) { + } // Left to be implemented in the subclass: - /* + /* * public Object getChild(Object parent, int index) - * public int getChildCount(Object parent) - * public int getColumnCount() - * public String getColumnName(Object node, int column) - * public Object getValueAt(Object node, int column) + * public int getChildCount(Object parent) + * public int getColumnCount() + * public String getColumnName(Object node, int column) + * public Object getValueAt(Object node, int column) */ } - diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/DynamicTreeTableModel.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/DynamicTreeTableModel.java index 16cebe2..35cd3ba 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/DynamicTreeTableModel.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/DynamicTreeTableModel.java @@ -1,22 +1,22 @@ /* * Copyright 1997-1999 Sun Microsystems, Inc. All Rights Reserved. - * + * * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following * conditions are met: - * + * * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * + * notice, this list of conditions and the following disclaimer. + * * - Redistribution in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials - * provided with the distribution. - * + * provided with the distribution. + * * Neither the name of Sun Microsystems, Inc. or the names of * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * This software is provided "AS IS," without a warranty of any * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, @@ -24,21 +24,24 @@ * EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY * DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR * RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE OR - * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE - * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, - * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER - * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF - * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS + * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE + * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, + * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER + * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF + * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS * BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * + * * You acknowledge that this software is not designed, licensed or * intended for use in the design, construction, operation or * maintenance of any nuclear facility. */ package org.freeinternals.commonlib.ui.jtreetable; -import java.lang.reflect.*; -import javax.swing.tree.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import javax.swing.tree.TreeNode; + /** * An implementation of TreeTableModel that uses reflection to answer @@ -54,7 +57,8 @@ * constructor. * *

- * A little change may be done on formatting, annotation, java doc, etc. + * Created by Scott Violet. Miner change may be done on formatting, + * annotation, java doc, etc, for check style. *

* * @author Scott Violet @@ -77,17 +81,17 @@ public class DynamicTreeTableModel extends AbstractTreeTableModel { /** * Constructor for creating a DynamicTreeTableModel. - * + * * @param root * @param columnNames * @param getterMethodNames * @param setterMethodNames - * @param cTypes + * @param cTypes */ - public DynamicTreeTableModel(TreeNode root, String[] columnNames, - String[] getterMethodNames, - String[] setterMethodNames, - Class[] cTypes) { + public DynamicTreeTableModel(final TreeNode root, final String[] columnNames, + final String[] getterMethodNames, + final String[] setterMethodNames, + final Class[] cTypes) { super(root); this.columnNames = columnNames; this.methodNames = getterMethodNames; @@ -102,12 +106,12 @@ public DynamicTreeTableModel(TreeNode root, String[] columnNames, * TreeModel method to return the number of children of a particular * node. Since node is a TreeNode, this can be answered * via the TreeNode method getChildCount. - * - * @param node - * @return + * + * @param node + * @return */ @Override - public int getChildCount(Object node) { + public int getChildCount(final Object node) { return ((TreeNode) node).getChildCount(); } @@ -115,36 +119,36 @@ public int getChildCount(Object node) { * TreeModel method to locate a particular child of the specified * node. Since node is a TreeNode, this can be answered * via the TreeNode method getChild. - * - * @param node + * + * @param node * @param i - * @return + * @return */ @Override - public Object getChild(Object node, int i) { + public Object getChild(final Object node, final int i) { return ((TreeNode) node).getChildAt(i); } /** - * TreeModel method to determine if a node is a leaf. + * TreeModel method to determine if a node is a leaf. * Since node is a TreeNode, this can be answered * via the TreeNode method isLeaf. - * + * * @param node - * @return + * @return */ @Override - public boolean isLeaf(Object node) { + public boolean isLeaf(final Object node) { return ((TreeNode) node).isLeaf(); } // - // The TreeTable interface. + // The TreeTable interface. // /** * Returns the number of column names passed into the constructor. - * - * @return + * + * @return */ @Override public int getColumnCount() { @@ -153,9 +157,9 @@ public int getColumnCount() { /** * Returns the column name passed into the constructor. - * + * * @param column - * @return + * @return */ @Override public String getColumnName(int column) { @@ -168,12 +172,12 @@ public String getColumnName(int column) { /** * Returns the column class for column column. This * is set in the constructor. - * + * * @param column - * @return + * @return */ @Override - public Class getColumnClass(int column) { + public Class getColumnClass(final int column) { if (cTypes == null || column < 0 || column >= cTypes.length) { return null; } @@ -186,10 +190,10 @@ public Class getColumnClass(int column) { * the method specified in constructor for the passed in column. * @param node * @param column - * @return + * @return */ @Override - public Object getValueAt(Object node, int column) { + public Object getValueAt(final Object node, final int column) { try { Method method = node.getClass().getMethod(methodNames[column], (Class[]) null); if (method != null) { @@ -204,13 +208,13 @@ public Object getValueAt(Object node, int column) { /** * Returns true if there is a setter method name for column * column. This is set in the constructor. - * + * * @param node * @param column - * @return + * @return */ @Override - public boolean isCellEditable(Object node, int column) { + public boolean isCellEditable(final Object node, final int column) { return (setterMethodNames != null && setterMethodNames[column] != null); } @@ -220,7 +224,7 @@ public boolean isCellEditable(Object node, int column) { * node in column column. This is done * by using the setter method name, and coercing the passed in * value to the specified type. - * + * * @param aValue * @param node * @param column @@ -229,7 +233,7 @@ public boolean isCellEditable(Object node, int column) { // it should really be changed to cache matching methods/constructors // based on node's class, and aValue's class. @Override - public void setValueAt(Object aValue, Object node, int column) { + public void setValueAt(Object aValue, final Object node, final int column) { boolean found = false; try { // We have to search through all the methods since the @@ -286,11 +290,11 @@ public void setValueAt(Object aValue, Object node, int column) { * where the original node is the last element in the returned array. * The length of the returned array gives the node's depth in the * tree. - * + * * @param aNode the TreeNode to get the path for - * @return + * @return */ - public TreeNode[] getPathToRoot(TreeNode aNode) { + public TreeNode[] getPathToRoot(final TreeNode aNode) { return getPathToRoot(aNode, 0); } @@ -299,14 +303,14 @@ public TreeNode[] getPathToRoot(TreeNode aNode) { * where the original node is the last element in the returned array. * The length of the returned array gives the node's depth in the * tree. - * + * * @param aNode the TreeNode to get the path for * @param depth an int giving the number of steps already taken towards * the root (on recursive calls), used to size the returned array * @return an array of TreeNodes giving the path from the root to the - * specified node + * specified node */ - private TreeNode[] getPathToRoot(TreeNode aNode, int depth) { + private TreeNode[] getPathToRoot(final TreeNode aNode, int depth) { TreeNode[] retNodes; // This method recurses, traversing towards the root in order // size the array. On the way back, it fills in the nodes, diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/JTreeTable.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/JTreeTable.java index 2cad979..7ed809a 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/JTreeTable.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/JTreeTable.java @@ -1,22 +1,22 @@ /* * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved. - * + * * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following * conditions are met: - * + * * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * + * notice, this list of conditions and the following disclaimer. + * * - Redistribution in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials - * provided with the distribution. - * + * provided with the distribution. + * * Neither the name of Sun Microsystems, Inc. or the names of * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * This software is provided "AS IS," without a warranty of any * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, @@ -24,47 +24,68 @@ * EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY * DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR * RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE OR - * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE - * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, - * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER - * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF - * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS + * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE + * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, + * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER + * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF + * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS * BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * + * * You acknowledge that this software is not designed, licensed or * intended for use in the design, construction, operation or * maintenance of any nuclear facility. */ package org.freeinternals.commonlib.ui.jtreetable; -import java.awt.*; -import java.awt.event.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Rectangle; +import java.awt.event.InputEvent; +import java.awt.event.MouseEvent; import java.util.EventObject; -import javax.swing.*; -import javax.swing.border.*; -import javax.swing.event.*; -import javax.swing.table.*; -import javax.swing.tree.*; +import javax.swing.DefaultCellEditor; +import javax.swing.Icon; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.JTree; +import javax.swing.ListSelectionModel; +import javax.swing.LookAndFeel; +import javax.swing.UIManager; +import javax.swing.border.Border; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.table.TableCellRenderer; +import javax.swing.tree.DefaultTreeCellRenderer; +import javax.swing.tree.DefaultTreeSelectionModel; +import javax.swing.tree.TreeCellRenderer; +import javax.swing.tree.TreeModel; +import javax.swing.tree.TreePath; /** - * This example shows how to create a simple JTreeTable component, - * by using a JTree as a renderer (and editor) for the cells in a - * particular column in the JTable. + * This example shows how to create a simple JTreeTable component, by using a + * JTree as a renderer (and editor) for the cells in a particular column in the + * JTable. * *

- * A little change may be done on formatting, annotation, java doc, etc. + * Created by Philip Milne | Scott Violet. Miner change may be done + * on formatting, annotation, java doc, etc, for check style. *

* * @version 1.2 10/27/98 * * @author Philip Milne * @author Scott Violet - * @see The Swing HTML Parser + * @see The + * Swing HTML Parser */ public class JTreeTable extends JTable { private static final long serialVersionUID = 4876543219876500005L; - /** A subclass of JTree. */ + /** + * A subclass of JTree. + */ @SuppressWarnings("ProtectedField") protected TreeTableCellRenderer tree; @@ -101,9 +122,9 @@ public JTreeTable(TreeTableModel treeTableModel) { } /** - * Overridden to message super and forward the method to the tree. - * Since the tree is not actually in the component hierarchy it will - * never receive this unless we forward it in this manner. + * Overridden to message super and forward the method to the tree. Since the + * tree is not actually in the component hierarchy it will never receive + * this unless we forward it in this manner. */ @Override public void updateUI() { @@ -122,11 +143,13 @@ public void updateUI() { } /** - * Workaround for BasicTableUI anomaly. Make sure the UI never tries to - * resize the editor. The UI currently uses different techniques to - * paint the renderers and editors; overriding setBounds() below - * is not the right thing to do for an editor. Returning -1 for the - * editing row in this case, ensures the editor is never painted. + * Workaround for BasicTableUI anomaly.Make sure the UI never tries to + * resize the editor. The UI currently uses different techniques to paint + * the renderers and editors; overriding setBounds() below is not the right + * thing to do for an editor. Returning -1 for the editing row in this case, + * ensures the editor is never painted. + * + * @return Get editing row */ @Override public int getEditingRow() { @@ -135,22 +158,24 @@ public int getEditingRow() { } /** - * Returns the actual row that is editing as getEditingRow - * will always return -1. + * Returns the actual row that is editing as getEditingRow will + * always return -1. */ private int realEditingRow() { return editingRow; } /** - * This is overridden to invoke super's implementation, and then, - * if the receiver is editing a Tree column, the editor's bounds is - * reset. The reason we have to do this is because JTable doesn't - * think the table is being edited, as getEditingRow returns - * -1, and therefore doesn't automatically resize the editor for us. + * This is overridden to invoke super's implementation, and then, if the + * receiver is editing a Tree column, the editor's bounds is reset.The + * reason we have to do this is because JTable doesn't think the table is + * being edited, as getEditingRow returns -1, and therefore + * doesn't automatically resize the editor for us. + * + * @param resizingColumn Resizing column */ @Override - public void sizeColumnsToFit(int resizingColumn) { + public void sizeColumnsToFit(final int resizingColumn) { super.sizeColumnsToFit(resizingColumn); if (getEditingColumn() != -1 && getColumnClass(editingColumn) == TreeTableModel.class) { @@ -164,9 +189,11 @@ public void sizeColumnsToFit(int resizingColumn) { /** * Overridden to pass the new rowHeight to the tree. + * + * @param rowHeight Table row height */ @Override - public final void setRowHeight(int rowHeight) { + public final void setRowHeight(final int rowHeight) { super.setRowHeight(rowHeight); if (tree != null && tree.getRowHeight() != rowHeight) { tree.setRowHeight(getRowHeight()); @@ -175,6 +202,7 @@ public final void setRowHeight(int rowHeight) { /** * Returns the tree that is being shared between the model. + * * @return the shared tree */ public JTree getTree() { @@ -182,13 +210,18 @@ public JTree getTree() { } /** - * Overridden to invoke repaint for the particular location if - * the column contains the tree. This is done as the tree editor does - * not fill the bounds of the cell, we need the renderer to paint - * the tree in the background, and then draw the editor over it. + * Overridden to invoke repaint for the particular location if the column + * contains the tree.This is done as the tree editor does not fill the + * bounds of the cell, we need the renderer to paint the tree in the + * background, and then draw the editor over it. + * + * @param row Table row + * @param column Table column + * @param e Event object + * @return Cell is editable or not */ @Override - public boolean editCellAt(int row, int column, EventObject e) { + public boolean editCellAt(final int row, final int column, final EventObject e) { boolean retValue = super.editCellAt(row, column, e); if (retValue && getColumnClass(column) == TreeTableModel.class) { repaint(getCellRect(row, column, false)); @@ -204,21 +237,25 @@ public class TreeTableCellRenderer extends JTree implements TableCellRenderer { private static final long serialVersionUID = 4876543219876500005L; - /** Last table/tree row asked to renderer. */ + /** + * Last table/tree row asked to renderer. + */ @SuppressWarnings("ProtectedField") protected int visibleRow; - /** Border to draw around the tree, if this is non-null, it will - * be painted. */ + /** + * Border to draw around the tree, if this is non-null, it will be + * painted. + */ @SuppressWarnings("ProtectedField") protected Border highlightBorder; - public TreeTableCellRenderer(TreeModel model) { + public TreeTableCellRenderer(final TreeModel model) { super(model); } /** - * updateUI is overridden to set the colors of the Tree's renderer - * to match that of the table. + * updateUI is overridden to set the colors of the Tree's renderer to + * match that of the table. */ @Override public void updateUI() { @@ -238,11 +275,13 @@ public void updateUI() { } /** - * Sets the row height of the tree, and forwards the row height to - * the table. + * Sets the row height of the tree, and forwards the row height to the + * table. + * + * @param rowHeight Table row height */ @Override - public void setRowHeight(int rowHeight) { + public void setRowHeight(final int rowHeight) { if (rowHeight > 0) { super.setRowHeight(rowHeight); if (JTreeTable.this != null @@ -254,22 +293,25 @@ public void setRowHeight(int rowHeight) { /** * This is overridden to set the height to match that of the JTable. + * * @param x x position * @param y x position * @param w width * @param h height */ @Override - public void setBounds(int x, int y, int w, int h) { + public void setBounds(final int x, final int y, final int w, final int h) { super.setBounds(x, 0, w, JTreeTable.this.getHeight()); } /** - * Sub-classed to translate the graphics such that the last visible - * row will be drawn at 0,0. + * Sub-classed to translate the graphics such that the last visible row + * will be drawn at 0,0. + * + * @param g UI painter */ @Override - public void paint(Graphics g) { + public void paint(final Graphics g) { g.translate(0, -visibleRow * getRowHeight()); super.paint(g); // Draw the Table border if we have focus. @@ -281,16 +323,22 @@ public void paint(Graphics g) { } /** - * TreeCellRenderer method. - * Overridden to update the visible row. - * - * @return the cell render + * TreeCellRenderer method.Overridden to update the visible row. + * + * @param table Table control + * @param value Cell value + * @param isSelected Cell is selected or not + * @param hasFocus Cell has focus or not + * @param row Table row + * @param column Table column + * @return the cell render */ - public Component getTableCellRendererComponent(JTable table, - Object value, - boolean isSelected, - boolean hasFocus, - int row, int column) { + @Override + public Component getTableCellRendererComponent(final JTable table, + final Object value, + final boolean isSelected, + final boolean hasFocus, + final int row, final int column) { Color background; Color foreground; @@ -333,39 +381,39 @@ public Component getTableCellRendererComponent(JTable table, /** * An editor that can be used to edit the tree column. This extends - * DefaultCellEditor and uses a JTextField (actually, TreeTableTextField) - * to perform the actual editing. - *

To support editing of the tree column we can not make the tree - * editable. The reason this doesn't work is that you can not use - * the same component for editing and renderering. The table may have - * the need to paint cells, while a cell is being edited. If the same - * component were used for the rendering and editing the component would - * be moved around, and the contents would change. When editing, this - * is undesirable, the contents of the text field must stay the same, - * including the caret blinking, and selections persisting. For this - * reason the editing is done via a TableCellEditor. - *

Another interesting thing to be aware of is how tree positions - * its render and editor. The render/editor is responsible for drawing the - * icon indicating the type of node (leaf, branch...). The tree is - * responsible for drawing any other indicators, perhaps an additional - * +/- sign, or lines connecting the various nodes. So, the renderer - * is positioned based on depth. On the other hand, table always makes - * its editor fill the contents of the cell. To get the allusion - * that the table cell editor is part of the tree, we don't want the - * table cell editor to fill the cell bounds. We want it to be placed - * in the same manner as tree places it editor, and have table message - * the tree to paint any decorations the tree wants. Then, we would - * only have to worry about the editing part. The approach taken - * here is to determine where tree would place the editor, and to override - * the reshape method in the JTextField component to - * nudge the text field to the location tree would place it. Since - * JTreeTable will paint the tree behind the editor everything should - * just work. So, that is what we are doing here. Determining of - * the icon position will only work if the TreeCellRenderer is - * an instance of DefaultTreeCellRenderer. If you need custom - * TreeCellRenderers, that don't descend from DefaultTreeCellRenderer, - * and you want to support editing in JTreeTable, you will have - * to do something similar. + * DefaultCellEditor and uses a JTextField (actually, TreeTableTextField) to + * perform the actual editing. + *

+ * To support editing of the tree column we can not make the tree editable. + * The reason this doesn't work is that you can not use the same component + * for editing and renderering. The table may have the need to paint cells, + * while a cell is being edited. If the same component were used for the + * rendering and editing the component would be moved around, and the + * contents would change. When editing, this is undesirable, the contents of + * the text field must stay the same, including the caret blinking, and + * selections persisting. For this reason the editing is done via a + * TableCellEditor. + *

+ * Another interesting thing to be aware of is how tree positions its render + * and editor. The render/editor is responsible for drawing the icon + * indicating the type of node (leaf, branch...). The tree is responsible + * for drawing any other indicators, perhaps an additional +/- sign, or + * lines connecting the various nodes. So, the renderer is positioned based + * on depth. On the other hand, table always makes its editor fill the + * contents of the cell. To get the allusion that the table cell editor is + * part of the tree, we don't want the table cell editor to fill the cell + * bounds. We want it to be placed in the same manner as tree places it + * editor, and have table message the tree to paint any decorations the tree + * wants. Then, we would only have to worry about the editing part. The + * approach taken here is to determine where tree would place the editor, + * and to override the reshape method in the JTextField + * component to nudge the text field to the location tree would place it. + * Since JTreeTable will paint the tree behind the editor everything should + * just work. So, that is what we are doing here. Determining of the icon + * position will only work if the TreeCellRenderer is an instance of + * DefaultTreeCellRenderer. If you need custom TreeCellRenderers, that don't + * descend from DefaultTreeCellRenderer, and you want to support editing in + * JTreeTable, you will have to do something similar. */ @SuppressWarnings("PublicInnerClass") public class TreeTableCellEditor extends DefaultCellEditor { @@ -377,21 +425,25 @@ public TreeTableCellEditor() { } /** - * Overridden to determine an offset that tree would place the - * editor at. The offset is determined from the - * getRowBounds JTree method, and additionally - * from the icon DefaultTreeCellRenderer will use. - *

The offset is then set on the TreeTableTextField component - * created in the constructor, and returned. - * - * @param r - * @param c + * Overridden to determine an offset that tree would place the editor + * at.The offset is determined from the getRowBounds JTree + * method, and additionally from the icon DefaultTreeCellRenderer will + * use.

+ * The offset is then set on the TreeTableTextField component created in + * the constructor, and returned. + * + * @param table Table control + * @param value Cell value + * @param isSelected Is selected + * @param r Row + * @param c Column + * @return Table cell editor */ @Override - public Component getTableCellEditorComponent(JTable table, - Object value, - boolean isSelected, - int r, int c) { + public Component getTableCellEditorComponent(final JTable table, + final Object value, + final boolean isSelected, + final int r, int c) { Component component = super.getTableCellEditorComponent(table, value, isSelected, r, c); JTree t = getTree(); boolean rv = t.isRootVisible(); @@ -420,13 +472,14 @@ public Component getTableCellEditorComponent(JTable table, } /** - * This is overridden to forward the event to the tree. This will - * return true if the click count Greater Equals 3, or the event is null. - * - * @param e + * This is overridden to forward the event to the tree. This will return + * true if the click count Greater Equals 3, or the event is null. + * + * @param e Event object + * @return If cell is editable or not */ @Override - public boolean isCellEditable(EventObject e) { + public boolean isCellEditable(final EventObject e) { if (e instanceof MouseEvent) { MouseEvent me = (MouseEvent) e; // If the modifiers are not 0 (or the left mouse button), @@ -463,45 +516,45 @@ public boolean isCellEditable(EventObject e) { } /** - * Component used by TreeTableCellEditor. The only thing this does - * is to override the reshape method, and to ALWAYS - * make the x location be offset. + * Component used by TreeTableCellEditor. The only thing this does is to + * override the reshape method, and to ALWAYS make the x + * location be offset. */ @SuppressWarnings("PackageVisibleInnerClass") static class TreeTableTextField extends JTextField { private static final long serialVersionUID = 4876543219876500005L; - @SuppressWarnings("PublicField") - public int offset; + private int offset; @Override @SuppressWarnings("deprecation") - public void reshape(int x, int y, int w, int h) { + public void reshape(final int x, final int y, final int w, final int h) { int newX = Math.max(x, offset); //super.reshape(newX, y, w - (newX - x), h); super.setBounds(newX, y, w - (newX - x), h); } @Override - public void setBounds(int x, int y, int width, int height) { + public void setBounds(final int x, final int y, final int width, final int height) { int newX = Math.max(x, offset); super.setBounds(newX, y, width - (newX - x), height); } } /** - * ListToTreeSelectionModelWrapper extends DefaultTreeSelectionModel - * to listen for changes in the ListSelectionModel it maintains. Once - * a change in the ListSelectionModel happens, the paths are updated - * in the DefaultTreeSelectionModel. + * ListToTreeSelectionModelWrapper extends DefaultTreeSelectionModel to + * listen for changes in the ListSelectionModel it maintains. Once a change + * in the ListSelectionModel happens, the paths are updated in the + * DefaultTreeSelectionModel. */ @SuppressWarnings("PackageVisibleInnerClass") class ListToTreeSelectionModelWrapper extends DefaultTreeSelectionModel { private static final long serialVersionUID = 4876543219876500005L; - /** Set to true when we are updating the ListSelectionModel. */ - @SuppressWarnings("ProtectedField") - protected boolean updatingListSelectionModel; + /** + * Set to true when we are updating the ListSelectionModel. + */ + private boolean updatingListSelectionModel; ListToTreeSelectionModelWrapper() { super(); @@ -512,14 +565,16 @@ class ListToTreeSelectionModelWrapper extends DefaultTreeSelectionModel { * Returns the list selection model. ListToTreeSelectionModelWrapper * listens for changes to this model and updates the selected paths * accordingly. + * + * @return {@link ListSelectionModel} */ final ListSelectionModel getListSelectionModel() { return listSelectionModel; } /** - * This is overridden to set updatingListSelectionModel - * and message super. This is the only place DefaultTreeSelectionModel + * This is overridden to set updatingListSelectionModel and + * message super. This is the only place DefaultTreeSelectionModel * alters the ListSelectionModel. */ @Override @@ -541,15 +596,17 @@ public void resetRowSelection() { /** * Creates and returns an instance of ListSelectionHandler. + * + * @return {@link #ListSelectionHandler} */ protected final ListSelectionListener createListSelectionListener() { return new ListSelectionHandler(); } /** - * If updatingListSelectionModel is false, this will - * reset the selected paths from the selected rows in the list - * selection model. + * If updatingListSelectionModel is false, this will reset + * the selected paths from the selected rows in the list selection + * model. */ protected void updateSelectedPathsFromSelectedRows() { if (!updatingListSelectionModel) { @@ -584,7 +641,8 @@ protected void updateSelectedPathsFromSelectedRows() { */ class ListSelectionHandler implements ListSelectionListener { - public void valueChanged(ListSelectionEvent e) { + @Override + public void valueChanged(final ListSelectionEvent e) { updateSelectedPathsFromSelectedRows(); } } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/TreeTableModel.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/TreeTableModel.java index c624a7c..b966bd7 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/TreeTableModel.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/TreeTableModel.java @@ -1,22 +1,22 @@ /* * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved. - * + * * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following * conditions are met: - * + * * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * + * notice, this list of conditions and the following disclaimer. + * * - Redistribution in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials - * provided with the distribution. - * + * provided with the distribution. + * * Neither the name of Sun Microsystems, Inc. or the names of * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * This software is provided "AS IS," without a warranty of any * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, @@ -24,13 +24,13 @@ * EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY * DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR * RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE OR - * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE - * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, - * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER - * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF - * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS + * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE + * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, + * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER + * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF + * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS * BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * + * * You acknowledge that this software is not designed, licensed or * intended for use in the design, construction, operation or * maintenance of any nuclear facility. @@ -42,17 +42,18 @@ /** * TreeTableModel is the model used by a JTreeTable. It extends TreeModel - * to add methods for getting information about the set of columns each - * node in the TreeTableModel may have. Each column, like a column in - * a TableModel, has a name and a type associated with it. Each node in - * the TreeTableModel can return a value for each of the columns and - * set that value if isCellEditable() returns true. + * to add methods for getting information about the set of columns each + * node in the TreeTableModel may have. Each column, like a column in + * a TableModel, has a name and a type associated with it. Each node in + * the TreeTableModel can return a value for each of the columns and + * set that value if isCellEditable() returns true. * *

- * A little change may be done on formatting, annotation, java doc, etc. + * Created by Philip Milne | Scott Violet. Miner change may be done + * on formatting, annotation, java doc, etc, for check style. *

* - * @author Philip Milne + * @author Philip Milne * @author Scott Violet * @see The Swing HTML Parser */ @@ -60,54 +61,54 @@ public interface TreeTableModel extends TreeModel { /** * Returns the number of available columns. - * + * * @return column number */ - public int getColumnCount(); + int getColumnCount(); /** * Returns the name for column number column. * @param column column number * @return column name */ - public String getColumnName(int column); + String getColumnName(int column); /** * Returns the type for column number column. * @param column number * @return column type */ - public Class getColumnClass(int column); + Class getColumnClass(int column); /** - * Returns the value to be displayed for node node, + * Returns the value to be displayed for node node, * at column number column. * - * + * * @param node * @param column - * @return + * @return */ - public Object getValueAt(Object node, int column); + Object getValueAt(Object node, int column); /** - * Indicates whether the the value for node node, + * Indicates whether the the value for node node, * at column number column is editable. - * + * * @param node * @param column * @return */ - public boolean isCellEditable(Object node, int column); + boolean isCellEditable(Object node, int column); /** - * Sets the value for node node, + * Sets the value for node node, * at column number column. - * + * * @param aValue * @param node * @param column */ - public void setValueAt(Object aValue, Object node, int column); + void setValueAt(Object aValue, Object node, int column); } diff --git a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/TreeTableModelAdapter.java b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/TreeTableModelAdapter.java index f829a16..b1a854f 100644 --- a/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/TreeTableModelAdapter.java +++ b/CommonLib/src/main/java/org/freeinternals/commonlib/ui/jtreetable/TreeTableModelAdapter.java @@ -1,22 +1,22 @@ /* * Copyright 1997-1999 Sun Microsystems, Inc. All Rights Reserved. - * + * * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following * conditions are met: - * + * * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * + * notice, this list of conditions and the following disclaimer. + * * - Redistribution in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials - * provided with the distribution. - * + * provided with the distribution. + * * Neither the name of Sun Microsystems, Inc. or the names of * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * This software is provided "AS IS," without a warranty of any * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, @@ -24,18 +24,17 @@ * EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY * DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR * RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE OR - * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE - * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, - * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER - * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF - * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS + * ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE + * FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, + * SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER + * CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF + * THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS * BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * + * * You acknowledge that this software is not designed, licensed or * intended for use in the design, construction, operation or * maintenance of any nuclear facility. */ - package org.freeinternals.commonlib.ui.jtreetable; import javax.swing.JTree; @@ -48,23 +47,24 @@ import javax.swing.tree.TreePath; /** - * This is a wrapper class takes a TreeTableModel and implements - * the table model interface. The implementation is trivial, with - * all of the event dispatching support provided by the superclass: - * the AbstractTableModel. + * This is a wrapper class takes a TreeTableModel and implements the table model + * interface. The implementation is trivial, with all of the event dispatching + * support provided by the superclass: the AbstractTableModel. * *

- * A little change may be done on formatting, annotation, java doc, etc. + * Created by Philip Milne | Scott Violet. Miner change may be done + * on formatting, annotation, java doc, etc, for check style. *

* * @version 1.2 10/27/98 * * @author Philip Milne * @author Scott Violet - * @see The Swing HTML Parser + * @see The + * Swing HTML Parser */ -public class TreeTableModelAdapter extends AbstractTableModel -{ +public final class TreeTableModelAdapter extends AbstractTableModel { + JTree tree; TreeTableModel treeTableModel; @@ -72,77 +72,86 @@ public TreeTableModelAdapter(TreeTableModel treeTableModel, JTree tree) { this.tree = tree; this.treeTableModel = treeTableModel; - tree.addTreeExpansionListener(new TreeExpansionListener() { - // Don't use fireTableRowsInserted() here; the selection model - // would get updated twice. - public void treeExpanded(TreeExpansionEvent event) { - fireTableDataChanged(); - } - public void treeCollapsed(TreeExpansionEvent event) { - fireTableDataChanged(); - } - }); - - // Installs a TreeModelListener that can update the table when - // the tree changes. We use delayedFireTableDataChanged as we can - // not be guaranteed the tree will have finished processing - // the event before us. - treeTableModel.addTreeModelListener(new TreeModelListener() { - public void treeNodesChanged(TreeModelEvent e) { - delayedFireTableDataChanged(); - } - - public void treeNodesInserted(TreeModelEvent e) { - delayedFireTableDataChanged(); - } - - public void treeNodesRemoved(TreeModelEvent e) { - delayedFireTableDataChanged(); - } - - public void treeStructureChanged(TreeModelEvent e) { - delayedFireTableDataChanged(); - } - }); + tree.addTreeExpansionListener(new TreeExpansionListener() { + // Don't use fireTableRowsInserted() here; the selection model + // would get updated twice. + @Override + public void treeExpanded(final TreeExpansionEvent event) { + fireTableDataChanged(); + } + + @Override + public void treeCollapsed(final TreeExpansionEvent event) { + fireTableDataChanged(); + } + }); + + // Installs a TreeModelListener that can update the table when + // the tree changes. We use delayedFireTableDataChanged as we can + // not be guaranteed the tree will have finished processing + // the event before us. + treeTableModel.addTreeModelListener(new TreeModelListener() { + @Override + public void treeNodesChanged(final TreeModelEvent e) { + delayedFireTableDataChanged(); + } + + @Override + public void treeNodesInserted(final TreeModelEvent e) { + delayedFireTableDataChanged(); + } + + @Override + public void treeNodesRemoved(final TreeModelEvent e) { + delayedFireTableDataChanged(); + } + + @Override + public void treeStructureChanged(final TreeModelEvent e) { + delayedFireTableDataChanged(); + } + }); } - // Wrappers, implementing TableModel interface. - + // Wrappers, implementing TableModel interface. + @Override public int getColumnCount() { - return treeTableModel.getColumnCount(); + return treeTableModel.getColumnCount(); } @Override - public String getColumnName(int column) { - return treeTableModel.getColumnName(column); + public String getColumnName(final int column) { + return treeTableModel.getColumnName(column); } @Override - public Class getColumnClass(int column) { - return treeTableModel.getColumnClass(column); + public Class getColumnClass(final int column) { + return treeTableModel.getColumnClass(column); } + @Override public int getRowCount() { - return tree.getRowCount(); + return tree.getRowCount(); } - protected Object nodeForRow(int row) { - TreePath treePath = tree.getPathForRow(row); - return treePath.getLastPathComponent(); + protected Object nodeForRow(final int row) { + TreePath treePath = tree.getPathForRow(row); + return treePath.getLastPathComponent(); } - public Object getValueAt(int row, int column) { - return treeTableModel.getValueAt(nodeForRow(row), column); + @Override + public Object getValueAt(final int row, final int column) { + return treeTableModel.getValueAt(nodeForRow(row), column); } @Override - public boolean isCellEditable(int row, int column) { - return treeTableModel.isCellEditable(nodeForRow(row), column); + public boolean isCellEditable(final int row, final int column) { + return treeTableModel.isCellEditable(nodeForRow(row), column); } @Override - public void setValueAt(Object value, int row, int column) { - treeTableModel.setValueAt(value, nodeForRow(row), column); + public void setValueAt(final Object value, final int row, final int column) { + treeTableModel.setValueAt(value, nodeForRow(row), column); } /** @@ -150,12 +159,11 @@ public void setValueAt(Object value, int row, int column) { * processed. SwingUtilities.invokeLater is used to handle this. */ protected void delayedFireTableDataChanged() { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - fireTableDataChanged(); - } - }); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + fireTableDataChanged(); + } + }); } } - - diff --git a/FormatBMP/src/main/java/org/freeinternals/format/bmp/BMPFile.java b/FormatBMP/src/main/java/org/freeinternals/format/bmp/BMPFile.java index e4d3ff0..dbe4731 100644 --- a/FormatBMP/src/main/java/org/freeinternals/format/bmp/BMPFile.java +++ b/FormatBMP/src/main/java/org/freeinternals/format/bmp/BMPFile.java @@ -13,7 +13,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/ClassFile.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/ClassFile.java index 59f4f35..6bf0f13 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/ClassFile.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/ClassFile.java @@ -11,7 +11,7 @@ import java.util.logging.Logger; import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.attribute.AttributeInfo; import org.freeinternals.format.classfile.constant.CPInfo; import org.freeinternals.format.classfile.constant.CPInfo.ConstantType; @@ -369,7 +369,7 @@ private void analysisDeclarations() * Get the text of {@link #this_class}, which is the class name. * * @return Corresponding text of {@link #this_class} - * @throws org.freeinternals.format.FileFormatException Invalid + * @throws org.freeinternals.commonlib.core.FileFormatException Invalid * {@link #constant_pool} item found */ public String getThisClassName() throws FileFormatException { @@ -380,7 +380,7 @@ public String getThisClassName() throws FileFormatException { * Get the text of {@link #super_class}, which is the super class name. * * @return Corresponding text of {@link #super_class} - * @throws org.freeinternals.format.FileFormatException Invalid + * @throws org.freeinternals.commonlib.core.FileFormatException Invalid * {@link #constant_pool} item found */ public String getSuperClassName() throws FileFormatException { @@ -399,7 +399,7 @@ public String getSuperClassName() throws FileFormatException { * * @param cpIndex {@link #constant_pool} item index * @return Get CONSTANT_Class_info name at cpIndex - * @throws org.freeinternals.format.FileFormatException Invalid + * @throws org.freeinternals.commonlib.core.FileFormatException Invalid * {@link #constant_pool} item found */ public String getConstantClassInfoName(int cpIndex) throws FileFormatException { @@ -422,7 +422,7 @@ public String getConstantClassInfoName(int cpIndex) throws FileFormatException { * @param cpIndex Constant Pool object Index for * CONSTANT_Utf8_info * @return The UTF-8 text - * @throws org.freeinternals.format.FileFormatException Invalid class file + * @throws org.freeinternals.commonlib.core.FileFormatException Invalid class file * format */ public String getConstantUtf8Value(final int cpIndex) throws FileFormatException { diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/FieldInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/FieldInfo.java index 0ee0d60..f711f3a 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/FieldInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/FieldInfo.java @@ -9,7 +9,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.attribute.AttributeInfo; import org.freeinternals.format.classfile.constant.CPInfo; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/MethodInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/MethodInfo.java index 648b754..0c411f2 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/MethodInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/MethodInfo.java @@ -11,7 +11,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * {@code Method} of a class or interface. The {@code Method} structure has the diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/SignatureConvertor.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/SignatureConvertor.java index c1ab7c3..9bdfb4d 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/SignatureConvertor.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/SignatureConvertor.java @@ -9,7 +9,7 @@ import org.freeinternals.format.classfile.attribute.AttributeSignature; import java.util.ArrayList; import java.util.List; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.attribute.AttributeSignature.ReferenceType; /** diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/Annotation.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/Annotation.java index 7c20670..b015878 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/Annotation.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/Annotation.java @@ -5,7 +5,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeAnnotationDefault.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeAnnotationDefault.java index e54b784..e0c2591 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeAnnotationDefault.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeAnnotationDefault.java @@ -9,7 +9,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeBootstrapMethods.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeBootstrapMethods.java index 938f988..e672f62 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeBootstrapMethods.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeBootstrapMethods.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeCode.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeCode.java index 8e0d956..aa2d937 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeCode.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeCode.java @@ -13,7 +13,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.constant.CPInfo; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeConstantValue.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeConstantValue.java index dba6251..07c154a 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeConstantValue.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeConstantValue.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeDeprecated.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeDeprecated.java index dabcfb0..401a066 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeDeprecated.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeDeprecated.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeEnclosingMethod.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeEnclosingMethod.java index 8242400..a0c6c8a 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeEnclosingMethod.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeEnclosingMethod.java @@ -9,7 +9,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeExceptions.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeExceptions.java index 2d7da1e..41f2691 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeExceptions.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeExceptions.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeInfo.java index f4e4480..1e08034 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeInfo.java @@ -15,7 +15,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.GenerateClassfileTreeNode; import org.freeinternals.format.classfile.JavaSEVersion; @@ -108,7 +108,7 @@ public abstract class AttributeInfo extends FileComponent implements GenerateCla * @param cp Constant Pool item * @return Parsed result * @throws java.io.IOException Input Stream read fail - * @throws org.freeinternals.format.FileFormatException Class file format + * @throws org.freeinternals.commonlib.core.FileFormatException Class file format * error */ public static AttributeInfo parse(final PosDataInputStream posDataInputStream, final CPInfo[] cp) throws IOException, FileFormatException { @@ -158,7 +158,7 @@ public static AttributeInfo parse(final PosDataInputStream posDataInputStream, f * Verify the current class file input stream position is correct. * * @param endPos Current position - * @throws org.freeinternals.format.FileFormatException Invalid class file + * @throws org.freeinternals.commonlib.core.FileFormatException Invalid class file * format */ protected void checkSize(final int endPos) throws FileFormatException { diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeInnerClasses.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeInnerClasses.java index 252bb57..9461232 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeInnerClasses.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeInnerClasses.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.AccessFlag; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLineNumberTable.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLineNumberTable.java index 38eef53..520d0f1 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLineNumberTable.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLineNumberTable.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLocalVariableTable.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLocalVariableTable.java index c503abc..9f64fad 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLocalVariableTable.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLocalVariableTable.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLocalVariableTypeTable.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLocalVariableTypeTable.java index 22c1dd9..c101c9c 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLocalVariableTypeTable.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeLocalVariableTypeTable.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeMethodParameters.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeMethodParameters.java index f4216ed..9c94a17 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeMethodParameters.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeMethodParameters.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.AccessFlag; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModule.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModule.java index b657400..7b43cf8 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModule.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModule.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleHashes.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleHashes.java index ab1af8e..5dd1eb9 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleHashes.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleHashes.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u1; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleMainClass.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleMainClass.java index e27bb11..d5f9d6d 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleMainClass.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleMainClass.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModulePackages.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModulePackages.java index 9f058ee..cff0f5e 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModulePackages.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModulePackages.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleTarget.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleTarget.java index d4c87f5..82de1e3 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleTarget.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeModuleTarget.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeNestHost.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeNestHost.java index 8377df4..11343e7 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeNestHost.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeNestHost.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeNestMembers.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeNestMembers.java index 6daa6f4..39245af 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeNestMembers.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeNestMembers.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeAnnotations.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeAnnotations.java index 59e22ae..d391ae1 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeAnnotations.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeAnnotations.java @@ -3,7 +3,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleAnnotations.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleAnnotations.java index 5592242..fe8f9fd 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleAnnotations.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleAnnotations.java @@ -7,7 +7,7 @@ package org.freeinternals.format.classfile.attribute; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleParameterAnnotations.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleParameterAnnotations.java index 59ead2a..3563b28 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleParameterAnnotations.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleParameterAnnotations.java @@ -7,7 +7,7 @@ package org.freeinternals.format.classfile.attribute; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleTypeAnnotations.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleTypeAnnotations.java index 2fceab1..ceec85e 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleTypeAnnotations.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeInvisibleTypeAnnotations.java @@ -7,7 +7,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeParameterAnnotations.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeParameterAnnotations.java index 88badeb..6451ed8 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeParameterAnnotations.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeParameterAnnotations.java @@ -5,7 +5,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u1; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeTypeAnnotations.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeTypeAnnotations.java index 2f9ca7d..15e30b6 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeTypeAnnotations.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeTypeAnnotations.java @@ -10,7 +10,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u1; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleAnnotations.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleAnnotations.java index 96f36b9..f5a8594 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleAnnotations.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleAnnotations.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleParameterAnnotations.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleParameterAnnotations.java index 1396563..d24ad70 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleParameterAnnotations.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleParameterAnnotations.java @@ -7,7 +7,7 @@ package org.freeinternals.format.classfile.attribute; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleTypeAnnotations.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleTypeAnnotations.java index c8c8fcf..6c5fa8c 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleTypeAnnotations.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeRuntimeVisibleTypeAnnotations.java @@ -7,7 +7,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSignature.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSignature.java index 3a1a525..5c671a1 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSignature.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSignature.java @@ -9,7 +9,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.constant.CPInfo; import org.freeinternals.format.classfile.JavaLangSpec; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSourceDebugExtension.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSourceDebugExtension.java index 7b8094d..aeaa81e 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSourceDebugExtension.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSourceDebugExtension.java @@ -9,7 +9,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSourceFile.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSourceFile.java index 9f9a687..f9d06e1 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSourceFile.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSourceFile.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeStackMapTable.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeStackMapTable.java index ea6ffa6..29d6fad 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeStackMapTable.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeStackMapTable.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u1; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSynthetic.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSynthetic.java index 9383c2a..c3d38e5 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSynthetic.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeSynthetic.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeUnrecognized.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeUnrecognized.java index 1f243b4..256bab4 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeUnrecognized.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/attribute/AttributeUnrecognized.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/CPInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/CPInfo.java index e914851..780d205 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/CPInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/CPInfo.java @@ -12,7 +12,7 @@ import java.util.logging.Logger; import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.GenerateClassfileTreeNode; import org.freeinternals.format.classfile.JavaSEVersion; @@ -313,7 +313,7 @@ public static ConstantType valueOf(int tag) { * @param tag Constant pool item tag, indicating the type of the item * @param posDataInputStream Class file byte stream * @return Parsed constant pool info - * @throws org.freeinternals.format.FileFormatException An invalid class + * @throws org.freeinternals.commonlib.core.FileFormatException An invalid class * file format encountered */ public static CPInfo parse(int tag, final PosDataInputStream posDataInputStream) throws FileFormatException { diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantDynamicInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantDynamicInfo.java index 04fd83b..20102d0 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantDynamicInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantDynamicInfo.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantFieldrefInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantFieldrefInfo.java index 36aa331..37dcd2b 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantFieldrefInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantFieldrefInfo.java @@ -12,7 +12,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.SignatureConvertor; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantInvokeDynamicInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantInvokeDynamicInfo.java index 25f9c24..40a9fa0 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantInvokeDynamicInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantInvokeDynamicInfo.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantMethodHandleInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantMethodHandleInfo.java index 914ef48..5a80ebb 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantMethodHandleInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantMethodHandleInfo.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u1; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantMethodTypeInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantMethodTypeInfo.java index 941c543..d648c1b 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantMethodTypeInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantMethodTypeInfo.java @@ -12,7 +12,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.SignatureConvertor; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantRefInfo.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantRefInfo.java index 24885d1..d65e965 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantRefInfo.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantRefInfo.java @@ -9,7 +9,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.SignatureConvertor; diff --git a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantUtf8Info.java b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantUtf8Info.java index 9c7795d..12f42e4 100644 --- a/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantUtf8Info.java +++ b/FormatCLASS/src/main/java/org/freeinternals/format/classfile/constant/ConstantUtf8Info.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.JavaSEVersion; import org.freeinternals.format.classfile.u2; diff --git a/FormatDEX/src/main/java/org/freeinternals/format/dex/DexFile.java b/FormatDEX/src/main/java/org/freeinternals/format/dex/DexFile.java index 95a104d..cad611c 100644 --- a/FormatDEX/src/main/java/org/freeinternals/format/dex/DexFile.java +++ b/FormatDEX/src/main/java/org/freeinternals/format/dex/DexFile.java @@ -18,7 +18,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.core.BytesTool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.dex.HeaderItem.Endian; /** diff --git a/FormatDEX/src/main/java/org/freeinternals/format/dex/PosDataInputStreamDex.java b/FormatDEX/src/main/java/org/freeinternals/format/dex/PosDataInputStreamDex.java index b783a72..ff8240a 100644 --- a/FormatDEX/src/main/java/org/freeinternals/format/dex/PosDataInputStreamDex.java +++ b/FormatDEX/src/main/java/org/freeinternals/format/dex/PosDataInputStreamDex.java @@ -9,7 +9,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.dex.HeaderItem.Endian; /** @@ -143,7 +143,7 @@ public Dex_ulong Dex_ulong() throws IOException { * Read a {@link Dex_sleb128} from the input stream. * * @throws java.io.IOException I/O Error - * @throws org.freeinternals.format.FileFormatException Invalid LEB128 + * @throws org.freeinternals.commonlib.core.FileFormatException Invalid LEB128 * format * @return a {@link Dex_sleb128} * @see DWARF 3.0 Standard @@ -177,7 +177,7 @@ public Dex_sleb128 Dex_sleb128() throws IOException, FileFormatException { * Read a {@link Dex_uleb128} from the input stream. * * @throws java.io.IOException I/O Error - * @throws org.freeinternals.format.FileFormatException Invalid LEB128 + * @throws org.freeinternals.commonlib.core.FileFormatException Invalid LEB128 * format * @return a {@link Dex_uleb128} * @see DWARF 3.0 Standard @@ -205,7 +205,7 @@ public Dex_uleb128 Dex_uleb128() throws IOException, FileFormatException { * Read a {@link Dex_uleb128p1} from the input stream. * * @throws java.io.IOException I/O Error - * @throws org.freeinternals.format.FileFormatException Invalid LEB128 + * @throws org.freeinternals.commonlib.core.FileFormatException Invalid LEB128 * format * @return a {@link Dex_uleb128p1} * @see DWARF 3.0 Standard diff --git a/FormatDEX/src/main/java/org/freeinternals/format/dex/StringDataItem.java b/FormatDEX/src/main/java/org/freeinternals/format/dex/StringDataItem.java index 2fcf099..49736c7 100644 --- a/FormatDEX/src/main/java/org/freeinternals/format/dex/StringDataItem.java +++ b/FormatDEX/src/main/java/org/freeinternals/format/dex/StringDataItem.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.FileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatELF/src/main/java/org/freeinternals/format/elf/ElfFile.java b/FormatELF/src/main/java/org/freeinternals/format/elf/ElfFile.java index ebe54db..9530374 100644 --- a/FormatELF/src/main/java/org/freeinternals/format/elf/ElfFile.java +++ b/FormatELF/src/main/java/org/freeinternals/format/elf/ElfFile.java @@ -10,7 +10,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.FileFormat; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/JPEGFile.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/JPEGFile.java index 04b99be..b4dea54 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/JPEGFile.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/JPEGFile.java @@ -15,7 +15,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.GenerateTreeNode; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker.java index 012bad1..b1813aa 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker.java @@ -12,7 +12,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/MarkerParse.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/MarkerParse.java index e49b17e..a709d3d 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/MarkerParse.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/MarkerParse.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP00.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP00.java index 0024cec..42721ff 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP00.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP00.java @@ -12,7 +12,7 @@ import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.GenerateTreeNode; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP01.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP01.java index 2e0eb07..14a22ff 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP01.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP01.java @@ -12,7 +12,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.JXMLViewer; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.jpeg.tiff.TIFF; import org.freeinternals.format.jpeg.xmp.XMP; diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP02.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP02.java index 924690f..5e9d0f8 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP02.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP02.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.jpeg.icc.ICCProfile; /** diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP03.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP03.java index 107cb2c..dbde482 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP03.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP03.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP04.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP04.java index a214630..4f6dd1a 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP04.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP04.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP05.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP05.java index fa9d095..9771fc1 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP05.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP05.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP06.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP06.java index 963d5f9..dba18fa 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP06.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP06.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP08.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP08.java index b59f7e4..bf9e917 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP08.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP08.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP10.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP10.java index 6514ecc..9e11be6 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP10.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP10.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP12.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP12.java index 4b36846..f9583d0 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP12.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP12.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP13.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP13.java index 8161584..67d0592 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP13.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP13.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.jpeg.ps.PhotoshopImageResource; /** diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP14.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP14.java index b248c0e..f886df5 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP14.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP14.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP15.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP15.java index d24a705..69612f0 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP15.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_APP15.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_COM.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_COM.java index 27994ab..f21a34f 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_COM.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_COM.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponenPlaceHolder; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DAC.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DAC.java index a237120..c54812d 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DAC.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DAC.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DHP.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DHP.java index 32d7ff5..c47868d 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DHP.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DHP.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DHT.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DHT.java index 4170580..a492383 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DHT.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DHT.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponenPlaceHolder; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DNL.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DNL.java index ddc9626..a8a4d91 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DNL.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DNL.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DQT.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DQT.java index df98993..67988e8 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DQT.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DQT.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponenPlaceHolder; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DRI.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DRI.java index 04542cc..9b0639b 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DRI.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_DRI.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_EOI.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_EOI.java index 0e4aac3..183bb19 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_EOI.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_EOI.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_EXP.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_EXP.java index f5eed24..44dbbd5 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_EXP.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_EXP.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_RSTm.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_RSTm.java index 4a11049..5977ac4 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_RSTm.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_RSTm.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOFnn.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOFnn.java index 59168de..43b6b35 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOFnn.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOFnn.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOI.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOI.java index b9bb233..e4bc54d 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOI.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOI.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOS.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOS.java index 312af02..eae4ca3 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOS.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_SOS.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_TEM.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_TEM.java index d5ffd8b..c71083b 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_TEM.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/Marker_TEM.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/icc/ICCProfile.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/icc/ICCProfile.java index f430d3e..f74860a 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/icc/ICCProfile.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/icc/ICCProfile.java @@ -83,7 +83,7 @@ public void generateTreeNode(DefaultMutableTreeNode parentNode) { for (RefItem ref : sortedMap.values()) { diff = (int) ((this.startPos + ref.tag.Offset) - lastPos); if (diff > 0) { - UITool.generateTreeNode_Diff( + UITool.generateTreeNodeDiff( parentNode, lastPos, diff, this.rawData, this.startPos); } @@ -97,7 +97,7 @@ public void generateTreeNode(DefaultMutableTreeNode parentNode) { diff = (this.startPos + this.rawData.length) - lastPos; if (diff > 0) { - UITool.generateTreeNode_Diff( + UITool.generateTreeNodeDiff( parentNode, lastPos, diff, this.rawData, this.startPos); } diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD.java index 19b4a69..0f9ff49 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD.java @@ -13,7 +13,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; public class IFD extends FileComponent { diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFDGroup.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFDGroup.java index 07744f7..d4d16d3 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFDGroup.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFDGroup.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; class IFDGroup { diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFDParse.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFDParse.java index 300b78c..08339fe 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFDParse.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFDParse.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0000_GPSVersionID.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0000_GPSVersionID.java index 7f56655..f326a76 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0000_GPSVersionID.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0000_GPSVersionID.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0001_InteroperabilityIndex.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0001_InteroperabilityIndex.java index 4b7f63f..9e7c739 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0001_InteroperabilityIndex.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0001_InteroperabilityIndex.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0002_InteroperabilityVersion.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0002_InteroperabilityVersion.java index 3303a7b..dcc568e 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0002_InteroperabilityVersion.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0002_InteroperabilityVersion.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0106_PhotometricInterpretation.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0106_PhotometricInterpretation.java index e2867d8..127d4f8 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0106_PhotometricInterpretation.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0106_PhotometricInterpretation.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_010E_ImageDescription.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_010E_ImageDescription.java index 7085217..e528474 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_010E_ImageDescription.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_010E_ImageDescription.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_010F_Make.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_010F_Make.java index bc34110..58f0f39 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_010F_Make.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_010F_Make.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0110_Model.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0110_Model.java index e30da81..062c6ba 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0110_Model.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0110_Model.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0112_Orientation.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0112_Orientation.java index 252e007..df6d706 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0112_Orientation.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0112_Orientation.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_011A_XResolution.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_011A_XResolution.java index c3ddbcf..52fe746 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_011A_XResolution.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_011A_XResolution.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_011B_YResolution.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_011B_YResolution.java index 2d2cbf5..92203f9 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_011B_YResolution.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_011B_YResolution.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0128_ResolutionUnit.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0128_ResolutionUnit.java index ed0446c..f16cf10 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0128_ResolutionUnit.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0128_ResolutionUnit.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0131_Software.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0131_Software.java index 7d09d6b..28bd0fb 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0131_Software.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0131_Software.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * @@ -52,7 +52,7 @@ public void generateTreeNode(DefaultMutableTreeNode parentNode) { super.tiff_StartPos + super.ifd_value_offset, super.data_size, String.format("Software: %s", this.value), - UITool.getShortcutIcon(), null; + UITool.getShortcutIcon(), null); comp.setDescription(IFDMessage.getString(IFDMessage.KEY_IFD_0131_Description)); parentNode.add(new DefaultMutableTreeNode(comp)); } diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0132_DateTime.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0132_DateTime.java index c55d1cd..17546cb 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0132_DateTime.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0132_DateTime.java @@ -10,7 +10,7 @@ import java.util.Calendar; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_013E_WhitePoint.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_013E_WhitePoint.java index f0f79da..f3f5d26 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_013E_WhitePoint.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_013E_WhitePoint.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_013F_PrimaryChromaticities.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_013F_PrimaryChromaticities.java index 4167792..61d0fac 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_013F_PrimaryChromaticities.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_013F_PrimaryChromaticities.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0201_JPEGInterchangeFormat.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0201_JPEGInterchangeFormat.java index 93f68bd..80793ca 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0201_JPEGInterchangeFormat.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0201_JPEGInterchangeFormat.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0202_JPEGInterchangeFormatLength.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0202_JPEGInterchangeFormatLength.java index c38dfef..776dcfb 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0202_JPEGInterchangeFormatLength.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0202_JPEGInterchangeFormatLength.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0211_YCbCrCoefficients.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0211_YCbCrCoefficients.java index e977fdb..d8aaf12 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0211_YCbCrCoefficients.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0211_YCbCrCoefficients.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0213_YCbCrPositioning.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0213_YCbCrPositioning.java index 63e0e17..1896050 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0213_YCbCrPositioning.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0213_YCbCrPositioning.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0214_ReferenceBlackWhite.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0214_ReferenceBlackWhite.java index fda5eee..940a53c 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0214_ReferenceBlackWhite.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_0214_ReferenceBlackWhite.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_829A_ExposureTime.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_829A_ExposureTime.java index 98dc9db..5e594f7 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_829A_ExposureTime.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_829A_ExposureTime.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_829D_FNumber.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_829D_FNumber.java index 88b3127..7370be9 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_829D_FNumber.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_829D_FNumber.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8769_Exif.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8769_Exif.java index 1eba13b..dd14c65 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8769_Exif.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8769_Exif.java @@ -12,7 +12,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8822_ExposureProgram.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8822_ExposureProgram.java index dfd2f55..ae329f3 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8822_ExposureProgram.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8822_ExposureProgram.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8825_GPS.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8825_GPS.java index 584ccab..9910c48 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8825_GPS.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8825_GPS.java @@ -12,7 +12,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8827_PhotographicSensitivity.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8827_PhotographicSensitivity.java index 3fc08c1..b2b8c5e 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8827_PhotographicSensitivity.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_8827_PhotographicSensitivity.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9000_ExifVersion.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9000_ExifVersion.java index 59a0f55..ff78762 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9000_ExifVersion.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9000_ExifVersion.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9003_DateTimeOriginal.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9003_DateTimeOriginal.java index b02c3e1..77de472 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9003_DateTimeOriginal.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9003_DateTimeOriginal.java @@ -10,7 +10,7 @@ import java.util.Calendar; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9004_DateTimeDigitized.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9004_DateTimeDigitized.java index a76a7f9..7235f98 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9004_DateTimeDigitized.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9004_DateTimeDigitized.java @@ -10,7 +10,7 @@ import java.util.Calendar; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9101_ComponentsConfiguration.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9101_ComponentsConfiguration.java index 46404f0..5309cfd 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9101_ComponentsConfiguration.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9101_ComponentsConfiguration.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9102_CompressedBitsPerPixel.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9102_CompressedBitsPerPixel.java index 3488319..65f4581 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9102_CompressedBitsPerPixel.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9102_CompressedBitsPerPixel.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9201_ShutterSpeedValue.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9201_ShutterSpeedValue.java index 3b4a862..bfd07cc 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9201_ShutterSpeedValue.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9201_ShutterSpeedValue.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9202_ApertureValue.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9202_ApertureValue.java index a0a4e26..2ac88bf 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9202_ApertureValue.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9202_ApertureValue.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9204_ExposureBiasValue.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9204_ExposureBiasValue.java index 94c42a1..d224c08 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9204_ExposureBiasValue.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9204_ExposureBiasValue.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9205_MaxApertureValue.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9205_MaxApertureValue.java index abbcba8..3fde81a 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9205_MaxApertureValue.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9205_MaxApertureValue.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9207_MeteringMode.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9207_MeteringMode.java index feb6d85..fc60317 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9207_MeteringMode.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9207_MeteringMode.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9208_LightSource.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9208_LightSource.java index 0164c9c..d7a5241 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9208_LightSource.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9208_LightSource.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9209_Flash.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9209_Flash.java index 12d3d2b..c1b00e4 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9209_Flash.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9209_Flash.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_920A_FocalLength.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_920A_FocalLength.java index d4c54c5..79dcf35 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_920A_FocalLength.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_920A_FocalLength.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_927C_MakerNode.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_927C_MakerNode.java index 25692f4..0507681 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_927C_MakerNode.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_927C_MakerNode.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9286_UserComment.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9286_UserComment.java index 6a75d04..6eb6153 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9286_UserComment.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9286_UserComment.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9290_SubsecTime.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9290_SubsecTime.java index 6506372..9c91b7e 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9290_SubsecTime.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9290_SubsecTime.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9291_SubsecTimeOriginal.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9291_SubsecTimeOriginal.java index 26ce2c1..4a3f9c3 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9291_SubsecTimeOriginal.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9291_SubsecTimeOriginal.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9292_SubsecTimeDigitized.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9292_SubsecTimeDigitized.java index 7a65513..3034768 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9292_SubsecTimeDigitized.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_9292_SubsecTimeDigitized.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A000_FlashpixVersion.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A000_FlashpixVersion.java index 66e876d..573a9bd 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A000_FlashpixVersion.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A000_FlashpixVersion.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A001_ColorSpace.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A001_ColorSpace.java index 0ef8efd..f7b6654 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A001_ColorSpace.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A001_ColorSpace.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A002_PixelXDimension.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A002_PixelXDimension.java index cae8048..d560e91 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A002_PixelXDimension.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A002_PixelXDimension.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A003_PixelYDimension.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A003_PixelYDimension.java index d2288d3..c799257 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A003_PixelYDimension.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A003_PixelYDimension.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A005_Interoperability.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A005_Interoperability.java index b31bb70..d99f7a8 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A005_Interoperability.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A005_Interoperability.java @@ -12,7 +12,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A20E_FocalPlaneXResolution.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A20E_FocalPlaneXResolution.java index 3b2b376..91a03f4 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A20E_FocalPlaneXResolution.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A20E_FocalPlaneXResolution.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A20F_FocalPlaneYResolution.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A20F_FocalPlaneYResolution.java index 605ff1a..69499b9 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A20F_FocalPlaneYResolution.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A20F_FocalPlaneYResolution.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A210_FocalPlaneResolutionUnit.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A210_FocalPlaneResolutionUnit.java index 61aca69..dec7196 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A210_FocalPlaneResolutionUnit.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A210_FocalPlaneResolutionUnit.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A215_ExposureIndex.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A215_ExposureIndex.java index ff6d643..6019d27 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A215_ExposureIndex.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A215_ExposureIndex.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A217_SensingMethod.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A217_SensingMethod.java index c96ff66..bcf9c3e 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A217_SensingMethod.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A217_SensingMethod.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A300_FileSource.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A300_FileSource.java index 30b1f60..9d970e3 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A300_FileSource.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A300_FileSource.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A301_SceneType.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A301_SceneType.java index 958c7a0..962533f 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A301_SceneType.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A301_SceneType.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A302_CFAPattern.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A302_CFAPattern.java index 0d062c7..04e3b22 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A302_CFAPattern.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A302_CFAPattern.java @@ -12,7 +12,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A401_CustomRendered.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A401_CustomRendered.java index ad9626d..31ed800 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A401_CustomRendered.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A401_CustomRendered.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A402_ExposureMode.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A402_ExposureMode.java index acc427d..a7bc2ee 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A402_ExposureMode.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A402_ExposureMode.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A403_WhiteBalance.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A403_WhiteBalance.java index 5666861..2e7735f 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A403_WhiteBalance.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A403_WhiteBalance.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A404_DigitalZoomRatio.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A404_DigitalZoomRatio.java index ab819d2..0f12386 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A404_DigitalZoomRatio.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A404_DigitalZoomRatio.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A405_FocalLengthIn35mmFilm.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A405_FocalLengthIn35mmFilm.java index c32ac0e..193d878 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A405_FocalLengthIn35mmFilm.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A405_FocalLengthIn35mmFilm.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A406_SceneCaptureType.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A406_SceneCaptureType.java index 1a28bdc..0044caa 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A406_SceneCaptureType.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A406_SceneCaptureType.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A407_GainControl.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A407_GainControl.java index 45e406e..5380157 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A407_GainControl.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A407_GainControl.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A408_Contrast.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A408_Contrast.java index 5bd85e3..6138600 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A408_Contrast.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A408_Contrast.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A409_Saturation.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A409_Saturation.java index c402c15..508950e 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A409_Saturation.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A409_Saturation.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A40A_Sharpness.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A40A_Sharpness.java index 24c2753..503b44e 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A40A_Sharpness.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A40A_Sharpness.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A40C_SubjectDistanceRange.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A40C_SubjectDistanceRange.java index 3540ee7..db3652f 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A40C_SubjectDistanceRange.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A40C_SubjectDistanceRange.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A500_Gamma.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A500_Gamma.java index 08bf3a4..ca86ebd 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A500_Gamma.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_A500_Gamma.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_ASCII.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_ASCII.java index 0008317..bd2da27 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_ASCII.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_ASCII.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_BYTE.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_BYTE.java index 4038e10..7b73b40 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_BYTE.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_BYTE.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_DOUBLE.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_DOUBLE.java index fd2f785..4fb21f1 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_DOUBLE.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_DOUBLE.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_FLOAT.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_FLOAT.java index 14ddcd2..fbf4831 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_FLOAT.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_FLOAT.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG.java index aeb34b7..3693826 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG_COUNT1.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG_COUNT1.java index 28672ad..aeaa177 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG_COUNT1.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG_COUNT1.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG_Pointer.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG_Pointer.java index 019867f..42aa844 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG_Pointer.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_LONG_Pointer.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_RATIONAL.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_RATIONAL.java index 57fe4c7..9668f0a 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_RATIONAL.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_RATIONAL.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_RATIONAL_COUNT1.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_RATIONAL_COUNT1.java index 647d6ab..f9ef0bd 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_RATIONAL_COUNT1.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_RATIONAL_COUNT1.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SBYTE.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SBYTE.java index 71eec6a..26075be 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SBYTE.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SBYTE.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SHORT.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SHORT.java index 32ddea9..aa3e5a3 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SHORT.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SHORT.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SHORT_COUNT1.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SHORT_COUNT1.java index 2abaf98..b036685 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SHORT_COUNT1.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SHORT_COUNT1.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SLONG.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SLONG.java index dbf9ea6..1a3955b 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SLONG.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SLONG.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SRATIONAL.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SRATIONAL.java index 8c608f3..032e7d7 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SRATIONAL.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SRATIONAL.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SRATIONAL_COUNT1.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SRATIONAL_COUNT1.java index fba368b..da4fcba 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SRATIONAL_COUNT1.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SRATIONAL_COUNT1.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SSHORT.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SSHORT.java index 33dcdad..b91d7da 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SSHORT.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_SSHORT.java @@ -8,7 +8,7 @@ import java.io.IOException; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_UNDEFINED.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_UNDEFINED.java index 92d440b..ef4a2f6 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_UNDEFINED.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/IFD_UNDEFINED.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/TIFF.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/TIFF.java index ccdff17..591168a 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/TIFF.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/TIFF.java @@ -14,7 +14,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.ui.UITool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; public class TIFF extends FileComponent { @@ -70,7 +70,7 @@ public void generateTreeNode(DefaultMutableTreeNode parentNode) { for (RefItem ref : sortedMap.values()) { diff = (this.startPos + ref.offset) - lastEnd; if (diff > 0) { - UITool.generateTreeNode_Diff( + UITool.generateTreeNodeDiff( parentNode, lastEnd, diff, this.tiffByteArray, this.startPos); } @@ -94,7 +94,7 @@ public void generateTreeNode(DefaultMutableTreeNode parentNode) { // In case, there is some extra space in the end diff = (this.tiffHeader.getStartPos() + this.tiffByteArray.length) - lastEnd; if (diff > 0) { - UITool.generateTreeNode_Diff( + UITool.generateTreeNodeDiff( parentNode, lastEnd, diff, this.tiffByteArray, this.startPos); } diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/TIFFHeader.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/TIFFHeader.java index 001b238..45016f2 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/TIFFHeader.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/tiff/TIFFHeader.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/xmp/XMP.java b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/xmp/XMP.java index 64243f6..c1ae5e6 100644 --- a/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/xmp/XMP.java +++ b/FormatJPEG/src/main/java/org/freeinternals/format/jpeg/xmp/XMP.java @@ -8,7 +8,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** diff --git a/FormatPDF/src/main/java/org/freeinternals/format/pdf/CrossReferenceTable.java b/FormatPDF/src/main/java/org/freeinternals/format/pdf/CrossReferenceTable.java index 34d2123..50237d3 100644 --- a/FormatPDF/src/main/java/org/freeinternals/format/pdf/CrossReferenceTable.java +++ b/FormatPDF/src/main/java/org/freeinternals/format/pdf/CrossReferenceTable.java @@ -9,7 +9,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream.ASCIILine; import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * PDF Cross-Reference Table, see diff --git a/FormatPDF/src/main/java/org/freeinternals/format/pdf/EmptyLine.java b/FormatPDF/src/main/java/org/freeinternals/format/pdf/EmptyLine.java index cefb43b..f8e0cec 100644 --- a/FormatPDF/src/main/java/org/freeinternals/format/pdf/EmptyLine.java +++ b/FormatPDF/src/main/java/org/freeinternals/format/pdf/EmptyLine.java @@ -7,7 +7,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream.ASCIILine; import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * An empty line in the PDF file. diff --git a/FormatPDF/src/main/java/org/freeinternals/format/pdf/EndOfFile.java b/FormatPDF/src/main/java/org/freeinternals/format/pdf/EndOfFile.java index dbe66fb..b0e18c0 100644 --- a/FormatPDF/src/main/java/org/freeinternals/format/pdf/EndOfFile.java +++ b/FormatPDF/src/main/java/org/freeinternals/format/pdf/EndOfFile.java @@ -7,7 +7,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream.ASCIILine; import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * PDF End of File ( diff --git a/FormatPDF/src/main/java/org/freeinternals/format/pdf/IndirectObject.java b/FormatPDF/src/main/java/org/freeinternals/format/pdf/IndirectObject.java index 62ae20d..ada5d05 100644 --- a/FormatPDF/src/main/java/org/freeinternals/format/pdf/IndirectObject.java +++ b/FormatPDF/src/main/java/org/freeinternals/format/pdf/IndirectObject.java @@ -10,7 +10,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream.ASCIILine; import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.pdf.basicobj.Analysis; import org.freeinternals.format.pdf.basicobj.Reference; import org.freeinternals.format.pdf.basicobj.Stream; diff --git a/FormatPDF/src/main/java/org/freeinternals/format/pdf/PDFFile.java b/FormatPDF/src/main/java/org/freeinternals/format/pdf/PDFFile.java index b33e830..d36932f 100644 --- a/FormatPDF/src/main/java/org/freeinternals/format/pdf/PDFFile.java +++ b/FormatPDF/src/main/java/org/freeinternals/format/pdf/PDFFile.java @@ -14,7 +14,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.GenerateTreeNode; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * PDF File Object. diff --git a/FormatPDF/src/main/java/org/freeinternals/format/pdf/StartXRef.java b/FormatPDF/src/main/java/org/freeinternals/format/pdf/StartXRef.java index 1626f26..c4fb45f 100644 --- a/FormatPDF/src/main/java/org/freeinternals/format/pdf/StartXRef.java +++ b/FormatPDF/src/main/java/org/freeinternals/format/pdf/StartXRef.java @@ -7,7 +7,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream.ASCIILine; import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * PDF diff --git a/FormatPDF/src/main/java/org/freeinternals/format/pdf/Trailer.java b/FormatPDF/src/main/java/org/freeinternals/format/pdf/Trailer.java index 2b226e7..fff1422 100644 --- a/FormatPDF/src/main/java/org/freeinternals/format/pdf/Trailer.java +++ b/FormatPDF/src/main/java/org/freeinternals/format/pdf/Trailer.java @@ -7,7 +7,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream.ASCIILine; import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * PDF File Trailer, see diff --git a/FormatPDF/src/main/java/org/freeinternals/format/pdf/basicobj/Stream.java b/FormatPDF/src/main/java/org/freeinternals/format/pdf/basicobj/Stream.java index 44da4ff..e77c5ff 100644 --- a/FormatPDF/src/main/java/org/freeinternals/format/pdf/basicobj/Stream.java +++ b/FormatPDF/src/main/java/org/freeinternals/format/pdf/basicobj/Stream.java @@ -7,7 +7,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream.ASCIILine; import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.pdf.Texts; /** diff --git a/FormatPE/src/main/java/org/freeinternals/format/pe/PeFile.java b/FormatPE/src/main/java/org/freeinternals/format/pe/PeFile.java index a0f6ac8..59bd21b 100644 --- a/FormatPE/src/main/java/org/freeinternals/format/pe/PeFile.java +++ b/FormatPE/src/main/java/org/freeinternals/format/pe/PeFile.java @@ -10,7 +10,7 @@ import java.io.IOException; import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.FileFormat; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk.java b/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk.java index 324875a..bf0129a 100644 --- a/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk.java +++ b/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk.java @@ -13,7 +13,7 @@ import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_PLTE.java b/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_PLTE.java index 3eaaec0..4125e1e 100644 --- a/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_PLTE.java +++ b/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_PLTE.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * The PLTE chunk contains from 1 to 256 palette entries. diff --git a/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_sPLT.java b/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_sPLT.java index a519def..6bb62a3 100644 --- a/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_sPLT.java +++ b/FormatPNG/src/main/java/org/freeinternals/format/png/Chunk_sPLT.java @@ -10,7 +10,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * This chunk can be used to suggest a reduced palette to be used when the diff --git a/FormatPNG/src/main/java/org/freeinternals/format/png/PNGFile.java b/FormatPNG/src/main/java/org/freeinternals/format/png/PNGFile.java index e9079bc..11c9ee6 100644 --- a/FormatPNG/src/main/java/org/freeinternals/format/png/PNGFile.java +++ b/FormatPNG/src/main/java/org/freeinternals/format/png/PNGFile.java @@ -24,7 +24,7 @@ import org.freeinternals.commonlib.ui.GenerateTreeNode; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.core.BytesTool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * diff --git a/FormatZIP/src/main/java/org/freeinternals/format/zip/CentralDirectoryStructure.java b/FormatZIP/src/main/java/org/freeinternals/format/zip/CentralDirectoryStructure.java index 23725a8..6db967c 100644 --- a/FormatZIP/src/main/java/org/freeinternals/format/zip/CentralDirectoryStructure.java +++ b/FormatZIP/src/main/java/org/freeinternals/format/zip/CentralDirectoryStructure.java @@ -11,7 +11,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.core.BytesTool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * File header of central directory structure. diff --git a/FormatZIP/src/main/java/org/freeinternals/format/zip/EndOfCentralDirectoryRecord.java b/FormatZIP/src/main/java/org/freeinternals/format/zip/EndOfCentralDirectoryRecord.java index effe2c1..a3f75b5 100644 --- a/FormatZIP/src/main/java/org/freeinternals/format/zip/EndOfCentralDirectoryRecord.java +++ b/FormatZIP/src/main/java/org/freeinternals/format/zip/EndOfCentralDirectoryRecord.java @@ -10,7 +10,7 @@ import org.freeinternals.commonlib.core.FileComponent; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.core.BytesTool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * End of central directory record. diff --git a/FormatZIP/src/main/java/org/freeinternals/format/zip/LocalFileHeader.java b/FormatZIP/src/main/java/org/freeinternals/format/zip/LocalFileHeader.java index b860754..76313fb 100644 --- a/FormatZIP/src/main/java/org/freeinternals/format/zip/LocalFileHeader.java +++ b/FormatZIP/src/main/java/org/freeinternals/format/zip/LocalFileHeader.java @@ -12,7 +12,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.core.BytesTool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; /** * Local file header. diff --git a/FormatZIP/src/main/java/org/freeinternals/format/zip/ZIPFile.java b/FormatZIP/src/main/java/org/freeinternals/format/zip/ZIPFile.java index 48d364f..6791fe8 100644 --- a/FormatZIP/src/main/java/org/freeinternals/format/zip/ZIPFile.java +++ b/FormatZIP/src/main/java/org/freeinternals/format/zip/ZIPFile.java @@ -15,7 +15,7 @@ import org.freeinternals.commonlib.core.PosByteArrayInputStream; import org.freeinternals.commonlib.core.PosDataInputStream; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.zip.ui.biv.GenerateTreeNode_CDE; import org.freeinternals.format.zip.ui.biv.GenerateTreeNode_CDS; import org.freeinternals.format.zip.ui.biv.GenerateTreeNode_LFH; diff --git a/JavaClassViewer/src/main/java/org/freeinternals/javaclassviewer/JSplitPaneClassFile.java b/JavaClassViewer/src/main/java/org/freeinternals/javaclassviewer/JSplitPaneClassFile.java index d80dd01..8a7b501 100644 --- a/JavaClassViewer/src/main/java/org/freeinternals/javaclassviewer/JSplitPaneClassFile.java +++ b/JavaClassViewer/src/main/java/org/freeinternals/javaclassviewer/JSplitPaneClassFile.java @@ -24,7 +24,7 @@ import org.freeinternals.commonlib.ui.JPanelForTree; import org.freeinternals.commonlib.ui.JTreeNodeFileComponent; import org.freeinternals.commonlib.core.BytesTool; -import org.freeinternals.format.FileFormatException; +import org.freeinternals.commonlib.core.FileFormatException; import org.freeinternals.format.classfile.constant.CPInfo; import org.freeinternals.format.classfile.ClassFile; import org.freeinternals.format.classfile.FieldInfo; @@ -135,7 +135,7 @@ private void jTreeClassFileSelectionChanged(final TreeSelectionEvent evt) { private void generateOpcodeParseResult(byte[] opcodeData) { StringBuilder sb = new StringBuilder(1024); - sb.append(HTMLKit.Start()); + sb.append(HTMLKit.start()); int cpindexCounter = 0; @@ -157,27 +157,27 @@ private void generateOpcodeParseResult(byte[] opcodeData) { if (cpindexCounter > 0) { sb.append("
    "); codeResult.stream().filter((iResult) -> (iResult.getCpindex() != null)).forEachOrdered((InstructionParsed iResult) -> { - sb.append(String.format("
  1. %s
    2. ", HTMLKit.EscapeFilter( + sb.append(String.format("
  2. %s
    3. ", HTMLKit.escapeFilter( this.classFile.getCPDescription(iResult.getCpindex() )))); }); sb.append("
"); } - sb.append(HTMLKit.End()); + sb.append(HTMLKit.end()); this.opcode.setText(sb.toString()); } private void generateClassReport() { StringBuilder sb = new StringBuilder(1024); - sb.append(HTMLKit.Start()); + sb.append(HTMLKit.start()); int count; // Constant Pool count = this.classFile.constant_pool_count.value; sb.append(String.format("Constant Pool Count: %d", count)); - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.newLine()); if (count > 0) { CPInfo[] CPInfoList = this.classFile.constant_pool; @@ -191,10 +191,10 @@ private void generateClassReport() { // Constant Pool Object List sb.append("Constant Pool Object List"); - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.newLine()); sb.append("
    "); for (int i = 1; i < count; i++) { - sb.append(String.format("
  1. %s
    2. ", HTMLKit.EscapeFilter(this.classFile.getCPDescription(i)))); + sb.append(String.format("
  2. %s
    3. ", HTMLKit.escapeFilter(this.classFile.getCPDescription(i)))); } sb.append("
"); } @@ -202,40 +202,40 @@ private void generateClassReport() { // Fields count = this.classFile.fields_count.getValue(); sb.append(String.format("Field Count: %d", count)); - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.newLine()); if (count > 0) { sb.append("
    "); for (FieldInfo field : this.classFile.fields) { - sb.append(String.format("
  1. %s
    2. ", HTMLKit.EscapeFilter(field.getDeclaration()))); + sb.append(String.format("
  2. %s
    3. ", HTMLKit.escapeFilter(field.getDeclaration()))); } sb.append("
"); } - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.newLine()); // Methods count = this.classFile.methods_count.getValue(); sb.append(String.format("Method Count: %d", count)); - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.newLine()); if (count > 0) { sb.append("
    "); for (MethodInfo method : this.classFile.methods) { - sb.append(String.format("
  1. %s
    2. ", HTMLKit.EscapeFilter(method.getDeclaration()))); + sb.append(String.format("
  2. %s
    3. ", HTMLKit.escapeFilter(method.getDeclaration()))); } sb.append("
"); } - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.newLine()); - sb.append(HTMLKit.End()); + sb.append(HTMLKit.end()); this.report.setText(sb.toString()); } private void generateCPTypeReport(StringBuilder sb, CPInfo[] CPInfoList, int count, short tag) { - sb.append(HTMLKit.NewLine()); + sb.append(HTMLKit.newLine()); sb.append("");