From: <ni...@us...> - 2008-07-24 19:39:24
|
Revision: 9642 http://jmol.svn.sourceforge.net/jmol/?rev=9642&view=rev Author: nicove Date: 2008-07-24 19:39:21 +0000 (Thu, 24 Jul 2008) Log Message: ----------- Warning Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java Modified: trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-07-24 19:01:27 UTC (rev 9641) +++ trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-07-24 19:39:21 UTC (rev 9642) @@ -24,10 +24,10 @@ */ package org.openscience.jmol.app.webexport; -import java.awt.*; -import java.awt.event.*; import java.awt.BorderLayout; import java.awt.Dimension; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; @@ -38,7 +38,15 @@ import java.text.DateFormat; import java.util.Date; import java.util.Properties; -import javax.swing.*; + +import javax.swing.JDialog; +import javax.swing.JEditorPane; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.WindowConstants; import javax.swing.filechooser.FileSystemView; import org.jmol.api.JmolViewer; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2008-08-12 23:27:56
|
Revision: 9718 http://jmol.svn.sourceforge.net/jmol/?rev=9718&view=rev Author: hansonr Date: 2008-08-12 23:27:53 +0000 (Tue, 12 Aug 2008) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java Modified: trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-12 23:17:50 UTC (rev 9717) +++ trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-12 23:27:53 UTC (rev 9718) @@ -271,7 +271,7 @@ String lang = GT.getLanguage(); String fileName = root + "_" + lang + ".html"; URL url = getResource(object, fileName, false); - if (url == null) { + if (url == null && lang.length() == 5) { fileName = root + "_" + lang.substring(0, 2) + ".html"; url = getResource(object, fileName, false); if (url == null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2008-08-13 14:22:59
|
Revision: 9725 http://jmol.svn.sourceforge.net/jmol/?rev=9725&view=rev Author: hansonr Date: 2008-08-13 14:22:53 +0000 (Wed, 13 Aug 2008) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java Modified: trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-13 13:24:33 UTC (rev 9724) +++ trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-13 14:22:53 UTC (rev 9725) @@ -274,11 +274,11 @@ if (url == null && lang.length() == 5) { fileName = root + "_" + lang.substring(0, 2) + ".html"; url = getResource(object, fileName, false); - if (url == null) { - fileName = root + ".html"; - url = getResource(object, fileName, true); - } } + if (url == null) { + fileName = root + ".html"; + url = getResource(object, fileName, true); + } return url; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2008-08-28 11:37:21
|
Revision: 9796 http://jmol.svn.sourceforge.net/jmol/?rev=9796&view=rev Author: hansonr Date: 2008-08-28 11:37:15 +0000 (Thu, 28 Aug 2008) Log Message: ----------- version=11.6.RC12_dev # translation: added GT._ calls for HTML templates and JS in WebExport Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java Modified: trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-28 11:36:00 UTC (rev 9795) +++ trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-28 11:37:15 UTC (rev 9796) @@ -304,9 +304,8 @@ return url; } - static String[] translations; - public static void setTranslations() { - // called for a language change. + private static String[] translations; + private static void setTranslations() { // for all templates and JmolPopIn.js translations = new String[] { "GT_JmolPopIn.js_TOGETA3DMODEL", GT._("To get a 3-D model you can manipulate, click {0}here{1}. Download time may be significant the first time the applet is loaded.", new String[] {"<a href=\"HREF\">", "</a>"}), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ahe...@us...> - 2008-08-30 18:59:43
|
Revision: 9817 http://jmol.svn.sourceforge.net/jmol/?rev=9817&view=rev Author: aherraez Date: 2008-08-30 18:59:41 +0000 (Sat, 30 Aug 2008) Log Message: ----------- one more missing GT.escapeHTML() Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java Modified: trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-30 18:48:16 UTC (rev 9816) +++ trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-30 18:59:41 UTC (rev 9817) @@ -160,7 +160,7 @@ static String TimeStamp_WebLink() { String out = " <small>" - + GT._("Page skeleton and JavaScript generated by export to web function of"); + + GT.escapeHTML(GT._("Page skeleton and JavaScript generated by export to web function of")); Date now = new Date(); String now_string = DateFormat.getDateInstance().format(now);//Specify medium verbosity on the date and time out = out This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2008-08-31 16:56:01
|
Revision: 9837 http://jmol.svn.sourceforge.net/jmol/?rev=9837&view=rev Author: hansonr Date: 2008-08-31 16:55:55 +0000 (Sun, 31 Aug 2008) Log Message: ----------- . moved into sentence. Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java Modified: trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-31 16:09:30 UTC (rev 9836) +++ trunk/Jmol/src/org/openscience/jmol/app/webexport/WebExport.java 2008-08-31 16:55:55 UTC (rev 9837) @@ -159,12 +159,9 @@ } static String TimeStamp_WebLink() { - return " <small>" + GT._("Page skeleton and JavaScript generated by export to web function using {0} on {1}", + return " <small>" + GT._("Page skeleton and JavaScript generated by export to web function using {0} on {1}.", new String[] {" <a href=\"http://jmol.sourceforge.net\">Jmol " + JmolViewer.getJmolVersion() + "</a> ", - DateFormat.getDateInstance().format(new Date()) - } - ) - + ".</small><br />"; + DateFormat.getDateInstance().format(new Date()) }) + "</small><br />"; //Specify medium verbosity on the date and time } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |