[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent Da
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2007-04-21 20:49:00
|
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30583/fw/datasetviewer/cellcomponent Modified Files: Tag: squirrel-2_5-branch DataTypeBinary.java Log Message: 1699294: Squirrel imports BLOB, but does not update data. Merge from trunk to 2.5 branch Index: DataTypeBinary.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeBinary.java,v retrieving revision 1.15 retrieving revision 1.15.8.1 diff -C2 -d -r1.15 -r1.15.8.1 *** DataTypeBinary.java 19 Aug 2006 11:40:23 -0000 1.15 --- DataTypeBinary.java 21 Apr 2007 20:48:40 -0000 1.15.8.1 *************** *** 19,38 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! import java.awt.event.*; ! import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import javax.swing.JTable; - import javax.swing.JTextField; import javax.swing.JTextArea; import javax.swing.SwingUtilities; import javax.swing.text.JTextComponent; - import java.sql.PreparedStatement; - import java.sql.ResultSet; import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup; import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition; /** --- 19,40 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ ! import java.awt.event.KeyEvent; ! import java.awt.event.MouseAdapter; ! import java.awt.event.MouseEvent; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; + import java.sql.PreparedStatement; + import java.sql.ResultSet; import javax.swing.JTable; import javax.swing.JTextArea; + import javax.swing.JTextField; import javax.swing.SwingUtilities; import javax.swing.text.JTextComponent; import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup; import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition; + import net.sourceforge.squirrel_sql.fw.util.StringUtilities; /** *************** *** 111,116 **** */ public boolean areEqual(Object obj1, Object obj2) { ! Byte[] b1 = (Byte[])obj1; ! Byte[] b2 = (Byte[])obj2; for (int i=0; i<b1.length; i++) if (b1[i] != b2[i]) --- 113,137 ---- */ public boolean areEqual(Object obj1, Object obj2) { ! Byte[] b1 = null; ! Byte[] b2 = null; ! if (obj1 == null && obj2 == null) { ! return true; ! } ! if ( (obj1 != null && obj2 == null) ! || (obj1 == null && obj2 != null) ) ! { ! return false; ! } ! if (obj1 instanceof Byte[]) { ! b1 = (Byte[])obj1; ! } else { ! b1 = StringUtilities.getByteArray(obj1.toString().getBytes()); ! } ! if (obj2 instanceof Byte[]) { ! b2 = (Byte[])obj2; ! } else { ! b2 = StringUtilities.getByteArray(obj2.toString().getBytes()); ! } ! for (int i=0; i<b1.length; i++) if (b1[i] != b2[i]) |