[Adfconverter-commit] adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui ResourceUpdateFrame.j
Status: Beta
Brought to you by:
pierreebi
|
From: pierre <pie...@us...> - 2005-08-22 23:27:06
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26865 Modified Files: ResourceUpdateFrame.java Log Message: Update Internet connection management Index: ResourceUpdateFrame.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/ResourceUpdateFrame.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ResourceUpdateFrame.java 12 Aug 2005 14:16:16 -0000 1.3 --- ResourceUpdateFrame.java 22 Aug 2005 23:26:58 -0000 1.4 *************** *** 72,75 **** --- 72,76 ---- import javax.swing.JLabel; import javax.swing.JList; + import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; *************** *** 78,81 **** --- 79,83 ---- import uk.ac.ebi.adfconverter.common.tools.log.ADFConverterLogger; import uk.ac.ebi.adfconverter.common.tools.log.ADFConverterLoggerImpl; + import uk.ac.ebi.adfconverter.common.tools.net.update.exception.UnableToConnectException; import uk.ac.ebi.adfconverter.library.ADFConverterLibrary; *************** *** 354,362 **** if (info != null && info.length()>0) this.updateInfoPane.append(info+"\n"); this.pack(); ! ADFConverterSimpleGUI.getAdfconverter().updateAllResources(); } if(updateButtonAction.equals(cmd)) { ! this.updateInfoPane.setText(""); Object [] selectedResources = this.resourceList.getSelectedValues(); if(selectedResources !=null) --- 356,372 ---- if (info != null && info.length()>0) this.updateInfoPane.append(info+"\n"); this.pack(); ! try ! { ! ADFConverterSimpleGUI.getAdfconverter().updateAllResources(); ! } ! catch (UnableToConnectException excep) ! { ! JOptionPane.showMessageDialog(this, GUIUtils.getBundleMessage(ResourceBundleName,"nointernetconnection"),//this.getBundleMessage("The_file")+" \" "+f.getName()+" \" "+this.getBundleMessage("is_correct")+".":this.getBundleMessage("The_file")+" "+ this.getBundleMessage("is_incorrect")+" - "+this.getBundleMessage("check_file_Log_for_details")+" - "+file.getAbsolutePath()+".log", ! "information", JOptionPane.INFORMATION_MESSAGE); ! } } if(updateButtonAction.equals(cmd)) { ! // this.updateInfoPane.setText(""); Object [] selectedResources = this.resourceList.getSelectedValues(); if(selectedResources !=null) *************** *** 367,375 **** if( resourceName !=null && resourceName.length()>0) { ! boolean result = ADFConverterSimpleGUI.getAdfconverter().updateResource(resourceName); ! String info =""; if (result) info = resourceName+" : "+GUIUtils.getBundleMessage(ResourceBundleName, "hasbeenupdated.label"); else info = resourceName+" : "+GUIUtils.getBundleMessage(ResourceBundleName, "hasnotbeenupdated.label"); ! if (info != null && info.length()>0) this.updateInfoPane.append(info+"\n"); } } --- 377,398 ---- if( resourceName !=null && resourceName.length()>0) { ! boolean result = false; ! String info = resourceName+" : "+GUIUtils.getBundleMessage(ResourceBundleName, "updating.label"); ! this.updateInfoPane.append(info+"\n"); ! this.pack(); ! try ! { ! result = ADFConverterSimpleGUI.getAdfconverter().updateResource(resourceName); ! } ! catch (UnableToConnectException excep) ! { ! JOptionPane.showMessageDialog(this, GUIUtils.getBundleMessage(ResourceBundleName,"nointernetconnection"),//this.getBundleMessage("The_file")+" \" "+f.getName()+" \" "+this.getBundleMessage("is_correct")+".":this.getBundleMessage("The_file")+" "+ this.getBundleMessage("is_incorrect")+" - "+this.getBundleMessage("check_file_Log_for_details")+" - "+file.getAbsolutePath()+".log", ! "information", JOptionPane.INFORMATION_MESSAGE); ! break; ! } ! info =""; if (result) info = resourceName+" : "+GUIUtils.getBundleMessage(ResourceBundleName, "hasbeenupdated.label"); else info = resourceName+" : "+GUIUtils.getBundleMessage(ResourceBundleName, "hasnotbeenupdated.label"); ! if (info != null && info.length()>0) {this.updateInfoPane.append(info+"\n");this.pack();} } } |