[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/dnd I18NStrings.properties, 1.1, 1.2 FileEditorDropTargetListener.java, 1.4, 1.5

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/dnd
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14854/app/src/net/sourceforge/squirrel_sql/client/gui/dnd

Modified Files:
	I18NStrings.properties FileEditorDropTargetListener.java 
Log Message:
Added test case.  Fixed stack trace which wasgo to STDERR.

Index: FileEditorDropTargetListener.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/dnd/FileEditorDropTargetListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileEditorDropTargetListener.java	11 Nov 2007 18:23:12 -0000	1.4
--- FileEditorDropTargetListener.java	27 Sep 2008 02:56:09 -0000	1.5
***************
*** 60,67 ****
--- 60,73 ----
      
      private static interface i18n {
+    	 
          //i18n[FileEditorDropTargetListener.oneFileDropMessage=Only one file 
          //may be dropped onto the editor at a time.]
          String ONE_FILE_DROP_MESSAGE = 
              s_stringMgr.getString("FileEditorDropTargetListener.oneFileDropMessage");
+         
+         //i18n[FileEditorDropTargetListener.internalErrorMessage=Internal error occurred. 
+         //See log for details]
+         String INTERNAL_ERROR_MESSAGE = 
+       	  s_stringMgr.getString("FileEditorDropTargetListener.internalErrorMessage");
      }
      
***************
*** 76,80 ****
       * @see java.awt.dnd.DropTargetListener#drop(java.awt.dnd.DropTargetDropEvent)
       */
-     @SuppressWarnings("unchecked")
      public void drop(DropTargetDropEvent dtde) {
          try {
--- 82,85 ----
***************
*** 121,125 ****
              }
          } catch (Exception e) {
!             e.printStackTrace();
          }                
          return result;
--- 126,131 ----
              }
          } catch (Exception e) {
!             s_log.error("handleUriListFlavor: unexpected excption - "+e.getMessage(), e);
!             
          }                
          return result;
***************
*** 141,145 ****
          File result = null;
          
-         @SuppressWarnings("unchecked")
          String transferData = 
              (String)t.getTransferData(DataFlavor.stringFlavor);
--- 147,150 ----
***************
*** 196,200 ****
              (List<File>)t.getTransferData(DataFlavor.javaFileListFlavor);
          
!         if (transferData.size() > 1) {
              _session.showErrorMessage(i18n.ONE_FILE_DROP_MESSAGE);
          } else {
--- 201,208 ----
              (List<File>)t.getTransferData(DataFlavor.javaFileListFlavor);
          
!         if (transferData == null || transferData.size() == 0) {
!       	  s_log.error("Transferable.getTransferData returned a null/empty list");
!       	  _session.showErrorMessage(i18n.INTERNAL_ERROR_MESSAGE);
!         } else if (transferData.size() > 1) {
              _session.showErrorMessage(i18n.ONE_FILE_DROP_MESSAGE);
          } else {

Index: I18NStrings.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/dnd/I18NStrings.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** I18NStrings.properties	27 Aug 2007 00:42:43 -0000	1.1
--- I18NStrings.properties	27 Sep 2008 02:56:09 -0000	1.2
***************
*** 1 ****
! FileEditorDropTargetListener.oneFileDropMessage=Only one file may be dropped onto the editor at a time.
\ No newline at end of file
--- 1,2 ----
! FileEditorDropTargetListener.oneFileDropMessage=Only one file may be dropped onto the editor at a time.
! FileEditorDropTargetListener.internalErrorMessage=Internal error occurred. See log for details
\ No newline at end of file