From: <sh...@us...> - 2009-09-25 12:30:36
|
Revision: 14879 http://cdk.svn.sourceforge.net/cdk/?rev=14879&view=rev Author: shk3 Date: 2009-09-25 12:30:26 +0000 (Fri, 25 Sep 2009) Log Message: ----------- Removed tiff from export. Modified Paths: -------------- jchempaint/trunk/src/main/org/openscience/jchempaint/action/ExportAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/AboutDialog.java jchempaint/trunk/src/main/org/openscience/jchempaint/io/JCPExportFileFilter.java jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/ExportAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/ExportAction.java 2009-09-25 12:24:09 UTC (rev 14878) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/ExportAction.java 2009-09-25 12:30:26 UTC (rev 14879) @@ -120,8 +120,6 @@ String imageIOType; if (type.equals(JCPExportFileFilter.bmp)) { imageIOType = "BMP"; - } else if (type.equals(JCPExportFileFilter.tiff)) { - imageIOType = "TIFF"; } else if (type.equals(JCPExportFileFilter.jpg)) { imageIOType = "JPEG"; } else { Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/AboutDialog.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/AboutDialog.java 2009-09-25 12:24:09 UTC (rev 14878) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/AboutDialog.java 2009-09-25 12:30:26 UTC (rev 14879) @@ -71,7 +71,7 @@ String version = self.getImplementationVersion(); String s1 = "JChemPaint " + version + "\n"; s1 += GT._("An open-source editor for 2D chemical structures."); - String s2 = GT._("An OpenScience project by Christoph Steinbeck, Egon Willighagen and others.")+"\n"; + String s2 = GT._("An OpenScience project.")+"\n"; s2 += GT._("See 'http://jchempaint.sourceforge.net' for more information."); getContentPane().setLayout(new BorderLayout()); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/io/JCPExportFileFilter.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/io/JCPExportFileFilter.java 2009-09-25 12:24:09 UTC (rev 14878) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/io/JCPExportFileFilter.java 2009-09-25 12:30:26 UTC (rev 14879) @@ -45,7 +45,6 @@ // only those extensions are given here that are *not* on JCPFileFilter public final static String bmp = "bmp"; public final static String png = "png"; - public final static String tiff = "tiff"; public final static String jpg = "jpg"; public final static String svg = "svg"; @@ -65,7 +64,6 @@ chooser.addChoosableFileFilter(new JCPExportFileFilter(JCPExportFileFilter.jpg)); chooser.addChoosableFileFilter(new JCPExportFileFilter(JCPExportFileFilter.png)); chooser.addChoosableFileFilter(new JCPExportFileFilter(JCPExportFileFilter.svg)); - chooser.addChoosableFileFilter(new JCPExportFileFilter(JCPExportFileFilter.tiff)); } /** @@ -78,8 +76,6 @@ result = "PNG"; } else if (type.equals(bmp)) { result = "BMP"; - } else if (type.equals(tiff)) { - result = "TIFF"; } else if (type.equals(jpg)) { result = "JPEG"; } else if (type.equals(svg)) { Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-09-25 12:24:09 UTC (rev 14878) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-09-25 12:30:26 UTC (rev 14879) @@ -138,24 +138,6 @@ //we only check the existence of file for now Assert.assertTrue(file.exists()); } - @Test public void testMenuExportTiff() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { - File file=new File("/tmp/test.tiff"); - if(file.exists()) - file.delete(); - applet.menuItem("export").click(); - DialogFixture dialog = applet.dialog(); - JComboBox combobox = dialog.robot.finder().find(new ComboBoxTextComponentMatcher("org.openscience.jchempaint.io.JCPExportFileFilter")); - combobox.setSelectedItem(combobox.getItemAt(5)); - JTextComponentFixture text = dialog.textBox(); - text.setText("/tmp/test"); - JButtonFixture okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("Save"))); - okbutton.click(); - dialog = applet.dialog(); - okbutton = new JButtonFixture(dialog.robot, dialog.robot.finder().find(new ButtonTextComponentMatcher("OK"))); - okbutton.click(); - //we only check the existence of file for now - Assert.assertTrue(file.exists()); - } @Test public void testMenuPrint() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { //applet.menuItem("print").click(); //TODO in linux, the java print dialog is not working This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |