[Openbroad-commits] openbroad/src/org/openbroad/client/user/view OpenBroad.java,1.2,1.3

[Frank B. J. <bi...@us...>]

Update of /cvsroot/openbroad/openbroad/src/org/openbroad/client/user/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31820

Modified Files:
	OpenBroad.java 
Log Message:
When uploading a file, we've got a NullPointerException, causing the progressbar to continue.
Saving a playlist now refreshes the playlist in the dataholder.



Index: OpenBroad.java
===================================================================
RCS file: /cvsroot/openbroad/openbroad/src/org/openbroad/client/user/view/OpenBroad.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OpenBroad.java	20 Apr 2004 16:31:41 -0000	1.2
--- OpenBroad.java	26 Apr 2004 17:31:07 -0000	1.3
***************
*** 463,468 ****
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 2;
-       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
        jPanel7.add(plEndTime, gridBagConstraints);
  
--- 463,468 ----
        gridBagConstraints.gridx = 2;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
+       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        jPanel7.add(plEndTime, gridBagConstraints);
  
***************
*** 470,475 ****
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 1;
-       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
        jPanel7.add(plStartDate, gridBagConstraints);
  
--- 470,475 ----
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 1;
        gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
+       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        jPanel7.add(plStartDate, gridBagConstraints);
  
***************
*** 477,482 ****
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 2;
-       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
        jPanel7.add(plEndDate, gridBagConstraints);
  
--- 477,482 ----
        gridBagConstraints.gridx = 1;
        gridBagConstraints.gridy = 2;
        gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
+       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
        jPanel7.add(plEndDate, gridBagConstraints);
  
***************
*** 867,871 ****
         {
            format = new MaskFormatter("##:##");
-           //            format.setValidCharacters("0123456789");
            
         }catch(Exception e)
--- 867,870 ----
***************
*** 922,927 ****
  
      {//GEN-HEADEREND:event_savePlaylistActionPerformed
-        
-        
         if(OpenBroadLogic.create(name,plStartTime,plEndTime))
         {
--- 921,924 ----
***************
*** 1009,1012 ****
--- 1006,1011 ----
               murle.printStackTrace();
            }
+           
+           DataHolder.getInstance().refreshPlaylist();
         }
      }//GEN-LAST:event_savePlaylistActionPerformed
***************
*** 1148,1156 ****
         for(int j=0;j<selectedSize;j++)
            array[j]=""+liste.get(j);
-        
-        //        model = new PlaylistModel(array);
-        
-        //        playListTabel.setModel(model);
-        
      }
      private void refreshDataHolder()
--- 1147,1150 ----
***************
*** 1162,1166 ****
  
      {//GEN-HEADEREND:event_formComponentMoved
-        
         conf.setProperty("playListX",""+getX());
         conf.setProperty("playListY",""+getY());
--- 1156,1159 ----
***************
*** 1168,1174 ****
      
      /** Exit the Application */
-     
      private void exitForm(java.awt.event.WindowEvent evt)//GEN-FIRST:event_exitForm
-     
      {
         System.exit(0);
--- 1161,1165 ----
***************
*** 1234,1240 ****
               usstub.addAttachment( new DataHandler( new FileDataSource(filesrc) ) );
               
               serverProgress.setIndeterminate(true);
               usstub.uploadFile(filedata);
-              serverProgress.setIndeterminate(false);
            }
            catch( IOException ioe )
--- 1225,1231 ----
               usstub.addAttachment( new DataHandler( new FileDataSource(filesrc) ) );
               
+              serverProgress.setString(java.util.ResourceBundle.getBundle("org/openbroad/client/languages/openbroad").getString("uploading"));
               serverProgress.setIndeterminate(true);
               usstub.uploadFile(filedata);
            }
            catch( IOException ioe )
***************
*** 1246,1249 ****
--- 1237,1244 ----
               se.printStackTrace();
            }
+           catch( NullPointerException npe )
+           {}
+           
+           serverProgress.setIndeterminate(false);
            
            progressPanel.setVisible(false);