adfconverter-commit Mailing List for ADF MAGE-ML Tool
Status: Beta
Brought to you by:
pierreebi
Menu
▾
▴
adfconverter-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(58) |
Aug
(45) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: pierre <pie...@us...> - 2005-08-23 15:43:52
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32757 Modified Files: MyImageView.java Log Message: fix javadoc tags Index: MyImageView.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/MyImageView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MyImageView.java 27 Jul 2005 19:28:57 -0000 1.2 --- MyImageView.java 23 Aug 2005 15:43:44 -0000 1.3 *************** *** 689,693 **** * * @param axis may be either X_AXIS or Y_AXIS ! * @returns the span the view would like to be rendered into. * Typically the view is told to render into the span * that is returned, although there is no guarantee. --- 689,693 ---- * * @param axis may be either X_AXIS or Y_AXIS ! * @return the span the view would like to be rendered into. * Typically the view is told to render into the span * that is returned, although there is no guarantee. *************** *** 714,718 **** * * @param axis may be either X_AXIS or Y_AXIS ! * @returns the desired alignment. This should be a value * between 0.0 and 1.0 where 0 indicates alignment at the * origin and 1.0 indicates alignment to the full span --- 714,718 ---- * * @param axis may be either X_AXIS or Y_AXIS ! * @return the desired alignment. This should be a value * between 0.0 and 1.0 where 0 indicates alignment at the * origin and 1.0 indicates alignment to the full span |
|
From: pierre <pie...@us...> - 2005-08-23 14:56:38
|
Update of /cvsroot/adfconverter/adfconverter-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20436 Modified Files: about.html Log Message: update about messages Index: about.html =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/about.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** about.html 23 Aug 2005 10:35:10 -0000 1.2 --- about.html 23 Aug 2005 14:56:28 -0000 1.3 *************** *** 17,33 **** </table> <h1>ADF MAGE-ML Tool</h1> ! <p>New versions, and homepage at: <a href="http://adfconverter.sourceforge.net/" title="Tool web site">http://adfconverter.sourceforge.net</a></p> <p>First developer: Pierre Marguerite</p> <p>For support: <a href="mailto:adf...@li..." title="Tool general mailing list">adf...@li...</a> (Check <a href="http://sourceforge.net/mailarchive/forum.php?forum_id=44214" title="General Mailing list">archives</a> or <a href="http://lists.sourceforge.net/mailman/listinfo/adfconverter-general" title="To subscribe to the mailing list" >subscribe</a>)</p> ! <p>Please send bugs, comments, feedback or suggestions to Source Forge project page at: <a href="http://sourceforge.net/projects/adfconverter/" title="ADF MAGE-ML Tool Sourceforge projet">http://sourceforge.net/projects/adfconverter</a></p> ! <p>ADF Home: <a href="http://www.ebi.ac.uk/adf/" title="ADF Home">http://www.ebi.ac.uk/adf</a></p> <h2>Credits </h2> <p>Thanks:</p> <ul> ! <li>All EBI MicroArray Informatics Team: <a href="http://www.ebi.ac.uk/microarray/" title="MicroArray Informatics Team From the EBI">http://www.ebi.ac.uk/microarray</a></li> <li>Philippe Rocca-serra: for his help on ADF and his support.</li> <li>Joel Fillon: for his help on XML and XML Schema.</li> ! <li>JExcel API project : for XLS reading and Writing - Copyright Andy Khan</li> <li><a href="http://www.izforge.com/izpack/" title="IzPack Project">IZPack Project</a>: for its installer</li> <li><a href="http://www.mged.org/Workgroups/MAGE/mage.html">MAGE Project</a>: for the MAGE-stk</li> --- 17,33 ---- </table> <h1>ADF MAGE-ML Tool</h1> ! <p>New versions, and homepage at: <a href="http://adfconverter.sourceforge.net/" title="Tool web site">http://adfconverter.sourceforge.net/</a></p> <p>First developer: Pierre Marguerite</p> <p>For support: <a href="mailto:adf...@li..." title="Tool general mailing list">adf...@li...</a> (Check <a href="http://sourceforge.net/mailarchive/forum.php?forum_id=44214" title="General Mailing list">archives</a> or <a href="http://lists.sourceforge.net/mailman/listinfo/adfconverter-general" title="To subscribe to the mailing list" >subscribe</a>)</p> ! <p>Please send bugs, comments, feedback or suggestions to Source Forge project page at: <a href="http://sourceforge.net/projects/adfconverter/" title="ADF MAGE-ML Tool Sourceforge projet">http://sourceforge.net/projects/adfconverter/</a></p> ! <p>ADF Home: <a href="http://www.ebi.ac.uk/adf/" title="ADF Home">http://www.ebi.ac.uk/adf/</a></p> <h2>Credits </h2> <p>Thanks:</p> <ul> ! <li>All EBI MicroArray Informatics Team: <a href="http://www.ebi.ac.uk/microarray/" title="MicroArray Informatics Team From the EBI">http://www.ebi.ac.uk/microarray/</a></li> <li>Philippe Rocca-serra: for his help on ADF and his support.</li> <li>Joel Fillon: for his help on XML and XML Schema.</li> ! <li><a href="http://www.andykhan.com/jexcelapi/" title="jxl project page" >JExcel API project</a>: for XLS reading and Writing - Copyright Andy Khan</li> <li><a href="http://www.izforge.com/izpack/" title="IzPack Project">IZPack Project</a>: for its installer</li> <li><a href="http://www.mged.org/Workgroups/MAGE/mage.html">MAGE Project</a>: for the MAGE-stk</li> |
|
From: pierre <pie...@us...> - 2005-08-23 14:52:39
|
Update of /cvsroot/adfconverter/adfconverter-dev/etc/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19801 Modified Files: resourceupdateframe_fr.properties Log Message: Fix localized messages Index: resourceupdateframe_fr.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/resourceupdateframe_fr.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** resourceupdateframe_fr.properties 23 Aug 2005 12:44:13 -0000 1.5 --- resourceupdateframe_fr.properties 23 Aug 2005 14:52:31 -0000 1.6 *************** *** 1,13 **** ! updateableresources.label=Ressources pouvant être mis à jour ! updateButton.label=Mettre à jour ! updateButton.tooltip=Mettre à jour les ressources sélectionnées. ! updateAllButton.label=Mettre à jour toutes les ressources. ! updateAllButton.tooltip=Mettre à jour toutes les ressources disponibles. quitButton.label=Quitter ! quitButton.tooltip=Fermer cette fenêtre. ! hasbeenupdated.label=a ~t~ mis ~ jour. hasnotbeenupdated.label=Pas de nouvelle version disponible. ! updateallinbackground.label=Les ressources sont mises àjour en tâche de fond (voir log). ! updating.label=Recherche de mise à jour. ! nointernetconnection=Pas de connexion à Internet disponible.\n Une connexion à Internet est requise pour les mises à jours. --- 1,13 ---- ! updateableresources.label=Ressources pouvant ~tre mis ~ jour ! updateButton.label=Mettre ~ jour ! updateButton.tooltip=Mettre ~ jour les ressources s~lectionn~es. ! updateAllButton.label=Mettre ~ jour toutes les ressources. ! updateAllButton.tooltip=Mettre ~ jour toutes les ressources disponibles. quitButton.label=Quitter ! quitButton.tooltip=Fermer cette fen~tre. ! hasbeenupdated.label=a été mis à jour. hasnotbeenupdated.label=Pas de nouvelle version disponible. ! updateallinbackground.label=Les ressources sont mises ~ jour en t~che de fond (voir log). ! updating.label=Recherche de mise ~ jour. ! nointernetconnection=Pas de connexion ~ Internet disponible.\n Une connexion ~ Internet est requise pour les mises ~ jours. |
|
From: pierre <pie...@us...> - 2005-08-23 14:25:59
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13402 Modified Files: GUIUtils.java Log Message: import cleaning Index: GUIUtils.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/GUIUtils.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GUIUtils.java 23 Aug 2005 14:24:56 -0000 1.5 --- GUIUtils.java 23 Aug 2005 14:25:49 -0000 1.6 *************** *** 17,23 **** import javax.swing.ImageIcon; import javax.swing.JComponent; - import javax.swing.JFrame; - import javax.swing.JRootPane; - import javax.swing.LookAndFeel; import javax.swing.SwingUtilities; import javax.swing.UIManager; --- 17,20 ---- |
|
From: pierre <pie...@us...> - 2005-08-23 14:25:07
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13210 Modified Files: GUIUtils.java JAddeablePropertyFrame.java ResourceUpdateFrame.java Log Message: fix icon path -> use resource Index: JAddeablePropertyFrame.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/JAddeablePropertyFrame.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JAddeablePropertyFrame.java 1 Aug 2005 17:11:12 -0000 1.3 --- JAddeablePropertyFrame.java 23 Aug 2005 14:24:56 -0000 1.4 *************** *** 60,63 **** --- 60,64 ---- import java.awt.event.MouseEvent; import java.awt.event.MouseListener; + import java.io.File; import java.util.ArrayList; import java.util.Enumeration; *************** *** 288,292 **** if(this.addButton == null) { ! this.addButton = new JLocalizedButton(AddeabelPropertyResourceBundle,"addbutton",GUIUtils.createImageIcon("images/right.gif")); this.addButton.addActionListener(this); this.addButton.setActionCommand(addButtonAction); --- 289,293 ---- if(this.addButton == null) { ! this.addButton = new JLocalizedButton(AddeabelPropertyResourceBundle,"addbutton",GUIUtils.createImageIcon("/right.gif"));//"images"+File.separator+"right.gif")); this.addButton.addActionListener(this); this.addButton.setActionCommand(addButtonAction); *************** *** 306,310 **** if(this.removeButton == null) { ! this.removeButton = new JLocalizedButton(AddeabelPropertyResourceBundle,"removebutton",GUIUtils.createImageIcon("images/left.gif")); this.removeButton.addActionListener(this); this.removeButton.setActionCommand(removeButtonAction); --- 307,311 ---- if(this.removeButton == null) { ! this.removeButton = new JLocalizedButton(AddeabelPropertyResourceBundle,"removebutton",GUIUtils.createImageIcon("/left.gif"));//"images"+File.separator+"left.gif")); this.removeButton.addActionListener(this); this.removeButton.setActionCommand(removeButtonAction); Index: GUIUtils.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/GUIUtils.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GUIUtils.java 22 Aug 2005 22:04:31 -0000 1.4 --- GUIUtils.java 23 Aug 2005 14:24:56 -0000 1.5 *************** *** 3,6 **** --- 3,8 ---- import java.awt.Component; import java.awt.Container; + import java.awt.Image; + import java.awt.Toolkit; import java.awt.Window; import java.util.Enumeration; *************** *** 145,148 **** --- 147,151 ---- if (imgURL != null) { + if (isDEBUGMODE()) log.Applidebug("Cfound imgURL: " + imgURL); return new ImageIcon(imgURL); } *************** *** 150,153 **** --- 153,183 ---- return new ImageIcon(path); } + + /** Returns an ImageIcon, or null if the path was invalid. + * <dt><b> Requires</b><code> + * </code><b>fmtOk</b> path!=null + * <dt><b> Ensures</b><code> + * </code> + * @param path the path to an Icon to load + * @param description description of the icon + * @return the ImageIcon created with the file in path + */ + public static ImageIcon createImageIcon(String path, String description) + { + java.net.URL imgURL = GUIUtils.class.getResource(path); + if (imgURL != null) + { + if (isDEBUGMODE()) log.Applidebug("Cfound imgURL: " + imgURL); + return new ImageIcon(imgURL, description); + } + Image img = Toolkit.getDefaultToolkit().createImage(path); + if (img != null) + { + if (isDEBUGMODE()) log.Applidebug("find file: " + path); + return new ImageIcon(img,description); + } + if (isDEBUGMODE()) log.Applidebug("Couldn't find file: " + path); + return new ImageIcon(path); + } /** Index: ResourceUpdateFrame.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/gui/ResourceUpdateFrame.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ResourceUpdateFrame.java 22 Aug 2005 23:26:58 -0000 1.4 --- ResourceUpdateFrame.java 23 Aug 2005 14:24:56 -0000 1.5 *************** *** 204,208 **** JLabel updateableresourcesLabel = new JLocalizedLabel(ResourceBundleName); updateableresourcesLabel.setText("updateableresources"); ! updateableresourcesLabel.setIcon(GUIUtils.createImageIcon("images"+File.separator+"Globe.gif")); updateableresourcesLabel.setAlignmentX(Component.LEFT_ALIGNMENT); updateableresourcesLabel.setAlignmentY(Component.CENTER_ALIGNMENT); --- 204,208 ---- JLabel updateableresourcesLabel = new JLocalizedLabel(ResourceBundleName); updateableresourcesLabel.setText("updateableresources"); ! updateableresourcesLabel.setIcon(GUIUtils.createImageIcon("/Globe.gif"));//"images"+File.separator+"Globe.gif")); updateableresourcesLabel.setAlignmentX(Component.LEFT_ALIGNMENT); updateableresourcesLabel.setAlignmentY(Component.CENTER_ALIGNMENT); |
|
From: pierre <pie...@us...> - 2005-08-23 14:10:46
|
Update of /cvsroot/adfconverter/adfconverter-dev/etc/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9465 Modified Files: addeablepropertyframe_fr.properties Log Message: Fix localized messages Index: addeablepropertyframe_fr.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/addeablepropertyframe_fr.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** addeablepropertyframe_fr.properties 1 Aug 2005 16:43:52 -0000 1.2 --- addeablepropertyframe_fr.properties 23 Aug 2005 14:10:37 -0000 1.3 *************** *** 5,9 **** CancelButton.tooltip=Cliquez pour annuler les modifications. CancelButton.mnemonic=c ! addeableproperties.label=List des propriétés : addbutton.tooltip=Cliquez pour ajouter les propriétés séléctionnées. addbutton.mnemonic=a --- 5,9 ---- CancelButton.tooltip=Cliquez pour annuler les modifications. CancelButton.mnemonic=c ! addeableproperties.label=Liste des propriétés : addbutton.tooltip=Cliquez pour ajouter les propriétés séléctionnées. addbutton.mnemonic=a |
|
From: pierre <pie...@us...> - 2005-08-23 13:00:36
|
Update of /cvsroot/adfconverter/adfconverter-dev/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23021/installer Modified Files: adfSimpleGUI-configure.bat adfSimpleGUI-installer.sh Log Message: add images dir to classpath for GUI Index: adfSimpleGUI-configure.bat =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/installer/adfSimpleGUI-configure.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** adfSimpleGUI-configure.bat 1 Aug 2005 10:23:40 -0000 1.3 --- adfSimpleGUI-configure.bat 23 Aug 2005 13:00:27 -0000 1.4 *************** *** 19,23 **** :launch ! "%JAVA_HOME%\bin\java.exe" -Xms128m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseParallelGC -DADFCONVERTERHOME="%ADFCONVERTERHOME%" -cp "%ADFCONVERTERHOME%"\bin;"%ADFCONVERTERHOME%"\etc;"%ADFCONVERTERHOME%"\ext\log4j-1.2.11.jar;"%ADFCONVERTERHOME%"\ext\jaxb-api.jar;"%ADFCONVERTERHOME%"\ext\jaxb-libs.jar;"%ADFCONVERTERHOME%"\ext\jaxb-impl.jar;"%ADFCONVERTERHOME%"\ext\jaas.jar;"%ADFCONVERTERHOME%"\ext\jax-qname.jar;"%ADFCONVERTERHOME%"\ext\jta-spec1_0_1.jar;"%ADFCONVERTERHOME%"\ext\dom.jar;"%ADFCONVERTERHOME%"\ext\jax-qname.jar;"%ADFCONVERTERHOME%"\ext\namespace.jar;"%ADFCONVERTERHOME%"\ext\sax.jar;"%ADFCONVERTERHOME%"\ext\xalan.jar;"%ADFCONVERTERHOME%"\ext\xercesImpl.jar;"%ADFCONVERTERHOME%"\ext\xsdlib.jar;"%ADFCONVERTERHOME%"\bin\uk\ac\ebi\adfconverter\tools\checker\data\;"%ADFCONVERTERHOME%"\images\;"%ADFCONVERTERHOME%"\ext\mage.jar;"%ADFCONVERTERHOME%"\ext\xercesImpl-2.6.0.jar;"%ADFCONVERTERHOME%"\ext\sax2.jar;"%ADFCONVERTERHOME%"\ext\activation.jar;"%ADFCONVERTERHOME%"\ext\jxl.jar;"%ADFCONVERTERHOME%"\ext\tar.jar;"%ADFCONVERTERHOME%"\ext\liquidlnf.jar;"%ADFCONVERTERHOME%"\ext\smoothmetal.jar;"%ADFCONVERTERHOME%"\ext\toniclf.jar uk.ac.ebi.adfconverter.usermode.gui.Splasher %* --- 19,23 ---- :launch ! "%JAVA_HOME%\bin\java.exe" -Xms128m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseParallelGC -DADFCONVERTERHOME="%ADFCONVERTERHOME%" -cp "%ADFCONVERTERHOME%"\bin;"%ADFCONVERTERHOME%"\etc;"%ADFCONVERTERHOME%"\images;"%ADFCONVERTERHOME%"\ext\log4j-1.2.11.jar;"%ADFCONVERTERHOME%"\ext\jaxb-api.jar;"%ADFCONVERTERHOME%"\ext\jaxb-libs.jar;"%ADFCONVERTERHOME%"\ext\jaxb-impl.jar;"%ADFCONVERTERHOME%"\ext\jaas.jar;"%ADFCONVERTERHOME%"\ext\jax-qname.jar;"%ADFCONVERTERHOME%"\ext\jta-spec1_0_1.jar;"%ADFCONVERTERHOME%"\ext\dom.jar;"%ADFCONVERTERHOME%"\ext\jax-qname.jar;"%ADFCONVERTERHOME%"\ext\namespace.jar;"%ADFCONVERTERHOME%"\ext\sax.jar;"%ADFCONVERTERHOME%"\ext\xalan.jar;"%ADFCONVERTERHOME%"\ext\xercesImpl.jar;"%ADFCONVERTERHOME%"\ext\xsdlib.jar;"%ADFCONVERTERHOME%"\bin\uk\ac\ebi\adfconverter\tools\checker\data\;"%ADFCONVERTERHOME%"\images\;"%ADFCONVERTERHOME%"\ext\mage.jar;"%ADFCONVERTERHOME%"\ext\xercesImpl-2.6.0.jar;"%ADFCONVERTERHOME%"\ext\sax2.jar;"%ADFCONVERTERHOME%"\ext\activation.jar;"%ADFCONVERTERHOME%"\ext\jxl.jar;"%ADFCONVERTERHOME%"\ext\tar.jar;"%ADFCONVERTERHOME%"\ext\liquidlnf.jar;"%ADFCONVERTERHOME%"\ext\smoothmetal.jar;"%ADFCONVERTERHOME%"\ext\toniclf.jar uk.ac.ebi.adfconverter.usermode.gui.Splasher %* Index: adfSimpleGUI-installer.sh =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/installer/adfSimpleGUI-installer.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** adfSimpleGUI-installer.sh 30 Jul 2005 23:35:21 -0000 1.2 --- adfSimpleGUI-installer.sh 23 Aug 2005 13:00:27 -0000 1.3 *************** *** 39,43 **** ! CLASSPATH="$ADFCONVERTERHOME/ext:$ADFCONVERTERHOME/bin:$ADFCONVERTERHOME/etc" for X in "$ADFCONVERTERHOME"/ext/*.jar --- 39,43 ---- ! CLASSPATH="$ADFCONVERTERHOME/ext:$ADFCONVERTERHOME/bin:$ADFCONVERTERHOME/etc:$ADFCONVERTERHOME/images/" for X in "$ADFCONVERTERHOME"/ext/*.jar *************** *** 62,68 **** exit 0 - # version $APP_VER - #export ADFCONVERTERHOME=$INSTALL_PATH - #$JAVA_HOME/bin/java -Xms128m -Xmx1024m -XX:MaxPermSize=256m -DADFCONVERTERHOME=$ADFCONVERTERHOME -cp $ADFCONVERTERHOME/bin:$ADFCONVERTERHOME/etc:$ADFCONVERTERHOME/ext/log4j-1.2.9.jar:$ADFCONVERTERHOME/ext/jaxb-api.jar:$ADFCONVERTERHOME/ext/jaxb-libs.jar:$ADFCONVERTERHOME/ext/jaxb-impl.jar:$ADFCONVERTERHOME/ext/jaas.jar:$ADFCONVERTERHOME/ext/jaxb-xjc.jar:$ADFCONVERTERHOME/ext/jax-qname.jar:$ADFCONVERTERHOME/ext/jta-spec1_0_1.jar:$ADFCONVERTERHOME/ext/dom.jar:$ADFCONVERTERHOME/ext/jax-qname.jar:$ADFCONVERTERHOME/ext/namespace.jar:$ADFCONVERTERHOME/ext/sax.jar:$ADFCONVERTERHOME/ext/xalan.jar:$ADFCONVERTERHOME/ext/xercesImpl.jar:$ADFCONVERTERHOME/ext/xsdlib.jar:$ADFCONVERTERHOME/images/:$ADFCONVERTERHOME/ext/mage.jar:$ADFCONVERTERHOME/ext/xercesImpl-2.6.0.jar:$ADFCONVERTERHOME/ext/sax2.jar:$ADFCONVERTERHOME/ext/activation.jar:$ADFCONVERTERHOME/ext/jxl.jar:$ADFCONVERTER/ext/tar.jar uk.ac.ebi.adfconverter.usermode.commandline.ADFConverterCommandLine $@ - ##exit 0 --- 62,64 ---- |
|
From: pierre <pie...@us...> - 2005-08-23 13:00:36
|
Update of /cvsroot/adfconverter/adfconverter-dev/archive In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23021/archive Modified Files: adfSimpleGUI.bat adfSimpleGUI.sh Log Message: add images dir to classpath for GUI Index: adfSimpleGUI.bat =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/archive/adfSimpleGUI.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** adfSimpleGUI.bat 28 Jul 2005 22:53:39 -0000 1.3 --- adfSimpleGUI.bat 23 Aug 2005 13:00:27 -0000 1.4 *************** *** 22,26 **** :launch ! "%JAVA_HOME%\bin\java.exe" -Xms128m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseParallelGC -DADFCONVERTERHOME="%ADFCONVERTERHOME%" -cp "%ADFCONVERTERHOME%"\bin;"%ADFCONVERTERHOME%"\etc;"%ADFCONVERTERHOME%"\ext\log4j-1.2.11.jar;"%ADFCONVERTERHOME%"\ext\jaxb-api.jar;"%ADFCONVERTERHOME%"\ext\jaxb-libs.jar;"%ADFCONVERTERHOME%"\ext\jaxb-impl.jar;"%ADFCONVERTERHOME%"\ext\jaas.jar;"%ADFCONVERTERHOME%"\ext\jax-qname.jar;"%ADFCONVERTERHOME%"\ext\jta-spec1_0_1.jar;"%ADFCONVERTERHOME%"\ext\dom.jar;"%ADFCONVERTERHOME%"\ext\jax-qname.jar;"%ADFCONVERTERHOME%"\ext\namespace.jar;"%ADFCONVERTERHOME%"\ext\sax.jar;"%ADFCONVERTERHOME%"\ext\xalan.jar;"%ADFCONVERTERHOME%"\ext\xercesImpl.jar;"%ADFCONVERTERHOME%"\ext\xsdlib.jar;"%ADFCONVERTERHOME%"\bin\uk\ac\ebi\adfconverter\tools\checker\data\;"%ADFCONVERTERHOME%"\images\;"%ADFCONVERTERHOME%"\ext\mage.jar;"%ADFCONVERTERHOME%"\ext\xercesImpl-2.6.0.jar;"%ADFCONVERTERHOME%"\ext\sax2.jar;"%ADFCONVERTERHOME%"\ext\activation.jar;"%ADFCONVERTERHOME%"\ext\jxl.jar;"%ADFCONVERTERHOME%"\ext\tar.jar;%ADFCONVERTERHOME%\ext\liquidlnf.jar;%ADFCONVERTERHOME%\ext\smoothmetal.jar;%ADFCONVERTERHOME%\ext\toniclf.jar uk.ac.ebi.adfconverter.usermode.gui.Splasher %* :end --- 22,26 ---- :launch ! "%JAVA_HOME%\bin\java.exe" -Xms128m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseParallelGC -DADFCONVERTERHOME="%ADFCONVERTERHOME%" -cp "%ADFCONVERTERHOME%"\bin;"%ADFCONVERTERHOME%"\etc;"%ADFCONVERTERHOME"\images;"%ADFCONVERTERHOME%"\ext\log4j-1.2.11.jar;"%ADFCONVERTERHOME%"\ext\jaxb-api.jar;"%ADFCONVERTERHOME%"\ext\jaxb-libs.jar;"%ADFCONVERTERHOME%"\ext\jaxb-impl.jar;"%ADFCONVERTERHOME%"\ext\jaas.jar;"%ADFCONVERTERHOME%"\ext\jax-qname.jar;"%ADFCONVERTERHOME%"\ext\jta-spec1_0_1.jar;"%ADFCONVERTERHOME%"\ext\dom.jar;"%ADFCONVERTERHOME%"\ext\jax-qname.jar;"%ADFCONVERTERHOME%"\ext\namespace.jar;"%ADFCONVERTERHOME%"\ext\sax.jar;"%ADFCONVERTERHOME%"\ext\xalan.jar;"%ADFCONVERTERHOME%"\ext\xercesImpl.jar;"%ADFCONVERTERHOME%"\ext\xsdlib.jar;"%ADFCONVERTERHOME%"\bin\uk\ac\ebi\adfconverter\tools\checker\data\;"%ADFCONVERTERHOME%"\images\;"%ADFCONVERTERHOME%"\ext\mage.jar;"%ADFCONVERTERHOME%"\ext\xercesImpl-2.6.0.jar;"%ADFCONVERTERHOME%"\ext\sax2.jar;"%ADFCONVERTERHOME%"\ext\activation.jar;"%ADFCONVERTERHOME%"\ext\jxl.jar;"%ADFCONVERTERHOME%"\ext\tar.jar;%ADFCONVERTERHOME%\ext\liquidlnf.jar;%ADFCONVERTERHOME%\ext\smoothmetal.jar;%ADFCONVERTERHOME%\ext\toniclf.jar uk.ac.ebi.adfconverter.usermode.gui.Splasher %* :end Index: adfSimpleGUI.sh =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/archive/adfSimpleGUI.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** adfSimpleGUI.sh 30 Jul 2005 23:34:40 -0000 1.3 --- adfSimpleGUI.sh 23 Aug 2005 13:00:27 -0000 1.4 *************** *** 40,44 **** ! CLASSPATH="$ADFCONVERTERHOME/ext:$ADFCONVERTERHOME/bin:$ADFCONVERTERHOME/etc" for X in "$ADFCONVERTERHOME"/ext/*.jar --- 40,44 ---- ! CLASSPATH="$ADFCONVERTERHOME/ext:$ADFCONVERTERHOME/bin:$ADFCONVERTERHOME/etc:$ADFCONVERTERHOME/images" for X in "$ADFCONVERTERHOME"/ext/*.jar |
|
From: pierre <pie...@us...> - 2005-08-23 12:44:23
|
Update of /cvsroot/adfconverter/adfconverter-dev/etc/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19265 Modified Files: resourceupdateframe_fr.properties Log Message: fix localised messages Index: resourceupdateframe_fr.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/resourceupdateframe_fr.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** resourceupdateframe_fr.properties 22 Aug 2005 23:04:01 -0000 1.4 --- resourceupdateframe_fr.properties 23 Aug 2005 12:44:13 -0000 1.5 *************** *** 1,11 **** updateableresources.label=Ressources pouvant être mis à jour updateButton.label=Mettre à jour ! updateButton.tooltip=Mettre à jour les ressources s~lectionn~es. ! updateAllButton.label=Mettre à jour toutes les ressources ! updateAllButton.tooltip=Mettre à jour toutes les ressources disponible. quitButton.label=Quitter quitButton.tooltip=Fermer cette fenêtre. ! hasbeenupdated.label=a été mis à jour. hasnotbeenupdated.label=Pas de nouvelle version disponible. ! updateallinbackground.label=Les ressources sont mises à jour en tâche de fond (voir log). ! updating.label=Updating \ No newline at end of file --- 1,13 ---- updateableresources.label=Ressources pouvant être mis à jour updateButton.label=Mettre à jour ! updateButton.tooltip=Mettre à jour les ressources sélectionnées. ! updateAllButton.label=Mettre à jour toutes les ressources. ! updateAllButton.tooltip=Mettre à jour toutes les ressources disponibles. quitButton.label=Quitter quitButton.tooltip=Fermer cette fenêtre. ! hasbeenupdated.label=a ~t~ mis ~ jour. hasnotbeenupdated.label=Pas de nouvelle version disponible. ! updateallinbackground.label=Les ressources sont mises àjour en tâche de fond (voir log). ! updating.label=Recherche de mise à jour. ! nointernetconnection=Pas de connexion à Internet disponible.\n Une connexion à Internet est requise pour les mises à jours. ! |
|
From: pierre <pie...@us...> - 2005-08-23 10:35:34
|
Update of /cvsroot/adfconverter/adfconverter-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22985 Modified Files: about.html Log Message: Update about page Index: about.html =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/about.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** about.html 26 Jul 2005 18:48:57 -0000 1.1 --- about.html 23 Aug 2005 10:35:10 -0000 1.2 *************** *** 17,25 **** </table> <h1>ADF MAGE-ML Tool</h1> ! <p>New versions, and homepage at: <a href="http://adfconverter.sourceforge.net" title="Tool web site">http://adfconverter.sourceforge.net</a></p> <p>First developer: Pierre Marguerite</p> <p>For support: <a href="mailto:adf...@li..." title="Tool general mailing list">adf...@li...</a> (Check <a href="http://sourceforge.net/mailarchive/forum.php?forum_id=44214" title="General Mailing list">archives</a> or <a href="http://lists.sourceforge.net/mailman/listinfo/adfconverter-general" title="To subscribe to the mailing list" >subscribe</a>)</p> <p>Please send bugs, comments, feedback or suggestions to Source Forge project page at: <a href="http://sourceforge.net/projects/adfconverter/" title="ADF MAGE-ML Tool Sourceforge projet">http://sourceforge.net/projects/adfconverter</a></p> ! <p>ADF Home: <a href="http://www.ebi.ac.uk/adf" title="ADF Home">http://www.ebi.ac.uk/adf</a></p> <h2>Credits </h2> --- 17,25 ---- </table> <h1>ADF MAGE-ML Tool</h1> ! <p>New versions, and homepage at: <a href="http://adfconverter.sourceforge.net/" title="Tool web site">http://adfconverter.sourceforge.net</a></p> <p>First developer: Pierre Marguerite</p> <p>For support: <a href="mailto:adf...@li..." title="Tool general mailing list">adf...@li...</a> (Check <a href="http://sourceforge.net/mailarchive/forum.php?forum_id=44214" title="General Mailing list">archives</a> or <a href="http://lists.sourceforge.net/mailman/listinfo/adfconverter-general" title="To subscribe to the mailing list" >subscribe</a>)</p> <p>Please send bugs, comments, feedback or suggestions to Source Forge project page at: <a href="http://sourceforge.net/projects/adfconverter/" title="ADF MAGE-ML Tool Sourceforge projet">http://sourceforge.net/projects/adfconverter</a></p> ! <p>ADF Home: <a href="http://www.ebi.ac.uk/adf/" title="ADF Home">http://www.ebi.ac.uk/adf</a></p> <h2>Credits </h2> *************** *** 29,33 **** <li>Philippe Rocca-serra: for his help on ADF and his support.</li> <li>Joel Fillon: for his help on XML and XML Schema.</li> ! <li>JExcel API project : for XLS reading and Writing</li> <li><a href="http://www.izforge.com/izpack/" title="IzPack Project">IZPack Project</a>: for its installer</li> <li><a href="http://www.mged.org/Workgroups/MAGE/mage.html">MAGE Project</a>: for the MAGE-stk</li> --- 29,33 ---- <li>Philippe Rocca-serra: for his help on ADF and his support.</li> <li>Joel Fillon: for his help on XML and XML Schema.</li> ! <li>JExcel API project : for XLS reading and Writing - Copyright Andy Khan</li> <li><a href="http://www.izforge.com/izpack/" title="IzPack Project">IZPack Project</a>: for its installer</li> <li><a href="http://www.mged.org/Workgroups/MAGE/mage.html">MAGE Project</a>: for the MAGE-stk</li> |
|
From: pierre <pie...@us...> - 2005-08-23 09:26:11
|
Update of /cvsroot/adfconverter/adfconverter-dev/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10782 Modified Files: MyShortcutSpec.xml Log Message: clean windows shortcuts Index: MyShortcutSpec.xml =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/installer/MyShortcutSpec.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MyShortcutSpec.xml 30 Jul 2005 22:09:56 -0000 1.2 --- MyShortcutSpec.xml 23 Aug 2005 09:26:03 -0000 1.3 *************** *** 1,13 **** ! <?xml version="1.0" encoding="UTF-8"?> <shortcuts> <programGroup defaultName="ADFMAGEMLTool" location="applications"/> ! <shortcut name="$APP_NAME" target="$INSTALL_PATH" commandLine="explorer.exe" workingDirectory=""description="Exploring ADF MAGE-ML Tool Directory" initialState="normal" programGroup="yes" desktop="yes" applications="no" startMenu="no" startup="no"> ! <createForPack name="Base"/> </shortcut> <shortcut name="ADF MAGE-ML Tool Documentation" programGroup="yes" desktop="yes" applications="no" startMenu="no" startup="no" target="explorer.exe $INSTALL_PATH\docs\" workingDirectory="" commandLine="" initialState="normal" iconFile="" iconIndex="0" description="Documentation files"> <createForPack name="Docs"/> </shortcut> ! <shortcut name="Tool website" programGroup="yes" desktop="no" applications="no"startMenu="no" startup="no" target="http://adfconverter.sourceforge.net/" workingDirectory="" commandLine="" initialState="normal" iconFile="" iconIndex="0" description="Check ADF MAGE-ML Tool update"> ! <createForPack name="Base"/> </shortcut> ! <shortcut name="Uninstaller" programGroup="yes" desktop="no" applications="no" startMenu="no" startup="no" target="$INSTALL_PATH\Uninstaller\uninstaller.jar" commandLine="" description="IzPack uninstaller"> <createForPack name="Base" /> </shortcut> --- 1,68 ---- ! <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <shortcuts> + <skipIfNotSupported /> <programGroup defaultName="ADFMAGEMLTool" location="applications"/> ! <shortcut name="ADF MAGE-ML Tool" target="$INSTALL_PATH" commandLine="explorer.exe" workingDirectory=""description="Exploring ADF MAGE-ML Tool Directory" initialState="normal" programGroup="yes" desktop="yes" applications="no" startMenu="no" startup="no"> ! <createForPack name="Base"/> </shortcut> ! <shortcut ! name="ADF MAGE-ML Tool Documentation" ! programGroup="yes" ! desktop="no" ! applications="no" ! startMenu="no" ! startup="no" ! target="explorer.exe $INSTALL_PATH\docs\" ! workingDirectory="" ! commandLine="" ! initialState="normal" ! iconFile="" ! iconIndex="0" ! description="Documentation files"> <createForPack name="Docs"/> </shortcut> ! <shortcut ! name="ADF MAGE-ML Tool GUI" ! programGroup="yes" ! desktop="yes" ! applications="no" ! startMenu="no" ! startup="no" ! target="$INSTALL_PATH\adfSimpleGUI.bat" ! commandLine="" ! description="Front-end for ADF MAGE-ML Tool" ! iconFile="" ! iconIndex="0" ! initialState="noShow"> ! <createForPack name="GUI"/> ! ! </shortcut> ! ! ! <shortcut ! name="Tool website" ! programGroup="yes" ! desktop="no" ! applications="no" ! startMenu="no" ! startup="no" ! target="http://adfconverter.sourceforge.net/" ! workingDirectory="" ! commandLine="" ! initialState="normal" ! iconFile="" ! iconIndex="0" ! description="Check ADF MAGE-ML Tool update"> ! <createForPack name="Base"/> </shortcut> ! <shortcut ! name="Uninstaller" ! programGroup="yes" ! desktop="no" ! applications="no" ! startMenu="no" ! startup="no" ! target="$INSTALL_PATH\Uninstaller\uninstaller.jar" ! commandLine="" ! description="IzPack uninstaller"> <createForPack name="Base" /> </shortcut> |
|
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();} } } |
|
From: pierre <pie...@us...> - 2005-08-22 23:26:31
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/commandline In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26775 Modified Files: ADFConverterCommandLine.java Log Message: Update Internet connection management Index: ADFConverterCommandLine.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/commandline/ADFConverterCommandLine.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ADFConverterCommandLine.java 22 Aug 2005 22:04:30 -0000 1.4 --- ADFConverterCommandLine.java 22 Aug 2005 23:26:23 -0000 1.5 *************** *** 61,64 **** --- 61,65 ---- 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; import uk.ac.ebi.adfconverter.library.exceptions.LibraryException; *************** *** 529,532 **** --- 530,537 ---- System.exit(-1); } + catch (UnableToConnectException utce) + { + log.AppliFatal("The tool is unable to connect to Mirror URLs. Please check URLS or your Internet connection (network parameters). Internet connection is mandatory to update resource.", utce); + } catch (java.lang.Exception e) { |
|
From: pierre <pie...@us...> - 2005-08-22 23:25:21
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/tools/networking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26328 Modified Files: ADFConverterNetwork.java Log Message: Update Internet connection management Index: ADFConverterNetwork.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/tools/networking/ADFConverterNetwork.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ADFConverterNetwork.java 27 Jul 2005 22:35:15 -0000 1.2 --- ADFConverterNetwork.java 22 Aug 2005 23:25:13 -0000 1.3 *************** *** 64,67 **** --- 64,68 ---- import uk.ac.ebi.adfconverter.common.tools.log.ADFConverterLoggerImpl; import uk.ac.ebi.adfconverter.common.tools.net.update.Updater; + import uk.ac.ebi.adfconverter.common.tools.net.update.exception.UnableToConnectException; import uk.ac.ebi.adfconverter.tools.networking.exceptions.ADFconverterNetworkInitException; *************** *** 114,118 **** { super(); - // TODO Auto-generated constructor stub try { --- 115,118 ---- *************** *** 199,210 **** if (key.endsWith(MIRRORATTRIBUT)) { ! if( !ADFConverterLoggerImpl.isProduction()) log.Applidebug("prop: "+key); int endpos = key.lastIndexOf("."); ! if( !ADFConverterLoggerImpl.isProduction()) log.Applidebug(". position: "+endpos); String resourceName = key.substring(UPDATERPREFIX.length()+1,endpos); String mirror = networkProps.getProperty(key); ! if(!ADFConverterLoggerImpl.isProduction() ) log.Applidebug("resourcename "+resourceName); if(mirror == null || mirror.length()<1 ) --- 199,210 ---- if (key.endsWith(MIRRORATTRIBUT)) { ! if( !ADFConverterLogger.isProduction()) log.Applidebug("prop: "+key); int endpos = key.lastIndexOf("."); ! if( !ADFConverterLogger.isProduction()) log.Applidebug(". position: "+endpos); String resourceName = key.substring(UPDATERPREFIX.length()+1,endpos); String mirror = networkProps.getProperty(key); ! if(!ADFConverterLogger.isProduction() ) log.Applidebug("resourcename "+resourceName); if(mirror == null || mirror.length()<1 ) *************** *** 284,289 **** * @param resourceName the name of the resource to update * @return true , if the update occurs correctly. false, otherwise. */ ! public boolean updateResource(String resourceName) { --- 284,290 ---- * @param resourceName the name of the resource to update * @return true , if the update occurs correctly. false, otherwise. + * @throws UnableToConnectException unable to connect to resource URL. */ ! public boolean updateResource(String resourceName) throws UnableToConnectException { *************** *** 313,319 **** * @param resource the resource object to update * @return true , if the update occurs correctly. false, otherwise. */ ! public boolean updateResource(UpdateResource resource) { if (resource == null) --- 314,321 ---- * @param resource the resource object to update * @return true , if the update occurs correctly. false, otherwise. + * @throws UnableToConnectException unable to connect to two update URL in a row. */ ! public boolean updateResource(UpdateResource resource) throws UnableToConnectException { if (resource == null) *************** *** 346,355 **** log.Applidebug("Property value/ path to the file to update: "+ filepath); //while no update try next mirror while( !result && mirrorList.size()>mirrorNumber) { ! ! result = updater.updateFile((String)mirrorList.get(mirrorNumber++),filepath ); } return result; --- 348,376 ---- log.Applidebug("Property value/ path to the file to update: "+ filepath); + boolean connectionProblem = false; //while no update try next mirror while( !result && mirrorList.size()>mirrorNumber) { ! String mirrorURL = (String)mirrorList.get(mirrorNumber++); ! try ! { ! result = updater.updateFile(mirrorURL,filepath ); ! connectionProblem = false; ! } ! catch (UnableToConnectException excep) ! {//the application is unable to connect to the URL. Try next one ! if (!connectionProblem) ! {//allow a nURL connection problem ! log.AppliWarn("The tool is unable to connect to : "+mirrorURL+" . Please check URL correctness."); ! connectionProblem = true; ! if( mirrorList.size() == mirrorNumber ) throw excep; ! } ! else ! {//considere as the internet connection is down. ! log.AppliError("The application has been unable to connect a couple of times. An Internet connection is required for Update. Please check your network parameters."); ! throw excep; ! } ! } } return result; *************** *** 361,367 **** * * Try to find a new available version for all resources ! * */ ! public void updateAllResources() { --- 382,388 ---- * * Try to find a new available version for all resources ! * @throws UnableToConnectException if the application is unable to connect to */ ! public void updateAllResources() throws UnableToConnectException { |
|
From: pierre <pie...@us...> - 2005-08-22 23:24:30
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/tools/net/update/exception In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25998/exception Added Files: UnableToConnectException.java Log Message: Update Internet connection management --- NEW FILE: UnableToConnectException.java --- /* * created on 23 aug. 2005 * * Copyright (c) 2002 The European Bioinformatics Institute. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The name ArrayExpress must not be used to endorse or promote products * derived from this software without prior written permission. For * written permission, please contact arr...@eb... * * 4. Products derived from this software may not be called "ArrayExpress" * nor may "ArrayExpress" appear in their names without prior written * permission of the ArrayExpress developers. * * 5. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by ArrayExpress * (http://www.ebi.ac.uk/arrayexpress)" * * THIS SOFTWARE IS PROVIDED BY THE ARRAYEXPRESS GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ARRAYEXPRESS GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * *The European Bioinformatics Institute may publish revised and/or new *versions of this license with new releases of ArrayExpress software. * * Created on 23 aug. 2005 * @author <a href="mailto:pie...@us...">Pierre MARGUERITE</a> * @version 1 * @since version 1.0 23 aug. 2005 */ package uk.ac.ebi.adfconverter.common.tools.net.update.exception; /** * Exception raised when the application is unable to connect/ url unavailable * * Created on 23 aug. 2005 * @author <a href="mailto:pie...@us...">Pierre MARGUERITE</a> * @version 1 * @since version 1.0 23 aug. 2005 */ public class UnableToConnectException extends Exception { /** attribut declares to avoid warning in JDK 1.5, used for Serialization*/ private static final long serialVersionUID = 1; /** * */ public UnableToConnectException() { super(); } /** * Specified a message for the exception * @param message messge of the exception */ public UnableToConnectException(String message) { super(message); } /** * Adds throwable cause of the current exception * @param cause cause of the exception */ public UnableToConnectException(Throwable cause) { super(cause); } /** * Adds a message to the exception and associates the throwable cause of the exception * @param message message of the exception * @param cause cause of the exception */ public UnableToConnectException(String message, Throwable cause) { super(message, cause); } } |
|
From: pierre <pie...@us...> - 2005-08-22 23:22:44
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/tools/net/update/exception In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25334/exception Log Message: Directory /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/tools/net/update/exception added to the repository |
|
From: pierre <pie...@us...> - 2005-08-22 23:04:09
|
Update of /cvsroot/adfconverter/adfconverter-dev/etc/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18770 Modified Files: resourceupdateframe.properties resourceupdateframe_fr.properties Log Message: Update Internet connection management Index: resourceupdateframe.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/resourceupdateframe.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resourceupdateframe.properties 22 Aug 2005 22:04:30 -0000 1.2 --- resourceupdateframe.properties 22 Aug 2005 23:04:01 -0000 1.3 *************** *** 9,10 **** --- 9,12 ---- hasnotbeenupdated.label=No update available. updateallinbackground.label=All Resources are updated in background (see log for details). + updating= Recherche de mise -Aà jour.-b + nointernetconnection=Pas de connexion -Aà Internet disponible.\n Une connexion à Internet est requise pour les mises à jours.-b Index: resourceupdateframe_fr.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/resourceupdateframe_fr.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** resourceupdateframe_fr.properties 22 Aug 2005 22:04:30 -0000 1.3 --- resourceupdateframe_fr.properties 22 Aug 2005 23:04:01 -0000 1.4 *************** *** 9,11 **** hasnotbeenupdated.label=Pas de nouvelle version disponible. updateallinbackground.label=Les ressources sont mises à jour en tâche de fond (voir log). ! \ No newline at end of file --- 9,11 ---- hasnotbeenupdated.label=Pas de nouvelle version disponible. updateallinbackground.label=Les ressources sont mises à jour en tâche de fond (voir log). ! updating.label=Updating \ No newline at end of file |
|
From: pierre <pie...@us...> - 2005-08-22 22:09:31
|
Update of /cvsroot/adfconverter/adfconverter-dev/etc/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7564 Modified Files: SimpleGUI.properties SimpleGUI_fr.properties SimpleGUI_fr_FR.properties Sim...@eu... Log Message: bug fixes with gui message Index: SimpleGUI_fr_FR.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/SimpleGUI_fr_FR.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SimpleGUI_fr_FR.properties 7 Jul 2005 14:41:51 -0000 1.1.1.1 --- SimpleGUI_fr_FR.properties 22 Aug 2005 22:09:22 -0000 1.2 *************** *** 33,35 **** is_correct=est correct is_incorrect=est incorrect ! check_file_Log_for_details=Lisez le fichier log pour plus de détails --- 33,36 ---- is_correct=est correct is_incorrect=est incorrect ! check_file_Log_for_details=Lisez le fichier log pour plus de détail ! magedtd_nointernetconnection=Pas de connexion Internet disponible.\n Le doctype du fichier MAGE-ML est une URL Internet.\n Modifiez le pour pointer sur un fichier DTD local. \n(<!DOCTYPE MAGE-ML PUBLIC "-//OMG//DTD MAGE-ML 1.1//EN" "MAGE-ML.dtd"> devrait fonctionner.) Index: Sim...@eu... =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/Sim...@eu...,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Sim...@eu... 7 Jul 2005 14:41:50 -0000 1.1.1.1 --- Sim...@eu... 22 Aug 2005 22:09:22 -0000 1.2 *************** *** 33,35 **** is_correct=est correct is_incorrect=est incorrect ! check_file_Log_for_details=Lisez le fichier log pour plus de détails --- 33,37 ---- is_correct=est correct is_incorrect=est incorrect ! check_file_Log_for_details=Lisez le fichier log pour plus de détails. ! magedtd_nointernetconnection=Pas de connexion Internet disponible.\n Le doctype du fichier MAGE-ML est une URL Internet.\n Modifiez le pour pointer sur un fichier DTD local.\n (<!DOCTYPE MAGE-ML PUBLIC "-//OMG//DTD MAGE-ML 1.1//EN" "MAGE-ML.dtd"> devrait fonctionner.) ! Index: SimpleGUI.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/SimpleGUI.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SimpleGUI.properties 7 Jul 2005 14:41:51 -0000 1.1.1.1 --- SimpleGUI.properties 22 Aug 2005 22:09:22 -0000 1.2 *************** *** 34,35 **** --- 34,36 ---- is_incorrect=is incorrect check_file_Log_for_details=check file Log for details + magedtd_nointernetconnection=No Internet connection available. The MAGE-ML file doctype is an Internet URL.\n Please set to a local file. (<!DOCTYPE MAGE-ML PUBLIC "-//OMG//DTD MAGE-ML 1.1//EN" "MAGE-ML.dtd"> should work.) Index: SimpleGUI_fr.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/SimpleGUI_fr.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SimpleGUI_fr.properties 7 Jul 2005 14:41:50 -0000 1.1.1.1 --- SimpleGUI_fr.properties 22 Aug 2005 22:09:22 -0000 1.2 *************** *** 34,35 **** --- 34,36 ---- is_incorrect=est incorrect check_file_Log_for_details=Lisez le fichier log pour plus de détails + magedtd_nointernetconnection=Pas de connexion Internet disponible.\n Le doctype du fichier MAGE-ML est une URL Internet.\nModifiez le pour pointer sur un fichier DTD local.\n(<!DOCTYPE MAGE-ML PUBLIC "-//OMG//DTD MAGE-ML 1.1//EN" "MAGE-ML.dtd"> devrait fonctionner.) |
|
From: pierre <pie...@us...> - 2005-08-22 22:04:45
|
Update of /cvsroot/adfconverter/adfconverter-dev/etc/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5166/etc/lang Modified Files: resourceupdateframe.properties resourceupdateframe_fr.properties Log Message: bug fix, update internet connection management Index: resourceupdateframe.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/resourceupdateframe.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** resourceupdateframe.properties 7 Jul 2005 14:41:51 -0000 1.1.1.1 --- resourceupdateframe.properties 22 Aug 2005 22:04:30 -0000 1.2 *************** *** 8,9 **** --- 8,10 ---- hasbeenupdated.label=has been updated hasnotbeenupdated.label=No update available. + updateallinbackground.label=All Resources are updated in background (see log for details). Index: resourceupdateframe_fr.properties =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/etc/lang/resourceupdateframe_fr.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resourceupdateframe_fr.properties 1 Aug 2005 22:25:04 -0000 1.2 --- resourceupdateframe_fr.properties 22 Aug 2005 22:04:30 -0000 1.3 *************** *** 1,5 **** updateableresources.label=Ressources pouvant être mis à jour updateButton.label=Mettre à jour ! updateButton.tooltip=Mettre à jour les ressources sélectionnées. updateAllButton.label=Mettre à jour toutes les ressources updateAllButton.tooltip=Mettre à jour toutes les ressources disponible. --- 1,5 ---- updateableresources.label=Ressources pouvant être mis à jour updateButton.label=Mettre à jour ! updateButton.tooltip=Mettre à jour les ressources s~lectionn~es. updateAllButton.label=Mettre à jour toutes les ressources updateAllButton.tooltip=Mettre à jour toutes les ressources disponible. *************** *** 8,9 **** --- 8,11 ---- hasbeenupdated.label=a été mis à jour. hasnotbeenupdated.label=Pas de nouvelle version disponible. + updateallinbackground.label=Les ressources sont mises à jour en tâche de fond (voir log). + \ No newline at end of file |
|
From: pierre <pie...@us...> - 2005-08-22 22:04:45
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/commandline In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5166/src/uk/ac/ebi/adfconverter/usermode/commandline Modified Files: ADFConverterCommandLine.java Log Message: bug fix, update internet connection management Index: ADFConverterCommandLine.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/usermode/commandline/ADFConverterCommandLine.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ADFConverterCommandLine.java 28 Jul 2005 22:11:38 -0000 1.3 --- ADFConverterCommandLine.java 22 Aug 2005 22:04:30 -0000 1.4 *************** *** 58,61 **** --- 58,62 ---- import uk.ac.ebi.adfconverter.common.data.tabulardata.DataTable; + 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; *************** *** 468,472 **** { log.AppliInfo("No file type specified (adf mage-ml). Try to guess"); ! adfconverter.check(file.getAbsolutePath(),strictMode,stepByStepMode,doCuration,convert); } else --- 469,480 ---- { log.AppliInfo("No file type specified (adf mage-ml). Try to guess"); ! try ! { ! adfconverter.check(file.getAbsolutePath(),strictMode,stepByStepMode,doCuration,convert); ! } ! catch (NoInternetConnectionForXMLParsing nointernetexception) ! { ! log.AppliWarn("There is no internet connection for internet doctype. Please set system doctype to a local MAGE-ML DTD file.( <!DOCTYPE MAGE-ML PUBLIC \"-//OMG//DTD MAGE-ML 1.1//EN\" \"MAGE-ML.dtd\"> should work.) "); ! } } else *************** *** 475,479 **** adfconverter.checkADF(file,strictMode,stepByStepMode,doCuration,convert); else ! adfconverter.checkMAGEML(file,strictMode,stepByStepMode,convert); } toMAGEML = false; --- 483,497 ---- adfconverter.checkADF(file,strictMode,stepByStepMode,doCuration,convert); else ! { ! try ! { ! adfconverter.checkMAGEML(file,strictMode,stepByStepMode,convert); ! } ! catch (NoInternetConnectionForXMLParsing nointernetexception) ! { ! log.AppliWarn("There is no internet connection for internet doctype. Please set system doctype to a local MAGE-ML DTD file.( <!DOCTYPE MAGE-ML PUBLIC \"-//OMG//DTD MAGE-ML 1.1//EN\" \"MAGE-ML.dtd\"> should work.) "); ! } ! ! } } toMAGEML = false; |
|
From: pierre <pie...@us...> - 2005-08-22 22:04:45
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/tools/log In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5166/src/uk/ac/ebi/adfconverter/common/tools/log Modified Files: ADFConverterLoggerImpl.java Log Message: bug fix, update internet connection management Index: ADFConverterLoggerImpl.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/tools/log/ADFConverterLoggerImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ADFConverterLoggerImpl.java 28 Jul 2005 22:01:03 -0000 1.3 --- ADFConverterLoggerImpl.java 22 Aug 2005 22:04:30 -0000 1.4 *************** *** 136,156 **** public void setLoggingLevel (String fileLoggingLevel) {//init ! if (fileLoggingLevel.equalsIgnoreCase("debug")) { level = Level.DEBUG; } ! if (fileLoggingLevel.equalsIgnoreCase("info")) { level = Level.INFO; } ! if (fileLoggingLevel.equalsIgnoreCase("warn")) { level = Level.WARN; } ! if (fileLoggingLevel.equalsIgnoreCase("error")) { level = Level.ERROR; } ! if (fileLoggingLevel.equalsIgnoreCase("fatal")) { level = Level.FATAL; --- 136,156 ---- public void setLoggingLevel (String fileLoggingLevel) {//init ! if ("debug".equalsIgnoreCase(fileLoggingLevel)) { level = Level.DEBUG; } ! if ("info".equalsIgnoreCase(fileLoggingLevel)) { level = Level.INFO; } ! if ("warn".equalsIgnoreCase(fileLoggingLevel)) { level = Level.WARN; } ! if ("error".equalsIgnoreCase(fileLoggingLevel)) { level = Level.ERROR; } ! if ("fatal".equals(fileLoggingLevel)) { level = Level.FATAL; |
|
From: pierre <pie...@us...> - 2005-08-22 22:04:44
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5166/src/uk/ac/ebi/adfconverter/common/configuration Modified Files: ADFConverterConfiguration.java Log Message: bug fix, update internet connection management Index: ADFConverterConfiguration.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/configuration/ADFConverterConfiguration.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ADFConverterConfiguration.java 15 Aug 2005 11:20:27 -0000 1.5 --- ADFConverterConfiguration.java 22 Aug 2005 22:04:30 -0000 1.6 *************** *** 1145,1150 **** public static String getProperty(String name) { ! if (name.startsWith(PREFIX)) ! name = name.replaceAll("PREFIX",""); return converterProps.getProperty(name.trim().toLowerCase()); } --- 1145,1150 ---- public static String getProperty(String name) { ! //if (name.startsWith(PREFIX)) ! //name = name.replaceAll("PREFIX",""); return converterProps.getProperty(name.trim().toLowerCase()); } |
|
From: pierre <pie...@us...> - 2005-08-22 22:04:44
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/org/biomage/tools/helpers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5166/src/org/biomage/tools/helpers Modified Files: OntologyHelper.java Log Message: bug fix, update internet connection management Index: OntologyHelper.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/org/biomage/tools/helpers/OntologyHelper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OntologyHelper.java 27 Jul 2005 22:39:14 -0000 1.2 --- OntologyHelper.java 22 Aug 2005 22:04:30 -0000 1.3 *************** *** 3,7 **** - import java.net.URL; import java.util.ArrayList; import java.util.HashMap; --- 3,6 ---- |
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 |
|
From: pierre <pie...@us...> - 2005-08-15 11:20:38
|
Update of /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1470 Modified Files: ADFConverterConfiguration.java Log Message: fix bug when GUI locale given in configuration file/ from installer Index: ADFConverterConfiguration.java =================================================================== RCS file: /cvsroot/adfconverter/adfconverter-dev/src/uk/ac/ebi/adfconverter/common/configuration/ADFConverterConfiguration.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ADFConverterConfiguration.java 31 Jul 2005 10:26:25 -0000 1.4 --- ADFConverterConfiguration.java 15 Aug 2005 11:20:27 -0000 1.5 *************** *** 648,651 **** --- 648,652 ---- int i = 0; + logger.Applidebug("Checking properties"); //while (converterProps.containsKey()); //MandatoryPropsList. *************** *** 728,732 **** continue; } ! logger.error("The properthttp://www.ics.uci.edu/pub/ietf/http/related/iso639.txty value of "+propName+" is incorrect: "+ value+" should be a directory."); correct = false; continue; --- 729,733 ---- continue; } ! logger.error("The property value of "+propName+" is incorrect: "+ value+" should be a directory."); correct = false; continue; *************** *** 803,807 **** { // (value) ! logger.Applidebug("testing locate"); if (value== null || value .length()<1) { --- 804,809 ---- { // (value) ! value = value.trim(); ! if (!ADFConverterLogger.isProduction())logger.Applidebug("testing locate"); if (value== null || value .length()<1) { *************** *** 815,823 **** {//The locale should have a length of 2. It may happen with the IzPack installer. Simply remove the third character. logger.AppliWarn("The language argument must a valid ISO Language Code (http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt). It must be composed of two characters"); ! value = value.substring(0,1); } //the locale must be in lowercase, force it value = value.toLowerCase(); try { new Locale (value); //the locale exists, reset value --- 817,826 ---- {//The locale should have a length of 2. It may happen with the IzPack installer. Simply remove the third character. logger.AppliWarn("The language argument must a valid ISO Language Code (http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt). It must be composed of two characters"); ! value = value.substring(0,2); } //the locale must be in lowercase, force it value = value.toLowerCase(); try { + if (!ADFConverterLogger.isProduction()) logger.Applidebug("locale parameter "+value); new Locale (value); //the locale exists, reset value |
