[Adfconverter-commit] adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui ADFConverterSimpleGUI
Status: Beta
Brought to you by:
pierreebi
Menu
▾
▴
[Adfconverter-commit] adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui ADFConverterSimpleGUI.java,1.7,1.8 ConfigurationFrame.java,1.5,1.6 GUIUtils.java,1.3,1.4 JLocaleChooser.java,1.6,1.7 JLocalizedProgressBar.java,1.2,1.3
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5166/src/uk/ac/ebi/adfconverter/usermode/gui Modified Files: ADFConverterSimpleGUI.java ConfigurationFrame.java GUIUtils.java JLocaleChooser.java JLocalizedProgressBar.java Log Message: bug fix, update internet connection management Index: GUIUtils.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/GUIUtils.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GUIUtils.java 12 Aug 2005 13:26:39 -0000 1.3 --- GUIUtils.java 22 Aug 2005 22:04:31 -0000 1.4 *************** *** 119,129 **** public GUIUtils (Properties guiProperties) { String loc = guiProperties.getProperty("locale"); if(loc !=null && loc.length()>0) { ! locale = new Locale (loc); ! Locale.setDefault(locale); } else locale = Locale.getDefault(); lookAndFeelName = guiProperties.getProperty("lookandfeel"); } --- 119,132 ---- public GUIUtils (Properties guiProperties) { + if (isDEBUGMODE()) log.Applidebug("Init GUI utils"); String loc = guiProperties.getProperty("locale"); if(loc !=null && loc.length()>0) { ! locale = new Locale (loc); ! Locale.setDefault(locale); ! log.Applidebug("set locale "+loc); } else locale = Locale.getDefault(); + if (isDEBUGMODE()) log.Applidebug("set look and feel"); lookAndFeelName = guiProperties.getProperty("lookandfeel"); } *************** *** 137,141 **** * @return the ImageIcon created with the file in path */ ! protected static ImageIcon createImageIcon(String path) { java.net.URL imgURL = GUIUtils.class.getResource(path); --- 140,144 ---- * @return the ImageIcon created with the file in path */ ! public static ImageIcon createImageIcon(String path) { java.net.URL imgURL = GUIUtils.class.getResource(path); *************** *** 153,157 **** * @return the locale for GUI */ ! protected static Locale getUILocale() { return locale!=null?locale:Locale.getDefault(); --- 156,160 ---- * @return the locale for GUI */ ! public static Locale getUILocale() { return locale!=null?locale:Locale.getDefault(); *************** *** 282,286 **** --- 285,292 ---- { if (_locale != null) + { GUIUtils.locale = _locale; + Locale.setDefault(locale); + } } *************** *** 293,297 **** --- 299,306 ---- { if (_locale != null && _locale.length()>0) + { GUIUtils.locale = new Locale(_locale); + Locale.setDefault(locale); + } } Index: JLocalizedProgressBar.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/JLocalizedProgressBar.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JLocalizedProgressBar.java 27 Jul 2005 19:28:57 -0000 1.2 --- JLocalizedProgressBar.java 22 Aug 2005 22:04:31 -0000 1.3 *************** *** 174,179 **** public void setString (String text) { ! this.setText(text); } /** --- 174,187 ---- public void setString (String text) { ! super.setString(text);//this.setText(text); } + /** + * Set bar label to empty string + * + */ + public void setEmptyString() + { + super.setString(""); + } /** Index: ConfigurationFrame.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/ConfigurationFrame.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ConfigurationFrame.java 1 Aug 2005 17:11:12 -0000 1.5 --- ConfigurationFrame.java 22 Aug 2005 22:04:31 -0000 1.6 *************** *** 80,85 **** --- 80,87 ---- import javax.swing.JRadioButton; import javax.swing.JScrollPane; + import javax.swing.JSpinner; import javax.swing.JTabbedPane; import javax.swing.JTextField; + import javax.swing.SpinnerNumberModel; import javax.swing.SwingConstants; *************** *** 950,953 **** --- 952,1000 ---- textField.setDoubleBuffered(true); + Integer val = new Integer(0); + if( value != null && value.length()>0) + try + { + val = new Integer (value); + } + catch (Exception e) + {//should not happen has the value should has been tested before + log.AppliWarn("Incorrect value for "+propertyName, e); + + if( shortName.equals("ftpproxyport")) + { + val = new Integer("2121"); + } + else + if( shortName.equals("proxyport")) + { + val = new Integer("8081"); + } + else + val = new Integer(0); + } + else + { + if( shortName.equals("proxyport")) + { + val = new Integer("8081"); + } + else + if( shortName.equals("ftpproxyport")) + { + val = new Integer("2121"); + } + else + val = new Integer(0); + } + Integer min = new Integer(0); + Integer max = new Integer(9999); + Integer step = new Integer(1); + SpinnerNumberModel model = new SpinnerNumberModel(val, min, max, step); + //int fifty = model.getNumber().intValue(); + JSpinner spinner = new JSpinner (model); + spinner.setEditor( new JSpinner.NumberEditor(spinner)); + + JLabel label = new JLabel(shortName); *************** *** 955,964 **** p.setLayout(new BoxLayout(p, BoxLayout.LINE_AXIS));//new GridLayout(1,0)); p.add(label); ! p.add(textField); if (isDisabled) p.setEnabled(false); panel.add(p); ! propertyComponentList.add(textField); // associate component to the propertyname ! associatedPropertyName.put(textField,propertyName); } catch (java.lang.Throwable e) --- 1002,1011 ---- p.setLayout(new BoxLayout(p, BoxLayout.LINE_AXIS));//new GridLayout(1,0)); p.add(label); ! p.add(spinner);//textField); if (isDisabled) p.setEnabled(false); panel.add(p); ! propertyComponentList.add(spinner);//textField); // associate component to the propertyname ! associatedPropertyName.put(spinner,propertyName);//textField,propertyName); } catch (java.lang.Throwable e) *************** *** 1238,1241 **** --- 1285,1302 ---- value = ((JRadioButton)comp).isSelected() ? "true": "false"; } + + if (comp instanceof JSpinner) + { + JSpinner spinner = (JSpinner) comp; + JComponent editor = spinner.getEditor(); + if (editor instanceof JSpinner.DefaultEditor) { + value = ((JSpinner.DefaultEditor)editor).getTextField().getText(); + } else { + log.AppliError("Unexpected editor type: " + + spinner.getEditor().getClass() + + " isn't a descendant of DefaultEditor"); + value =""; + } + } if (GUIUtils.isDEBUGMODE()) log.Applidebug("value "+value); //replace tool location by @adfconverterhome@ Index: JLocaleChooser.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/JLocaleChooser.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JLocaleChooser.java 13 Aug 2005 12:05:13 -0000 1.6 --- JLocaleChooser.java 22 Aug 2005 22:04:31 -0000 1.7 *************** *** 120,124 **** //The dir must be as url, convert file separator to / ! if(!File.separator.equals("/") ) resDir = resDir.replaceAll(File.separator,"/"); // URL url = ClassLoader.getSystemResource(resDir); --- 120,124 ---- //The dir must be as url, convert file separator to / ! if(!File.separator.equals("/") ) resDir = resDir.replace(File.separatorChar,'/');//.replaceAll(File.separator,"/"); // URL url = ClassLoader.getSystemResource(resDir); *************** *** 271,277 **** return; } ! String lString = ((ImageIcon)cb.getSelectedItem()).getDescription(); ! String localeStr = lString.substring(lString.indexOf('(') + 1, ! lString.indexOf(')')); Locale locale = new Locale(localeStr, ""); if (!Locale.getDefault().equals(locale)) { --- 271,291 ---- return; } ! Object selectedItem = cb.getSelectedItem(); ! String lString = ""; ! String localeStr = ""; ! if (selectedItem instanceof ImageIcon ) ! { ! lString = ((ImageIcon)selectedItem).getDescription(); ! localeStr = lString.substring(lString.indexOf('(') + 1, ! lString.indexOf(')')); ! } ! if (selectedItem instanceof String ) ! { ! lString = (String)selectedItem; ! localeStr = lString; ! } ! // String lString = ((ImageIcon)cb.getSelectedItem()).getDescription(); ! //String localeStr = lString.substring(lString.indexOf('(') + 1, ! // lString.indexOf(')')); Locale locale = new Locale(localeStr, ""); if (!Locale.getDefault().equals(locale)) { Index: ADFConverterSimpleGUI.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/ADFConverterSimpleGUI.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ADFConverterSimpleGUI.java 15 Aug 2005 11:18:33 -0000 1.7 --- ADFConverterSimpleGUI.java 22 Aug 2005 22:04:31 -0000 1.8 *************** *** 117,120 **** --- 117,121 ---- import uk.ac.ebi.adfconverter.common.configuration.ADFConverterConfiguration; + import uk.ac.ebi.adfconverter.common.tools.file.reader.exceptions.NoInternetConnectionForXMLParsing; import uk.ac.ebi.adfconverter.common.tools.log.ADFConverterLogger; import uk.ac.ebi.adfconverter.common.tools.log.ADFConverterLoggerImpl; *************** *** 361,365 **** if (this.jProgressBar == null) { this.jProgressBar = new JLocalizedProgressBar(SimpleGUIResourceBundle); ! this.jProgressBar.setString("Waiting"); this.jProgressBar.setStringPainted(true); this.jProgressBar.setBounds(360, 145, 129, 18); --- 362,366 ---- if (this.jProgressBar == null) { this.jProgressBar = new JLocalizedProgressBar(SimpleGUIResourceBundle); ! this.jProgressBar.setText("Waiting"); this.jProgressBar.setStringPainted(true); this.jProgressBar.setBounds(360, 145, 129, 18); *************** *** 794,798 **** this.jContentPane.add(getCheckConvert(), null); this.jContentPane.add(getCurationBox(), null); ! this.jContentPane.add(this.jProgressBar, null); this.jContentPane.add(getJComboBox(), null); this.jContentPane.add(getAboutButton(), null); --- 795,799 ---- this.jContentPane.add(getCheckConvert(), null); this.jContentPane.add(getCurationBox(), null); ! //this.jContentPane.add(this.jProgressBar, null); this.jContentPane.add(getJComboBox(), null); this.jContentPane.add(getAboutButton(), null); *************** *** 1239,1243 **** log.AppliInfo("No file type specified (adf mage-ml). Try to guess"); this.jProgressBar.setIndeterminate(true); ! this.jProgressBar.setString(GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"Checking")+ (convert?" & "+GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"Converting"): GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"only") ));//this.getBundleMessage("Checking")+(convert?" & "+this.getBundleMessage("Converting"): this.getBundleMessage("only") )); setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); // result = ((Boolean)this.doWork()).booleanValue(); --- 1240,1245 ---- log.AppliInfo("No file type specified (adf mage-ml). Try to guess"); this.jProgressBar.setIndeterminate(true); ! //this.jProgressBar.setString(GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"Checking")+ (convert?" & "+GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"Converting"): GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"only") ));//this.getBundleMessage("Checking")+(convert?" & "+this.getBundleMessage("Converting"): this.getBundleMessage("only") )); ! this.jProgressBar.setString(GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"Checking")+ (convert?" & "+GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"Converting"): GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"only") ));//this.getBundleMessage("Checking")+(convert?" & "+this.getBundleMessage("Converting"): this.getBundleMessage("only") )); setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); // result = ((Boolean)this.doWork()).booleanValue(); *************** *** 1261,1265 **** { jProgressBar.setIndeterminate(false); ! jProgressBar.setString(""); setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); if(GUIUtils.isDEBUGMODE())log.Applidebug("Launching next worker"+(this.workerNumber+1)); --- 1263,1267 ---- { jProgressBar.setIndeterminate(false); ! jProgressBar.setEmptyString();//.setString(""); setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); if(GUIUtils.isDEBUGMODE())log.Applidebug("Launching next worker"+(this.workerNumber+1)); *************** *** 1287,1291 **** result = adfconverter.checkADF(selectedFile,strictMode,stepByStepMode,doCuration,convert); else ! result = adfconverter.checkMAGEML(selectedFile,strictMode,stepByStepMode,convert); this.jProgressBar.setIndeterminate(false); } --- 1289,1305 ---- result = adfconverter.checkADF(selectedFile,strictMode,stepByStepMode,doCuration,convert); else ! { ! try ! { ! result = adfconverter.checkMAGEML(selectedFile,strictMode,stepByStepMode,convert); ! } ! catch (NoInternetConnectionForXMLParsing nointernetexcep) ! { ! JOptionPane.showMessageDialog(this, GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"magedtd_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); ! result = false; ! } ! ! } this.jProgressBar.setIndeterminate(false); } *************** *** 1326,1330 **** * @param wNumber number of the worker to execute * @param f file to treat ! * @return * @throws InterruptedException if the thread is interrupted */ --- 1340,1344 ---- * @param wNumber number of the worker to execute * @param f file to treat ! * @return true if the file is correct, false otherwise. * @throws InterruptedException if the thread is interrupted */ *************** *** 1333,1337 **** Boolean out= null; boolean result; ! result = adfconverter.check(f.getAbsolutePath(),strictMode,stepByStepMode,doCuration,convert); if (Thread.interrupted()) { --- 1347,1362 ---- Boolean out= null; boolean result; ! boolean internalError = false; ! try ! { ! result = adfconverter.check(f.getAbsolutePath(),strictMode,stepByStepMode,doCuration,convert); ! } ! catch (NoInternetConnectionForXMLParsing nointernetexcep) ! { ! JOptionPane.showMessageDialog(this, GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"magedtd_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); ! result = false; ! internalError = true; ! } if (Thread.interrupted()) { *************** *** 1349,1356 **** this.resultLabel.setText(GUIUtils.getBundleMessage(SimpleGUIResourceBundle, "Correct"));//this.getBundleMessage("Correct")); } ! JOptionPane.showMessageDialog(this, result?GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"The_file")+" \" "+f.getName()+" \" "+GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"is_correct")+".":GUIUtils.getBundleMessage(SimpleGUIResourceBundle, "The_file")+" "+ GUIUtils.getBundleMessage(SimpleGUIResourceBundle, "is_incorrect")+" - "+ GUIUtils.getBundleMessage(SimpleGUIResourceBundle, "check_file_Log_for_details")+" - "+file.getAbsolutePath()+".log",//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); this.jProgressBar.setIndeterminate(false); ! this.jProgressBar.setString(""); setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); return out;//"All Done"; // or this --- 1374,1381 ---- this.resultLabel.setText(GUIUtils.getBundleMessage(SimpleGUIResourceBundle, "Correct"));//this.getBundleMessage("Correct")); } ! if (!internalError ) JOptionPane.showMessageDialog(this, result?GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"The_file")+" \" "+f.getName()+" \" "+GUIUtils.getBundleMessage(SimpleGUIResourceBundle,"is_correct")+".":GUIUtils.getBundleMessage(SimpleGUIResourceBundle, "The_file")+" "+ GUIUtils.getBundleMessage(SimpleGUIResourceBundle, "is_incorrect")+" - "+ GUIUtils.getBundleMessage(SimpleGUIResourceBundle, "check_file_Log_for_details")+" - "+file.getAbsolutePath()+".log",//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); this.jProgressBar.setIndeterminate(false); ! this.jProgressBar.setEmptyString();//.setString(""); setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); return out;//"All Done"; // or this |
