From: <mar...@us...> - 2009-07-17 14:58:02
|
Revision: 14681 http://cdk.svn.sourceforge.net/cdk/?rev=14681&view=rev Author: mark_rynbeek Date: 2009-07-17 14:57:59 +0000 (Fri, 17 Jul 2009) Log Message: ----------- changes to make jcp work with git based primary Modified Paths: -------------- jchempaint/trunk/.classpath jchempaint/trunk/META-INF/MANIFEST.MF jchempaint/trunk/build.xml jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeModeAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/ConvertToRadicalAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/OpenAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/ZoomAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java jchempaint/trunk/src/main/org/openscience/jchempaint/application/JChemPaint.java jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java Modified: jchempaint/trunk/.classpath =================================================================== --- jchempaint/trunk/.classpath 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/.classpath 2009-07-17 14:57:59 UTC (rev 14681) @@ -6,5 +6,6 @@ <classpathentry kind="lib" path="lib/commons-cli.jar"/> <classpathentry kind="lib" path="lib/jfontchooser.jar"/> <classpathentry kind="lib" path="po/classes"/> + <classpathentry combineaccessrules="false" kind="src" path="/org.openscience.cdk"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: jchempaint/trunk/META-INF/MANIFEST.MF =================================================================== --- jchempaint/trunk/META-INF/MANIFEST.MF 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/META-INF/MANIFEST.MF 2009-07-17 14:57:59 UTC (rev 14681) @@ -6,6 +6,5 @@ Bundle-ClassPath: . Bundle-Vendor: The Chemistry Development Kit Project Export-Package: org.openscience.jchempaint -Require-Bundle: org.openscience.cdk.jcp;bundle-version="1.1.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/build.xml 2009-07-17 14:57:59 UTC (rev 14681) @@ -139,6 +139,16 @@ <include name="cdk-controlbasic.jar"/> <include name="cdk-structgen.jar"/> <include name="cdk-valencycheck.jar"/> + + <!-- added by MR, new controller/renderer --> + <include name="cdk-renderawt.jar"/> + <include name="cdk-renderbasic.jar"/> + <include name="cdk-rendercontrol.jar"/> + <include name="cdk-renderextra.jar"/> + <include name="cdk-rendersvg.jar"/> + <include name="cdk-ioformats.jar"/> + + </fileset> </unjar> </target> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-07-17 14:57:59 UTC (rev 14681) @@ -270,6 +270,11 @@ } public void paint(Graphics g) { + Dimension appletSize = this.getSize(); + int appletHeight = appletSize.height; + int appletWidth = appletSize.width; + System.out.println("paint in : appletWidth appletHeight "+ appletWidth+ " "+ appletHeight); + this.setBackground(renderer.getRenderer2DModel().getBackColor()); super.paint(g); @@ -296,6 +301,14 @@ this.paintChemModel(chemModel, g2, screen); } } + + + appletSize = this.getSize(); + appletHeight = appletSize.height; + appletWidth = appletSize.width; + + System.out.println("paint out : appletWidth appletHeight "+ appletWidth+ " "+ appletHeight); + } /** @@ -306,7 +319,12 @@ * @param screen */ private void paintChemModel( + IChemModel chemModel, Graphics2D g, Rectangle screen) { + Dimension appletSize = this.getSize(); + int appletHeight = appletSize.height; + int appletWidth = appletSize.width; + System.out.println("paintChemModel in : appletWidth appletHeight "+ appletWidth+ " "+ appletHeight); if (isNewChemModel) { renderer.setup(chemModel, screen); @@ -329,7 +347,17 @@ this.revalidate(); super.paint(g); renderer.paintChemModel(chemModel, new AWTDrawVisitor(g)); + + + } + + + appletSize = this.getSize(); + appletHeight = appletSize.height; + appletWidth = appletSize.width; + System.out.println("paintChemModel out : appletWidth appletHeight "+ appletWidth+ " "+ appletHeight); + } private void paintChemModelFitToScreen( Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeModeAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeModeAction.java 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeModeAction.java 2009-07-17 14:57:59 UTC (rev 14681) @@ -30,6 +30,9 @@ import java.awt.Color; import java.awt.event.ActionEvent; + +import java.io.IOException; + import java.util.EventObject; import javax.swing.JComponent; @@ -49,6 +52,7 @@ import org.openscience.cdk.controller.SelectSquareModule; import org.openscience.cdk.controller.IChemModelRelay.Direction; import org.openscience.cdk.event.ICDKChangeListener; +import org.openscience.cdk.exception.CDKException; import org.openscience.jchempaint.dialog.EnterElementSwingModule; import org.openscience.jchempaint.dialog.PeriodicTableDialog; import org.openscience.jchempaint.dialog.PeriodicTablePanel; @@ -157,9 +161,17 @@ public void stateChanged(EventObject event) { logger.debug("Element change signaled..."); if (event.getSource() instanceof PeriodicTablePanel) { - PeriodicTablePanel source = (PeriodicTablePanel) event - .getSource(); - String symbol = source.getSelectedElement().getSymbol(); + PeriodicTablePanel source = (PeriodicTablePanel)event.getSource(); + String symbol=null; + try { + symbol = source.getSelectedElement().getSymbol(); + } catch (CDKException e) { + throw new RuntimeException(e); + } + catch (IOException e) { + throw new RuntimeException(e); + + } logger.debug("Setting drawing element to: ", symbol); model.setDrawElement(symbol); dialog.setVisible(false); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/ConvertToRadicalAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/ConvertToRadicalAction.java 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/ConvertToRadicalAction.java 2009-07-17 14:57:59 UTC (rev 14681) @@ -59,7 +59,14 @@ try { IAtomContainer relevantContainer = ChemModelManipulator.getRelevantAtomContainer(jcpPanel.getChemModel(), atom); AtomContainerManipulator.percieveAtomTypesAndConfigureAtoms(relevantContainer); - number = new LonePairElectronChecker().getImplicitLonePairCount(atom, relevantContainer); + + + + //TODO MR + //fix this ?? how ?? + //number = new LonePairElectronChecker().getImplicitLonePairCount(atom, relevantContainer); + + } catch (CDKException e) { e.printStackTrace(); e.getMessage(); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/OpenAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/OpenAction.java 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/OpenAction.java 2009-07-17 14:57:59 UTC (rev 14681) @@ -32,6 +32,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStreamReader; +import java.net.MalformedURLException; import javax.swing.JFileChooser; import javax.swing.JOptionPane; @@ -93,19 +94,22 @@ int clear=jcpPanel.showWarning(); if(clear==JOptionPane.YES_OPTION){ try { - IChemModel chemModel = JChemPaint.readFromFileReader(new InputStreamReader(new FileInputStream(chooser.getSelectedFile())), chooser.getSelectedFile().toURI().toString(), type); + IChemModel chemModel=null; + try { + chemModel = JChemPaint.readFromFileReader(chooser.getSelectedFile().toURI().toURL(), chooser.getSelectedFile().toURI().toString(), type); + } catch (MalformedURLException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } if(jcpPanel.get2DHub().getUndoRedoFactory()!=null && jcpPanel.get2DHub().getUndoRedoHandler()!=null){ IUndoRedoable undoredo = jcpPanel.get2DHub().getUndoRedoFactory().getLoadNewModelEdit(jcpPanel.getChemModel(), jcpPanel.getChemModel().getMoleculeSet(), jcpPanel.getChemModel().getReactionSet(), chemModel.getMoleculeSet(), chemModel.getReactionSet(), "Load "+chooser.getSelectedFile().getName()); jcpPanel.get2DHub().getUndoRedoHandler().postEdit(undoredo); } jcpPanel.getChemModel().setMoleculeSet(chemModel.getMoleculeSet()); - jcpPanel.getChemModel().setReactionSet(chemModel.getReactionSet()); + //jcpPanel.getChemModel().setReactionSet(chemModel.getReactionSet()); jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection( new LogicalSelection(LogicalSelection.Type.NONE)); jcpPanel.get2DHub().updateView(); - } catch (FileNotFoundException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); } catch (CDKException e1) { // TODO Auto-generated catch block e1.printStackTrace(); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/ZoomAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/ZoomAction.java 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/ZoomAction.java 2009-07-17 14:57:59 UTC (rev 14681) @@ -28,9 +28,14 @@ */ package org.openscience.jchempaint.action; +import java.awt.Dimension; +import java.awt.Rectangle; import java.awt.event.ActionEvent; +import org.openscience.cdk.interfaces.IChemModel; +import org.openscience.cdk.renderer.Renderer; import org.openscience.cdk.renderer.RendererModel; +import org.openscience.cdk.renderer.visitor.AWTDrawVisitor; /** * @cdk.module jchempaint @@ -61,7 +66,12 @@ // temp fix //jcpPanel.getRenderPanel().getRenderer().setDrawCenter(0,0); + } + void burp () { + //jcpPanel.getRenderPanel().paint(jcpPanel.getRenderPanel().getGraphics()); + } + } Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java 2009-07-17 14:57:59 UTC (rev 14681) @@ -170,7 +170,7 @@ */ public void loadModelFromUrl(URL fileURL) { try { - IChemModel chemModel = JChemPaint.readFromFileReader(new InputStreamReader(fileURL.openStream()), fileURL.toString(), null); + IChemModel chemModel = JChemPaint.readFromFileReader(fileURL, fileURL.toString(), null); theJcpp.setChemModel(chemModel); } catch (Exception exception) { System.out.println("Cannot parse model: " + exception.toString()); @@ -296,7 +296,7 @@ public String getMolFile() throws CDKException{ StringWriter sw = new StringWriter(); MDLWriter mdlwriter = new MDLWriter(sw); - mdlwriter.dontWriteAromatic(); + //mdlwriter.dontWriteAromatic(); org.openscience.cdk.interfaces.IMoleculeSet som = theJcpp.getChemModel().getMoleculeSet(); mdlwriter.write(som); return(sw.toString()); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/application/JChemPaint.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/application/JChemPaint.java 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/application/JChemPaint.java 2009-07-17 14:57:59 UTC (rev 14681) @@ -37,6 +37,7 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.Reader; import java.net.MalformedURLException; import java.net.URL; @@ -211,8 +212,8 @@ } public static IChemModel readFromFileReader( - Reader instream, String url, String type) throws CDKException { - ISimpleChemObjectReader cor = JChemPaint.createReader(instream, url, type); + URL fileURL, String url, String type) throws CDKException { + ISimpleChemObjectReader cor = JChemPaint.createReader(fileURL, url, type); IChemModel chemModel = JChemPaint.getChemModelFromReader(cor); JChemPaint.cleanUpChemModel(chemModel); @@ -223,7 +224,13 @@ File file, String type) throws CDKException, FileNotFoundException { Reader reader = new FileReader(file); String url = file.toURI().toString(); - ISimpleChemObjectReader cor = JChemPaint.createReader(reader, url, type); + ISimpleChemObjectReader cor=null; + try { + cor = JChemPaint.createReader(file.toURI().toURL(), url, type); + } catch (MalformedURLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } if(cor instanceof CMLReader) cor.setReader(new FileInputStream(file)); // hack @@ -253,10 +260,22 @@ ControllerHub.avoidOverlap(chemModel); } + private static Reader getReader (URL url ) { + InputStreamReader reader=null; + try { + reader= new InputStreamReader(url.openStream()); + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return reader; + + } private static ISimpleChemObjectReader createReader( - Reader instream, String url, String type) throws CDKException { + URL url, String urlString, String type) throws CDKException { if (type == null) { - type = "unknown"; + type = "mol"; } ISimpleChemObjectReader cor = null; @@ -264,13 +283,13 @@ /* * Have the ReaderFactory determine the file format */ - cor = new MDLV2000Reader(instream, Mode.RELAXED); + cor = new MDLV2000Reader(getReader(url), Mode.RELAXED); try { ReaderFactory factory = new ReaderFactory(); - cor = factory.createReader(instream); + cor = factory.createReader(getReader(url)); //this is a workaround for bug #2698194, since it works with url only if (cor instanceof CMLReader) { - cor = new CMLReader(url); + cor = new CMLReader(urlString); } } catch (IOException ioExc) { // we do nothing right now and hope it still works @@ -282,23 +301,23 @@ if (type.equals(JCPFileFilter.cml) || type.equals(JCPFileFilter.xml)) { //this is a workaround for bug #2698194, since it works with url only - cor = new CMLReader(url); + cor = new CMLReader(urlString); } else if (type.equals(JCPFileFilter.sdf)) { - cor = new MDLV2000Reader(instream);//TODO once merged, egons new reader needs to be used here + cor = new MDLV2000Reader(getReader(url));//TODO once merged, egons new reader needs to be used here } else if (type.equals(JCPFileFilter.mol)) { - cor = new MDLV2000Reader(instream); + cor = new MDLV2000Reader(getReader(url)); } else if (type.equals(JCPFileFilter.inchi)) { try { - cor = new INChIReader(new URL(url).openStream()); + cor = new INChIReader(new URL(urlString).openStream()); } catch (MalformedURLException e) { // These should not happen, since URL is built from a file before } catch (IOException e) { // These should not happen, since URL is built from a file before } } else if (type.equals(JCPFileFilter.rxn)) { - cor = new MDLRXNV2000Reader(instream); + cor = new MDLRXNV2000Reader(getReader(url)); } else if (type.equals(JCPFileFilter.smi)) { - cor = new SMILESReader(instream); + cor = new SMILESReader(getReader(url)); } } if (cor == null) { @@ -308,7 +327,7 @@ // entries if (cor instanceof MDLV2000Reader) { try { - BufferedReader in = new BufferedReader(instream); + BufferedReader in = new BufferedReader(getReader(url)); String line; while ((line = in.readLine()) != null) { if (line.equals("$$$$")) { Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java 2009-07-16 04:43:23 UTC (rev 14680) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java 2009-07-17 14:57:59 UTC (rev 14681) @@ -36,6 +36,9 @@ import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; + +import java.io.IOException; + import java.net.URL; import java.util.EventObject; import java.util.Vector; @@ -56,6 +59,7 @@ import org.openscience.cdk.PeriodicTableElement; import org.openscience.cdk.config.ElementPTFactory; import org.openscience.cdk.event.ICDKChangeListener; +import org.openscience.cdk.exception.CDKException; import org.openscience.cdk.tools.LoggingTool; import org.openscience.jchempaint.GT; /** @@ -369,8 +373,13 @@ */ private JButton createButton(String elementS) { - PeriodicTableElement element = factory.configure(new PeriodicTableElement(elementS)); - String colorFS = "000000"; + PeriodicTableElement element; + try { + element = factory.configure(new PeriodicTableElement(elementS)); + } catch (CDKException e) { + throw new RuntimeException (e); + } + String colorFS = "000000"; Color colorF = new Color(0,0,0); String colorPh = element.getPhase(); if(colorPh.equals("Solid")){ @@ -434,9 +443,13 @@ * *@return The selectedElement value */ - public Element getSelectedElement() - { - return PeriodicTableElement.configure(selectedElement); + public Element getSelectedElement() throws IOException, CDKException { + + ElementPTFactory eptf = ElementPTFactory.getInstance(); + return eptf.configure(selectedElement); + //or ? -> factory.configure(new PeriodicTableElement(selectedElement.getSymbol())); + + //return PeriodicTableElement.configure(selectedElement); } @@ -551,9 +564,13 @@ */ public ElementButton(PeriodicTableElement element) { - super("H"); - this.element = factory.configure(element); - } + super("H"); + try { + this.element = factory.configure(element); + } catch (CDKException e) { + throw new RuntimeException(e); + } + } /** * Constructor for the ElementButton object * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-07-29 15:46:41
|
Revision: 14687 http://cdk.svn.sourceforge.net/cdk/?rev=14687&view=rev Author: shk3 Date: 2009-07-29 15:46:30 +0000 (Wed, 29 Jul 2009) Log Message: ----------- started a automated gui testing Modified Paths: -------------- jchempaint/trunk/.classpath jchempaint/trunk/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/CreateSmilesAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/TextViewDialog.java Added Paths: ----------- jchempaint/trunk/lib/fest-assert-1.1.jar jchempaint/trunk/lib/fest-reflect-1.1.jar jchempaint/trunk/lib/fest-swing-1.2a2.jar jchempaint/trunk/lib/fest-util-1.1.jar jchempaint/trunk/lib/testng-5.10-jdk15.jar jchempaint/trunk/src/test/org/ jchempaint/trunk/src/test/org/openscience/ jchempaint/trunk/src/test/org/openscience/jchempaint/ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletTest.java Property Changed: ---------------- jchempaint/trunk/ Property changes on: jchempaint/trunk ___________________________________________________________________ Modified: svn:ignore - bin dist ant.properties build + bin dist ant.properties build test-output Modified: jchempaint/trunk/.classpath =================================================================== --- jchempaint/trunk/.classpath 2009-07-22 16:17:28 UTC (rev 14686) +++ jchempaint/trunk/.classpath 2009-07-29 15:46:30 UTC (rev 14687) @@ -1,11 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="org/openscience/jchempaint/TestEditor.java|org/openscience/jchempaint/TestRenderer.java" kind="src" path="src/main"/> + <classpathentry kind="src" path="src/test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="lib" path="lib/commons-cli.jar"/> <classpathentry kind="lib" path="lib/jfontchooser.jar"/> <classpathentry kind="lib" path="po/classes"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.openscience.cdk"/> + <classpathentry kind="lib" path="lib/fest-swing-1.2a2.jar"/> + <classpathentry kind="lib" path="lib/testng-5.10-jdk15.jar"/> + <classpathentry kind="lib" path="lib/fest-util-1.1.jar"/> + <classpathentry kind="lib" path="lib/fest-assert-1.1.jar"/> + <classpathentry kind="lib" path="lib/fest-reflect-1.1.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/jchempaint-primary"/> <classpathentry kind="output" path="bin"/> </classpath> Added: jchempaint/trunk/lib/fest-assert-1.1.jar =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/lib/fest-assert-1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/lib/fest-reflect-1.1.jar =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/lib/fest-reflect-1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/lib/fest-swing-1.2a2.jar =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/lib/fest-swing-1.2a2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/lib/fest-util-1.1.jar =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/lib/fest-util-1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/lib/testng-5.10-jdk15.jar =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/lib/testng-5.10-jdk15.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java 2009-07-22 16:17:28 UTC (rev 14686) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java 2009-07-29 15:46:30 UTC (rev 14687) @@ -74,6 +74,7 @@ protected JComponent createMenu(JChemPaintPanel jcpPanel, String key, boolean isPopup, String guiString) { logger.debug("Creating menu: ", key); JMenu menu = new JMenu(JCPMenuTextMaker.getInstance(jcpPanel.getGuistring()).getText(key)); + menu.setName(key); return createMenu(jcpPanel, key, isPopup, guiString, menu); } @@ -147,6 +148,7 @@ else { mi = new JMenuItem(translation); } + mi.setName(cmd); logger.debug("Created new menu item..."); String astr = JCPPropertyHandler.getInstance().getResourceString(cmd + JCPAction.actionSuffix); if (astr == null) { Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/CreateSmilesAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/CreateSmilesAction.java 2009-07-22 16:17:28 UTC (rev 14686) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/CreateSmilesAction.java 2009-07-29 15:46:30 UTC (rev 14687) @@ -66,6 +66,7 @@ if (dialog == null) { dialog = new TextViewDialog(frame, "SMILES", null, false, 40, 2); + dialog.setName("smilestextdialog"); } String smiles = ""; String chiralsmiles =""; Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/TextViewDialog.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/TextViewDialog.java 2009-07-22 16:17:28 UTC (rev 14686) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/TextViewDialog.java 2009-07-29 15:46:30 UTC (rev 14687) @@ -93,6 +93,7 @@ super(fr, title, true); textArea = new JTextArea(width,height); textArea.setEditable(false); + textArea.setName("textviewdialogtextarea"); if (wrap) { textArea.setLineWrap(wrap); textArea.setWrapStyleWord(true); Added: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletTest.java (rev 0) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletTest.java 2009-07-29 15:46:30 UTC (rev 14687) @@ -0,0 +1,41 @@ +package org.openscience.jchempaint; + +import java.util.HashMap; +import java.util.Map; + +import org.fest.swing.applet.AppletViewer; +import org.fest.swing.fixture.FrameFixture; +import org.fest.swing.launcher.AppletLauncher; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openscience.jchempaint.applet.JChemPaintEditorApplet; + +public class JCPEditorAppletTest { + private static AppletViewer viewer; + private static FrameFixture applet; + + + @BeforeClass public static void setUp() { + Map<String, String> parameters = new HashMap<String, String>(); + parameters.put("smiles", "CCCCCCCC"); + viewer = AppletLauncher.applet(new JChemPaintEditorApplet()) + .withParameters(parameters) + .start(); + applet = new FrameFixture(viewer); + applet.show(); + } + + @Test public void testReportSmiles() { + applet.menuItem("createSMILES").click(); + String text = applet.dialog("smilestextdialog").textBox("textviewdialogtextarea").text(); + Assert.assertTrue(text.indexOf("CCCCCCCC")>-1); + Assert.assertTrue(text.indexOf("[H]C([H])([H])C([H])([H])C([H])([H])C([H])([H])C([H])([H])C([H])([H])C([H])([H])C([H])([H])[H]")>-1); + } + + @AfterClass public static void tearDown() { + viewer.unloadApplet(); + applet.cleanUp(); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-08-13 09:52:34
|
Revision: 14716 http://cdk.svn.sourceforge.net/cdk/?rev=14716&view=rev Author: mark_rynbeek Date: 2009-08-13 09:52:22 +0000 (Thu, 13 Aug 2009) Log Message: ----------- added (temporary) zoom buttons Modified Paths: -------------- jchempaint/trunk/.classpath jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_applet.properties jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties Added Paths: ----------- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/zoomin.gif jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/zoomout.gif Modified: jchempaint/trunk/.classpath =================================================================== --- jchempaint/trunk/.classpath 2009-08-12 19:25:24 UTC (rev 14715) +++ jchempaint/trunk/.classpath 2009-08-13 09:52:22 UTC (rev 14716) @@ -12,6 +12,6 @@ <classpathentry kind="lib" path="lib/fest-util-1.1.jar"/> <classpathentry kind="lib" path="lib/fest-assert-1.1.jar"/> <classpathentry kind="lib" path="lib/fest-reflect-1.1.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/jchempaint-primary"/> + <classpathentry combineaccessrules="false" kind="src" path="/org.openscience.cdk"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_applet.properties =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_applet.properties 2009-08-12 19:25:24 UTC (rev 14715) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_applet.properties 2009-08-13 09:52:22 UTC (rev 14716) @@ -100,7 +100,7 @@ # toolbar definition # ####################################################### -uppertoolbar=select lasso eraser undo redo plus minus move +uppertoolbar=select lasso eraser undo redo zoomin zoomout plus minus move righttoolbar=periodictable enterelement C H O N P S F Cl Br I lowertoolbar=triangle square pentagon hexagon heptagon octagon benzene lefttoolbar=bond up_bond down_bond Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties 2009-08-12 19:25:24 UTC (rev 14715) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties 2009-08-13 09:52:22 UTC (rev 14716) @@ -72,6 +72,8 @@ undoImage=resources/small-bin/undo.gif redoImage=resources/small-bin/redo.gif atomatommappingImage=resources/small-bin/atomatommap.gif +zoominImage=resources/small-bin/zoomin.gif +zoomoutImage=resources/small-bin/zoomout.gif ####################################################### # Action definition # ####################################################### @@ -240,6 +242,8 @@ undoLabel=undo redoLabel=redo mapLabel=Map two atoms +zoomin=Zoom in +zoomout=Zoom out ####################################################### # Default settings for JChemPaint # Added: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/zoomin.gif =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/zoomin.gif ___________________________________________________________________ Added: svn:mime-type + image/gif Added: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/zoomout.gif =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/zoomout.gif ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + image/gif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-08-17 17:06:50
|
Revision: 14732 http://cdk.svn.sourceforge.net/cdk/?rev=14732&view=rev Author: shk3 Date: 2009-08-17 17:06:44 +0000 (Mon, 17 Aug 2009) Log Message: ----------- everyting in jcp needed for the undefined stereo stuff Modified Paths: -------------- jchempaint/trunk/.classpath jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeModeAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/CopyPasteAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_applet.properties jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_stable.properties jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties Added Paths: ----------- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/undefined_bond.gif jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/undefined_stereo_bond.gif Modified: jchempaint/trunk/.classpath =================================================================== --- jchempaint/trunk/.classpath 2009-08-17 14:45:41 UTC (rev 14731) +++ jchempaint/trunk/.classpath 2009-08-17 17:06:44 UTC (rev 14732) @@ -12,6 +12,6 @@ <classpathentry kind="lib" path="lib/fest-util-1.1.jar"/> <classpathentry kind="lib" path="lib/fest-assert-1.1.jar"/> <classpathentry kind="lib" path="lib/fest-reflect-1.1.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.openscience.cdk"/> + <classpathentry combineaccessrules="false" kind="src" path="/jchempaint-primary"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeModeAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeModeAction.java 2009-08-17 14:45:41 UTC (rev 14731) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeModeAction.java 2009-08-17 17:06:44 UTC (rev 14732) @@ -107,6 +107,14 @@ hub.setActiveDrawModule(new AlterBondStereoModule( hub, Direction.DOWN)); hub.getController2DModel().setDrawElement("C"); + } else if (type.equals("undefined_bond")) { + hub.setActiveDrawModule(new AlterBondStereoModule( + hub, Direction.UNDEFINED)); + hub.getController2DModel().setDrawElement("C"); + } else if (type.equals("undefined_stereo_bond")) { + hub.setActiveDrawModule(new AlterBondStereoModule( + hub, Direction.EZ_UNDEFINED)); + hub.getController2DModel().setDrawElement("C"); } else if (type.equals("triangle")) { hub.setActiveDrawModule(new AddRingModule(hub, 3, false)); hub.getController2DModel().setDrawElement("C"); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/CopyPasteAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/CopyPasteAction.java 2009-08-17 14:45:41 UTC (rev 14731) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/CopyPasteAction.java 2009-08-17 17:06:44 UTC (rev 14732) @@ -64,6 +64,7 @@ import org.openscience.cdk.interfaces.IMolecule; import org.openscience.cdk.interfaces.IReaction; import org.openscience.cdk.io.IChemObjectWriter; +import org.openscience.cdk.io.INChIPlainTextReader; import org.openscience.cdk.io.ISimpleChemObjectReader; import org.openscience.cdk.io.MDLV2000Reader; import org.openscience.cdk.io.MDLWriter; @@ -193,23 +194,21 @@ ); sdg.generateCoordinates(); } catch (Exception ex) { - if (content.startsWith("InChI")) { // handle it as an InChI + if (content.indexOf("INChI")>-1) { // handle it as an InChI try { - InChIGeneratorFactory inchiFactory = new InChIGeneratorFactory(); - InChIToStructure inchiToStructure = inchiFactory.getInChIToStructure(content,jcpPanel.getChemModel().getBuilder()); - INCHI_RET status = inchiToStructure.getReturnStatus(); - if (status == INCHI_RET.OKAY) { - IAtomContainer atomContainer = inchiToStructure.getAtomContainer(); - toPaste = atomContainer.getBuilder().newMolecule(atomContainer); - StructureDiagramGenerator sdg = - new StructureDiagramGenerator((IMolecule)toPaste); + StringReader sr = new StringReader(content); + INChIPlainTextReader inchireader = new INChIPlainTextReader(sr); + IChemFile mol = DefaultChemObjectBuilder.getInstance().newChemFile(); + toPaste = ((IChemFile) inchireader.read(mol)).getChemSequence(0).getChemModel(0).getMoleculeSet().getMolecule(0); + StructureDiagramGenerator sdg = + new StructureDiagramGenerator((IMolecule)toPaste); - sdg.setTemplateHandler( - new TemplateHandler(toPaste.getBuilder()) - ); - sdg.generateCoordinates(); } - } catch (Exception e2) { - //we do nothing + sdg.setTemplateHandler( + new TemplateHandler(toPaste.getBuilder()) + ); + sdg.generateCoordinates(); + } catch (Exception e2) { + e2.printStackTrace(); } } } Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_applet.properties =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_applet.properties 2009-08-17 14:45:41 UTC (rev 14731) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_applet.properties 2009-08-17 17:06:44 UTC (rev 14732) @@ -103,6 +103,6 @@ uppertoolbar=select lasso eraser undo redo zoomin zoomout plus minus move righttoolbar=periodictable enterelement C H O N P S F Cl Br I lowertoolbar=triangle square pentagon hexagon heptagon octagon benzene -lefttoolbar=bond up_bond down_bond +lefttoolbar=bond up_bond down_bond undefined_bond undefined_stereo_bond Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_stable.properties =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_stable.properties 2009-08-17 14:45:41 UTC (rev 14731) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_stable.properties 2009-08-17 17:06:44 UTC (rev 14732) @@ -100,10 +100,10 @@ # toolbar definition # ####################################################### -uppertoolbar=select lasso eraser undo redo plus minus move +uppertoolbar=select lasso eraser undo redo zoomin zoomout plus minus move righttoolbar=periodictable enterelement C H O N P S F Cl Br I lowertoolbar=triangle square pentagon hexagon heptagon octagon benzene -lefttoolbar=bond up_bond down_bond +lefttoolbar=bond up_bond down_bond undefined_bond undefined_stereo_bond #open saveAs cyclesymbol move cleanup atomatommapping Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties 2009-08-17 14:45:41 UTC (rev 14731) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties 2009-08-17 17:06:44 UTC (rev 14732) @@ -64,6 +64,8 @@ rotationImage=resources/small-bin/rotation.gif up_bondImage=resources/small-bin/up_bond.gif down_bondImage=resources/small-bin/down_bond.gif +undefined_bondImage=resources/small-bin/undefined_bond.gif +undefined_stereo_bondImage=resources/small-bin/undefined_stereo_bond.gif normalizeImage=resources/small-bin/normalize.gif undoImage=resources/small-bin/undo.gif redoImage=resources/small-bin/redo.gif @@ -211,6 +213,8 @@ benzeneAction=org.openscience.jchempaint.action.ChangeModeAction@benzene up_bondAction=org.openscience.jchempaint.action.ChangeModeAction@up_bond down_bondAction=org.openscience.jchempaint.action.ChangeModeAction@down_bond +undefined_bondAction=org.openscience.jchempaint.action.ChangeModeAction@undefined_bond +undefined_stereo_bondAction=org.openscience.jchempaint.action.ChangeModeAction@undefined_stereo_bond atomatommappingAction=org.openscience.jchempaint.action.ChangeModeAction@atomatommapping ####################################################### @@ -238,6 +242,8 @@ rotationLabel=rotation up_bondLabel=up_bond down_bondLabel=down_bond +undefined_bondLabel=undefined_bond +undefined_stereo_bondLabel=undefined_stereo_bond normalizeLabel=normalize undoLabel=undo redoLabel=redo Added: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/undefined_bond.gif =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/undefined_bond.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/undefined_stereo_bond.gif =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/small-bin/undefined_stereo_bond.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-08-24 11:17:58
|
Revision: 14755 http://cdk.svn.sourceforge.net/cdk/?rev=14755&view=rev Author: shk3 Date: 2009-08-24 11:17:47 +0000 (Mon, 24 Aug 2009) Log Message: ----------- reorganized the build process a bit Modified Paths: -------------- jchempaint/trunk/.classpath jchempaint/trunk/build.xml Removed Paths: ------------- jchempaint/trunk/lib/testng-5.10-jdk15.jar Modified: jchempaint/trunk/.classpath =================================================================== --- jchempaint/trunk/.classpath 2009-08-21 12:46:47 UTC (rev 14754) +++ jchempaint/trunk/.classpath 2009-08-24 11:17:47 UTC (rev 14755) @@ -8,7 +8,6 @@ <classpathentry kind="lib" path="lib/jfontchooser.jar"/> <classpathentry kind="lib" path="po/classes"/> <classpathentry kind="lib" path="lib/fest-swing-1.2a2.jar"/> - <classpathentry kind="lib" path="lib/testng-5.10-jdk15.jar"/> <classpathentry kind="lib" path="lib/fest-util-1.1.jar"/> <classpathentry kind="lib" path="lib/fest-assert-1.1.jar"/> <classpathentry kind="lib" path="lib/fest-reflect-1.1.jar"/> Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-08-21 12:46:47 UTC (rev 14754) +++ jchempaint/trunk/build.xml 2009-08-24 11:17:47 UTC (rev 14755) @@ -93,6 +93,7 @@ <include name="**/*" /> </fileset> </unjar> + <delete dir="${dist-classes}/META-INF" /> </target> <target id="unjar-cdkjars" name="unjar-cdkjars"> @@ -153,6 +154,7 @@ </fileset> </unjar> + <delete dir="${dist-classes}/META-INF" /> </target> <target id="compile-jcp" name="compile-jcp"> @@ -265,6 +267,8 @@ <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_tools.jar" includepattern="org/openscience/cdk/tools/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_structgen.jar" includepattern="org/openscience/cdk/structgen/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_nonotify.jar" includepattern="org/openscience/cdk/nonotify/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_modeling.jar" includepattern="org/openscience/cdk/modeling/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_controller.jar" includepattern="org/openscience/cdk/controller/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar" includepattern="org/openscience/cdk/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience.jar" includepattern="org/openscience/**"/> @@ -272,12 +276,16 @@ <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_apache.jar" includepattern="org/apache/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_omegahat.jar" includepattern="org/omegahat/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_w3c.jar" includepattern="org/w3c/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_fest.jar" includepattern="org/fest/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_jaxen.jar" includepattern="org/jaxen/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_xmlcml.jar" includepattern="org/xmlcml/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org.jar" includepattern="org/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-com_ozten.jar" includepattern="com/ozten/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-Jama.jar" includepattern="Jama/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-jas.jar" includepattern="jas/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-javax_vecmath.jar" includepattern="javax/vecmath/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-nu.jar" includepattern="nu/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-bsh.jar" includepattern="bsh/**"/> <!-- the following jar contains all other classes and resources --> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-others.jar" includepattern="**/*"/> <!-- the main jar file is packed from a list, but it must be packed as last file because it contains INDEX.LIST --> Deleted: jchempaint/trunk/lib/testng-5.10-jdk15.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-04 10:06:01
|
Revision: 14792 http://cdk.svn.sourceforge.net/cdk/?rev=14792&view=rev Author: shk3 Date: 2009-09-04 10:05:52 +0000 (Fri, 04 Sep 2009) Log Message: ----------- some size optimizations Modified Paths: -------------- jchempaint/trunk/EditorApplet.html jchempaint/trunk/META-INF/applet-core.files jchempaint/trunk/META-INF/applet-editor.files jchempaint/trunk/META-INF/applet-viewer-opts.files jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java Modified: jchempaint/trunk/EditorApplet.html =================================================================== --- jchempaint/trunk/EditorApplet.html 2009-09-03 13:43:32 UTC (rev 14791) +++ jchempaint/trunk/EditorApplet.html 2009-09-04 10:05:52 UTC (rev 14792) @@ -13,7 +13,7 @@ <applet code="org.openscience.jchempaint.applet.JChemPaintEditorApplet" archive="dist/jar/jchempaint-applet-core.jar" name="Editor" width="600" height="500"> -<param name="load" value="applettests/big.mol"--> +<!--param name="load" value="applettests/big.mol"--> <param name="impliciths" value="true"> </applet> <a href="javascript:alert(document.Editor.getMolFile())">show mol file</a> Modified: jchempaint/trunk/META-INF/applet-core.files =================================================================== --- jchempaint/trunk/META-INF/applet-core.files 2009-09-03 13:43:32 UTC (rev 14791) +++ jchempaint/trunk/META-INF/applet-core.files 2009-09-04 10:05:52 UTC (rev 14792) @@ -77,6 +77,8 @@ org/openscience/cdk/atomtype/CDKAtomTypeMatcher.class org/openscience/cdk/AtomType.class org/openscience/cdk/atomtype/IAtomTypeMatcher.class +org/openscience/cdk/Bond$1.class +org/openscience/cdk/Bond$AtomsIterator.class org/openscience/cdk/Bond.class org/openscience/cdk/CDKConstants.class org/openscience/cdk/ChemModel.class @@ -122,6 +124,7 @@ org/openscience/cdk/graph/ConnectivityChecker.class org/openscience/cdk/graph/MoleculeGraphs.class org/openscience/cdk/graph/PathTools.class +org/openscience/cdk/graph/SpanningTree.class org/openscience/cdk/interfaces/IAdductFormula.class org/openscience/cdk/interfaces/IAminoAcid.class org/openscience/cdk/interfaces/IAtom.class @@ -291,6 +294,7 @@ org/openscience/cdk/renderer/elements/TextGroupElement.class org/openscience/cdk/renderer/elements/TextGroupElement$Position.class org/openscience/cdk/renderer/elements/WedgeLineElement.class +org/openscience/cdk/renderer/elements/WigglyLineElement.class org/openscience/cdk/renderer/font/AbstractFontManager.class org/openscience/cdk/renderer/font/AWTFontManager.class org/openscience/cdk/renderer/font/IFontManager.class @@ -322,6 +326,9 @@ org/openscience/cdk/renderer/RenderingParameters$AtomShape.class org/openscience/cdk/renderer/RenderingParameters.class org/openscience/cdk/renderer/selection/IChemObjectSelection.class +org/openscience/cdk/renderer/selection/IncrementalSelection.class +org/openscience/cdk/renderer/selection/LogicalSelection.class +org/openscience/cdk/renderer/selection/LogicalSelection$Type.class org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.class org/openscience/cdk/renderer/visitor/AWTDrawVisitor$1.class org/openscience/cdk/renderer/visitor/AWTDrawVisitor.class Modified: jchempaint/trunk/META-INF/applet-editor.files =================================================================== --- jchempaint/trunk/META-INF/applet-editor.files 2009-09-03 13:43:32 UTC (rev 14791) +++ jchempaint/trunk/META-INF/applet-editor.files 2009-09-04 10:05:52 UTC (rev 14792) @@ -1,13 +1,9 @@ javax/vecmath/Point2d.class javax/vecmath/Point2f.class javax/vecmath/Point3d.class -javax/vecmath/Point3f.class -javax/vecmath/Point4d.class javax/vecmath/Tuple2d.class javax/vecmath/Tuple2f.class javax/vecmath/Tuple3d.class -javax/vecmath/Tuple3f.class -javax/vecmath/Tuple4d.class javax/vecmath/Vector2d.class javax/vecmath/Vector2f.class javax/vecmath/Vector3d.class @@ -54,11 +50,6 @@ org/_3pq/jgrapht/traverse/CrossComponentIterator$UndirectedSpecifics.class org/_3pq/jgrapht/traverse/GraphIterator.class org/_3pq/jgrapht/UndirectedGraph.class -org/apache/commons/cli/CommandLineParser.class -org/apache/commons/cli/ParseException.class -org/apache/commons/cli/Parser.class -org/apache/commons/cli/PosixParser.class -org/apache/commons/cli/UnrecognizedOptionException.class org/openscience/cdk/Atom.class org/openscience/cdk/AtomContainer$1.class org/openscience/cdk/AtomContainer$2.class @@ -105,13 +96,11 @@ org/openscience/cdk/controller/IMouseEventRelay.class org/openscience/cdk/controller/IViewEventRelay.class org/openscience/cdk/controller/PhantomBondGenerator.class -org/openscience/cdk/controller/RemoveModule.class org/openscience/cdk/controller/SwingMouseEventRelay.class org/openscience/cdk/controller/undoredo/AddAtomsAndBondsEdit.class org/openscience/cdk/controller/undoredo/IUndoListener.class org/openscience/cdk/controller/undoredo/IUndoRedoable.class org/openscience/cdk/controller/undoredo/IUndoRedoFactory.class -org/openscience/cdk/controller/undoredo/RemoveAtomsAndBondsEdit.class org/openscience/cdk/controller/undoredo/UndoRedoHandler.class org/openscience/cdk/controller/ZoomModule.class org/openscience/cdk/DefaultChemObjectBuilder.class @@ -175,130 +164,24 @@ org/openscience/cdk/interfaces/IRingSet.class org/openscience/cdk/interfaces/ISingleElectron.class org/openscience/cdk/interfaces/IStrand.class -org/openscience/cdk/io/CMLReader.class org/openscience/cdk/io/DefaultChemObjectReader.class -org/openscience/cdk/io/FormatFactory.class -org/openscience/cdk/io/formats/ABINITFormat.class -org/openscience/cdk/io/formats/Aces2Format.class -org/openscience/cdk/io/formats/ADFFormat.class -org/openscience/cdk/io/formats/AlchemyFormat.class -org/openscience/cdk/io/formats/BGFFormat.class -org/openscience/cdk/io/formats/BSFormat.class -org/openscience/cdk/io/formats/CacaoCartesianFormat.class -org/openscience/cdk/io/formats/CacaoInternalFormat.class -org/openscience/cdk/io/formats/CACheFormat.class -org/openscience/cdk/io/formats/CDKSourceCodeFormat.class -org/openscience/cdk/io/formats/Chem3D_Cartesian_1Format.class -org/openscience/cdk/io/formats/Chem3D_Cartesian_2Format.class -org/openscience/cdk/io/formats/ChemDrawFormat.class -org/openscience/cdk/io/formats/ChemtoolFormat.class -org/openscience/cdk/io/formats/CIFFormat.class -org/openscience/cdk/io/formats/CMLFormat.class -org/openscience/cdk/io/formats/CMLRSSFormat.class -org/openscience/cdk/io/formats/CRK2DFormat.class -org/openscience/cdk/io/formats/CRK3DFormat.class -org/openscience/cdk/io/formats/CrystClustFormat.class -org/openscience/cdk/io/formats/CTXFormat.class -org/openscience/cdk/io/formats/DaltonFormat.class -org/openscience/cdk/io/formats/DMol3Format.class -org/openscience/cdk/io/formats/DOCK5Format.class -org/openscience/cdk/io/formats/FenskeHall_ZMatrixFormat.class -org/openscience/cdk/io/formats/FingerprintFormat.class -org/openscience/cdk/io/formats/GamessFormat.class -org/openscience/cdk/io/formats/Gaussian03Format.class -org/openscience/cdk/io/formats/Gaussian90Format.class -org/openscience/cdk/io/formats/Gaussian92Format.class -org/openscience/cdk/io/formats/Gaussian94Format.class -org/openscience/cdk/io/formats/Gaussian95Format.class -org/openscience/cdk/io/formats/Gaussian98Format.class -org/openscience/cdk/io/formats/GaussianInputFormat.class -org/openscience/cdk/io/formats/GhemicalMMFormat.class -org/openscience/cdk/io/formats/GhemicalSPMFormat.class -org/openscience/cdk/io/formats/GROMOS96Format.class -org/openscience/cdk/io/formats/HINFormat.class -org/openscience/cdk/io/formats/IChemFormat.class -org/openscience/cdk/io/formats/IChemFormatMatcher.class -org/openscience/cdk/io/formats/INChIFormat.class -org/openscience/cdk/io/formats/INChIPlainTextFormat.class -org/openscience/cdk/io/formats/IResourceFormat.class -org/openscience/cdk/io/formats/JaguarFormat.class -org/openscience/cdk/io/formats/JMEFormat.class -org/openscience/cdk/io/formats/MacroModelFormat.class -org/openscience/cdk/io/formats/MDLFormat.class -org/openscience/cdk/io/formats/MDLRXNFormat.class -org/openscience/cdk/io/formats/MDLRXNV3000Format.class -org/openscience/cdk/io/formats/MDLV2000Format.class -org/openscience/cdk/io/formats/MDLV3000Format.class -org/openscience/cdk/io/formats/MMODFormat.class -org/openscience/cdk/io/formats/Mol2Format.class -org/openscience/cdk/io/formats/MOPAC2002Format.class -org/openscience/cdk/io/formats/MOPAC7Format.class -org/openscience/cdk/io/formats/MOPAC93Format.class -org/openscience/cdk/io/formats/MOPAC97Format.class -org/openscience/cdk/io/formats/MPQCFormat.class -org/openscience/cdk/io/formats/NWChemFormat.class -org/openscience/cdk/io/formats/PCModelFormat.class -org/openscience/cdk/io/formats/PDBFormat.class -org/openscience/cdk/io/formats/PDBMLFormat.class -org/openscience/cdk/io/formats/PMPFormat.class -org/openscience/cdk/io/formats/POVRayFormat.class -org/openscience/cdk/io/formats/PQSChemFormat.class -org/openscience/cdk/io/formats/PubChemASNFormat.class -org/openscience/cdk/io/formats/PubChemCompoundsXMLFormat.class -org/openscience/cdk/io/formats/PubChemCompoundXMLFormat.class -org/openscience/cdk/io/formats/PubChemFormat.class -org/openscience/cdk/io/formats/PubChemSubstancesASNFormat.class -org/openscience/cdk/io/formats/PubChemSubstancesXMLFormat.class -org/openscience/cdk/io/formats/PubChemSubstanceXMLFormat.class -org/openscience/cdk/io/formats/QChemFormat.class -org/openscience/cdk/io/formats/RawCopyFormat.class -org/openscience/cdk/io/formats/SDFFormat.class -org/openscience/cdk/io/formats/ShelXFormat.class -org/openscience/cdk/io/formats/SMARTSFormat.class -org/openscience/cdk/io/formats/SMILESFIXFormat.class -org/openscience/cdk/io/formats/SMILESFormat.class -org/openscience/cdk/io/formats/SpartanFormat.class -org/openscience/cdk/io/formats/SVGFormat.class -org/openscience/cdk/io/formats/SybylDescriptorFormat.class -org/openscience/cdk/io/formats/TinkerMM2Format.class -org/openscience/cdk/io/formats/TinkerXYZFormat.class -org/openscience/cdk/io/formats/TurboMoleFormat.class -org/openscience/cdk/io/formats/UniChemXYZFormat.class -org/openscience/cdk/io/formats/VASPFormat.class -org/openscience/cdk/io/formats/ViewmolFormat.class -org/openscience/cdk/io/formats/XEDFormat.class -org/openscience/cdk/io/formats/XYZFormat.class -org/openscience/cdk/io/formats/YasaraFormat.class -org/openscience/cdk/io/formats/ZindoFormat.class -org/openscience/cdk/io/formats/ZMatrixFormat.class org/openscience/cdk/io/IChemObjectIO.class org/openscience/cdk/io/IChemObjectReader.class -org/openscience/cdk/io/IChemObjectReader$Mode.class org/openscience/cdk/io/IChemObjectWriter.class org/openscience/cdk/io/ISimpleChemObjectReader.class org/openscience/cdk/io/listener/IChemObjectIOListener.class org/openscience/cdk/io/MDLV2000Reader.class -org/openscience/cdk/io/ReaderFactory.class -org/openscience/cdk/io/setting/BooleanIOSetting.class -org/openscience/cdk/io/setting/IOSetting.class org/openscience/cdk/Isotope.class org/openscience/cdk/layout/AtomPlacer$1.class org/openscience/cdk/layout/AtomPlacer.class org/openscience/cdk/layout/RingPlacer.class org/openscience/cdk/Molecule.class org/openscience/cdk/MoleculeSet.class -org/openscience/cdk/nonotify/NNElement.class -org/openscience/cdk/nonotify/NNIsotope.class -org/openscience/cdk/nonotify/NNMolecularFormula.class -org/openscience/cdk/nonotify/NoNotificationChemObjectBuilder.class org/openscience/cdk/PseudoAtom.class -org/openscience/cdk/Reaction.class org/openscience/cdk/renderer/AtomContainerRenderer.class -org/openscience/cdk/renderer/BoundsCalculator.class org/openscience/cdk/renderer/color/CDK2DAtomColors.class org/openscience/cdk/renderer/color/IAtomColorer.class org/openscience/cdk/renderer/elements/ArrowElement.class -org/openscience/cdk/renderer/elements/AtomSymbolElement.class org/openscience/cdk/renderer/elements/ElementGroup.class org/openscience/cdk/renderer/elements/IRenderingElement.class org/openscience/cdk/renderer/elements/IRenderingVisitor.class @@ -310,12 +193,12 @@ org/openscience/cdk/renderer/elements/TextGroupElement.class org/openscience/cdk/renderer/elements/TextGroupElement$Position.class org/openscience/cdk/renderer/elements/WedgeLineElement.class +org/openscience/cdk/renderer/elements/WigglyLineElement.class org/openscience/cdk/renderer/font/AbstractFontManager.class org/openscience/cdk/renderer/font/AWTFontManager.class org/openscience/cdk/renderer/font/IFontManager.class org/openscience/cdk/renderer/font/IFontManager$FontStyle.class org/openscience/cdk/renderer/generators/BasicAtomGenerator.class -org/openscience/cdk/renderer/generators/BasicBondGenerator$1.class org/openscience/cdk/renderer/generators/BasicBondGenerator.class org/openscience/cdk/renderer/generators/ExtendedAtomGenerator.class org/openscience/cdk/renderer/generators/ExternalHighlightGenerator.class @@ -333,7 +216,6 @@ org/openscience/cdk/renderer/generators/ReactionBoxGenerator.class org/openscience/cdk/renderer/generators/ReactionPlusGenerator.class org/openscience/cdk/renderer/generators/RingGenerator.class -org/openscience/cdk/renderer/generators/SelectAtomGenerator$1.class org/openscience/cdk/renderer/generators/SelectAtomGenerator.class org/openscience/cdk/renderer/generators/SelectBondGenerator.class org/openscience/cdk/renderer/IRenderer.class @@ -345,9 +227,10 @@ org/openscience/cdk/renderer/selection/AbstractSelection.class org/openscience/cdk/renderer/selection/IChemObjectSelection.class org/openscience/cdk/renderer/selection/IncrementalSelection.class +org/openscience/cdk/renderer/selection/LogicalSelection.class +org/openscience/cdk/renderer/selection/LogicalSelection$Type.class org/openscience/cdk/renderer/selection/RectangleSelection.class org/openscience/cdk/renderer/selection/ShapeSelection.class -org/openscience/cdk/renderer/selection/SingleSelection.class org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.class org/openscience/cdk/renderer/visitor/AWTDrawVisitor$1.class org/openscience/cdk/renderer/visitor/AWTDrawVisitor.class @@ -360,39 +243,37 @@ org/openscience/cdk/ringsearch/SSSRFinder.class org/openscience/cdk/RingSet.class org/openscience/cdk/smiles/SmilesParser.class -org/openscience/cdk/tools/CDKHydrogenAdder.class org/openscience/cdk/tools/LoggingTool.class +org/openscience/cdk/tools/manipulator/AtomContainerManipulator.class org/openscience/cdk/tools/manipulator/AtomContainerSetManipulator.class org/openscience/cdk/tools/manipulator/ChemModelManipulator.class org/openscience/cdk/tools/manipulator/MolecularFormulaManipulator.class org/openscience/cdk/tools/manipulator/MoleculeSetManipulator.class org/openscience/cdk/tools/manipulator/RingSetManipulator.class -org/openscience/cdk/validate/IValidator.class org/openscience/cdk/validate/ProblemMarker.class org/openscience/jchempaint/AbstractJChemPaintPanel.class org/openscience/jchempaint/action/AboutAction.class org/openscience/jchempaint/action/AddHydrogenAction.class org/openscience/jchempaint/action/AdjustBondOrdersAction.class org/openscience/jchempaint/action/ChangeAtomSymbolAction.class +org/openscience/jchempaint/action/ChangeBondAction.class org/openscience/jchempaint/action/ChangeIsotopeAction.class org/openscience/jchempaint/action/ChangeModeAction.class +org/openscience/jchempaint/action/ChargeAction.class org/openscience/jchempaint/action/CleanupAction.class org/openscience/jchempaint/action/ConvertToPseudoAtomAction.class org/openscience/jchempaint/action/ConvertToRadicalAction.class org/openscience/jchempaint/action/CopyPasteAction.class org/openscience/jchempaint/action/CopyPasteAction$JcpSelection.class org/openscience/jchempaint/action/CreateInChIAction.class -org/openscience/jchempaint/action/CreateReactionAction.class org/openscience/jchempaint/action/CreateSmilesAction.class org/openscience/jchempaint/action/EditAtomContainerPropsAction.class org/openscience/jchempaint/action/EditChemObjectPropsAction.class org/openscience/jchempaint/action/ExportAction.class org/openscience/jchempaint/action/FlipAction.class org/openscience/jchempaint/action/HelpAction.class -org/openscience/jchempaint/action/InsertStructureAction.class org/openscience/jchempaint/action/JCPAction.class org/openscience/jchempaint/action/LicenseAction.class -org/openscience/jchempaint/action/MenuBarAction.class org/openscience/jchempaint/action/ModifyDisplaySettingsAction.class org/openscience/jchempaint/action/ModifyGeneralSettingsAction.class org/openscience/jchempaint/action/NewAction.class @@ -402,14 +283,10 @@ org/openscience/jchempaint/action/RedoAction.class org/openscience/jchempaint/action/SaveAction.class org/openscience/jchempaint/action/SaveAsAction.class -org/openscience/jchempaint/action/StatusBarAction.class -org/openscience/jchempaint/action/ToolBarAction.class org/openscience/jchempaint/action/UndoAction.class -org/openscience/jchempaint/action/ValidateAction.class org/openscience/jchempaint/action/ZoomAction.class org/openscience/jchempaint/applet/JChemPaintAbstractApplet.class org/openscience/jchempaint/applet/JChemPaintEditorApplet.class -org/openscience/jchempaint/application/JChemPaint.class org/openscience/jchempaint/dialog/editor/AtomContainerEditor.class org/openscience/jchempaint/dialog/editor/AtomEditor.class org/openscience/jchempaint/dialog/editor/BondEditor.class @@ -435,5 +312,4 @@ org/openscience/jchempaint/StringHelper.class org/openscience/jchempaint/SwingPopupModule.class org/openscience/jchempaint/undoredo/SwingAddAtomsAndBondsEdit.class -org/openscience/jchempaint/undoredo/SwingRemoveAtomsAndBondsEdit.class org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.class Modified: jchempaint/trunk/META-INF/applet-viewer-opts.files =================================================================== --- jchempaint/trunk/META-INF/applet-viewer-opts.files 2009-09-03 13:43:32 UTC (rev 14791) +++ jchempaint/trunk/META-INF/applet-viewer-opts.files 2009-09-04 10:05:52 UTC (rev 14792) @@ -1,2 +1 @@ -org/openscience/cdk/config/data/isotopes.xml org/openscience/jchempaint/JExternalFrame.class \ No newline at end of file Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-09-03 13:43:32 UTC (rev 14791) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-09-04 10:05:52 UTC (rev 14792) @@ -47,7 +47,6 @@ import javax.swing.undo.UndoManager; import javax.swing.undo.UndoableEdit; -import org.openscience.cdk.CDKConstants; import org.openscience.cdk.config.IsotopeFactory; import org.openscience.cdk.controller.ControllerHub; import org.openscience.cdk.controller.ControllerModel; @@ -59,11 +58,9 @@ import org.openscience.cdk.controller.undoredo.UndoRedoHandler; import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IAtomContainer; -import org.openscience.cdk.interfaces.IBond; import org.openscience.cdk.interfaces.IChemModel; import org.openscience.cdk.interfaces.IMolecularFormula; import org.openscience.cdk.interfaces.IMoleculeSet; -import org.openscience.cdk.nonotify.NoNotificationChemObjectBuilder; import org.openscience.cdk.renderer.Renderer; import org.openscience.cdk.renderer.font.AWTFontManager; import org.openscience.cdk.renderer.generators.AtomContainerBoundsGenerator; @@ -377,8 +374,8 @@ IChemModel chemModel = hub.getIChemModel(); IMoleculeSet molecules = chemModel.getMoleculeSet(); if (molecules != null && molecules.getAtomContainerCount() > 0) { - IMolecularFormula wholeModel = NoNotificationChemObjectBuilder - .getInstance().newMolecularFormula(); + IMolecularFormula wholeModel = hub.getIChemModel().getBuilder() + .newMolecularFormula(); Iterator<IAtomContainer> containers = ChemModelManipulator .getAllAtomContainers(chemModel).iterator(); int implicitHs = 0; @@ -401,9 +398,7 @@ String formula = MolecularFormulaManipulator.getHTML( wholeModel, true, false); - status = makeStatusBarString(formula, implicitHs, - MolecularFormulaManipulator - .getNaturalExactMass(wholeModel)); + status = makeStatusBarString(formula, implicitHs); } } else if (position == 2) { // depict brutto formula of the selected molecule or part of @@ -423,8 +418,7 @@ String formula = MolecularFormulaManipulator .getHTML(MolecularFormulaManipulator .getMolecularFormula(ac), true, false); - status = makeStatusBarString(formula, implicitHs, - AtomContainerManipulator.getNaturalExactMass(ac)); + status = makeStatusBarString(formula, implicitHs); } } } else if (position == 3) { @@ -436,15 +430,13 @@ return status; } - private String makeStatusBarString(String formula, int implicitHs, - double mass) { + private String makeStatusBarString(String formula, int implicitHs) { DecimalFormat df1 = new DecimalFormat("####.0000"); return "<html>" + formula + (implicitHs == 0 ? "" : " ( " + implicitHs + " " + GT._("Hs implicit") + ")") - + (mass > .1 ? " (" + GT._("mass") + " " + df1.format(mass) - + ")" : "") + "</html>"; + + "</html>"; } public Renderer getRenderer() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-04 11:17:25
|
Revision: 14794 http://cdk.svn.sourceforge.net/cdk/?rev=14794&view=rev Author: shk3 Date: 2009-09-04 11:17:13 +0000 (Fri, 04 Sep 2009) Log Message: ----------- the core resources for the applet now go in an extra jar Modified Paths: -------------- jchempaint/trunk/.classpath jchempaint/trunk/build.xml Added Paths: ----------- jchempaint/trunk/META-INF/applet-resources-core.files Modified: jchempaint/trunk/.classpath =================================================================== --- jchempaint/trunk/.classpath 2009-09-04 10:54:39 UTC (rev 14793) +++ jchempaint/trunk/.classpath 2009-09-04 11:17:13 UTC (rev 14794) @@ -11,6 +11,6 @@ <classpathentry kind="lib" path="lib/fest-util-1.1.jar"/> <classpathentry kind="lib" path="lib/fest-assert-1.1.jar"/> <classpathentry kind="lib" path="lib/fest-reflect-1.1.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/jchempaint-primary"/> + <classpathentry combineaccessrules="false" kind="src" path="/jchempaint-primary-public"/> <classpathentry kind="output" path="bin"/> </classpath> Added: jchempaint/trunk/META-INF/applet-resources-core.files =================================================================== --- jchempaint/trunk/META-INF/applet-resources-core.files (rev 0) +++ jchempaint/trunk/META-INF/applet-resources-core.files 2009-09-04 11:17:13 UTC (rev 14794) @@ -0,0 +1,32 @@ +org/openscience/jchempaint/resources/JChemPaintResources.properties +org/openscience/jchempaint/resources/JCPGUI_applet.properties +org/openscience/jchempaint/resources/JCPShort_Cuts.properties +org/openscience/jchempaint/resources/small-bin/benzene.gif +org/openscience/jchempaint/resources/small-bin/bond.gif +org/openscience/jchempaint/resources/small-bin/copy.gif +org/openscience/jchempaint/resources/small-bin/cut.gif +org/openscience/jchempaint/resources/small-bin/donw_bond.gif +org/openscience/jchempaint/resources/small-bin/element.gif +org/openscience/jchempaint/resources/small-bin/enterelement.gif +org/openscience/jchempaint/resources/small-bin/eraser.gif +org/openscience/jchempaint/resources/small-bin/flip_H.gif +org/openscience/jchempaint/resources/small-bin/flip_V.gif +org/openscience/jchempaint/resources/small-bin/hexagon.gif +org/openscience/jchempaint/resources/small-bin/lasso.gif +org/openscience/jchempaint/resources/small-bin/min_one.gif +org/openscience/jchempaint/resources/small-bin/move.gif +org/openscience/jchempaint/resources/small-bin/octagon.gif +org/openscience/jchempaint/resources/small-bin/paste.gif +org/openscience/jchempaint/resources/small-bin/pentagon.gif +org/openscience/jchempaint/resources/small-bin/plus_one.gif +org/openscience/jchempaint/resources/small-bin/redo.gif +org/openscience/jchempaint/resources/small-bin/rotation.gif +org/openscience/jchempaint/resources/small-bin/selectsquare.gif +org/openscience/jchempaint/resources/small-bin/square.gif +org/openscience/jchempaint/resources/small-bin/triangle.gif +org/openscience/jchempaint/resources/small-bin/undefined_bond.gif +org/openscience/jchempaint/resources/small-bin/undefined_stereo_bond.gif +org/openscience/jchempaint/resources/small-bin/undo.gif +org/openscience/jchempaint/resources/small-bin/up_bond.gif +org/openscience/jchempaint/resources/small-bin/zoomin.gif +org/openscience/jchempaint/resources/small-bin/zoomout.gif Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-04 10:54:39 UTC (rev 14793) +++ jchempaint/trunk/build.xml 2009-09-04 11:17:13 UTC (rev 14794) @@ -256,6 +256,7 @@ <jar-from-list destfile="${dist}/jar/jchempaint-applet-viewer-opts.jar" includesfile="${metainf}/applet-viewer-opts.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor.jar" includesfile="${metainf}/applet-editor.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor-opts.jar" includesfile="${metainf}/applet-editor-opts.files"/> + <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources-core.jar" includesfile="${metainf}/applet-resources-core.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources.jar" includesfile="${metainf}/jchempaint.datafiles"/> <!-- the following jar files are packed from directory patterns --> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**"/> @@ -305,7 +306,7 @@ </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > - <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_openscience_cdk_modeling.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_omegahat.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_openscience_cdk_modeling.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_omegahat.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> </exec> </target> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-07 15:33:53
|
Revision: 14798 http://cdk.svn.sourceforge.net/cdk/?rev=14798&view=rev Author: shk3 Date: 2009-09-07 15:33:39 +0000 (Mon, 07 Sep 2009) Log Message: ----------- work on pt and buttons Modified Paths: -------------- jchempaint/trunk/build.xml jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-04 17:41:25 UTC (rev 14797) +++ jchempaint/trunk/build.xml 2009-09-07 15:33:39 UTC (rev 14798) @@ -158,13 +158,14 @@ <delete> <fileset dir="${dist-classes}" includes="*"/> </delete> + <delete dir="${dist-classes}/org/omegahat" /> </target> <target id="compile-jcp" name="compile-jcp"> <!-- TODO check if dist-all in cdk has been done--> <echo message="Compiling JChemPaint classes." /> <mkdir dir="${dist-classes}" /> - <javac srcdir="${src}" destdir="${dist-classes}" optimize="${optimization}" + <javac srcdir="${src}/main" destdir="${dist-classes}" optimize="${optimization}" nowarn="${nowarn}" debug="${debug}" deprecation="${deprecation}" target="1.5" source="1.5"> <classpath> @@ -278,7 +279,6 @@ <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience.jar" includepattern="org/openscience/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_3pq.jar" includepattern="org/_3pq/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_apache.jar" includepattern="org/apache/**"/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_omegahat.jar" includepattern="org/omegahat/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_w3c.jar" includepattern="org/w3c/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_fest.jar" includepattern="org/fest/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_jaxen.jar" includepattern="org/jaxen/**"/> @@ -309,7 +309,7 @@ </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > - <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_openscience_cdk_modeling.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_omegahat.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_openscience_cdk_modeling.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> </exec> </target> </project> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java 2009-09-04 17:41:25 UTC (rev 14797) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java 2009-09-07 15:33:39 UTC (rev 14798) @@ -59,7 +59,7 @@ private static IAtomColorer colorer = new CDK2DAtomColors(); private static LoggingTool logger; - public static Color BUTTON_INACTIVE_COLOR=new Color(230,230,230); + public static Color BUTTON_INACTIVE_COLOR=Color.WHITE;//new Color(230,230,230); /** * Gets the toolbar attribute of the MainContainerPanel object * Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java 2009-09-04 17:41:25 UTC (rev 14797) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java 2009-09-07 15:33:39 UTC (rev 14798) @@ -35,15 +35,15 @@ import java.awt.GridLayout; import java.awt.Point; import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.io.IOException; import java.util.EventObject; +import java.util.HashMap; +import java.util.Map; import java.util.Vector; import javax.swing.AbstractAction; -import javax.swing.AbstractButton; import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.JButton; @@ -81,6 +81,8 @@ private ElementPTFactory factory; private LoggingTool logger; + + private Map<JButton,Color> buttoncolors = new HashMap<JButton,Color>(); public static int APPLICATION = 0; /*default*/ @@ -91,7 +93,6 @@ * APPLICATION = with html * JCP = default */ - private int controlViewerButton; /** * Constructor of the PeriodicTablePanel object @@ -108,23 +109,12 @@ logger.debug(ex1); } layeredPane = new JLayeredPane(); - layeredPane.setPreferredSize(new Dimension(611, 575)); - layeredPane.setBorder(BorderFactory.createTitledBorder( - GT._("Periodic Table for JChemPaint"))); + layeredPane.setPreferredSize(new Dimension(581, 435)); JPanel tp = PTPanel(); - tp.setBounds(8,85,600, 480); + tp.setBounds(8,85,570, 340); - JButton button = new JButton(GT._("Reload")); - button.setVerticalTextPosition(AbstractButton.BOTTOM); - button.setHorizontalTextPosition(AbstractButton.CENTER); - button.setMnemonic(KeyEvent.VK_R); - button.setToolTipText(GT._("Click this button to go back to PeriodicTable.")); - button.setFont(new Font("Times-Roman",Font.BOLD, 10)); - button.setBounds(510, 20, 90, 20); - button.addActionListener( new BackAction() ); panel = CreateLabelProperties(null); - layeredPane.add(button, new Integer(1)); layeredPane.add(tp, new Integer(0)); layeredPane.add(panel, new Integer(1)); add(layeredPane); @@ -133,12 +123,13 @@ private JPanel PTPanel() { - controlViewerButton = PeriodicTablePanel.JCP; JPanel panel = new JPanel(); listeners = new Vector(); - panel.setLayout(new GridLayout(0, 18)); + panel.setLayout(new GridLayout(0, 19)); //-------------------------------- + Box.createHorizontalGlue(); + panel.add(Box.createHorizontalGlue()); JButton butt = new JButton("1"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); @@ -152,6 +143,10 @@ butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); + + butt = new JButton("1"); + butt.setBorder(new EmptyBorder(2,2,2,2)); + panel.add(butt); panel.add(createButton("H")); butt = new JButton("2"); @@ -161,29 +156,33 @@ { panel.add(Box.createHorizontalGlue()); } - butt = new JButton("3"); + butt = new JButton("13"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("4"); + butt = new JButton("14"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("5"); + butt = new JButton("15"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("6"); + butt = new JButton("16"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("7"); + butt = new JButton("17"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); // panel.add(createButton(GT._("He"))); + butt = new JButton("2"); + butt.setBorder(new EmptyBorder(2,2,2,2)); + panel.add(butt); + panel.add(createButton(GT._("Li"))); panel.add(createButton(GT._("Be"))); @@ -200,37 +199,40 @@ // panel.add(createButton(GT._("Ne"))); + butt = new JButton("3"); + butt.setBorder(new EmptyBorder(2,2,2,2)); + panel.add(butt); panel.add(createButton(GT._("Na"))); panel.add(createButton(GT._("Mg"))); - butt = new JButton("8"); + butt = new JButton("3"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("9"); + butt = new JButton("4"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("10"); + butt = new JButton("5"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("11"); + butt = new JButton("6"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("12"); + butt = new JButton("7"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("13"); + butt = new JButton("8"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("14"); + butt = new JButton("9"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("15"); + butt = new JButton("10"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("16"); + butt = new JButton("11"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); - butt = new JButton("17"); + butt = new JButton("12"); butt.setBorder(new EmptyBorder(2,2,2,2)); panel.add(butt); //no metall @@ -242,6 +244,9 @@ // panel.add(createButton(GT._("Ar"))); + butt = new JButton("4"); + butt.setBorder(new EmptyBorder(2,2,2,2)); + panel.add(butt); panel.add(createButton(GT._("K"))); panel.add(createButton(GT._("Ca"))); //transition @@ -264,6 +269,9 @@ // panel.add(createButton(GT._("Kr"))); + butt = new JButton("5"); + butt.setBorder(new EmptyBorder(2,2,2,2)); + panel.add(butt); panel.add(createButton(GT._("Rb"))); panel.add(createButton(GT._("Sr"))); //transition @@ -286,6 +294,9 @@ // panel.add(createButton(GT._("Xe"))); + butt = new JButton("6"); + butt.setBorder(new EmptyBorder(2,2,2,2)); + panel.add(butt); panel.add(createButton(GT._("Cs"))); panel.add(createButton(GT._("Ba"))); //transition @@ -308,7 +319,10 @@ // panel.add(createButton(GT._("Rn"))); - panel.add(createButton(GT._("Fr"))); + butt = new JButton("7"); + butt.setBorder(new EmptyBorder(2,2,2,2)); + panel.add(butt); + panel.add(createButton(GT._("Fr"))); panel.add(createButton(GT._("Ra"))); //transition panel.add(createButton(GT._("Ac"))); @@ -320,7 +334,7 @@ panel.add(createButton(GT._("Mt"))); panel.add(createButton(GT._("Ds"))); panel.add(createButton(GT._("Rg"))); - for (int i = 0; i < 9; i++) + for (int i = 0; i < 10; i++) { panel.add(Box.createHorizontalGlue()); } @@ -339,7 +353,7 @@ panel.add(createButton(GT._("Tm"))); panel.add(createButton(GT._("Yb"))); panel.add(createButton(GT._("Lu"))); - for (int i = 0; i < 4; i++) + for (int i = 0; i < 5; i++) { panel.add(Box.createHorizontalGlue()); } @@ -377,25 +391,8 @@ } catch (CDKException e) { throw new RuntimeException (e); } - String colorFS = "000000"; + String colorFS = "000000"; Color colorF = new Color(0,0,0); - String colorPh = element.getPhase(); - if(colorPh.equals("Solid")){ - colorFS = "000000"; - colorF = new Color(0,0,0); - } - else if(colorPh.equals("Gas")){ - colorFS = "CC0033"; - colorF = new Color(200,0,0); - } - else if(colorPh.equals("Liquid")){ - colorFS = "3300CC"; - colorF = new Color(0,0,200); - } - else if(colorPh.equals("Synthetic")){ - colorFS = "FFCC00"; - colorF = new Color(235,208,6); - } Color colorB = null; String serie = element.getChemicalSerie(); @@ -423,6 +420,7 @@ JButton button = new ElementButton(element, new ElementMouseAction(), getTextButton(element,colorFS), colorF); button.setBackground(colorB); button.setName(elementS); + buttoncolors.put(button,colorB); return button; } @@ -495,14 +493,7 @@ * @return the String to show */ public String getTextButton(PeriodicTableElement element, String color){ - String buttonString = null; - switch (controlViewerButton) { - case 0: buttonString ="<html><p><u><FONT SIZE=-2>"+element.getAtomicNumber()+"</FONT></u></p><p><font COLOR="+color+">" - +element.getSymbol()+"<font></p></html>";break; - case 1: buttonString = element.getSymbol();break; - default: buttonString = element.getSymbol();break; - } - return buttonString; + return element.getSymbol(); } @@ -529,9 +520,12 @@ panel = CreateLabelProperties(button.getElement()); layeredPane.add(panel, new Integer(1)); layeredPane.repaint(); + + button.setBackground(Color.LIGHT_GRAY); } public void mouseExited(MouseEvent e) { + ((ElementButton)e.getSource()).setBackground(buttoncolors.get(e.getSource())); } public void mousePressed(MouseEvent e) { @@ -592,10 +586,7 @@ PeriodicTableElement element, MouseListener e,String buttonString, Color color) { super(buttonString); - if(controlViewerButton == JCP){ - setForeground(color); - } - + setForeground(color); this.element = element; setFont(new Font("Times-Roman",Font.BOLD, 15)); setBorder( new BevelBorder(BevelBorder.RAISED) ); @@ -623,29 +614,29 @@ JPanel pan = new JPanel(); pan.setLayout(new BorderLayout()); Color color = new Color(255,255,255); - Point origin = new Point(90, 20); + Point origin = new Point(120, 20); JLabel label; if(element != null){ - label = new JLabel("<html><PRE> <FONT SIZE=+2>" - +element.getSymbol()+"</FONT>" - +": At.No "+element.getAtomicNumber() - +", Group "+element.getGroup()+", Period " - + element.getPeriod()+"</PRE></html>"); + label = new JLabel("<html><FONT SIZE=+2>" + +element.getName()+" ("+element.getSymbol()+")</FONT><br>" + +" Atomic number "+element.getAtomicNumber() + + (element.getGroup()!=null ? + ", Group "+element.getGroup() : "") + +", Period "+ element.getPeriod()+"</html>"); pan.add(label,BorderLayout.NORTH); - label = new JLabel("<html><PRE><FONT SIZE=-2>" - +" CAS id: "+element.getCASid()+"<br>" - +" Name: "+element.getName()+"<br>" - +" Serie: "+element.getChemicalSerie()+"<br>" + label = new JLabel("<html><FONT SIZE=-2>" + +" CAS RN: "+element.getCASid()+"<br>" + +" Element Category: "+element.getChemicalSerie()+"<br>" +" State: "+element.getPhase()+"<br>" +" Electronativity: "+(element.getPaulingEneg()==null ? "undefined" : element.getPaulingEneg())+"<br>" - +"</FONT></PRE></html>"); - label.setMinimumSize(new Dimension(145,150)); + +"</FONT></html>"); + label.setMinimumSize(new Dimension(165,150)); pan.add(label,BorderLayout.CENTER); } else { - label = new JLabel(" Periodic Table of elements"); + label = new JLabel(" Periodic Table of elements"); label.setHorizontalTextPosition(JLabel.CENTER); label.setVerticalTextPosition(JLabel.CENTER); label.setOpaque(true); @@ -656,16 +647,8 @@ pan.setBackground(color); pan.setForeground(Color.black); pan.setBorder(BorderFactory.createLineBorder(Color.black)); - pan.setBounds(origin.x, origin.y, 295, 210); + pan.setBounds(origin.x, origin.y, 255, 160); return pan; } - /** - * set the form to do a button {html or normal) - * - * @param controlViewer - */ - public void setControlViewer(int controlViewer){ - this.controlViewerButton = controlViewer; - } } Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java 2009-09-04 17:41:25 UTC (rev 14797) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java 2009-09-07 15:33:39 UTC (rev 14798) @@ -1,50 +1,30 @@ package org.openscience.jchempaint; import java.awt.Point; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; -import java.util.List; import java.util.Map; -import javax.swing.JComboBox; import javax.vecmath.Point2d; import org.fest.swing.applet.AppletViewer; import org.fest.swing.core.MouseButton; import org.fest.swing.fixture.DialogFixture; import org.fest.swing.fixture.FrameFixture; -import org.fest.swing.fixture.JButtonFixture; import org.fest.swing.fixture.JPanelFixture; -import org.fest.swing.fixture.JTextComponentFixture; import org.fest.swing.launcher.AppletLauncher; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.omegahat.Environment.Parser.AntlrParser.ResettableLexer; import org.openscience.cdk.CDKConstants; -import org.openscience.cdk.ChemFile; -import org.openscience.cdk.ChemObject; import org.openscience.cdk.DefaultChemObjectBuilder; import org.openscience.cdk.exception.CDKException; -import org.openscience.cdk.interfaces.IAtom; -import org.openscience.cdk.interfaces.IAtomContainer; import org.openscience.cdk.interfaces.IBond; import org.openscience.cdk.interfaces.IChemModel; -import org.openscience.cdk.interfaces.IPseudoAtom; -import org.openscience.cdk.io.CMLReader; -import org.openscience.cdk.io.MDLReader; import org.openscience.cdk.io.MDLV2000Reader; -import org.openscience.cdk.io.IChemObjectReader.Mode; -import org.openscience.cdk.renderer.selection.SingleSelection; -import org.openscience.cdk.tools.manipulator.ChemFileManipulator; import org.openscience.jchempaint.applet.JChemPaintEditorApplet; -import org.openscience.jchempaint.matchers.ButtonTextComponentMatcher; -import org.openscience.jchempaint.matchers.ComboBoxTextComponentMatcher; public class JCPEditorAppletDrawingTest { private static AppletViewer viewer; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-10 13:04:46
|
Revision: 14814 http://cdk.svn.sourceforge.net/cdk/?rev=14814&view=rev Author: shk3 Date: 2009-09-10 13:04:34 +0000 (Thu, 10 Sep 2009) Log Message: ----------- the isotope menu changes dynamically dependent on atom in selection Modified Paths: -------------- jchempaint/trunk/META-INF/applet-editor.files jchempaint/trunk/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeIsotopeAction.java Modified: jchempaint/trunk/META-INF/applet-editor.files =================================================================== --- jchempaint/trunk/META-INF/applet-editor.files 2009-09-10 11:28:59 UTC (rev 14813) +++ jchempaint/trunk/META-INF/applet-editor.files 2009-09-10 13:04:34 UTC (rev 14814) @@ -312,6 +312,7 @@ org/openscience/jchempaint/io/JCPFileView.class org/openscience/jchempaint/JChemPaintMenuBar.class org/openscience/jchempaint/JChemPaintMenuHelper.class +org/openscience/jchempaint/JChemPaintMenuHelper$1.class org/openscience/jchempaint/JChemPaintPanel.class org/openscience/jchempaint/JChemPaintPopupMenu.class org/openscience/jchempaint/JCPMenuTextMaker.class Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java 2009-09-10 11:28:59 UTC (rev 14813) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java 2009-09-10 13:04:34 UTC (rev 14814) @@ -1,5 +1,8 @@ package org.openscience.jchempaint; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.MissingResourceException; @@ -11,11 +14,17 @@ import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.KeyStroke; +import javax.swing.event.MenuEvent; +import javax.swing.event.MenuListener; +import org.openscience.cdk.config.IsotopeFactory; +import org.openscience.cdk.interfaces.IIsotope; import org.openscience.cdk.tools.LoggingTool; import org.openscience.jchempaint.action.JCPAction; +import com.sun.org.apache.bcel.internal.generic.ISTORE; + /** * A class containing various helper methods used in JChemPaintMenuBar and JChemPaintPopupMenu. * @@ -93,7 +102,7 @@ * @param menu The menu to add the new menu to (must either be JMenu or JPopupMenu) * @return The created JMenu */ - protected JComponent createMenu(JChemPaintPanel jcpPanel, String key, boolean isPopup, String guiString, JComponent menu) { + protected JComponent createMenu(final JChemPaintPanel jcpPanel, String key, boolean isPopup, String guiString, final JComponent menu) { String[] itemKeys = StringHelper.tokenize(getMenuResourceString(key, guiString)); for (int i = 0; i < itemKeys.length; i++) { if (itemKeys[i].equals("-")) { @@ -119,6 +128,52 @@ jcpPanel.bondMenu=menu; menu.setEnabled(false); } + if(key.equals("isotopeChange")){ + ((JMenu)menu).addMenuListener(new MenuListener(){ + public void menuCanceled(MenuEvent arg0) { + } + + public void menuDeselected(MenuEvent arg0) { + } + + public void menuSelected(MenuEvent arg0) { + menu.removeAll(); + if(jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getSelection().isFilled()){ + if(jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getSelection().getConnectedAtomContainer().getAtomCount()>1){ + menu.add(new JChemPaintMenuHelper().createMenuItem(jcpPanel, "majorPlusThree", false)); + menu.add(new JChemPaintMenuHelper().createMenuItem(jcpPanel, "majorPlusTwo", false)); + menu.add(new JChemPaintMenuHelper().createMenuItem(jcpPanel, "majorPlusOne", false)); + menu.add(new JChemPaintMenuHelper().createMenuItem(jcpPanel, "major", false)); + menu.add(new JChemPaintMenuHelper().createMenuItem(jcpPanel, "majorMinusOne", false)); + menu.add(new JChemPaintMenuHelper().createMenuItem(jcpPanel, "majorMinusTwo", false)); + menu.add(new JChemPaintMenuHelper().createMenuItem(jcpPanel, "majorMinusThree", false)); + }else{ + try { + IIsotope[] isotopes = IsotopeFactory.getInstance(jcpPanel.getChemModel().getBuilder()).getIsotopes(jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getSelection().getConnectedAtomContainer().getAtom(0).getSymbol()); + for(int i=0;i<isotopes.length;i++){ + String cmd=isotopes[i].getSymbol()+isotopes[i].getMassNumber(); + JMenuItem mi = new JMenuItem(cmd); + mi.setName(cmd); + usedKeys.add(cmd); + String astr="org.openscience.jchempaint.action.ChangeIsotopeAction@specific"+isotopes[i].getMassNumber(); + mi.setActionCommand(astr); + JCPAction action = getJCPAction().getAction(jcpPanel, astr, false); + if (action != null) { + // sync some action properties with menu + mi.setEnabled(action.isEnabled()); + mi.addActionListener(action); + logger.debug("Coupled action to new menu item..."); + } + menu.add(mi); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + }); + } return menu; } Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeIsotopeAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeIsotopeAction.java 2009-09-10 11:28:59 UTC (rev 14813) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeIsotopeAction.java 2009-09-10 13:04:34 UTC (rev 14814) @@ -97,7 +97,9 @@ isotopeNumber -= 2; } else if (type.equals("majorMinusThree")) { isotopeNumber -= 3; - } + } else if (type.indexOf("specific")==0) { + isotopeNumber = Integer.parseInt(type.substring(8)); + } jcpPanel.get2DHub().setMassNumber(atom,isotopeNumber); jcpPanel.get2DHub().updateView(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-22 11:19:10
|
Revision: 14860 http://cdk.svn.sourceforge.net/cdk/?rev=14860&view=rev Author: shk3 Date: 2009-09-22 11:19:04 +0000 (Tue, 22 Sep 2009) Log Message: ----------- unifying several methods Modified Paths: -------------- jchempaint/trunk/EditorApplet.html jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java Modified: jchempaint/trunk/EditorApplet.html =================================================================== --- jchempaint/trunk/EditorApplet.html 2009-09-22 11:05:12 UTC (rev 14859) +++ jchempaint/trunk/EditorApplet.html 2009-09-22 11:19:04 UTC (rev 14860) @@ -21,7 +21,7 @@ <a href="javascript:alert(document.Editor.getSmilesChiral())">show stereo smiles</a> <a href="javascript:document.Editor.makeHydrogensExplicit()">Make hydrogens explicit</a> <a href="javascript:document.Editor.clear()">clear</a> -<a href="javascript:document.Editor.addMolFileWithReplace('\n CDK 1/19/07,10:3\n\n 2 1 0 0 0 0 0 0 0 0999 V2000 \n 252.0000 1022.0000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0\n 227.0000 1047.0000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0\n 2 1 1 0 0 0 0 \nM END')">insert CC (as mol file)</a> +<a href="javascript:document.Editor.setMolFile('\n CDK 1/19/07,10:3\n\n 2 1 0 0 0 0 0 0 0 0999 V2000 \n 2.520000 10.220000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0\n 2.270000 10.470000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0\n 2 1 1 0 0 0 0 \nM END')">insert CC (as mol file)</a> <a href="javascript:document.Editor.setSmiles('CCC')">insert CCC (as SMILES)</a> <blockquote> <hr> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java 2009-09-22 11:05:12 UTC (rev 14859) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java 2009-09-22 11:19:04 UTC (rev 14860) @@ -389,7 +389,12 @@ .getInstance().newMolecule()); InsertTextPanel.generateModel(theJcpp, cdkmol, false); theJcpp.get2DHub().updateView(); - repaint(); + // the newly opened file should nicely fit the screen + theJcpp.getRenderPanel().setFitToScreen(true); + theJcpp.getRenderPanel().update( + theJcpp.getRenderPanel().getGraphics()); + // enable zooming by removing constraint + theJcpp.getRenderPanel().setFitToScreen(false); } /** @@ -411,13 +416,7 @@ newmol.append(System.getProperty("file.separator")); s = e + 1; } - newmol.append(mol.substring(s)); - MDLV2000Reader reader = new MDLV2000Reader(new StringReader(mol)); - IMolecule cdkmol = (IMolecule) reader.read(DefaultChemObjectBuilder - .getInstance().newMolecule()); - theJcpp.setChemModel(ChemModelManipulator.newChemModel(cdkmol)); - theJcpp.get2DHub().updateView(); - repaint(); + setMolFile(newmol.toString()); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-23 16:01:28
|
Revision: 14867 http://cdk.svn.sourceforge.net/cdk/?rev=14867&view=rev Author: shk3 Date: 2009-09-23 16:01:22 +0000 (Wed, 23 Sep 2009) Log Message: ----------- the test now run from ant Modified Paths: -------------- jchempaint/trunk/build.xml jchempaint/trunk/src/main/org/openscience/jchempaint/action/PrintAction.java jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java Added Paths: ----------- jchempaint/trunk/src/test/org/openscience/jchempaint/AllJCPTests.java Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-23 12:13:48 UTC (rev 14866) +++ jchempaint/trunk/build.xml 2009-09-23 16:01:22 UTC (rev 14867) @@ -14,6 +14,7 @@ <property name="lib" value="lib" /> <property name="dist" value="dist" /> <property name="dist-classes" value="${dist}/classes" /> + <property name="dist-test" value="${dist}/test" /> <property name="metainf" value="META-INF" /> <property name="po-classes" value="po/classes" /> @@ -311,6 +312,46 @@ <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> </exec> </target> + + <target id="test-applet" name="test-applet"> + <mkdir dir="${dist-test}" /> + <javac srcdir="${src}/test" destdir="${dist-test}" optimize="${optimization}" + nowarn="${nowarn}" + debug="${debug}" deprecation="${deprecation}" target="1.5" source="1.5"> + <classpath> + <fileset dir="${dist}/jar/"> + <include name="*.jar" /> + </fileset> + <fileset dir="${lib}"> + <include name="*.jar" /> + </fileset> + <fileset dir="${cdk.devellib}"> + <include name="*.jar" /> + </fileset> + </classpath> + </javac> + <copy todir="${dist-test}/data"> + <fileset dir="${src}/test/data"/> + </copy> + <junit forkmode="perBatch" printsummary="yes" haltonfailure="no" haltonerror="no"> + <classpath> + <fileset dir="${dist}/jar/"> + <include name="*.jar" /> + </fileset> + <fileset dir="${lib}"> + <include name="*.jar" /> + </fileset> + <fileset dir="${cdk.devellib}"> + <include name="*.jar" /> + </fileset> + <pathelement location="${dist-test}"/> + </classpath> + <test name="org.openscience.jchempaint.AllJCPTests" + haltonfailure="no"> + <formatter type="brief" /> + </test> + </junit> + </target> </project> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/PrintAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/PrintAction.java 2009-09-23 12:13:48 UTC (rev 14866) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/PrintAction.java 2009-09-23 16:01:22 UTC (rev 14867) @@ -58,7 +58,7 @@ try { printJob.print(); } catch (PrinterException pe) { - System.out.println("Error printing: " + pe); + jcpPanel.announceError(pe); } } } Added: jchempaint/trunk/src/test/org/openscience/jchempaint/AllJCPTests.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/AllJCPTests.java (rev 0) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/AllJCPTests.java 2009-09-23 16:01:22 UTC (rev 14867) @@ -0,0 +1,15 @@ +package org.openscience.jchempaint; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + + +@RunWith(value=Suite.class) +@SuiteClasses( value = { + JCPEditorAppletMenuTest.class, + JCPEditorAppletDrawingTest.class, + JCPEditorAppletBugsTest.class} ) +public class AllJCPTests { + +} Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java 2009-09-23 12:13:48 UTC (rev 14866) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java 2009-09-23 16:01:22 UTC (rev 14867) @@ -38,8 +38,8 @@ applet = new FrameFixture(viewer); applet.show(); } - - @Test public void testSquareSelectSingleAtom() { + + @Test public void testSquareSelectSingleAtom() { JPanelFixture jcppanel=applet.panel("appletframe"); JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; applet.button("C").click(); @@ -57,6 +57,30 @@ restoreModel(); } + + @Test public void testMove() throws InterruptedException{ + JPanelFixture jcppanel=applet.panel("appletframe"); + JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; + //we draw a hexagon + applet.button("hexagon").click(); + applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point(100, 100), MouseButton.LEFT_BUTTON,1); + //select this + applet.button("select").click(); + Point movetopint=new Point(50,50); + ComponentDragAndDrop dandd = new ComponentDragAndDrop(applet.panel("renderpanel").robot); + dandd.drag(applet.panel("renderpanel").component(), movetopint); + movetopint=new Point(300,300); + dandd.drop(applet.panel("renderpanel").component(), movetopint); + Point2d oldcoord=new Point2d(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d().x,panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d().y); + //switch to move mode + applet.button("move").click(); + applet.panel("renderpanel").robot.moveMouse(applet.panel("renderpanel").target,new Point(100,100)); + applet.panel("renderpanel").robot.pressMouse(MouseButton.LEFT_BUTTON); + applet.panel("renderpanel").robot.moveMouse(applet.panel("renderpanel").target,new Point(150,150)); + applet.panel("renderpanel").robot.releaseMouseButtons(); + Assert.assertFalse(oldcoord.equals(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d())); + } + @Test public void testSetSmiles() throws CDKException{ JPanelFixture jcppanel=applet.panel("appletframe"); JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; @@ -165,22 +189,22 @@ applet.click(); applet.click(); applet.click(); - Point2d moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(1).getPoint2d().x,panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y); + Point2d moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().x,panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(5, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); - Assert.assertEquals(4, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()); + Assert.assertEquals(6, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); + Assert.assertEquals(5, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()); moveto=getBondPoint(panel,0); panel.getRenderPanel().getRenderer().getRenderer2DModel().setHighlightedAtom(null); applet.moveTo(new Point(100,100)); applet.button("eraser").click(); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); Assert.assertEquals(5, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); + Assert.assertEquals(4, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()); + moveto=getBondPoint(panel,1); + applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); + Assert.assertEquals(1, panel.getChemModel().getMoleculeSet().getAtomContainerCount()); + Assert.assertEquals(5, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); Assert.assertEquals(3, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()); - moveto=getBondPoint(panel,0); - applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(2, panel.getChemModel().getMoleculeSet().getAtomContainerCount()); - Assert.assertEquals(2, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); - Assert.assertEquals(1, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()); } /** @@ -237,30 +261,6 @@ } restoreModel(); } - - @Test public void testMove() throws InterruptedException{ - JPanelFixture jcppanel=applet.panel("appletframe"); - JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; - //we draw a hexagon - applet.button("hexagon").click(); - applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point(100, 100), MouseButton.LEFT_BUTTON,1); - //select this - applet.button("select").click(); - Point movetopint=new Point(50,50); - ComponentDragAndDrop dandd = new ComponentDragAndDrop(applet.panel("renderpanel").robot); - dandd.drag(applet.panel("renderpanel").component(), movetopint); - movetopint=new Point(300,300); - dandd.drop(applet.panel("renderpanel").component(), movetopint); - Point2d oldcoord=new Point2d(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d().x,panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d().y); - //switch to move mode - applet.button("move").click(); - applet.panel("renderpanel").robot.moveMouse(applet.panel("renderpanel").target,new Point(100,100)); - applet.panel("renderpanel").robot.pressMouse(MouseButton.LEFT_BUTTON); - applet.panel("renderpanel").robot.moveMouse(applet.panel("renderpanel").target,new Point(150,150)); - applet.panel("renderpanel").robot.releaseMouseButtons(); - Assert.assertFalse(oldcoord.equals(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d())); - } - private Point2d getBondPoint(JChemPaintPanel panel, int bondnumber) { IBond bond = panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(bondnumber); Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java 2009-09-23 12:13:48 UTC (rev 14866) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java 2009-09-23 16:01:22 UTC (rev 14867) @@ -85,7 +85,7 @@ moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates((panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().x+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().x)/2,(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().y+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y)/2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); //note it must be STEREO_BOND_DOWN_INV, since it was up before - Assert.assertEquals(CDKConstants.STEREO_BOND_DOWN_INV, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); + Assert.assertEquals(CDKConstants.STEREO_BOND_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); //using undefined bond button, panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IBond>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4))); applet.button("undefined_bond").click(); Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-09-23 12:13:48 UTC (rev 14866) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-09-23 16:01:22 UTC (rev 14867) @@ -156,7 +156,7 @@ Assert.assertTrue(file.exists()); } @Test public void testMenuPrint() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { - applet.menuItem("print").click(); + //applet.menuItem("print").click(); //TODO in linux, the java print dialog is not working //TODO printing as a such can not be tested, I suppose } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-24 10:48:25
|
Revision: 14870 http://cdk.svn.sourceforge.net/cdk/?rev=14870&view=rev Author: shk3 Date: 2009-09-24 10:48:05 +0000 (Thu, 24 Sep 2009) Log Message: ----------- added a viewer-with-detachable-editor Modified Paths: -------------- jchempaint/trunk/ViewerApplet.html jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java Modified: jchempaint/trunk/ViewerApplet.html =================================================================== --- jchempaint/trunk/ViewerApplet.html 2009-09-24 09:26:36 UTC (rev 14869) +++ jchempaint/trunk/ViewerApplet.html 2009-09-24 10:48:05 UTC (rev 14870) @@ -5,7 +5,7 @@ <body BGCOLOR="#ffffff" LINK="#000099"> <h2> -The JChemPaint Applet +The JChemPaint Applet (detachable with double click) </h2> <applet name="Viewer" code="org.openscience.jchempaint.applet.JChemPaintViewerApplet" archive="dist/jar/jchempaint-applet-core.jar" @@ -20,9 +20,23 @@ </applet> <a href="javascript:document.Viewer.selectAtom(6)">select atom 6</a> <a href="javascript:alert(document.Viewer.getMolFile())">show mol file</a> -<blockquote> <hr> +<br> +<h2> +The JChemPaint Applet (detachable editor with double click) +</h2> +<applet name="Viewer2" code="org.openscience.jchempaint.applet.JChemPaintViewerApplet" archive="dist/jar/jchempaint-applet-core.jar" + width="600" height="500"> +<param name="load" value="applettests/big.mol"> +<!--param name="smiles" value="CCCCC(=O)CCCCN"--> +<param name="atomNumbersVisible" value="true"> +<param name="background" value="12632256"> +<param name="detachableeditor" value="true"> +<!--param name="tooltips" value="30|test1|31|test2"--> +<param name="scrollbars" value="true"> +</applet> + </body> </html> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-09-24 09:26:36 UTC (rev 14869) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2009-09-24 10:48:05 UTC (rev 14870) @@ -337,7 +337,6 @@ // this makes sure the toolbars get drawn this.setPreferredSize(new Dimension(result.width, result.height)); this.revalidate(); - super.paint(g); renderer.paintChemModel(chemModel, new AWTDrawVisitor(g)); } Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java 2009-09-24 09:26:36 UTC (rev 14869) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintAbstractApplet.java 2009-09-24 10:48:05 UTC (rev 14870) @@ -32,9 +32,9 @@ import java.awt.Color; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.io.FileInputStream; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.IOException; -import java.io.InputStreamReader; import java.io.StringReader; import java.io.StringWriter; import java.net.URL; @@ -56,7 +56,6 @@ import org.openscience.cdk.io.ISimpleChemObjectReader; import org.openscience.cdk.io.MDLV2000Reader; import org.openscience.cdk.io.MDLWriter; -import org.openscience.cdk.io.ReaderFactory; import org.openscience.cdk.io.IChemObjectReader.Mode; import org.openscience.cdk.layout.StructureDiagramGenerator; import org.openscience.cdk.renderer.RendererModel; @@ -66,6 +65,7 @@ import org.openscience.jchempaint.AbstractJChemPaintPanel; import org.openscience.jchempaint.GT; import org.openscience.jchempaint.InsertTextPanel; +import org.openscience.jchempaint.JChemPaintPanel; import org.openscience.jchempaint.JExternalFrame; import org.openscience.jchempaint.action.CreateSmilesAction; import org.openscience.jchempaint.application.JChemPaint; @@ -115,6 +115,8 @@ "should user interface be translated (default) or not (e. g. if you want an English-only webpage)" }, { "detachable", "true or false", "should the applet be detacheable by a double click (default false)" }, + { "detachableeditor", "true or false", + "should the applet be detacheable as an editor by a double click (default false), only for viewer" }, { "debug", "true or false", "switches on debug output (default false)" } }; @@ -512,5 +514,35 @@ } }); } + if (getParameter("detachableeditor") != null + && getParameter("detachableeditor").equals("true")) { + getTheJcpp().getRenderPanel().addMouseListener(new MouseAdapter() { + public void mousePressed(MouseEvent e) { + if (e.getButton() == 1 && e.getClickCount() == 2) + if (!getJexf().isShowing()) { + final JChemPaintPanel p = new JChemPaintPanel(theJcpp.getChemModel(),JChemPaintEditorApplet.GUI_APPLET,debug); + p.setName("appletframe"); + p.setShowInsertTextField(false); + p.setShowStatusBar(false); + p.getChemModel().setID("JChemPaint Editor"); + getJexf(); + jexf.setTitle("JChemPaint Editor"); + jexf.add(p); + jexf.pack(); + jexf.setVisible(true); + jexf.addWindowListener(new WindowAdapter(){ + public void windowClosing(WindowEvent e) { + JChemPaintAbstractApplet.this.setChemModel(p.getChemModel()); + } + }); + } + } + }); + } } + + protected void setChemModel(IChemModel chemModel) { + theJcpp.setChemModel(chemModel); + theJcpp.get2DHub().updateView(); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-24 16:19:01
|
Revision: 14874 http://cdk.svn.sourceforge.net/cdk/?rev=14874&view=rev Author: mark_rynbeek Date: 2009-09-24 16:18:53 +0000 (Thu, 24 Sep 2009) Log Message: ----------- I will use these build file to try and build a smaller applet; may use yguard Modified Paths: -------------- jchempaint/trunk/.project Added Paths: ----------- jchempaint/trunk/META-INF/applet-core.shrink.files jchempaint/trunk/build.shrink.xml Modified: jchempaint/trunk/.project =================================================================== --- jchempaint/trunk/.project 2009-09-24 13:10:31 UTC (rev 14873) +++ jchempaint/trunk/.project 2009-09-24 16:18:53 UTC (rev 14874) @@ -3,6 +3,7 @@ <name>org.openscience.cdk.jchempaint</name> <comment></comment> <projects> + <project>org.openscience.cdk</project> </projects> <buildSpec> <buildCommand> Added: jchempaint/trunk/META-INF/applet-core.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-core.shrink.files (rev 0) +++ jchempaint/trunk/META-INF/applet-core.shrink.files 2009-09-24 16:18:53 UTC (rev 14874) @@ -0,0 +1,353 @@ +javax/vecmath/Point2d.class +javax/vecmath/Point2f.class +javax/vecmath/Point3d.class +javax/vecmath/Point3f.class +javax/vecmath/Point4d.class +javax/vecmath/Tuple2d.class +javax/vecmath/Tuple2f.class +javax/vecmath/Tuple3d.class +javax/vecmath/Tuple3f.class +javax/vecmath/Tuple4d.class +javax/vecmath/Vector2d.class +javax/vecmath/Vector2f.class +javax/vecmath/Vector3d.class +org/_3pq/jgrapht/alg/ConnectivityInspector.class +org/_3pq/jgrapht/alg/ConnectivityInspector$MyTraversalListener.class +org/_3pq/jgrapht/DirectedGraph.class +org/_3pq/jgrapht/Edge.class +org/_3pq/jgrapht/edge/DefaultEdge.class +org/_3pq/jgrapht/edge/DirectedEdge.class +org/_3pq/jgrapht/edge/EdgeFactories$AbstractEdgeFactory.class +org/_3pq/jgrapht/edge/EdgeFactories$DirectedEdgeFactory.class +org/_3pq/jgrapht/edge/EdgeFactories$UndirectedEdgeFactory.class +org/_3pq/jgrapht/EdgeFactory.class +org/_3pq/jgrapht/edge/UndirectedEdge.class +org/_3pq/jgrapht/event/ConnectedComponentTraversalEvent.class +org/_3pq/jgrapht/event/EdgeTraversalEvent.class +org/_3pq/jgrapht/event/GraphListener.class +org/_3pq/jgrapht/event/TraversalListenerAdapter.class +org/_3pq/jgrapht/event/TraversalListener.class +org/_3pq/jgrapht/event/VertexSetListener.class +org/_3pq/jgrapht/event/VertexTraversalEvent.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$ArrayListFactory.class +org/_3pq/jgrapht/graph/AbstractBaseGraph.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$DirectedEdgeContainer.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$DirectedSpecifics.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$Specifics.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$UndirectedEdgeContainer.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$UndirectedSpecifics.class +org/_3pq/jgrapht/graph/AbstractGraph.class +org/_3pq/jgrapht/Graph.class +org/_3pq/jgrapht/graph/EdgeListFactory.class +org/_3pq/jgrapht/graph/SimpleDirectedGraph.class +org/_3pq/jgrapht/graph/SimpleGraph.class +org/_3pq/jgrapht/graph/Subgraph.class +org/_3pq/jgrapht/graph/UndirectedSubgraph.class +org/_3pq/jgrapht/ListenableGraph.class +org/_3pq/jgrapht/traverse/AbstractGraphIterator.class +org/_3pq/jgrapht/traverse/BreadthFirstIterator.class +org/_3pq/jgrapht/traverse/CrossComponentIterator.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$DirectedSpecifics.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$FlyweightEdgeEvent.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$FlyweightVertexEvent.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$Specifics.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$UndirectedSpecifics.class +org/_3pq/jgrapht/traverse/GraphIterator.class +org/_3pq/jgrapht/UndirectedGraph.class +org/apache/commons/cli/CommandLineParser.class +org/apache/commons/cli/ParseException.class +org/apache/commons/cli/Parser.class +org/apache/commons/cli/PosixParser.class +org/apache/commons/cli/UnrecognizedOptionException.class +org/openscience/cdk/Atom.class +org/openscience/cdk/AtomContainer$1.class +org/openscience/cdk/AtomContainer$2.class +org/openscience/cdk/AtomContainer$3.class +org/openscience/cdk/AtomContainer$4.class +org/openscience/cdk/AtomContainer$5.class +org/openscience/cdk/AtomContainer$AtomIterator.class +org/openscience/cdk/AtomContainer$BondIterator.class +org/openscience/cdk/AtomContainer.class +org/openscience/cdk/AtomContainer$ElectronContainerIterator.class +org/openscience/cdk/AtomContainer$LonePairIterator.class +org/openscience/cdk/AtomContainerSet$1.class +org/openscience/cdk/AtomContainerSet$AtomContainerIterator.class +org/openscience/cdk/AtomContainerSet.class +org/openscience/cdk/AtomContainer$SingleElectronIterator.class +org/openscience/cdk/atomtype/CDKAtomTypeMatcher.class +org/openscience/cdk/AtomType.class +org/openscience/cdk/atomtype/IAtomTypeMatcher.class +org/openscience/cdk/Bond.class +org/openscience/cdk/CDKConstants.class +org/openscience/cdk/ChemModel.class +org/openscience/cdk/ChemObject.class +org/openscience/cdk/controller/ControllerHub.class +org/openscience/cdk/controller/ControllerModel.class +org/openscience/cdk/controller/ControllerModuleAdapter.class +org/openscience/cdk/controller/ControllerParameters.class +org/openscience/cdk/controller/HighlightModule.class +org/openscience/cdk/controller/IChangeModeListener.class +org/openscience/cdk/controller/IChemModelEventRelayHandler.class +org/openscience/cdk/controller/IChemModelRelay.class +org/openscience/cdk/controller/IControllerModel.class +org/openscience/cdk/controller/IControllerModule.class +org/openscience/cdk/controller/IMouseEventRelay.class +org/openscience/cdk/controller/IViewEventRelay.class +org/openscience/cdk/controller/PhantomBondGenerator.class +org/openscience/cdk/controller/SwingMouseEventRelay.class +org/openscience/cdk/controller/undoredo/IUndoListener.class +org/openscience/cdk/controller/undoredo/IUndoRedoable.class +org/openscience/cdk/controller/undoredo/IUndoRedoFactory.class +org/openscience/cdk/controller/undoredo/UndoRedoHandler.class +org/openscience/cdk/controller/ZoomModule.class +org/openscience/cdk/DefaultChemObjectBuilder.class +org/openscience/cdk/ElectronContainer.class +org/openscience/cdk/Element.class +org/openscience/cdk/event/ChemObjectChangeEvent.class +org/openscience/cdk/event/ICDKChangeListener.class +org/openscience/cdk/exception/CDKException.class +org/openscience/cdk/exception/NoSuchAtomException.class +org/openscience/cdk/exception/NoSuchAtomTypeException.class +org/openscience/cdk/geometry/GeometryTools.class +org/openscience/cdk/graph/BFSShortestPath.class +org/openscience/cdk/graph/BFSShortestPath$MyBreadthFirstIterator.class +org/openscience/cdk/graph/BiconnectivityInspector.class +org/openscience/cdk/graph/ConnectivityChecker.class +org/openscience/cdk/graph/MoleculeGraphs.class +org/openscience/cdk/graph/PathTools.class +org/openscience/cdk/graph/SpanningTree.class +org/openscience/cdk/interfaces/IAdductFormula.class +org/openscience/cdk/interfaces/IAminoAcid.class +org/openscience/cdk/interfaces/IAtom.class +org/openscience/cdk/interfaces/IAtomContainer.class +org/openscience/cdk/interfaces/IAtomContainerSet.class +org/openscience/cdk/interfaces/IAtomParity.class +org/openscience/cdk/interfaces/IAtomType.class +org/openscience/cdk/interfaces/IAtomType$Hybridization.class +org/openscience/cdk/interfaces/IBioPolymer.class +org/openscience/cdk/interfaces/IBond.class +org/openscience/cdk/interfaces/IBond$Order.class +org/openscience/cdk/interfaces/IChemFile.class +org/openscience/cdk/interfaces/IChemModel.class +org/openscience/cdk/interfaces/IChemObjectBuilder.class +org/openscience/cdk/interfaces/IChemObjectChangeEvent.class +org/openscience/cdk/interfaces/IChemObject.class +org/openscience/cdk/interfaces/IChemObjectListener.class +org/openscience/cdk/interfaces/IChemSequence.class +org/openscience/cdk/interfaces/ICrystal.class +org/openscience/cdk/interfaces/IElectronContainer.class +org/openscience/cdk/interfaces/IElement.class +org/openscience/cdk/interfaces/IFragmentAtom.class +org/openscience/cdk/interfaces/IIsotope.class +org/openscience/cdk/interfaces/ILonePair.class +org/openscience/cdk/interfaces/IMapping.class +org/openscience/cdk/interfaces/IMolecularFormula.class +org/openscience/cdk/interfaces/IMolecularFormulaSet.class +org/openscience/cdk/interfaces/IMolecule.class +org/openscience/cdk/interfaces/IMoleculeSet.class +org/openscience/cdk/interfaces/IMonomer.class +org/openscience/cdk/interfaces/IPDBAtom.class +org/openscience/cdk/interfaces/IPDBMonomer.class +org/openscience/cdk/interfaces/IPDBPolymer.class +org/openscience/cdk/interfaces/IPDBStructure.class +org/openscience/cdk/interfaces/IPolymer.class +org/openscience/cdk/interfaces/IPseudoAtom.class +org/openscience/cdk/interfaces/IReaction.class +org/openscience/cdk/interfaces/IReactionScheme.class +org/openscience/cdk/interfaces/IReactionSet.class +org/openscience/cdk/interfaces/IRing.class +org/openscience/cdk/interfaces/IRingSet.class +org/openscience/cdk/interfaces/ISingleElectron.class +org/openscience/cdk/interfaces/IStrand.class +org/openscience/cdk/io/CMLReader.class +org/openscience/cdk/io/DefaultChemObjectReader.class +org/openscience/cdk/io/FormatFactory.class +org/openscience/cdk/io/formats/ABINITFormat.class +org/openscience/cdk/io/formats/Aces2Format.class +org/openscience/cdk/io/formats/ADFFormat.class +org/openscience/cdk/io/formats/AlchemyFormat.class +org/openscience/cdk/io/formats/BGFFormat.class +org/openscience/cdk/io/formats/BSFormat.class +org/openscience/cdk/io/formats/CacaoCartesianFormat.class +org/openscience/cdk/io/formats/CacaoInternalFormat.class +org/openscience/cdk/io/formats/CACheFormat.class +org/openscience/cdk/io/formats/CDKSourceCodeFormat.class +org/openscience/cdk/io/formats/Chem3D_Cartesian_1Format.class +org/openscience/cdk/io/formats/Chem3D_Cartesian_2Format.class +org/openscience/cdk/io/formats/ChemDrawFormat.class +org/openscience/cdk/io/formats/ChemtoolFormat.class +org/openscience/cdk/io/formats/CIFFormat.class +org/openscience/cdk/io/formats/CMLFormat.class +org/openscience/cdk/io/formats/CMLRSSFormat.class +org/openscience/cdk/io/formats/CRK2DFormat.class +org/openscience/cdk/io/formats/CRK3DFormat.class +org/openscience/cdk/io/formats/CrystClustFormat.class +org/openscience/cdk/io/formats/CTXFormat.class +org/openscience/cdk/io/formats/DaltonFormat.class +org/openscience/cdk/io/formats/DMol3Format.class +org/openscience/cdk/io/formats/DOCK5Format.class +org/openscience/cdk/io/formats/FenskeHall_ZMatrixFormat.class +org/openscience/cdk/io/formats/FingerprintFormat.class +org/openscience/cdk/io/formats/GamessFormat.class +org/openscience/cdk/io/formats/Gaussian03Format.class +org/openscience/cdk/io/formats/Gaussian90Format.class +org/openscience/cdk/io/formats/Gaussian92Format.class +org/openscience/cdk/io/formats/Gaussian94Format.class +org/openscience/cdk/io/formats/Gaussian95Format.class +org/openscience/cdk/io/formats/Gaussian98Format.class +org/openscience/cdk/io/formats/GaussianInputFormat.class +org/openscience/cdk/io/formats/GhemicalMMFormat.class +org/openscience/cdk/io/formats/GhemicalSPMFormat.class +org/openscience/cdk/io/formats/GROMOS96Format.class +org/openscience/cdk/io/formats/HINFormat.class +org/openscience/cdk/io/formats/IChemFormat.class +org/openscience/cdk/io/formats/IChemFormatMatcher.class +org/openscience/cdk/io/formats/INChIFormat.class +org/openscience/cdk/io/formats/INChIPlainTextFormat.class +org/openscience/cdk/io/formats/IResourceFormat.class +org/openscience/cdk/io/formats/JaguarFormat.class +org/openscience/cdk/io/formats/JMEFormat.class +org/openscience/cdk/io/formats/MacroModelFormat.class +org/openscience/cdk/io/formats/MDLFormat.class +org/openscience/cdk/io/formats/MDLRXNFormat.class +org/openscience/cdk/io/formats/MDLRXNV3000Format.class +org/openscience/cdk/io/formats/MDLV2000Format.class +org/openscience/cdk/io/formats/MDLV3000Format.class +org/openscience/cdk/io/formats/MMODFormat.class +org/openscience/cdk/io/formats/Mol2Format.class +org/openscience/cdk/io/formats/MOPAC2002Format.class +org/openscience/cdk/io/formats/MOPAC7Format.class +org/openscience/cdk/io/formats/MOPAC93Format.class +org/openscience/cdk/io/formats/MOPAC97Format.class +org/openscience/cdk/io/formats/MPQCFormat.class +org/openscience/cdk/io/formats/NWChemFormat.class +org/openscience/cdk/io/formats/PCModelFormat.class +org/openscience/cdk/io/formats/PDBFormat.class +org/openscience/cdk/io/formats/PDBMLFormat.class +org/openscience/cdk/io/formats/PMPFormat.class +org/openscience/cdk/io/formats/POVRayFormat.class +org/openscience/cdk/io/formats/PQSChemFormat.class +org/openscience/cdk/io/formats/PubChemASNFormat.class +org/openscience/cdk/io/formats/PubChemCompoundsXMLFormat.class +org/openscience/cdk/io/formats/PubChemCompoundXMLFormat.class +org/openscience/cdk/io/formats/PubChemFormat.class +org/openscience/cdk/io/formats/PubChemSubstancesASNFormat.class +org/openscience/cdk/io/formats/PubChemSubstancesXMLFormat.class +org/openscience/cdk/io/formats/PubChemSubstanceXMLFormat.class +org/openscience/cdk/io/formats/QChemFormat.class +org/openscience/cdk/io/formats/RawCopyFormat.class +org/openscience/cdk/io/formats/SDFFormat.class +org/openscience/cdk/io/formats/ShelXFormat.class +org/openscience/cdk/io/formats/SMARTSFormat.class +org/openscience/cdk/io/formats/SMILESFIXFormat.class +org/openscience/cdk/io/formats/SMILESFormat.class +org/openscience/cdk/io/formats/SpartanFormat.class +org/openscience/cdk/io/formats/SVGFormat.class +org/openscience/cdk/io/formats/SybylDescriptorFormat.class +org/openscience/cdk/io/formats/TinkerMM2Format.class +org/openscience/cdk/io/formats/TinkerXYZFormat.class +org/openscience/cdk/io/formats/TurboMoleFormat.class +org/openscience/cdk/io/formats/UniChemXYZFormat.class +org/openscience/cdk/io/formats/VASPFormat.class +org/openscience/cdk/io/formats/ViewmolFormat.class +org/openscience/cdk/io/formats/XEDFormat.class +org/openscience/cdk/io/formats/XYZFormat.class +org/openscience/cdk/io/formats/YasaraFormat.class +org/openscience/cdk/io/formats/ZindoFormat.class +org/openscience/cdk/io/formats/ZMatrixFormat.class +org/openscience/cdk/io/IChemObjectIO.class +org/openscience/cdk/io/IChemObjectReader.class +org/openscience/cdk/io/IChemObjectReader$Mode.class +org/openscience/cdk/io/ISimpleChemObjectReader.class +org/openscience/cdk/io/MDLV2000Reader.class +org/openscience/cdk/io/ReaderFactory.class +org/openscience/cdk/io/setting/BooleanIOSetting.class +org/openscience/cdk/io/setting/IOSetting.class +org/openscience/cdk/Isotope.class +org/openscience/cdk/layout/AtomPlacer$1.class +org/openscience/cdk/layout/AtomPlacer.class +org/openscience/cdk/layout/RingPlacer.class +org/openscience/cdk/Molecule.class +org/openscience/cdk/MoleculeSet.class +org/openscience/cdk/renderer/AtomContainerRenderer.class +org/openscience/cdk/renderer/BoundsCalculator.class +org/openscience/cdk/renderer/color/CDK2DAtomColors.class +org/openscience/cdk/renderer/color/IAtomColorer.class +org/openscience/cdk/renderer/elements/ArrowElement.class +org/openscience/cdk/renderer/elements/ElementGroup.class +org/openscience/cdk/renderer/elements/IRenderingElement.class +org/openscience/cdk/renderer/elements/IRenderingVisitor.class +org/openscience/cdk/renderer/elements/LineElement.class +org/openscience/cdk/renderer/elements/OvalElement.class +org/openscience/cdk/renderer/elements/RectangleElement.class +org/openscience/cdk/renderer/elements/TextElement.class +org/openscience/cdk/renderer/elements/TextGroupElement$Child.class +org/openscience/cdk/renderer/elements/TextGroupElement.class +org/openscience/cdk/renderer/elements/TextGroupElement$Position.class +org/openscience/cdk/renderer/elements/WedgeLineElement.class +org/openscience/cdk/renderer/elements/WigglyLineElement.class +org/openscience/cdk/renderer/font/AbstractFontManager.class +org/openscience/cdk/renderer/font/AWTFontManager.class +org/openscience/cdk/renderer/font/IFontManager.class +org/openscience/cdk/renderer/font/IFontManager$FontStyle.class +org/openscience/cdk/renderer/generators/BasicAtomGenerator.class +org/openscience/cdk/renderer/generators/BasicBondGenerator$1.class +org/openscience/cdk/renderer/generators/BasicBondGenerator.class +org/openscience/cdk/renderer/generators/ExtendedAtomGenerator.class +org/openscience/cdk/renderer/generators/ExternalHighlightGenerator.class +org/openscience/cdk/renderer/generators/HighlightAtomGenerator.class +org/openscience/cdk/renderer/generators/HighlightBondGenerator.class +org/openscience/cdk/renderer/generators/IGenerator.class +org/openscience/cdk/renderer/generators/IReactionGenerator.class +org/openscience/cdk/renderer/generators/LonePairGenerator.class +org/openscience/cdk/renderer/generators/MappingGenerator.class +org/openscience/cdk/renderer/generators/MergeAtomsGenerator.class +org/openscience/cdk/renderer/generators/ProductsBoxGenerator.class +org/openscience/cdk/renderer/generators/RadicalGenerator.class +org/openscience/cdk/renderer/generators/ReactantsBoxGenerator.class +org/openscience/cdk/renderer/generators/ReactionArrowGenerator.class +org/openscience/cdk/renderer/generators/ReactionBoxGenerator.class +org/openscience/cdk/renderer/generators/ReactionPlusGenerator.class +org/openscience/cdk/renderer/generators/RingGenerator.class +org/openscience/cdk/renderer/generators/SelectAtomGenerator.class +org/openscience/cdk/renderer/generators/SelectBondGenerator.class +org/openscience/cdk/renderer/IRenderer.class +org/openscience/cdk/renderer/Renderer.class +org/openscience/cdk/renderer/RendererModel.class +org/openscience/cdk/renderer/RenderingParameters$AtomShape.class +org/openscience/cdk/renderer/RenderingParameters.class +org/openscience/cdk/renderer/selection/IChemObjectSelection.class +org/openscience/cdk/renderer/selection/IncrementalSelection.class +org/openscience/cdk/renderer/selection/LogicalSelection.class +org/openscience/cdk/renderer/selection/LogicalSelection$Type.class +org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.class +org/openscience/cdk/renderer/visitor/AWTDrawVisitor$1.class +org/openscience/cdk/renderer/visitor/AWTDrawVisitor.class +org/openscience/cdk/renderer/visitor/IDrawVisitor.class +org/openscience/cdk/Ring.class +org/openscience/cdk/ringsearch/cyclebasis/CycleBasis.class +org/openscience/cdk/ringsearch/cyclebasis/SimpleCycleBasis$AuxiliaryGraph.class +org/openscience/cdk/ringsearch/cyclebasis/SimpleCycleBasis.class +org/openscience/cdk/ringsearch/cyclebasis/SimpleCycle.class +org/openscience/cdk/ringsearch/SSSRFinder.class +org/openscience/cdk/RingSet.class +org/openscience/cdk/smiles/SmilesParser.class +org/openscience/cdk/tools/CDKHydrogenAdder.class +org/openscience/cdk/tools/LoggingTool.class +org/openscience/cdk/tools/manipulator/AtomContainerSetManipulator.class +org/openscience/cdk/tools/manipulator/ChemModelManipulator.class +org/openscience/cdk/tools/manipulator/MoleculeSetManipulator.class +org/openscience/cdk/tools/manipulator/RingSetManipulator.class +org/openscience/cdk/validate/ProblemMarker.class +org/openscience/jchempaint/AbstractJChemPaintPanel.class +org/openscience/jchempaint/applet/JChemPaintAbstractApplet$1.class +org/openscience/jchempaint/applet/JChemPaintAbstractApplet.class +org/openscience/jchempaint/applet/JChemPaintViewerApplet.class +org/openscience/jchempaint/application/JChemPaint.class +org/openscience/jchempaint/JChemPaintPanel.class +org/openscience/jchempaint/JChemPaintViewerPanel.class +org/openscience/jchempaint/JCPPropertyHandler.class +org/openscience/jchempaint/JExternalFrame.class +org/openscience/jchempaint/RenderPanel.class +io-formats.set +org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.class Added: jchempaint/trunk/build.shrink.xml =================================================================== --- jchempaint/trunk/build.shrink.xml (rev 0) +++ jchempaint/trunk/build.shrink.xml 2009-09-24 16:18:53 UTC (rev 14874) @@ -0,0 +1,367 @@ +<project name="JCPCDK" default="dist" basedir="."> + + <property file="ant.properties"/> + + <property name="debug" value="on" /> + <property name="deprecation" value="on" /> + <property name="optimization" value="off" /> + + <property name="cdk.dist" value="${cdk.dir}/dist" /> + <property name="cdk.lib" value="${cdk.dir}/jar" /> + <property name="cdk.devellib" value="${cdk.dir}/develjar" /> + <property name="cdk.metainf" value="${cdk.dir}/src/META-INF" /> + <property name="src" value="src" /> + <property name="lib" value="lib" /> + <property name="dist" value="dist" /> + <property name="dist-classes" value="${dist}/classes" /> + <property name="dist-test" value="${dist}/test" /> + <property name="metainf" value="META-INF" /> + <property name="po-classes" value="po/classes" /> + + <property name="growing_list_file" value="${dist}/applet-classes-list.files"/> + <property name="growing_classpath" value="${dist}/applet-jars-list.files"/> + + <target id="clean" name="clean" description="Removes compiled stuff."> + <delete dir="${dist}" /> + </target> + + <target id="dist" name="dist" depends="compile-jcp, unjar-libjars, unjar-cdkjars" + description="Builds the JChemPaint application"> + <jar jarfile="${dist}/jchempaint-${jcp.version}.jar"> + <manifest> + <attribute name="Main-Class" value="org.openscience.jchempaint.application.JChemPaint"/> + <section name="org/openscience/jchempaint/"> + <attribute name="Specification-Title" value="JChemPaint"/> + <attribute name="Specification-Version" value="2.2"/> + <attribute name="Specification-Vendor" value="The CDK Project"/> + <attribute name="Implementation-Title" value="org.openscience.cdk.applications.jchempaint"/> + <attribute name="Implementation-Version" value="${jcp.version}"/> + <attribute name="Implementation-Vendor" value="The CDK Project"/> + </section> + </manifest> + <fileset dir="${dist-classes}"> + <include name="**/*" /> + </fileset> + <fileset dir="${cdk.dir}/doc"> + <include name="lgpl.license" /> + </fileset> + </jar> + </target> + + <target id="unjar-libjars" name="unjar-libjars"> + <unjar dest="${dist-classes}"> + <fileset dir="${cdk.lib}"> + <includesfile name="${cdk.metainf}/atomtype.libdepends"/> + <includesfile name="${cdk.metainf}/builder3d.libdepends"/> + <includesfile name="${cdk.metainf}/builder3dtools.libdepends"/> + <includesfile name="${cdk.metainf}/charges.libdepends"/> + <includesfile name="${cdk.metainf}/control.libdepends"/> + <includesfile name="${cdk.metainf}/core.libdepends"/> + <includesfile name="${cdk.metainf}/data.libdepends"/> + <includesfile name="${cdk.metainf}/datadebug.libdepends"/> + <includesfile name="${cdk.metainf}/dict.libdepends"/> + <includesfile name="${cdk.metainf}/diff.libdepends"/> + <includesfile name="${cdk.metainf}/extra.libdepends"/> + <includesfile name="${cdk.metainf}/forcefield.libdepends"/> + <includesfile name="${cdk.metainf}/formula.libdepends"/> + <includesfile name="${cdk.metainf}/inchi.libdepends"/> + <includesfile name="${cdk.metainf}/interfaces.libdepends"/> + <includesfile name="${cdk.metainf}/io.libdepends"/> + <includesfile name="${cdk.metainf}/isomorphism.libdepends"/> + <includesfile name="${cdk.metainf}/libiocml.libdepends"/> + <includesfile name="${cdk.metainf}/libiomd.libdepends"/> + <includesfile name="${cdk.metainf}/nonotify.libdepends"/> + <includesfile name="${cdk.metainf}/pcore.libdepends"/> + <includesfile name="${cdk.metainf}/pdb.libdepends"/> + <includesfile name="${cdk.metainf}/pdbcml.libdepends"/> + <includesfile name="${cdk.metainf}/qm.libdepends"/> + <includesfile name="${cdk.metainf}/qsar.libdepends"/> + <includesfile name="${cdk.metainf}/qsaratomic.libdepends"/> + <includesfile name="${cdk.metainf}/qsarbond.libdepends"/> + <includesfile name="${cdk.metainf}/qsarcml.libdepends"/> + <includesfile name="${cdk.metainf}/qsarmolecular.libdepends"/> + <includesfile name="${cdk.metainf}/qsarprotein.libdepends"/> + <includesfile name="${cdk.metainf}/reaction.libdepends"/> + <includesfile name="${cdk.metainf}/render.libdepends"/> + <includesfile name="${cdk.metainf}/sdg.libdepends"/> + <includesfile name="${cdk.metainf}/smarts.libdepends"/> + <includesfile name="${cdk.metainf}/smiles.libdepends"/> + <includesfile name="${cdk.metainf}/standard.libdepends"/> + </fileset> + </unjar> + <unjar dest="${dist-classes}"> + <fileset dir="${lib}"> + <include name="**/*" /> + </fileset> + </unjar> + <delete dir="${dist-classes}/META-INF" /> + </target> + + <target id="unjar-cdkjars" name="unjar-cdkjars"> + <unjar dest="${dist-classes}"> + <fileset dir="${cdk.dist}/jar"> + <include name="cdk-atomtype.jar"/> + <include name="cdk-builder3d.jar"/> + <include name="cdk-builder3dtools.jar"/> + <include name="cdk-charges.jar"/> + <include name="cdk-control.jar"/> + <include name="cdk-core.jar"/> + <include name="cdk-datadebug.jar"/> + <include name="cdk-data.jar"/> + <include name="cdk-dict.jar"/> + <include name="cdk-diff.jar"/> + <include name="cdk-extra.jar"/> + <include name="cdk-fingerprint.jar"/> + <include name="cdk-forcefield.jar"/> + <include name="cdk-formula.jar"/> + <include name="cdk-inchi.jar"/> + <include name="cdk-interfaces.jar"/> + <include name="cdk-io.jar"/> + <include name="cdk-ionpot.jar"/> + <include name="cdk-isomorphism.jar"/> + <include name="cdk-libiocml.jar"/> + <include name="cdk-libiomd.jar"/> + <include name="cdk-nonotify.jar"/> + <include name="cdk-pcore.jar"/> + <include name="cdk-pdbcml.jar"/> + <include name="cdk-pdb.jar"/> + <include name="cdk-qm.jar"/> + <include name="cdk-qsaratomic.jar"/> + <include name="cdk-qsarbond.jar"/> + <include name="cdk-qsarionpot.jar"/> + <include name="cdk-qsar.jar"/> + <include name="cdk-qsarmolecular.jar"/> + <include name="cdk-qsarprotein.jar"/> + <include name="cdk-reaction.jar"/> + <include name="cdk-render.jar"/> + <include name="cdk-sdg.jar"/> + <include name="cdk-smarts.jar"/> + <include name="cdk-smiles.jar"/> + <include name="cdk-standard.jar"/> + <include name="cdk-controlbasic.jar"/> + <include name="cdk-structgen.jar"/> + <include name="cdk-valencycheck.jar"/> + + <!-- added by MR, new controller/renderer --> + <include name="cdk-controlawt.jar"/> + <include name="cdk-controlextra.jar"/> + <include name="cdk-renderawt.jar"/> + <include name="cdk-renderbasic.jar"/> + <include name="cdk-rendercontrol.jar"/> + <include name="cdk-renderextra.jar"/> + <include name="cdk-rendersvg.jar"/> + <include name="cdk-ioformats.jar"/> + + + </fileset> + </unjar> + <delete dir="${dist-classes}/META-INF" /> + <delete> + <fileset dir="${dist-classes}" includes="*" excludes="io-formats.set"/> + </delete> + <delete dir="${dist-classes}/org/omegahat" /> + </target> + + <target id="compile-jcp" name="compile-jcp"> + <!-- TODO check if dist-all in cdk has been done--> + <echo message="Compiling JChemPaint classes." /> + <mkdir dir="${dist-classes}" /> + <javac srcdir="${src}/main" destdir="${dist-classes}" optimize="${optimization}" + nowarn="${nowarn}" + debug="${debug}" deprecation="${deprecation}" target="1.5" source="1.5"> + <classpath> + <fileset dir="${cdk.lib}" > + </fileset> + <fileset dir="${cdk.devellib}"> + </fileset> + <fileset dir="${cdk.dist}/jar"> + </fileset> + <fileset dir="${lib}"> + </fileset> + </classpath> + + </javac> + <copydir dest="${dist-classes}/org/openscience/jchempaint/resources" src="${src}/main/org/openscience/jchempaint/resources"></copydir> + <copy todir="${dist-classes}"> + <fileset dir="${po-classes}"/> + </copy> + </target> + + <target id="dist-applet" name="dist-applet" depends="build-applet" description="Builds the JChemPaint applet jar files with jarindex"> + <zip destfile="${dist}/jchempaint-applet-${jcp.version}.zip"> + <zipfileset dir="${dist}/jar" includes="jchempaint-applet-*.jar"/> + <zipfileset dir="${cdk.dir}/doc" includes="lgpl.license"/> + </zip> + </target> + + <target id="dist-applet-signed" name="dist-applet-signed" depends="build-applet" description="Builds the JChemPaint applet jar files with jarindex"> + <signjar destDir="" + alias="${certificatealias}" + storepass="${keystorepassphrase}" + preservelastmodified="true"> + <path> + <fileset dir="."> + <includesfile name="${growing_classpath}"/> + </fileset> + </path> + </signjar> + <zip destfile="${dist}/jchempaint-applet-${jcp.version}.zip"> + <zipfileset dir="${dist}/jar" includes="jchempaint-applet-*.jar"/> + <zipfileset dir="${cdk.dir}/doc" includes="lgpl.license"/> + </zip> + </target> + + <!-- since only targets can be conditional, we need this in a separte target --> + <target name="concat" id="concat" unless="appendtolist"> + <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"> + <fileset file="@{includesfile}" /> + </concat> + </target> + + <target id="build-applet" name="build-applet" depends="compile-jcp, unjar-libjars, unjar-cdkjars" description="Builds the JChemPaint applet jar files with jarindex"> + <!-- At first jars are packed from file lists --> + <!-- The file lists are generated from tomcat access log files with unpacked class files (and without jar files) --> + <!-- cat apache/jakarta-tomcat-5.0.28/logs/localhost_access_log.2005-04-27.txt | awk -v classdir="/jcpapplet/classes/" '$9 != 404 && substr($7,0,length(classdir)) == classdir { print substr($7,length(classdir)+1) }' | sort --> + <!-- hint: uncomment <Valve className="org.apache.catalina.valves.AccessLogValve" in conf/server.xml to switch on tomcat's access logging --> + <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"> + <fileset file="${metainf}/applet-core.files"/> + </concat> + <concat destfile="${growing_classpath}" fixlastline="no" append="no">${dist}/jar/jchempaint-applet-core.jar${line.separator}</concat> + <macrodef name="jar-from-list"> + <attribute name="destfile"/> + <attribute name="includesfile"/> + <sequential> + <jar destfile="@{destfile}"> + <fileset dir="${dist-classes}"> + <includesfile name="@{includesfile}"/> + <excludesfile name="${growing_list_file}"/> + </fileset> + </jar> + <antcall target="concat"/> + <concat destfile="${growing_classpath}" fixlastline="no" append="yes">@{destfile}${line.separator}</concat> + </sequential> + </macrodef> + <macrodef name="jar-from-pattern"> + <attribute name="destfile"/> + <attribute name="includepattern"/> + <sequential> + <jar destfile="@{destfile}"> + <fileset dir="${dist-classes}"> + <include name="@{includepattern}"/> + <excludesfile name="${growing_list_file}"/> + </fileset> + </jar> + <concat destfile="${growing_list_file}" fixlastline="yes" append="yes">@{includepattern}${line.separator}</concat> + <concat destfile="${growing_classpath}" fixlastline="no" append="yes">@{destfile}${line.separator}</concat> + </sequential> + </macrodef> + + <!--<echo message="Compiling applet logging tool org/openscience/cdk/tools/LoggingTool.java to ${dist-classes}"/> + <delete file="${dist-classes}/org/openscience/cdk/tools/LoggingTool.class"/> + <javac srcdir="applet" destdir="${dist-classes}" optimize="${optimization}" debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3"> + </javac>--> + + <mkdir dir="${dist}/jar" /> + <jar-from-list destfile="${dist}/jar/jchempaint-applet-viewer-opts.jar" includesfile="${metainf}/applet-viewer-opts.files"/> + <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor.jar" includesfile="${metainf}/applet-editor.files"/> + <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor-opts.jar" includesfile="${metainf}/applet-editor-opts.files"/> + <!-- since for the display of the help, we need the icons in the same jar, we do not log + this to the growing_list_file, so that icons go into the resources.jar as well --> + <property name="appendtolist" value="true"/> + <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources-core.jar" includesfile="${metainf}/applet-resources-core.files"/> + <available file="build.xml" property="appendtolist"/> + <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources.jar" includesfile="${metainf}/jchempaint.datafiles"/> + <!-- the following jar files are packed from directory patterns --> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_dict.jar" includepattern="org/openscience/cdk/dict/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar" includepattern="org/openscience/cdk/io/**"/> + <!--jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_qsar.jar" includepattern="org/openscience/cdk/qsar/**"/--> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_iupac.jar" includepattern="org/openscience/cdk/iupac/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_math.jar" includepattern="org/openscience/cdk/math/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_tools.jar" includepattern="org/openscience/cdk/tools/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_structgen.jar" includepattern="org/openscience/cdk/structgen/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_nonotify.jar" includepattern="org/openscience/cdk/nonotify/**"/> + <!--jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_modeling.jar" includepattern="org/openscience/cdk/modeling/**"/--> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_controller.jar" includepattern="org/openscience/cdk/controller/**"/> + + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar" includepattern="org/openscience/cdk/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience.jar" includepattern="org/openscience/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_3pq.jar" includepattern="org/_3pq/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_apache.jar" includepattern="org/apache/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_w3c.jar" includepattern="org/w3c/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_fest.jar" includepattern="org/fest/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_jaxen.jar" includepattern="org/jaxen/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_xmlcml.jar" includepattern="org/xmlcml/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org.jar" includepattern="org/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-com_ozten.jar" includepattern="com/ozten/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-Jama.jar" includepattern="Jama/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-jas.jar" includepattern="jas/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-javax_vecmath.jar" includepattern="javax/vecmath/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-nu.jar" includepattern="nu/**"/> + <!-- the following jar contains all other classes and resources --> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-others.jar" includepattern="**/*"/> + <!-- the main jar file is packed from a list, but it must be packed as last file because it contains INDEX.LIST --> + <jar destfile="${dist}/jar/jchempaint-applet-core.jar" index="true"> + <manifest> + <section name="org/openscience/cdk/applications/jchempaint/"> + <attribute name="Specification-Title" value="JChemPaint"/> + <attribute name="Specification-Version" value="1.0"/> + <attribute name="Specification-Vendor" value="The CDK Project"/> + <attribute name="Implementation-Title" value="org.openscience.cdk"/> + <attribute name="Implementation-Version" value="${jcp.version}"/> + <attribute name="Implementation-Vendor" value="The CDK Project"/> + </section> + </manifest> + <fileset dir="${dist-classes}"> + <includesfile name="${metainf}/applet-core.files"/> + <exclude name="org/apache/log4j/**"/> + </fileset> + </jar> + <exec dir="${dist}/jar" executable="jar" > + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + </exec> + </target> + + <target id="test-applet" name="test-applet"> + <mkdir dir="${dist-test}" /> + <javac srcdir="${src}/test" destdir="${dist-test}" optimize="${optimization}" + nowarn="${nowarn}" + debug="${debug}" deprecation="${deprecation}" target="1.5" source="1.5"> + <classpath> + <fileset dir="${dist}/jar/"> + <include name="*.jar" /> + </fileset> + <fileset dir="${lib}"> + <include name="*.jar" /> + </fileset> + <fileset dir="${cdk.devellib}"> + <include name="*.jar" /> + </fileset> + </classpath> + </javac> + <copy todir="${dist-test}/data"> + <fileset dir="${src}/test/data"/> + </copy> + <junit forkmode="perBatch" printsummary="yes" haltonfailure="no" haltonerror="no"> + <classpath> + <fileset dir="${dist}/jar/"> + <include name="*.jar" /> + </fileset> + <fileset dir="${lib}"> + <include name="*.jar" /> + </fileset> + <fileset dir="${cdk.devellib}"> + <include name="*.jar" /> + </fileset> + <pathelement location="${dist-test}"/> + </classpath> + <test name="org.openscience.jchempaint.AllJCPTests" + haltonfailure="no"> + <formatter type="brief" /> + </test> + </junit> + </target> +</project> + + + Property changes on: jchempaint/trunk/build.shrink.xml ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-24 16:50:19
|
Revision: 14876 http://cdk.svn.sourceforge.net/cdk/?rev=14876&view=rev Author: shk3 Date: 2009-09-24 16:49:59 +0000 (Thu, 24 Sep 2009) Log Message: ----------- reworked the tutorial and the buttons help Modified Paths: -------------- jchempaint/trunk/build.xml jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/button.html jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/drawingButtons.html jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/otherButtons.html jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/tutorial.html Added Paths: ----------- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/elementButtons.html Removed Paths: ------------- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/molecules.html jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/moveButtons.html jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/reactions.html Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-24 16:29:23 UTC (rev 14875) +++ jchempaint/trunk/build.xml 2009-09-24 16:49:59 UTC (rev 14876) @@ -211,12 +211,6 @@ </zip> </target> - <!-- since only targets can be conditional, we need this in a separte target --> - <target name="concat" id="concat" unless="appendtolist"> - <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"> - <fileset file="@{includesfile}" /> - </concat> - </target> <target id="build-applet" name="build-applet" depends="compile-jcp, unjar-libjars, unjar-cdkjars" description="Builds the JChemPaint applet jar files with jarindex"> <!-- At first jars are packed from file lists --> @@ -237,10 +231,23 @@ <excludesfile name="${growing_list_file}"/> </fileset> </jar> - <antcall target="concat"/> + <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"><fileset file="@{includesfile}" /></concat> <concat destfile="${growing_classpath}" fixlastline="no" append="yes">@{destfile}${line.separator}</concat> </sequential> </macrodef> + <macrodef name="jar-from-list-no-concat"> + <attribute name="destfile"/> + <attribute name="includesfile"/> + <sequential> + <jar destfile="@{destfile}"> + <fileset dir="${dist-classes}"> + <includesfile name="@{includesfile}"/> + <excludesfile name="${growing_list_file}"/> + </fileset> + </jar> + <concat destfile="${growing_classpath}" fixlastline="no" append="yes">@{destfile}${line.separator}</concat> + </sequential> + </macrodef> <macrodef name="jar-from-pattern"> <attribute name="destfile"/> <attribute name="includepattern"/> @@ -267,9 +274,7 @@ <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor-opts.jar" includesfile="${metainf}/applet-editor-opts.files"/> <!-- since for the display of the help, we need the icons in the same jar, we do not log this to the growing_list_file, so that icons go into the resources.jar as well --> - <property name="appendtolist" value="true"/> - <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources-core.jar" includesfile="${metainf}/applet-resources-core.files"/> - <available file="build.xml" property="appendtolist"/> + <jar-from-list-no-concat destfile="${dist}/jar/jchempaint-applet-resources-core.jar" includesfile="${metainf}/applet-resources-core.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources.jar" includesfile="${metainf}/jchempaint.datafiles"/> <!-- the following jar files are packed from directory patterns --> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**"/> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/button.html =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/button.html 2009-09-24 16:29:23 UTC (rev 14875) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/button.html 2009-09-24 16:49:59 UTC (rev 14876) @@ -21,33 +21,17 @@ <hr> </div> -<h2>The Button Panel</h2> +<h2>The Button Panels</h2> <p> -In the following pages you can find an explanation of the function of the buttons in the button panel. </p> +In the following pages you can find an explanation of the function of the buttons in the button panels. </p> <td><img src="../../small-bin/hg_proc.gif" width="18" height="13"></td> - <td><a href="drawingButtons.html"><b>Drawing buttons</b></a></td> + <td><a href="otherButtons.html"><b>Top buttons</b></a></td> <td><img src="../../small-bin/hg_proc.gif" width="18" height="13"></td> - <td><a href="moveButtons.html"><b>Move buttons</b></a></td> + <td><a href="drawingButtons.html"><b>Bond buttons (left)</b></a></td> <td><img src="../../small-bin/hg_proc.gif" width="18" height="13"></td> - <td><a href="otherButtons.html"><b>Other buttons</b></a></td> -<p>But before starting on that, let's look at the code which offers the source of -this functionality.<br> -JChemPaint's source code provides only the GUI part, but all the -chemoinformational algorithms which make JChemPaint an editor are provided by the -CDK. The two main classes of interest are: -<ul type="circle"> - <li>the renderer.Renderer </li> - <li>controller.Controller </li> -</ul> -The first deals with graphical rendering of -the chemical information and the second deals with user input from mouse and -button events, and extends the renderer with editing features. -But the Controller does not handle all editing; it only does the editing -functionality in some editing mode, like the drawing and bond mode. A few -other buttons - and most menu items - do not use the functionality in this class, -but provide algorithms from other CDK classes. Where possible, the information -about the buttons will also link to the CDK classes that provide the algorithms -used. + <td><a href="elementButtons.html"><b>Element buttons (right)</b></a></td> + <td><img src="../../small-bin/hg_proc.gif" width="18" height="13"></td> + <td><a href="bottomButtons.html"><b>Ring buttons (bottom)</b></a></td> <div class="navfooter"><hr> <table width="100%"> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/drawingButtons.html =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/drawingButtons.html 2009-09-24 16:29:23 UTC (rev 14875) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/drawingButtons.html 2009-09-24 16:49:59 UTC (rev 14876) @@ -2,7 +2,7 @@ <html> <head> -<title>The Drawing Buttons</title> +<title>The Bond Buttons</title> <link rel="stylesheet" type="text/css" href="../jcp.css" title="Style"> </head> <body bgcolor="#ffffff"> @@ -10,75 +10,80 @@ <div class="navheader"> <table width="100%"> <tr> - <th align="center" colspan="3">The Button Panel</th> + <th align="center" colspan="3">The Bond Buttons</th> </tr> <tr> - <td align="left" width="20%"><a href="button.html">Prev</a> </td> + <td align="left" width="20%"><a href="otherButtons.html">Prev</a> </td> <th align="center" width="60%"> </th> - <td align="right" width="20%"> <a href="moveButtons.html">Next</a></td> + <td align="right" width="20%"> <a href="elementButtons.html">Next</a></td> </tr> </table> <hr> </div> -<h3>The Drawing Buttons</h3><br> +<h3>The Bond Buttons</h3> +<p>These buttons set JChemPaint into modes for drawing various types of bonds.</p><br> <ul type="circle"> - <li>The drawing button <img src="../../small-bin/bond.gif"></li> + <li>The Single Bond button <img src="../../small-bin/bond.gif"></li> </ul> - <p>Puts JChemapint in the draw mode, which is the standard mode for + <p>Puts JChemapint in the single bond mode, which is the standard mode for building up chemical structures. If selected you can click on a point on - the document and you'll create a single atom at this point. If you click, - hold, and drag the mouse, a bond is created. Multiple clicking on an - existing bond will cycle its bond order between the values 1, 2 and 3.</p> - <p>The algorithms behind this button are provided by the - controller.Controller class.</p><br> + the document and you'll create a single bond at this point. If you alreday + have atoms in your drawing, there are several ways to draw bonds in this mode: + <ul> + <li>Directly click on an atom: A bond with default length will be drawn at a reasonable angle.</li> + <li>Drag from an atom: A bond with default length will be drawn at the angle to drag to.</li> + <li>Drag from an atom to another atom: A bond with default length will be drawn at the angle to drag to.</li> + </ul> + Multiple clicking on an + existing bond will cycle its bond order between the values 1, 2, 3 and 4.</p><br> <ul type="circle"> <li>The up-bond button <img src="../../small-bin/up_bond.gif"></li> </ul> - <p>This mode enables you to change an existing bond into a filled + <p>This mode enables you to either draw filled wedge bonds the same way as single + bonds or change an existing bond into a filled wedge - the standard symbol to indicate that the atom at the thick end is above the 2D plane. Furthermore, multiple clicking on an existing bond will change it to a filled wedge and if it already has this - shape it will toggle between the two possible orientations</p>. - <p>The algorithms behind this button are provided by the - controller.Controller class.</p><br> + shape it will toggle between the two possible orientations</p>.<br> <ul type="circle"> <li>The down-bond button <img src="../../small-bin/down_bond.gif"></li> </ul> - <p>This mode enables you to change an existing bond into a dashed + <p>This mode enables you to either draw dashed wedge bonds the same way as single + bonds or change an existing bond into a dashed wedge - the standard symbol indicating that the atom at the thin end is below the 2D plane. While selected, a click on an existing bond will change it to a dashed wedge and if it already has this shape it - will toggle between the two possible orientations.</p> - </p>The algorithms behind this button are provided by the - controller.Controller2D class.</p><br> + will toggle between the two possible orientations.</p><br> <ul type="circle"> - <li>The Ring templates</li> + <li>The undefinied stereo bond button <img src="../../small-bin/undefined_bond.gif"></li> </ul> - <p>The ring templates, like, <img src="../../small-bin/triangle.gif">, - <img src="../../small-bin/pentagon.gif">, <img src="../../small-bin/hexagon.gif">, - allow you to draw single - rings and complex ring systems from a few predefined templates.</p> - <p>A click on an atom places the preselected ring such that the atom - on which you clicked is one of the ring atoms. Click on a bond and it - will be part of the newly created ring. A new ring is always placed - on the least hindered side of the system. If you don't like the result, - you can click on a bond, hold the mouse button and use the appearing - gray line to indicate side of the bond on which you want to have the - ring placed. Atoms of the newly place ring that are within the snap - radius of existing atoms will be fused with these.</p> - </p>The algorithms behind this button are provided by the - controller.Controller2D class.</p><br> + <p>This mode enables you to either draw zigzag wedge bonds the same way as single + bonds or change an existing bond into a zigzag + wedge - this is sometimes used to indicating that the atom at the thick end + is above or below the 2D plane. Note the latest IUPAC recommendation discourages + using this, but recommends using the wiggly bond instead. While selected, a click on an existing + bond will change it to a zigzag wedge and if it already has this shape it + will toggle between the two possible orientations.</p><br> + <ul type="circle"> + <li>The undefinied bond button <img src="../../small-bin/undefined_stereo_bond.gif"></li> + </ul> + <p>This mode enables you to either draw wiggly bonds the same way as single + bonds or change an existing bond into a wiggly bond - this can indicate either + up or down or undefined E/Z configuration. Note the latest IUPAC recommendation + encourages using this for all undefined cases. While selected, a click on an existing + bond will change it to a wiggly wedge.</p><br> + <div class="navfooter"><hr> <table width="100%"> <tr> - <td align="left" width="40%"><a href="button.html">Prev</a> </td> + <td align="left" width="40%"><a href="otherButtons.html">Prev</a> </td> <td align="center" width="20%"><a href="../jcp.html">Home</a></td> - <td align="right" width="40%"><a href="moveButtons.html">Next</a></td> + <td align="right" width="40%"><a href="elementButtons.html">Next</a></td> </tr> <tr> <td align="left" width="40%"> </td> Copied: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/elementButtons.html (from rev 14862, jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/moveButtons.html) =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/elementButtons.html (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/elementButtons.html 2009-09-24 16:49:59 UTC (rev 14876) @@ -0,0 +1,68 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> + +<html> +<head> +<title>The Element Buttons</title> +<link rel="stylesheet" type="text/css" href="../jcp.css" title="Style"> +</head> +<body bgcolor="#ffffff"> + +<div class="navheader"> + <table width="100%"> + <tr> + <th align="center" colspan="3">The Element Buttons</th> + </tr> + <tr> + <td align="left" width="20%"><a href="drawingButtons.html">Prev</a> </td> + <th align="center" width="60%"> </th> + <td align="right" width="20%"> <a href="bottomButtons.html">Next</a></td> + </tr> + </table> + <hr> +</div> + + <h3>Element Buttons</h3> + <p>These buttons set JChemPaint into a mode to set atoms to elements. They + all operate the same: Some element is chosen, all selected atoms are + changed to this and you can change atoms then by clicking on them + individually. There are different ways to select the element:</p><br> + <ul type="circle"> + <li> The Element Buttons (C H O N P S F Cl Br I)</li> + </ul> + <p>Here you can select the element directly</p><br> + + <ul type="circle"> + <li>The Periodic Table Button <img src="../../small-bin/element.gif"></li> + </ul> + <p>This opens a periodic table of elements. Hovering over the fields shows + additional informations. Clicking on one sets JChemPaint to this + element, as if you would have selected it via a button directly.</p><br> + + <ul type="circle"> + <li>The Enter element button <img src="../../small-bin/enterelement.gif"></li> + </ul> + <p>This button enables you to enter an element symbol (e. g. "N" or "Cl", + capitalisation is not considered) as text. After that, you are again in + element mode as if you would have pressed a button directly. If you click + on atoms in this mode, the input box appears again. You can then also select + from a choice of functional groups to replace the atoms with.</p><br> + + + <div class="navfooter"><hr> + <table width="100%"> + <tr> + <td align="left" width="40%"><a href="drawingButtons.html">Prev</a> </td> + <td align="center" width="20%"><a href="../jcp.html">Home</a></td> + <td align="right" width="40%"><a href="bottomButtons.html">Next</a></td> + </tr> + <tr> + <td align="left" width="40%"> </td> + <td align="center" width="20%"><a href="button.html">Up</a></td> + <td align="right" width="40%"> </td> + </tr> + </table> +</div> + + +</body> +</html> \ No newline at end of file Deleted: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/molecules.html =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/molecules.html 2009-09-24 16:29:23 UTC (rev 14875) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/molecules.html 2009-09-24 16:49:59 UTC (rev 14876) @@ -1,73 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> - -<html> -<head> -<title> Creating Molecules</title> -<link rel="stylesheet" type="text/css" href="../jcp.css" title="Style"> -</head> -<body bgcolor="#ffffff"> - -<div class="navheader"> - <table width="100%"> - <tr> - <th align="center" colspan="3">Creating Molecules</th> - </tr> - <tr> - <td align="left" width="20%"><a href="participate.html">Prev</a> </td> - <th align="center" width="60%"> </th> - <td align="right" width="20%"> <a href="reactions.html">Next</a></td> - </tr> - </table> - <hr> -</div> - - - -<h3> Creating Molecules</h3> -<p>When JChemPaint has been started, you automatically get an empty document. - In order to paint a structure the typical steps would be the following: -<ul><li>Often it is the best to start with rings. Using the ring templates in -the button bar (click on a button and then in the document) you can build the -ring structures of the molecule. You can dock a ring to another ring by clicking - on an existing ring (the docking atom or bond will be highlighted while hovering over it). If the molecule -has no rings, go to the next step.</li> -<li>The next step are typically the chains. Choose the -<img src="../../small-bin/bond.gif"> button, click on the atom where the chain -starts and then on the last atom of the chain to enlarge it.</li> -<li>After this, you can add double/triple bonds by using -<img src="../../small-bin/bond.gif"> again and clicking on the bonds to make -double or triple. You can use <img src="../../small-bin/up_bond.gif"> and -<img src="../../small-bin/down_bond.gif"> to make existing bonds wedge bonds or -you can draw wedge bonds directly by clicking on an existing bond.</li> -<li>Finally the atoms need to be set. Either use one of the symbol buttons and -click on an atom to change it to this symbol. For single-letter elements, you can -also just hit the key while an atom is highlighted. So to set all the Oxygens in your -molecule, hover over the atoms one after the other and hit "O" each time. -You can also use the periodic -table <img src="../../small-bin/element.gif"> to choose an element. Finally with - <img src="../../small-bin/symbol.gif"> you can go through some common elements - by clicking on an atom repeatedly. With - <img src="../../small-bin/plus_one.gif"> and - <img src="../../small-bin/min_one.gif"> you can change the charge.</li> -</ul> -Obviously the mentioned steps are only a suggestion. -You can do them in any order. Many functions are also available in context menus - by right clicking on an atom or bond.</p> -<div class="navfooter"><hr> - <table width="100%"> - <tr> - <td align="left" width="40%"><a href="participate.html">Prev</a> </td> - <td align="center" width="20%"><a href="../jcp.html">Home</a></td> - <td align="right" width="40%"><a href="reactions.html">Next</a></td> - </tr> - <tr> - <td align="left" width="40%"> </td> - <td align="center" width="20%"><a href="tutorial.html">Up</a></td> - <td align="right" width="40%"> </td> - </tr> - </table> -</div> - - -</body> -</html> Deleted: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/moveButtons.html =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/moveButtons.html 2009-09-24 16:29:23 UTC (rev 14875) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/moveButtons.html 2009-09-24 16:49:59 UTC (rev 14876) @@ -1,55 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> - -<html> -<head> -<title>Buttons for moving Objects</title> -<link rel="stylesheet" type="text/css" href="../jcp.css" title="Style"> -</head> -<body bgcolor="#ffffff"> - -<div class="navheader"> - <table width="100%"> - <tr> - <th align="center" colspan="3">The Button Panel</th> - </tr> - <tr> - <td align="left" width="20%"><a href="drawingButtons.html">Prev</a> </td> - <th align="center" width="60%"> </th> - <td align="right" width="20%"> <a href="otherButtons.html">Next</a></td> - </tr> - </table> - <hr> -</div> - - <h3>Buttons for moving Objects</h3> - <p>These buttons operate on selected items. This can either be done by - choosing the mode in question and manipulating single atoms, or by - selecting multiple items with the lasso and switching into the desired - mode for performing the operation.</p><br> - <ul type="circle"> - <li> The Translate Button <img src="../../small-bin/move.gif"></li> - </ul> - <p>This button lets you move selected objects in the xy plane. When two - atoms overlap (or nearly overlap) while moving they get marked. If you - release the mouse button while atoms are marked, these will be merged.</p> - <p>The algorithms behind this button are provided by - the controller.Controller class.</p><br> - - <div class="navfooter"><hr> - <table width="100%"> - <tr> - <td align="left" width="40%"><a href="drawingButtons.html">Prev</a> </td> - <td align="center" width="20%"><a href="../jcp.html">Home</a></td> - <td align="right" width="40%"><a href="otherButtons.html">Next</a></td> - </tr> - <tr> - <td align="left" width="40%"> </td> - <td align="center" width="20%"><a href="button.html">Up</a></td> - <td align="right" width="40%"> </td> - </tr> - </table> -</div> - - -</body> -</html> \ No newline at end of file Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/otherButtons.html =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/otherButtons.html 2009-09-24 16:29:23 UTC (rev 14875) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/otherButtons.html 2009-09-24 16:49:59 UTC (rev 14876) @@ -10,75 +10,103 @@ <div class="navheader"> <table width="100%"> <tr> - <th align="center" colspan="3">The Button Panel</th> + <th align="center" colspan="3">Buttons for other operations</th> </tr> <tr> - <td align="left" width="20%"><a href="moveButtons.html">Prev</a></td> + <td align="left" width="20%"><a href="button.html">Prev</a> </td> <th align="center" width="60%"> </th> - <td align="right" width="20%"> <a href="menuFile.html">Next</a></td> + <td align="right" width="20%"> <a href="drawingButtons.html">Next</a></td> </tr> </table> <hr> </div> -<h3>Buttons for other operations</h3><br> +<h3>Top Buttons</h3><br> <ul type="circle"> - <li> The Toggle Symbol Button <img src="../../small-bin/symbol.gif"></li> + <li>The Select (Square) Button <img src="../../small-bin/selectsquare.gif"> </li> </ul> - <p>This drawing mode allows toggling of the atom's element by clicking - one or more time on an atom. It toggles between a few common elements. - </p><br> + <p>In this mode one can select objects inside a square shape.</p> + <p>If you click on a selected part after the selection, you are switched + automatically to the move mode.</p> <ul type="circle"> - <li>The Element Symbol Button <img src="../../small-bin/element.gif"></li> + <li>The Select (Lasso) Button <img src="../../small-bin/lasso.gif"> </li> </ul> - <p>This button allows selecting a new drawing element from a list a - periodic table.</p><br> + <p>In this mode one can select objects inside a free form shape.</p> + <p>If you click on a selected part after the selection, you are switched + automatically to the move mode.</p> + + <ul type="circle"> + <li> The Eraser Button <img src="../../small-bin/eraser.gif"></li> + </ul> + <p>This mode makes it possible to delete objects. It deletes the current selection + and deletes anythign you click on afterwards.</p> <ul type="circle"> - <li>The Text Symbol Button <img src="../../small-bin/enterelement.gif"> + <li>The Undo Button <img src="../../small-bin/undo.gif"></li> + </ul> + <p>This button undos the last action. It is only active when something was + done before. This button does not have a mode associated.</p><br> + + <ul type="circle"> + <li>The Redo Button <img src="../../small-bin/redo.gif"></li> + </ul> + <p>This button redos the last undone action. It is only active when something was + undone before. This button does not have a mode associated.</p><br> + + <ul type="circle"> + <li>The Zoom In/Zoom Out Buttons <img src="../../small-bin/zoomin.gif"> <img src="../../small-bin/zoomout.gif"> </li> </ul> - <p>This button allows entering of element symbols via keyboard. Click on an - atom and enter the element name. Capitalisation does not matter. You can - also enter functional groups here which will be "expanded". For the - possible groups see <a href="../../text/funcgroups.txt">here</a>.</p><br> + <p>This zooms the structure in or out. It only sets the scale of the drawing, + it does not change the structure. These buttons have no mode associated.</p><br> <ul type="circle"> - <li> The Eraser Button <img src="../../small-bin/eraser.gif"></li> + <li>The Rotate Button <img src="../../small-bin/rotation.gif"></li> </ul> - <p>This mode makes it possible to delete selected objects, no matter - if preselected with the lasso or selected on the fly by clicking on an - object when in eraser mode.</p> - </p>The algorithms behind this button are provided by the - controller.Controller class.</p><br> + <p>This button rotates the current selection or the whole structure if nothing + is selected. Click and drag round to achieve the effect.</p><br> <ul type="circle"> - <li>The Select (Lasso) Button <img src="../../small-bin/lasso.gif"> </li> + <li> The +1/-1 buttons <img src="../../small-bin/plus_one.gif"><img src="../../small-bin/min_one.gif"></li> </ul> - <p>In this mode one can select objects with a lasso.</p> - <p>If you click on a selected part after the selection, you are switched - automatically to the move mode. When you hover inside a selected area, - a ring will appear. When you drag the mouse while this is visible, you can - rotate the marked structure.</p> - <p>The algorithms behind this button are provided by the - controller.Controller class.</p><br> + <p>These buttons increase or decrease charges of atoms by one. The button + changes the selection. It also switches to a mode where clicking on atoms + changes charge.</p><br> <ul type="circle"> - <li>The Cleanup Button <img src="../../small-bin/cleanup.gif"></li> + <li>The Cut Button <img src="../../small-bin/cut.gif"> </li> </ul> - <p>Clicking this button cleans up the structure on the screen, using - the MDraw algorithm [ BLE91 ]. </p> - <p>JChemPaint 2.x uses the CDK implementation - of this algorithm in the controller.Controller2D class.</p><br> + <p>This button removes the current selection from the drawing and puts it + into the system clipboard. Paste can be used to use it again. This button + does not trigger a mode.</p><br> + <ul type="circle"> + <li>The Copy Button <img src="../../small-bin/copy.gif"> </li> + </ul> + <p>This button copies the current selection into the system clipboard. Paste + can be used to use it again. This button does not trigger a mode.</p><br> + + <ul type="circle"> + <li>The Paste Button <img src="../../small-bin/paste.gif"> </li> + </ul> + <p>This button puts the content of the system clipboard into the drawing. + The system clipboard must either contain a copy from JChemPaint or text in + a <a href="formats.html">format</a> JChemPaint can read. This button does not trigger a mode.</p><br> + + <ul type="circle"> + <li>The Flip Horizontal/Vertical Buttons <img src="../../small-bin/flip_H.gif"><img src="../../small-bin/flip_V.gif"></li> + </ul> + <p>These buttons flip either the selection or the complete structure (if no + selection is done) around the horizontal or vertical axis. These buttons + do not trigger a mode.</p><br> <div class="navfooter"><hr> <table width="100%"> <tr> - <td align="left" width="40%"><a href="moveButtons.html">Prev</a> </td> + <td align="left" width="20%"><a href="button.html">Prev</a> </td> <td align="center" width="20%"><a href="../jcp.html">Home</a></td> - <td align="right" width="40%"><a href="menuFile.html">Next</a></td> + <td align="right" width="40%"><a href="drawingButtons.html">Next</a></td> </tr> <tr> <td align="left" width="40%"> </td> Deleted: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/reactions.html =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/reactions.html 2009-09-24 16:29:23 UTC (rev 14875) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/reactions.html 2009-09-24 16:49:59 UTC (rev 14876) @@ -1,53 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> - -<html> -<head> -<title> Creating Reactions</title> -<link rel="stylesheet" type="text/css" href="../jcp.css" title="Style"> -</head> -<body bgcolor="#ffffff"> - -<div class="navheader"> - <table width="100%"> - <tr> - <th align="center" colspan="3">JChemPaint Tutorial</th> - </tr> - <tr> - <td align="left" width="20%"><a href="molecules.html">Prev</a> </td> - <th align="center" width="60%"> </th> - <td align="right" width="20%"> <a href="button.html">Next</a></td> - </tr> - </table> - <hr> -</div> - - - -<h3> Creating Reactions</h3> -<p>Start a new document, by clicking the white paper with the yellow star on - the top left corner. In the Draw mode (the bond button), draw methane on the - left and methanol on the right. Right mouse click on the methane and choose - "Reaction..." and "Make Reactant in new Reaction". Similarly, right mouse - click on the methanol, and choose "Make Product in existing Reaction". - Choose in the drop down box the reaction you want to add methanol as product - to.</p> -<br> - - <div class="navfooter"><hr> - <table width="100%"> - <tr> - <td align="left" width="40%"><a href="molecules.html">Prev</a> </td> - <td align="center" width="20%"><a href="../jcp.html">Home</a></td> - <td align="right" width="40%"><a href="button.html">Next</a></td> - </tr> - <tr> - <td align="left" width="40%"> </td> - <td align="center" width="20%"><a href="tutorial.html">Up</a></td> - <td align="right" width="40%"> </td> - </tr> - </table> -</div> - - -</body> -</html> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/tutorial.html =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/tutorial.html 2009-09-24 16:29:23 UTC (rev 14875) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/resources/userhelp_jcp/contain/tutorial.html 2009-09-24 16:49:59 UTC (rev 14876) @@ -22,18 +22,57 @@ </div> <h1> JChemPaint Tutorial</h1> -<p>This chapter explains on some basic examples the use of JChemPaint. -<table width=70% border=0 cellpadding=5 align="left"> - <tr valign="top"> - <td><img src="../../small-bin/hg_proc.gif" width="18" height="13"></td> - <td><a href="molecules.html"><b>Drawing of Molecules</b></a></td> - </tr> - <tr valign="top"> - <td><img src="../../small-bin/hg_proc.gif" width="18" height="13"></td> - <td><a href="reactions.html"><b>Drawing of Reactions</b></a></td> - </tr> -</table> +<h3> General Usage</h3> +<p>The general idea is that while using JChemPaint, the program always is in a +"drawing mode". This means that clicks somewhere on the panel will draw a certain +chemical element. Examples for "drawing modes" are "single bond" or "Carbon atom". +Drawing modes can be changed by the buttons or via menus. In +addition to changing the mode, choosing a button or a menu item do also change +the currently selected items (if any). Context menus (which appear right clicking +on the panel) also change the element (atom, bond) on which you clicked for the +menu. Apart from these "mode changes", there are also some buttons/menu items, +which do a one-off action, but have no mode. Examples are "Cut" or "Generate +Smiles". Keeping this in mind, we now show you how to create a molecule.</p> +<h3> Creating Molecules</h3> +<p>When JChemPaint has been started, you automatically get an empty document. + In order to paint a structure the typical steps would be the following: +<ul><li>Often it is the best to start with rings. Using the ring templates in +the button bar (<img img src="../../small-bin/triangle.gif">, <img img src="../../small-bin/square.gif"> etc.) you can build the +ring structures of the molecule. Click on a ring button (you switched to "Draw +x-membered ring mode") and then in the document. You can dock a ring to another ring by clicking + on an existing ring (the docking atom or bond will be highlighted while hovering over it). If the molecule +has no rings, go to the next step.</li> +<li>The next step are typically the chains. Choose the +<img src="../../small-bin/bond.gif"> button (your are in "single bond mode" then), click on the atom where the chain +starts and then on the last atom of the chain to enlarge it. There are several +ways to draw bonds in this mode: + <ul> + <li>Directly click on an atom: A bond with default length will be drawn at a reasonable angle.</li> + <li>Drag from an atom: A bond with default length will be drawn at the angle to drag to.</li> + <li>Drag from an atom to another atom: A bond with default length will be drawn at the angle to drag to.</li> + </ul> +</li> +<li>After this, you can add double/triple bonds by using +<img src="../../small-bin/bond.gif"> again and clicking on the bonds to make +double or triple. You can use <img src="../../small-bin/up_bond.gif"> and +<img src="../../small-bin/down_bond.gif"> to make existing bonds wedge bonds or +you can draw wedge bonds directly by clicking on an existing atom. The "wedge bond +mode" works same as the "singel bond mode" with respect to dragging etc., just +that the bonds created are wedges.</li> +<li>Finally the atoms need to be set. Either use one of the symbol buttons ("Element X mode") and +click on an atom to change it to this symbol. For single-letter elements, you can +also just hit the key while an atom is highlighted. So to set all the Oxygens in your +molecule, hover over the atoms one after the other and hit "O" each time. +You can also use the periodic +table <img src="../../small-bin/element.gif"> to choose an element. With + <img src="../../small-bin/plus_one.gif"> and + <img src="../../small-bin/min_one.gif"> you can change the charge.</li> +</ul> +Obviously the mentioned steps are only a suggestion. +You can do them in any order. Have a look through the menus to see what is available +or read the <a href="referenceGuide.html">Reference Guide</a>.</p> + <div class="navfooter"><hr> <table width="100%"> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-29 08:41:59
|
Revision: 14898 http://cdk.svn.sourceforge.net/cdk/?rev=14898&view=rev Author: mark_rynbeek Date: 2009-09-29 08:41:53 +0000 (Tue, 29 Sep 2009) Log Message: ----------- little hourglass while loading Modified Paths: -------------- jchempaint/trunk/EditorApplet.html Added Paths: ----------- jchempaint/trunk/hourglass.gif Modified: jchempaint/trunk/EditorApplet.html =================================================================== --- jchempaint/trunk/EditorApplet.html 2009-09-28 20:04:15 UTC (rev 14897) +++ jchempaint/trunk/EditorApplet.html 2009-09-29 08:41:53 UTC (rev 14898) @@ -12,8 +12,15 @@ <applet code="org.openscience.jchempaint.applet.JChemPaintEditorApplet" archive="dist/jar/jchempaint-applet-core.jar" name="Editor" width="600" height="500"> - <param name="impliciths" value="true"> - <param name="codebase_lookup" value="false" /> + + <param name="impliciths" value="true"> + <param name="codebase_lookup" value="false" /> + <PARAM name="onLoadTarget" value="statusFrame"> + <PARAM NAME="image" VALUE="hourglass.gif"> + <PARAM NAME="boxborder" VALUE="false"> + <PARAM NAME="centerimage" VALUE="true"> + <!--param name="load" value="applettests/big.mol"--> + </applet> <a href="javascript:alert(document.Editor.getMolFile())">show mol file</a> Added: jchempaint/trunk/hourglass.gif =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/hourglass.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-29 10:24:32
|
Revision: 14904 http://cdk.svn.sourceforge.net/cdk/?rev=14904&view=rev Author: mark_rynbeek Date: 2009-09-29 10:24:24 +0000 (Tue, 29 Sep 2009) Log Message: ----------- shrinking jar files through ant Modified Paths: -------------- jchempaint/trunk/META-INF/applet-core.shrink.files jchempaint/trunk/build.shrink.xml Added Paths: ----------- jchempaint/trunk/META-INF/applet-editor.shrink.files Modified: jchempaint/trunk/META-INF/applet-core.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-core.shrink.files 2009-09-29 09:17:29 UTC (rev 14903) +++ jchempaint/trunk/META-INF/applet-core.shrink.files 2009-09-29 10:24:24 UTC (rev 14904) @@ -12,6 +12,7 @@ javax/vecmath/Vector2f.class javax/vecmath/Vector3d.class org/_3pq/jgrapht/alg/ConnectivityInspector.class +org/_3pq/jgrapht/alg/ConnectivityInspector$1.class org/_3pq/jgrapht/alg/ConnectivityInspector$MyTraversalListener.class org/_3pq/jgrapht/DirectedGraph.class org/_3pq/jgrapht/Edge.class @@ -31,6 +32,7 @@ org/_3pq/jgrapht/event/VertexTraversalEvent.class org/_3pq/jgrapht/graph/AbstractBaseGraph$ArrayListFactory.class org/_3pq/jgrapht/graph/AbstractBaseGraph.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$1.class org/_3pq/jgrapht/graph/AbstractBaseGraph$DirectedEdgeContainer.class org/_3pq/jgrapht/graph/AbstractBaseGraph$DirectedSpecifics.class org/_3pq/jgrapht/graph/AbstractBaseGraph$Specifics.class @@ -59,6 +61,29 @@ org/apache/commons/cli/Parser.class org/apache/commons/cli/PosixParser.class org/apache/commons/cli/UnrecognizedOptionException.class +org/apache/log4j/Category.class +org/apache/log4j/CategoryKey.class +org/apache/log4j/DefaultCategoryFactory.class +org/apache/log4j/helpers/Loader.class +org/apache/log4j/helpers/LogLog.class +org/apache/log4j/helpers/OptionConverter.class +org/apache/log4j/Hierarchy.class +org/apache/log4j/Level.class +org/apache/log4j/Logger.class +org/apache/log4j/LogManager.class +org/apache/log4j/or/DefaultRenderer.class +org/apache/log4j/or/ObjectRenderer.class +org/apache/log4j/or/RendererMap.class +org/apache/log4j/Priority.class +org/apache/log4j/ProvisionNode.class +org/apache/log4j/spi/AppenderAttachable.class +org/apache/log4j/spi/Configurator.class +org/apache/log4j/spi/DefaultRepositorySelector.class +org/apache/log4j/spi/LoggerFactory.class +org/apache/log4j/spi/LoggerRepository.class +org/apache/log4j/spi/RendererSupport.class +org/apache/log4j/spi/RepositorySelector.class +org/apache/log4j/spi/RootLogger.class org/openscience/cdk/Atom.class org/openscience/cdk/AtomContainer$1.class org/openscience/cdk/AtomContainer$2.class @@ -77,6 +102,8 @@ org/openscience/cdk/atomtype/CDKAtomTypeMatcher.class org/openscience/cdk/AtomType.class org/openscience/cdk/atomtype/IAtomTypeMatcher.class +org/openscience/cdk/Bond$1.class +org/openscience/cdk/Bond$AtomsIterator.class org/openscience/cdk/Bond.class org/openscience/cdk/CDKConstants.class org/openscience/cdk/ChemModel.class @@ -263,6 +290,7 @@ org/openscience/cdk/io/ReaderFactory.class org/openscience/cdk/io/setting/BooleanIOSetting.class org/openscience/cdk/io/setting/IOSetting.class +org/openscience/cdk/io/SMILESReader.class org/openscience/cdk/Isotope.class org/openscience/cdk/layout/AtomPlacer$1.class org/openscience/cdk/layout/AtomPlacer.class @@ -310,7 +338,9 @@ org/openscience/cdk/renderer/generators/ReactionPlusGenerator.class org/openscience/cdk/renderer/generators/RingGenerator.class org/openscience/cdk/renderer/generators/SelectAtomGenerator.class +org/openscience/cdk/renderer/generators/SelectAtomGenerator$1.class org/openscience/cdk/renderer/generators/SelectBondGenerator.class +org/openscience/cdk/renderer/elements/AtomSymbolElement.class org/openscience/cdk/renderer/IRenderer.class org/openscience/cdk/renderer/Renderer.class org/openscience/cdk/renderer/RendererModel.class @@ -320,6 +350,7 @@ org/openscience/cdk/renderer/selection/IncrementalSelection.class org/openscience/cdk/renderer/selection/LogicalSelection.class org/openscience/cdk/renderer/selection/LogicalSelection$Type.class +org/openscience/cdk/renderer/selection/SingleSelection.class org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.class org/openscience/cdk/renderer/visitor/AWTDrawVisitor$1.class org/openscience/cdk/renderer/visitor/AWTDrawVisitor.class @@ -341,6 +372,7 @@ org/openscience/cdk/validate/ProblemMarker.class org/openscience/jchempaint/AbstractJChemPaintPanel.class org/openscience/jchempaint/applet/JChemPaintAbstractApplet$1.class +org/openscience/jchempaint/applet/JChemPaintAbstractApplet$2.class org/openscience/jchempaint/applet/JChemPaintAbstractApplet.class org/openscience/jchempaint/applet/JChemPaintViewerApplet.class org/openscience/jchempaint/application/JChemPaint.class Added: jchempaint/trunk/META-INF/applet-editor.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-editor.shrink.files (rev 0) +++ jchempaint/trunk/META-INF/applet-editor.shrink.files 2009-09-29 10:24:24 UTC (rev 14904) @@ -0,0 +1,337 @@ +javax/vecmath/Point2d.class +javax/vecmath/Point2f.class +javax/vecmath/Point3d.class +javax/vecmath/Tuple2d.class +javax/vecmath/Tuple2f.class +javax/vecmath/Tuple3d.class +javax/vecmath/Vector2d.class +javax/vecmath/Vector2f.class +javax/vecmath/Vector3d.class +org/_3pq/jgrapht/alg/ConnectivityInspector.class +org/_3pq/jgrapht/alg/ConnectivityInspector$MyTraversalListener.class +org/_3pq/jgrapht/DirectedGraph.class +org/_3pq/jgrapht/Edge.class +org/_3pq/jgrapht/edge/DefaultEdge.class +org/_3pq/jgrapht/edge/DirectedEdge.class +org/_3pq/jgrapht/edge/EdgeFactories$AbstractEdgeFactory.class +org/_3pq/jgrapht/edge/EdgeFactories$DirectedEdgeFactory.class +org/_3pq/jgrapht/edge/EdgeFactories$UndirectedEdgeFactory.class +org/_3pq/jgrapht/EdgeFactory.class +org/_3pq/jgrapht/edge/UndirectedEdge.class +org/_3pq/jgrapht/event/ConnectedComponentTraversalEvent.class +org/_3pq/jgrapht/event/EdgeTraversalEvent.class +org/_3pq/jgrapht/event/GraphListener.class +org/_3pq/jgrapht/event/TraversalListenerAdapter.class +org/_3pq/jgrapht/event/TraversalListener.class +org/_3pq/jgrapht/event/VertexSetListener.class +org/_3pq/jgrapht/event/VertexTraversalEvent.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$ArrayListFactory.class +org/_3pq/jgrapht/graph/AbstractBaseGraph.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$DirectedEdgeContainer.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$DirectedSpecifics.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$Specifics.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$UndirectedEdgeContainer.class +org/_3pq/jgrapht/graph/AbstractBaseGraph$UndirectedSpecifics.class +org/_3pq/jgrapht/graph/AbstractGraph.class +org/_3pq/jgrapht/Graph.class +org/_3pq/jgrapht/graph/EdgeListFactory.class +org/_3pq/jgrapht/graph/SimpleDirectedGraph.class +org/_3pq/jgrapht/graph/SimpleGraph.class +org/_3pq/jgrapht/graph/Subgraph.class +org/_3pq/jgrapht/graph/UndirectedSubgraph.class +org/_3pq/jgrapht/ListenableGraph.class +org/_3pq/jgrapht/traverse/AbstractGraphIterator.class +org/_3pq/jgrapht/traverse/BreadthFirstIterator.class +org/_3pq/jgrapht/traverse/CrossComponentIterator.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$DirectedSpecifics.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$FlyweightEdgeEvent.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$FlyweightVertexEvent.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$Specifics.class +org/_3pq/jgrapht/traverse/CrossComponentIterator$UndirectedSpecifics.class +org/_3pq/jgrapht/traverse/GraphIterator.class +org/_3pq/jgrapht/UndirectedGraph.class +org/apache/log4j/Category.class +org/apache/log4j/CategoryKey.class +org/apache/log4j/DefaultCategoryFactory.class +org/apache/log4j/helpers/Loader.class +org/apache/log4j/helpers/LogLog.class +org/apache/log4j/helpers/OptionConverter.class +org/apache/log4j/Hierarchy.class +org/apache/log4j/Level.class +org/apache/log4j/Logger.class +org/apache/log4j/LogManager.class +org/apache/log4j/or/DefaultRenderer.class +org/apache/log4j/or/ObjectRenderer.class +org/apache/log4j/or/RendererMap.class +org/apache/log4j/Priority.class +org/apache/log4j/ProvisionNode.class +org/apache/log4j/spi/AppenderAttachable.class +org/apache/log4j/spi/Configurator.class +org/apache/log4j/spi/DefaultRepositorySelector.class +org/apache/log4j/spi/LoggerFactory.class +org/apache/log4j/spi/LoggerRepository.class +org/apache/log4j/spi/RendererSupport.class +org/apache/log4j/spi/RepositorySelector.class +org/apache/log4j/spi/RootLogger.class +org/openscience/cdk/Atom.class +org/openscience/cdk/AtomContainer$1.class +org/openscience/cdk/AtomContainer$2.class +org/openscience/cdk/AtomContainer$3.class +org/openscience/cdk/AtomContainer$4.class +org/openscience/cdk/AtomContainer$5.class +org/openscience/cdk/AtomContainer$AtomIterator.class +org/openscience/cdk/AtomContainer$BondIterator.class +org/openscience/cdk/AtomContainer.class +org/openscience/cdk/AtomContainer$ElectronContainerIterator.class +org/openscience/cdk/AtomContainer$LonePairIterator.class +org/openscience/cdk/AtomContainerSet$1.class +org/openscience/cdk/AtomContainerSet$AtomContainerIterator.class +org/openscience/cdk/AtomContainerSet.class +org/openscience/cdk/AtomContainer$SingleElectronIterator.class +org/openscience/cdk/atomtype/CDKAtomTypeMatcher.class +org/openscience/cdk/AtomType.class +org/openscience/cdk/atomtype/IAtomTypeMatcher.class +org/openscience/cdk/Bond$1.class +org/openscience/cdk/Bond$AtomsIterator.class +org/openscience/cdk/Bond.class +org/openscience/cdk/CDKConstants.class +org/openscience/cdk/ChemModel.class +org/openscience/cdk/ChemObject.class +org/openscience/cdk/controller/AddBondDragModule.class +org/openscience/cdk/controller/AddRingModule.class +org/openscience/cdk/controller/AtomAtomMappingModule.class +org/openscience/cdk/controller/ControllerHub.class +org/openscience/cdk/controller/ControllerModel.class +org/openscience/cdk/controller/ControllerModuleAdapter.class +org/openscience/cdk/controller/ControllerParameters.class +org/openscience/cdk/controller/HighlightModule.class +org/openscience/cdk/controller/IChangeModeListener.class +org/openscience/cdk/controller/IChemModelEventRelayHandler.class +org/openscience/cdk/controller/IChemModelRelay.class +org/openscience/cdk/controller/IControllerModel.class +org/openscience/cdk/controller/IControllerModule.class +org/openscience/cdk/controller/IMouseEventRelay.class +org/openscience/cdk/controller/IViewEventRelay.class +org/openscience/cdk/controller/MoveModule.class +org/openscience/cdk/controller/PhantomBondGenerator.class +org/openscience/cdk/controller/RemoveModule.class +org/openscience/cdk/controller/RotateModule.class +org/openscience/cdk/controller/SelectLassoModule.class +org/openscience/cdk/controller/SelectSquareModule.class +org/openscience/cdk/controller/SwingMouseEventRelay.class +org/openscience/cdk/controller/undoredo/AddAtomsAndBondsEdit.class +org/openscience/cdk/controller/undoredo/IUndoListener.class +org/openscience/cdk/controller/undoredo/IUndoRedoable.class +org/openscience/cdk/controller/undoredo/IUndoRedoFactory.class +org/openscience/cdk/controller/undoredo/UndoRedoHandler.class +org/openscience/cdk/controller/ZoomModule.class +org/openscience/cdk/DefaultChemObjectBuilder.class +org/openscience/cdk/ElectronContainer.class +org/openscience/cdk/Element.class +org/openscience/cdk/event/ChemObjectChangeEvent.class +org/openscience/cdk/event/ICDKChangeListener.class +org/openscience/cdk/exception/CDKException.class +org/openscience/cdk/exception/InvalidSmilesException.class +org/openscience/cdk/exception/NoSuchAtomException.class +org/openscience/cdk/exception/NoSuchAtomTypeException.class +org/openscience/cdk/formula/MolecularFormula.class +org/openscience/cdk/geometry/GeometryTools.class +org/openscience/cdk/graph/BFSShortestPath.class +org/openscience/cdk/graph/BFSShortestPath$MyBreadthFirstIterator.class +org/openscience/cdk/graph/BiconnectivityInspector.class +org/openscience/cdk/graph/ConnectivityChecker.class +org/openscience/cdk/graph/MoleculeGraphs.class +org/openscience/cdk/graph/PathTools.class +org/openscience/cdk/inchi/InChIGenerator.class +org/openscience/cdk/interfaces/IAdductFormula.class +org/openscience/cdk/interfaces/IAminoAcid.class +org/openscience/cdk/interfaces/IAtom.class +org/openscience/cdk/interfaces/IAtomContainer.class +org/openscience/cdk/interfaces/IAtomContainerSet.class +org/openscience/cdk/interfaces/IAtomParity.class +org/openscience/cdk/interfaces/IAtomType.class +org/openscience/cdk/interfaces/IAtomType$Hybridization.class +org/openscience/cdk/interfaces/IBioPolymer.class +org/openscience/cdk/interfaces/IBond.class +org/openscience/cdk/interfaces/IBond$Order.class +org/openscience/cdk/interfaces/IChemFile.class +org/openscience/cdk/interfaces/IChemModel.class +org/openscience/cdk/interfaces/IChemObjectBuilder.class +org/openscience/cdk/interfaces/IChemObjectChangeEvent.class +org/openscience/cdk/interfaces/IChemObject.class +org/openscience/cdk/interfaces/IChemObjectListener.class +org/openscience/cdk/interfaces/IChemSequence.class +org/openscience/cdk/interfaces/ICrystal.class +org/openscience/cdk/interfaces/IElectronContainer.class +org/openscience/cdk/interfaces/IElement.class +org/openscience/cdk/interfaces/IFragmentAtom.class +org/openscience/cdk/interfaces/IIsotope.class +org/openscience/cdk/interfaces/ILonePair.class +org/openscience/cdk/interfaces/IMapping.class +org/openscience/cdk/interfaces/IMolecularFormula.class +org/openscience/cdk/interfaces/IMolecularFormulaSet.class +org/openscience/cdk/interfaces/IMolecule.class +org/openscience/cdk/interfaces/IMoleculeSet.class +org/openscience/cdk/interfaces/IMonomer.class +org/openscience/cdk/interfaces/IPDBAtom.class +org/openscience/cdk/interfaces/IPDBMonomer.class +org/openscience/cdk/interfaces/IPDBPolymer.class +org/openscience/cdk/interfaces/IPDBStructure.class +org/openscience/cdk/interfaces/IPolymer.class +org/openscience/cdk/interfaces/IPseudoAtom.class +org/openscience/cdk/interfaces/IReaction.class +org/openscience/cdk/interfaces/IReactionScheme.class +org/openscience/cdk/interfaces/IReactionSet.class +org/openscience/cdk/interfaces/IRing.class +org/openscience/cdk/interfaces/IRingSet.class +org/openscience/cdk/interfaces/ISingleElectron.class +org/openscience/cdk/interfaces/IStrand.class +org/openscience/cdk/io/DefaultChemObjectReader.class +org/openscience/cdk/io/IChemObjectIO.class +org/openscience/cdk/io/IChemObjectReader.class +org/openscience/cdk/io/IChemObjectWriter.class +org/openscience/cdk/io/ISimpleChemObjectReader.class +org/openscience/cdk/io/listener/IChemObjectIOListener.class +org/openscience/cdk/io/MDLV2000Reader.class +org/openscience/cdk/Isotope.class +org/openscience/cdk/layout/AtomPlacer$1.class +org/openscience/cdk/layout/AtomPlacer.class +org/openscience/cdk/layout/RingPlacer.class +org/openscience/cdk/Molecule.class +org/openscience/cdk/MoleculeSet.class +org/openscience/cdk/PseudoAtom.class +org/openscience/cdk/renderer/AtomContainerRenderer.class +org/openscience/cdk/renderer/color/CDK2DAtomColors.class +org/openscience/cdk/renderer/color/IAtomColorer.class +org/openscience/cdk/renderer/elements/ArrowElement.class +org/openscience/cdk/renderer/elements/ElementGroup.class +org/openscience/cdk/renderer/elements/IRenderingElement.class +org/openscience/cdk/renderer/elements/IRenderingVisitor.class +org/openscience/cdk/renderer/elements/LineElement.class +org/openscience/cdk/renderer/elements/OvalElement.class +org/openscience/cdk/renderer/elements/RectangleElement.class +org/openscience/cdk/renderer/elements/TextElement.class +org/openscience/cdk/renderer/elements/TextGroupElement$Child.class +org/openscience/cdk/renderer/elements/TextGroupElement.class +org/openscience/cdk/renderer/elements/TextGroupElement$Position.class +org/openscience/cdk/renderer/elements/WedgeLineElement.class +org/openscience/cdk/renderer/elements/WigglyLineElement.class +org/openscience/cdk/renderer/font/AbstractFontManager.class +org/openscience/cdk/renderer/font/AWTFontManager.class +org/openscience/cdk/renderer/font/IFontManager.class +org/openscience/cdk/renderer/font/IFontManager$FontStyle.class +org/openscience/cdk/renderer/generators/BasicAtomGenerator.class +org/openscience/cdk/renderer/generators/BasicBondGenerator.class +org/openscience/cdk/renderer/generators/ExtendedAtomGenerator.class +org/openscience/cdk/renderer/generators/ExternalHighlightGenerator.class +org/openscience/cdk/renderer/generators/HighlightAtomGenerator.class +org/openscience/cdk/renderer/generators/HighlightBondGenerator.class +org/openscience/cdk/renderer/generators/IGenerator.class +org/openscience/cdk/renderer/generators/IReactionGenerator.class +org/openscience/cdk/renderer/generators/LonePairGenerator.class +org/openscience/cdk/renderer/generators/MappingGenerator.class +org/openscience/cdk/renderer/generators/MergeAtomsGenerator.class +org/openscience/cdk/renderer/generators/ProductsBoxGenerator.class +org/openscience/cdk/renderer/generators/RadicalGenerator.class +org/openscience/cdk/renderer/generators/ReactantsBoxGenerator.class +org/openscience/cdk/renderer/generators/ReactionArrowGenerator.class +org/openscience/cdk/renderer/generators/ReactionBoxGenerator.class +org/openscience/cdk/renderer/generators/ReactionPlusGenerator.class +org/openscience/cdk/renderer/generators/RingGenerator.class +org/openscience/cdk/renderer/generators/SelectAtomGenerator.class +org/openscience/cdk/renderer/generators/SelectBondGenerator.class +org/openscience/cdk/renderer/IRenderer.class +org/openscience/cdk/renderer/Renderer.class +org/openscience/cdk/renderer/RendererModel.class +org/openscience/cdk/renderer/RenderingParameters$AtomShape.class +org/openscience/cdk/renderer/RenderingParameters.class +org/openscience/cdk/renderer/selection/AbstractSelection$1.class +org/openscience/cdk/renderer/selection/AbstractSelection.class +org/openscience/cdk/renderer/selection/IChemObjectSelection.class +org/openscience/cdk/renderer/selection/IncrementalSelection.class +org/openscience/cdk/renderer/selection/LogicalSelection.class +org/openscience/cdk/renderer/selection/LogicalSelection$Type.class +org/openscience/cdk/renderer/selection/RectangleSelection.class +org/openscience/cdk/renderer/selection/ShapeSelection.class +org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.class +org/openscience/cdk/renderer/visitor/AWTDrawVisitor$1.class +org/openscience/cdk/renderer/visitor/AWTDrawVisitor.class +org/openscience/cdk/renderer/visitor/IDrawVisitor.class +org/openscience/cdk/Ring.class +org/openscience/cdk/ringsearch/cyclebasis/CycleBasis.class +org/openscience/cdk/ringsearch/cyclebasis/SimpleCycleBasis$AuxiliaryGraph.class +org/openscience/cdk/ringsearch/cyclebasis/SimpleCycleBasis.class +org/openscience/cdk/ringsearch/cyclebasis/SimpleCycle.class +org/openscience/cdk/ringsearch/SSSRFinder.class +org/openscience/cdk/RingSet.class +org/openscience/cdk/smiles/SmilesParser.class +org/openscience/cdk/tools/LoggingTool.class +org/openscience/cdk/tools/manipulator/AtomContainerManipulator.class +org/openscience/cdk/tools/manipulator/AtomContainerSetManipulator.class +org/openscience/cdk/tools/manipulator/ChemModelManipulator.class +org/openscience/cdk/tools/manipulator/MolecularFormulaManipulator.class +org/openscience/cdk/tools/manipulator/MoleculeSetManipulator.class +org/openscience/cdk/tools/manipulator/RingSetManipulator.class +org/openscience/cdk/validate/ProblemMarker.class +org/openscience/jchempaint/AbstractJChemPaintPanel.class +org/openscience/jchempaint/action/AboutAction.class +org/openscience/jchempaint/action/AddHydrogenAction.class +org/openscience/jchempaint/action/AdjustBondOrdersAction.class +org/openscience/jchempaint/action/ChangeAtomSymbolAction.class +org/openscience/jchempaint/action/ChangeBondAction.class +org/openscience/jchempaint/action/ChangeIsotopeAction.class +org/openscience/jchempaint/action/ChangeModeAction.class +org/openscience/jchempaint/action/ChangeValenceAction.class +org/openscience/jchempaint/action/ChargeAction.class +org/openscience/jchempaint/action/CleanupAction.class +org/openscience/jchempaint/action/ConvertToPseudoAtomAction.class +org/openscience/jchempaint/action/ConvertToRadicalAction.class +org/openscience/jchempaint/action/CopyPasteAction.class +org/openscience/jchempaint/action/CopyPasteAction$JcpSelection.class +org/openscience/jchempaint/action/CreateInChIAction.class +org/openscience/jchempaint/action/CreateSmilesAction.class +org/openscience/jchempaint/action/EditAtomContainerPropsAction.class +org/openscience/jchempaint/action/EditChemObjectPropsAction.class +org/openscience/jchempaint/action/ExportAction.class +org/openscience/jchempaint/action/FlipAction.class +org/openscience/jchempaint/action/HelpAction.class +org/openscience/jchempaint/action/JCPAction.class +org/openscience/jchempaint/action/LicenseAction.class +org/openscience/jchempaint/action/ModifySettingsAction.class +org/openscience/jchempaint/action/NewAction.class +org/openscience/jchempaint/action/OpenAction.class +org/openscience/jchempaint/action/PrintAction.class +org/openscience/jchempaint/action/RedoAction.class +org/openscience/jchempaint/action/SaveAction.class +org/openscience/jchempaint/action/SaveAsAction.class +org/openscience/jchempaint/action/UndoAction.class +org/openscience/jchempaint/action/ZoomAction.class +org/openscience/jchempaint/applet/JChemPaintAbstractApplet.class +org/openscience/jchempaint/applet/JChemPaintEditorApplet.class +org/openscience/jchempaint/dialog/editor/AtomContainerEditor.class +org/openscience/jchempaint/dialog/editor/AtomEditor.class +org/openscience/jchempaint/dialog/editor/BondEditor.class +org/openscience/jchempaint/dialog/editor/ChemObjectEditor.class +org/openscience/jchempaint/dialog/editor/PseudoAtomEditor.class +org/openscience/jchempaint/dialog/editor/ReactionEditor.class +org/openscience/jchempaint/dialog/FieldTablePanel.class +org/openscience/jchempaint/GT.class +org/openscience/jchempaint/GT$Language.class +org/openscience/jchempaint/InsertTextPanel.class +org/openscience/jchempaint/io/JCPFileView.class +org/openscience/jchempaint/JChemPaintMenuBar.class +org/openscience/jchempaint/JChemPaintMenuHelper$1.class +org/openscience/jchempaint/JChemPaintMenuHelper.class +org/openscience/jchempaint/JChemPaintPanel.class +org/openscience/jchempaint/JChemPaintPopupMenu.class +org/openscience/jchempaint/JCPMenuTextMaker.class +org/openscience/jchempaint/JCPPropertyHandler.class +org/openscience/jchempaint/JCPStatusBar.class +org/openscience/jchempaint/JCPToolBar$1.class +org/openscience/jchempaint/JCPToolBar.class +org/openscience/jchempaint/JExternalFrame.class +org/openscience/jchempaint/RenderPanel.class +org/openscience/jchempaint/StringHelper.class +org/openscience/jchempaint/SwingPopupModule.class +org/openscience/jchempaint/undoredo/SwingAddAtomsAndBondsEdit.class +org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.class Modified: jchempaint/trunk/build.shrink.xml =================================================================== --- jchempaint/trunk/build.shrink.xml 2009-09-29 09:17:29 UTC (rev 14903) +++ jchempaint/trunk/build.shrink.xml 2009-09-29 10:24:24 UTC (rev 14904) @@ -101,24 +101,24 @@ <unjar dest="${dist-classes}"> <fileset dir="${cdk.dist}/jar"> <include name="cdk-atomtype.jar"/> - <include name="cdk-builder3d.jar"/> - <include name="cdk-builder3dtools.jar"/> + <!--include name="cdk-builder3d.jar"/> + <include name="cdk-builder3dtools.jar"/--> <include name="cdk-charges.jar"/> <include name="cdk-control.jar"/> <include name="cdk-core.jar"/> - <include name="cdk-datadebug.jar"/> + <!--include name="cdk-datadebug.jar"/--> <include name="cdk-data.jar"/> <include name="cdk-dict.jar"/> <include name="cdk-diff.jar"/> <include name="cdk-extra.jar"/> - <include name="cdk-fingerprint.jar"/> + <!--include name="cdk-fingerprint.jar"/--> <include name="cdk-forcefield.jar"/> <include name="cdk-formula.jar"/> <include name="cdk-inchi.jar"/> <include name="cdk-interfaces.jar"/> <include name="cdk-io.jar"/> <include name="cdk-ionpot.jar"/> - <include name="cdk-isomorphism.jar"/> + <!--include name="cdk-isomorphism.jar"/--> <include name="cdk-libiocml.jar"/> <include name="cdk-libiomd.jar"/> <include name="cdk-nonotify.jar"/> @@ -126,13 +126,13 @@ <include name="cdk-pdbcml.jar"/> <include name="cdk-pdb.jar"/> <include name="cdk-qm.jar"/> - <include name="cdk-qsaratomic.jar"/> + <!--include name="cdk-qsaratomic.jar"/> <include name="cdk-qsarbond.jar"/> <include name="cdk-qsarionpot.jar"/> <include name="cdk-qsar.jar"/> <include name="cdk-qsarmolecular.jar"/> <include name="cdk-qsarprotein.jar"/> - <include name="cdk-reaction.jar"/> + <include name="cdk-reaction.jar"/--> <include name="cdk-render.jar"/> <include name="cdk-sdg.jar"/> <include name="cdk-smarts.jar"/> @@ -185,8 +185,153 @@ <copy todir="${dist-classes}"> <fileset dir="${po-classes}"/> </copy> - </target> + </target> + + + <target name="dist-applet-shrunk-signed" depends="build-applet"> + <taskdef name="yguard" classname="com.yworks.yguard.YGuardTask" classpath="yguard.jar"/> + + <mkdir dir="${dist}/jar/shrinkout"/> + + + <!-- shrink jcp editor file --> + <yguard> + <inoutpair in="${dist}/jar/jchempaint-applet-editor.jar" out="${dist}/jar/shrinkout/jchempaint-applet-editor.jar"/> + <externalclasses> + <fileset dir="${dist}/jar"> + <include name="**/*.jar"/> + <exclude name="**/jchempaint-applet-editor.jar"/> + </fileset> + </externalclasses> + + <shrink logfile="shrinklog.editor.xml"> + <entrypointjar name="${dist}/jar/jchempaint-applet-core.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-editor.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> + <property name="error-checking" value="pedantic"/> + </shrink> + </yguard> + + <!-- shrink jcp core file --> + <yguard> + <inoutpair in="${dist}/jar/jchempaint-applet-core.jar" out="${dist}/jar/shrinkout/jchempaint-applet-core.jar"/> + <externalclasses> + <fileset dir="${dist}/jar"> + <include name="**/*.jar"/> + <exclude name="**/jchempaint-applet-core.jar"/> + </fileset> + </externalclasses> + <shrink logfile="shrinklog.core.xml"> + <entrypointjar name="${dist}/jar/jchempaint-applet-editor.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_nonotify.jar"/> + <property name="error-checking" value="pedantic"/> + <keep> + <class name="org.openscience.jchempaint.applet.JChemPaintAbstractApplet" methods="public" fields="none" /> + <class name="org.openscience.jchempaint.applet.JChemPaintEditorApplet" methods="public" fields="none"/> + <class name="org.openscience.cdk.tools.LoggingTool" methods="public" fields="none" /> + <class name="org.openscience.cdk.interfaces.IChemObjectBuilder" methods="public" fields="none" /> + <class name="org.openscience.cdk.controller.IControllerModel" methods="public" fields="none" /> + <class name="org.openscience.cdk.controller.IChemModelRelay" methods="public" fields="none" /> + </keep> + </shrink> + </yguard> + + <!-- shrink CDK jar --> + <yguard> + <inoutpair in="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_openscience_cdk.jar"/> + <externalclasses> + <fileset dir="${dist}/jar"> + <include name="**/*.jar"/> + <exclude name="**/jchempaint-applet-org_openscience_cdk.jar"/> + </fileset> + </externalclasses> + <shrink logfile="shrinklog.cdk.xml"> + <entrypointjar name="${dist}/jar/jchempaint-applet-core.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-editor.jar"/> + <property name="error-checking" value="pedantic"/> + <keep> + <class classes="public"> + <patternset> + <include name="org.openscience.cdk.renderer.**.*"/> + <include name="org.openscience.cdk.controller.**.*"/> + </patternset> + </class> + </keep> + </shrink> + </yguard> + + <!-- shrink IO jar --> + <yguard> + <inoutpair in="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_openscience_cdk_io.jar"/> + <externalclasses> + <fileset dir="${dist}/jar"> + <include name="**/*.jar"/> + <exclude name="**/jchempaint-applet-org_openscience_cdk_io.jar"/> + </fileset> + </externalclasses> + + <shrink logfile="shrinklog.io.xml"> + <entrypointjar name="${dist}/jar/jchempaint-applet-core.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-editor.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> + <property name="error-checking" value="pedantic"/> + </shrink> + </yguard> + + + <!-- shrink config jar --> + <yguard> + <inoutpair in="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_openscience_cdk_config.jar"/> + <externalclasses> + <fileset dir="${dist}/jar"> + <include name="**/*.jar"/> + <exclude name="**/jchempaint-applet-org_openscience_cdk_config.jar"/> + </fileset> + </externalclasses> + + <shrink logfile="shrinklog.config.xml"> + <entrypointjar name="${dist}/jar/jchempaint-applet-core.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-editor.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> + <property name="error-checking" value="pedantic"/> + </shrink> + </yguard> + + + <move todir="${dist}/jar"> + <fileset dir="${dist}/jar/shrinkout"> + <include name="**/*.jar"/> + </fileset> + </move> + <delete dir="${dist}/jar/shrinkout"/> + + <signjar destDir="" + alias="${certificatealias}" + storepass="${keystorepassphrase}" + preservelastmodified="true"> + <path> + <fileset dir="."> + <includesfile name="${growing_classpath}"/> + </fileset> + </path> + </signjar> + <zip destfile="${dist}/jchempaint-applet-${jcp.version}.zip"> + <zipfileset dir="${dist}/jar" includes="jchempaint-applet-*.jar"/> + <zipfileset dir="${cdk.dir}/doc" includes="lgpl.license"/> + </zip> + </target> + + + <target id="dist-applet" name="dist-applet" depends="build-applet" description="Builds the JChemPaint applet jar files with jarindex"> <zip destfile="${dist}/jchempaint-applet-${jcp.version}.zip"> <zipfileset dir="${dist}/jar" includes="jchempaint-applet-*.jar"/> @@ -211,12 +356,6 @@ </zip> </target> - <!-- since only targets can be conditional, we need this in a separte target --> - <target name="concat" id="concat" unless="appendtolist"> - <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"> - <fileset file="@{includesfile}" /> - </concat> - </target> <target id="build-applet" name="build-applet" depends="compile-jcp, unjar-libjars, unjar-cdkjars" description="Builds the JChemPaint applet jar files with jarindex"> <!-- At first jars are packed from file lists --> @@ -224,7 +363,7 @@ <!-- cat apache/jakarta-tomcat-5.0.28/logs/localhost_access_log.2005-04-27.txt | awk -v classdir="/jcpapplet/classes/" '$9 != 404 && substr($7,0,length(classdir)) == classdir { print substr($7,length(classdir)+1) }' | sort --> <!-- hint: uncomment <Valve className="org.apache.catalina.valves.AccessLogValve" in conf/server.xml to switch on tomcat's access logging --> <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"> - <fileset file="${metainf}/applet-core.files"/> + <fileset file="${metainf}/applet-core.shrink.files"/> </concat> <concat destfile="${growing_classpath}" fixlastline="no" append="no">${dist}/jar/jchempaint-applet-core.jar${line.separator}</concat> <macrodef name="jar-from-list"> @@ -237,10 +376,23 @@ <excludesfile name="${growing_list_file}"/> </fileset> </jar> - <antcall target="concat"/> + <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"><fileset file="@{includesfile}" /></concat> <concat destfile="${growing_classpath}" fixlastline="no" append="yes">@{destfile}${line.separator}</concat> </sequential> </macrodef> + <macrodef name="jar-from-list-no-concat"> + <attribute name="destfile"/> + <attribute name="includesfile"/> + <sequential> + <jar destfile="@{destfile}"> + <fileset dir="${dist-classes}"> + <includesfile name="@{includesfile}"/> + <excludesfile name="${growing_list_file}"/> + </fileset> + </jar> + <concat destfile="${growing_classpath}" fixlastline="no" append="yes">@{destfile}${line.separator}</concat> + </sequential> + </macrodef> <macrodef name="jar-from-pattern"> <attribute name="destfile"/> <attribute name="includepattern"/> @@ -263,13 +415,11 @@ <mkdir dir="${dist}/jar" /> <jar-from-list destfile="${dist}/jar/jchempaint-applet-viewer-opts.jar" includesfile="${metainf}/applet-viewer-opts.files"/> - <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor.jar" includesfile="${metainf}/applet-editor.files"/> + <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor.jar" includesfile="${metainf}/applet-editor.shrink.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor-opts.jar" includesfile="${metainf}/applet-editor-opts.files"/> <!-- since for the display of the help, we need the icons in the same jar, we do not log this to the growing_list_file, so that icons go into the resources.jar as well --> - <property name="appendtolist" value="true"/> - <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources-core.jar" includesfile="${metainf}/applet-resources-core.files"/> - <available file="build.xml" property="appendtolist"/> + <jar-from-list-no-concat destfile="${dist}/jar/jchempaint-applet-resources-core.jar" includesfile="${metainf}/applet-resources-core.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources.jar" includesfile="${metainf}/jchempaint.datafiles"/> <!-- the following jar files are packed from directory patterns --> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**"/> @@ -313,8 +463,8 @@ </section> </manifest> <fileset dir="${dist-classes}"> - <includesfile name="${metainf}/applet-core.files"/> - <exclude name="org/apache/log4j/**"/> + <includesfile name="${metainf}/applet-core.shrink.files"/> + <!--exclude name="org/apache/log4j/**"/--> </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-29 11:03:16
|
Revision: 14906 http://cdk.svn.sourceforge.net/cdk/?rev=14906&view=rev Author: shk3 Date: 2009-09-29 11:03:06 +0000 (Tue, 29 Sep 2009) Log Message: ----------- updated the localization files Modified Paths: -------------- jchempaint/trunk/po/ar.po jchempaint/trunk/po/classes/app/i18n/Messages_de$1.class jchempaint/trunk/po/classes/app/i18n/Messages_de.class jchempaint/trunk/po/de.po jchempaint/trunk/po/es.po jchempaint/trunk/po/fr.po jchempaint/trunk/po/keys.pot jchempaint/trunk/po/nl.po jchempaint/trunk/po/pl.po jchempaint/trunk/po/pt_BR.po jchempaint/trunk/po/ru.po jchempaint/trunk/src/main/org/openscience/jchempaint/AbstractJChemPaintPanel.java jchempaint/trunk/src/main/org/openscience/jchempaint/JCPMenuTextMaker.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/SaveAsAction.java Modified: jchempaint/trunk/po/ar.po =================================================================== --- jchempaint/trunk/po/ar.po 2009-09-29 10:35:50 UTC (rev 14905) +++ jchempaint/trunk/po/ar.po 2009-09-29 11:03:06 UTC (rev 14906) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: jchempaint\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-14 17:31+0100\n" +"POT-Creation-Date: 2009-09-29 11:57+0100\n" "PO-Revision-Date: 2009-02-25 13:45+0000\n" "Last-Translator: عبد الله شلي (Abdellah Chelli) <sne...@gm...>\n" "Language-Team: Arabic <ar...@li...>\n" @@ -17,775 +17,901 @@ "X-Launchpad-Export-Date: 2009-02-09 17:16+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:179 +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:103 +msgid "Could not determine JCP version" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:107 +msgid "WARNING: JChemPaint" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:108 +msgid "must be run with a Java VM version" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:109 +msgid "or higher." +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:110 +msgid "Your JVM version" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:115 +msgid "gives this help page" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:117 +msgid "gives JChemPaints version number" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:122 +msgid "supported options are given below" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:174 +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:212 +msgid "File does not exist" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:195 msgid "Untitled-" msgstr "غير مُعَنوَن-" -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:90 +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:363 +msgid "Could not determine file format" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:374 +msgid "" +"It seems you opened a mol or sdf file containing several molecules. Only the " +"first one will be shown" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:378 +msgid "sdf-like file" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:525 +msgid "Model does not have bonds. Cannot depict contents." +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:560 +msgid "" +"Not all atoms have 2D coordinates. JCP can only show full 2D specified " +"structures. Shall we lay out the structure?" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:568 +msgid "Cannot display without 2D coordinates" +msgstr "" + +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:91 msgid "Enter a CAS, SMILES or InChI string" msgstr "أدخل سلسلة CAS أو SMILES أو InChI" -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:95 -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:122 +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:96 +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:123 msgid "Insert" msgstr "أدرِج" -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:146 +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:147 msgid "Could not process InChI" msgstr "لم يمكن معالجة InChI" -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:152 +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:153 msgid "Could not load InChI subsystem" msgstr "لم يمكن تحميل نظام InChI الفرعي" -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:159 +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:160 msgid "Error in reading data from PubChem" msgstr "خطأ عند قراءة البيانات من PubChem" -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:167 +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:173 msgid "Invalid SMILES specified" msgstr "سلسلة (SMILES) المقدّمة غير صالحة" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:111 -msgid "Periodic Table for JChemPaint" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:115 -#, fuzzy -msgid "Reload" -msgstr "كَرِّر" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:119 -msgid "Click this button to go back to PeriodicTable." -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:183 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:140 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:180 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:151 msgid "He" msgstr "He" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:185 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:145 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:186 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:156 msgid "Li" msgstr "Li" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:187 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:146 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:188 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:157 msgid "Be" msgstr "Be" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:193 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:143 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:194 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:154 msgid "B" msgstr "B" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:194 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:130 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:195 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:141 msgid "C" msgstr "C" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:195 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:132 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:196 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:143 msgid "N" msgstr "N" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:196 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:131 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:197 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:142 msgid "O" msgstr "O" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:197 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:136 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:198 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:147 msgid "F" msgstr "F" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:199 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:141 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:200 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:152 msgid "Ne" msgstr "Ne" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:201 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:147 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:205 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:158 msgid "Na" msgstr "Na" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:202 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:148 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:206 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:159 msgid "Mg" msgstr "Mg" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:235 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:149 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:239 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:160 msgid "Al" msgstr "Al" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:236 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:150 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:240 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:161 msgid "Si" msgstr "Si" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:237 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:134 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:144 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:241 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:145 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:155 msgid "P" msgstr "P" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:238 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:135 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:242 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:146 msgid "S" msgstr "S" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:239 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:137 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:243 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:148 msgid "Cl" msgstr "Cl" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:241 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:142 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:245 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:153 msgid "Ar" msgstr "Ar" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:243 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:250 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:172 msgid "K" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:244 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:251 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:176 #, fuzzy msgid "Ca" msgstr "C" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:246 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:253 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:180 #, fuzzy msgid "Sc" msgstr "S" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:247 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:254 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:181 msgid "Ti" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:248 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:255 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:182 msgid "V" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:249 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:256 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:183 #, fuzzy msgid "Cr" msgstr "C" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:250 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:257 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:184 msgid "Mn" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:251 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:151 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:258 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:162 msgid "Fe" msgstr "Fe" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:252 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:152 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:259 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:163 msgid "Co" msgstr "Co" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:253 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:158 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:260 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:169 msgid "Ni" msgstr "Ni" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:254 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:157 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:261 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:168 msgid "Cu" msgstr "Cu" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:255 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:159 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:262 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:170 msgid "Zn" msgstr "Zn" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:257 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:264 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:208 msgid "Ga" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:258 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:265 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:213 msgid "Ge" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:259 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:266 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:214 msgid "As" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:260 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:267 #, fuzzy msgid "Se" msgstr "إحفَظ" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:261 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:138 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:268 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:149 msgid "Br" msgstr "Br" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:263 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:270 msgid "Kr" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:265 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:275 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:173 #, fuzzy msgid "Rb" msgstr "R" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:266 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:276 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:177 #, fuzzy msgid "Sr" msgstr "S" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:268 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:278 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:185 msgid "Y" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:269 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:279 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:186 msgid "Zr" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:270 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:280 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:187 #, fuzzy msgid "Nb" msgstr "N" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:271 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:281 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:188 msgid "Mo" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:272 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:282 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:189 msgid "Tc" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:273 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:283 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:190 #, fuzzy msgid "Ru" msgstr "R" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:274 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:284 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:191 #, fuzzy msgid "Rh" msgstr "R" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:275 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:285 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:192 #, fuzzy msgid "Pd" msgstr "P" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:276 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:153 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:286 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:164 msgid "Ag" msgstr "Ag" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:277 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:287 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:193 #, fuzzy msgid "Cd" msgstr "C" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:279 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:289 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:209 #, fuzzy msgid "In" msgstr "I" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:280 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:160 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:290 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:171 msgid "Sn" msgstr "Sn" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:281 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:291 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:215 #, fuzzy msgid "Sb" msgstr "S" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:282 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:292 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:216 msgid "Te" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:283 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:139 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:293 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:150 msgid "I" msgstr "I" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:285 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:295 msgid "Xe" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:287 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:300 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:174 #, fuzzy msgid "Cs" msgstr "C" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:288 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:301 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:178 #, fuzzy msgid "Ba" msgstr "B" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:290 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:303 msgid "La" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:291 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:304 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:194 #, fuzzy msgid "Hf" msgstr "H" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:292 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:305 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:195 msgid "Ta" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:293 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:306 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:196 msgid "W" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:294 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:307 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:197 #, fuzzy msgid "Re" msgstr "كَرِّر" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:295 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:308 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:198 #, fuzzy msgid "Os" msgstr "O" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:296 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:309 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:199 #, fuzzy msgid "Ir" msgstr "I" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:297 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:154 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:310 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:165 msgid "Pt" msgstr "Pt" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:298 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:155 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:311 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:166 msgid "Au" msgstr "Au" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:299 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:156 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:312 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:167 msgid "Hg" msgstr "Hg" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:301 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:314 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:210 msgid "Tl" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:302 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:315 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:211 #, fuzzy msgid "Pb" msgstr "P" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:303 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:316 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:212 #, fuzzy msgid "Bi" msgstr "B" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:304 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:317 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:217 #, fuzzy msgid "Po" msgstr "P" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:305 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:318 msgid "At" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:307 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:320 #, fuzzy msgid "Rn" msgstr "R" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:309 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:325 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:175 #, fuzzy msgid "Fr" msgstr "F" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:310 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:326 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:179 #, fuzzy msgid "Ra" msgstr "R" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:312 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:328 msgid "Ac" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:313 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:329 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:200 #, fuzzy msgid "Rf" msgstr "R" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:314 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:330 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:201 msgid "Db" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:315 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:331 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:202 #, fuzzy msgid "Sg" msgstr "S" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:316 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:332 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:203 #, fuzzy msgid "Bh" msgstr "B" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:317 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:333 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:204 #, fuzzy msgid "Hs" msgstr "H" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:318 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:334 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:205 msgid "Mt" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:319 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:335 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:206 msgid "Ds" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:320 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:336 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:207 #, fuzzy msgid "Rg" msgstr "R" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:326 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:342 #, fuzzy msgid "Ce" msgstr "C" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:327 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:343 #, fuzzy msgid "Pr" msgstr "P" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:328 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:344 #, fuzzy msgid "Nd" msgstr "N" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:329 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:345 #, fuzzy msgid "Pm" msgstr "P" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:330 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:346 #, fuzzy msgid "Sm" msgstr "S" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:331 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:347 msgid "Eu" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:332 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:348 msgid "Gd" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:333 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:349 msgid "Tb" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:334 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:350 msgid "Dy" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:335 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:351 #, fuzzy msgid "Ho" msgstr "H" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:336 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:352 msgid "Er" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:337 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:353 msgid "Tm" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:338 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:354 msgid "Yb" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:339 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:355 msgid "Lu" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:345 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:361 msgid "Th" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:346 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:362 #, fuzzy msgid "Pa" msgstr "P" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:347 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:363 msgid "U" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:348 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:364 #, fuzzy msgid "Np" msgstr "N" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:349 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:365 #, fuzzy msgid "Pu" msgstr "P" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:350 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:366 msgid "Am" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:351 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:367 #, fuzzy msgid "Cm" msgstr "C" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:352 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:368 #, fuzzy msgid "Bk" msgstr "B" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:353 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:369 #, fuzzy msgid "Cf" msgstr "C" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:354 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:370 msgid "Es" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:355 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:371 #, fuzzy msgid "Fm" msgstr "F" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:356 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:372 msgid "Md" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:357 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:373 #, fuzzy msgid "No" msgstr "N" -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:358 +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:374 msgid "Lr" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:167 +#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:179 msgid "Add Functional Group" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:175 +#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:192 #, fuzzy msgid "Add Atom" msgstr "ذرّات كاذِبة" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:128 +#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:199 +msgid "is not a valid element symbol or functional group." +msgstr "" + +#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:199 +msgid "No valid input" +msgstr "" + +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:139 +msgid "Ask for IO settings" +msgstr "" + +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:142 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:342 +msgid "Undo/redo stack size" +msgstr "" + +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:148 msgid "Draw atom numbers" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:131 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:151 msgid "Show atom-atom mappings" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:134 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:154 msgid "Explicit carbons" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:137 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:157 msgid "Show explicit methyl groups" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:140 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:160 #, fuzzy msgid "Show explicit hydrogens" msgstr "تَشغيل/تَعطيل تَتَبُّع مُوَلِّدات الماء المُضَمَّنَة" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:143 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:163 #, fuzzy msgid "Show implicit hydrogens" msgstr "تَشغيل/تَعطيل تَتَبُّع مُوَلِّدات الماء المُضَمَّنَة" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:146 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:166 msgid "Use aromatic ring circles" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:149 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:169 msgid "CDK style aromatics" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:152 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:172 msgid "Color atoms by element" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:155 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:175 msgid "Use Anti-Aliasing" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:158 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:178 msgid "Show tooltips" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:161 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:181 msgid "Show boxes around reactions" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:164 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:184 msgid "Show atoms in compact form" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:167 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:187 msgid "Set fit to screen" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:175 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:195 msgid "Atom size" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:182 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:202 msgid "Bond width" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:190 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:210 msgid "Bond length" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:198 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:218 msgid "Highlight Distance" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:205 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:225 msgid "Wedge width" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:209 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:229 msgid "Oval Compact Atoms" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:213 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:233 msgid "Square Compact Atoms" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:217 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:237 msgid "Font name" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:219 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:239 msgid "Choose Font..." msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:224 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:244 msgid "BACKCOLOR" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:225 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:245 msgid "Background color" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:227 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:247 msgid "Choose Color..." msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:312 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:342 +msgid "must be a number from 1 to 100" +msgstr "" + +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:353 msgid "Choose a Font" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:313 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:354 msgid "Carbon Dioxide" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/RendererModelEditor.java:321 +#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:362 msgid "Choose Background Color" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/editor/GeneralSettingsEditor.java:65 -msgid "Ask for IO settings" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/GeneralSettingsEditor.java:67 -#: src/main/org/openscience/jchempaint/dialog/editor/GeneralSettingsEditor.java:91 -msgid "Undo/redo stack size" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/GeneralSettingsEditor.java:91 -msgid "must be a number from 1 to 100" -msgstr "" - #: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:75 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:85 msgid "Rendering Options" msgstr "خِيَّارات الإيحَاء بالوَاقِعِيَّة (Rendering)" #: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:81 -#: src/main/org/openscience/jchempaint/dialog/TextViewDialog.java:113 -#: src/main/org/openscience/jchempaint/dialog/ModifyGeneralSettingsDialog.java:71 +#: src/main/org/openscience/jchempaint/dialog/TextViewDialog.java:114 #, fuzzy msgid "OK" msgstr "O" #: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:89 -#: src/main/org/openscience/jchempaint/dialog/ModifyGeneralSettingsDialog.java:79 msgid "Apply" msgstr "" #: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:96 -#: src/main/org/openscience/jchempaint/dialog/ModifyGeneralSettingsDialog.java:86 msgid "Cancel" msgstr "" -#: src/main/org/openscience/jchempaint/dialog/ModifyGeneralSettingsDialog.java:56 -msgid "General Settings" -msgstr "" - #: src/main/org/openscience/jchempaint/dialog/AboutDialog.java:73 msgid "An open-source editor for 2D chemical structures." msgstr "" #: src/main/org/openscience/jchempaint/dialog/AboutDialog.java:74 -msgid "" -"An OpenScience project by Christoph Steinbeck, Egon Willighagen and others." +msgid "An OpenScience project." msgstr "" #: src/main/org/openscience/jchempaint/dialog/AboutDialog.java:75 msgid "See 'http://jchempaint.sourceforge.net' for more information." msgstr "" -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:478 +#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:490 msgid "has unsaved data. Do you want to save it?" msgstr "تملك بيانات غير محفوظة. هل تريد حفظها؟" -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:479 +#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:491 msgid "Unsaved data" msgstr "بيانات غير محفوظة" -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:611 +#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:646 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:66 +msgid "Redo" +msgstr "كَرِّر" + +#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:650 msgid "No redo possible" msgstr "" -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:621 +#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:656 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:65 +msgid "Undo" +msgstr "تَراجَع" + +#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:660 msgid "No undo possible" msgstr "" -#: src/main/org/openscience/jchempaint/action/ConvertToRadicalAction.java:76 +#: src/main/org/openscience/jchempaint/action/ConvertToRadicalAction.java:100 msgid "A radical cannot be added to this atom. Re-try with less hydrogens." msgstr "" -#: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:76 +#: src/main/org/openscience/jchempaint/action/CopyPasteAction.java:322 +msgid "The content you tried to copy could not be read to any known format" +msgstr "" + +#: src/main/org/openscience/jchempaint/action/CopyPasteAction.java:322 #, fuzzy +msgid "Could not process content" +msgstr "لم يمكن معالجة InChI" + +#: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:77 +#, fuzzy msgid "Generated SMILES:" msgstr "أنشِئ SMILES" -#: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:79 +#: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:80 msgid "Error while creating SMILES:" msgstr "" -#: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:82 +#: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:83 #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:75 msgid "Error" msgstr "" +#: src/main/org/openscience/jchempaint/action/ExportAction.java:92 +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:141 +msgid "Please chose a file type!" +msgstr "" + +#: src/main/org/openscience/jchempaint/action/ExportAction.java:92 +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:141 +msgid "No file type chosen" +msgstr "" + #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:72 msgid "Error loading InChI library:" msgstr "" @@ -812,29 +938,46 @@ msgid "Generated InChI" msgstr "أنشِئ InChI" -#: src/main/org/openscience/jchempaint/action/CreateReactionAction.java:105 -#: src/main/org/openscience/jchempaint/action/CreateReactionAction.java:136 -msgid "No reaction existing. Cannot add therefore to something!" +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:105 +msgid "Nothing to save." msgstr "" -#: src/main/org/openscience/jchempaint/action/CreateReactionAction.java:105 -#: src/main/org/openscience/jchempaint/action/CreateReactionAction.java:136 -#, fuzzy -msgid "No existing reactions" -msgstr "إجعَل النّاتِج في تفاعل موجود" +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:190 +msgid "Error while writing file" +msgstr "" -#: src/main/org/openscience/jchempaint/RenderPanel.java:439 +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:247 +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:253 +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:305 +msgid "Problems handling data" +msgstr "" + +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:248 +msgid "" +"MDL mol files can only save separate molecules. You have no molecules " +"painted!" +msgstr "" + +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:254 +msgid "" +"MDL mol files cannot contain reactions. Your have reaction(s) painted, which " +"will not be in the file. Continue?" +msgstr "" + +#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:306 +msgid "" +"SMILES files cannot contain reactions. Your have reaction(s) painted. The " +"reactants/products of these will be included as separate molecules. Continue?" +msgstr "" + +#: src/main/org/openscience/jchempaint/RenderPanel.java:435 msgid "Zoomfactor" msgstr "" -#: src/main/org/openscience/jchempaint/RenderPanel.java:453 +#: src/main/org/openscience/jchempaint/RenderPanel.java:448 msgid "Hs implicit" msgstr "" -#: src/main/org/openscience/jchempaint/RenderPanel.java:454 -msgid "mass" -msgstr "" - #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:52 msgid "File" msgstr "ملف" @@ -866,8 +1009,8 @@ #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:59 #, fuzzy -msgid "Export..." -msgstr "حَرِّر..." +msgid "Save As Image..." +msgstr "إحفَط كــ" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:60 msgid "Save" @@ -889,14 +1032,6 @@ msgid "Exit" msgstr "أخرُج" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:65 -msgid "Undo" -msgstr "تَراجَع" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:66 -msgid "Redo" -msgstr "كَرِّر" - #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:67 msgid "Select All" msgstr "إنتقِ الكل" @@ -906,462 +1041,578 @@ msgstr "إنسَخ" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:69 +#, fuzzy +msgid "Copy as SMILES" +msgstr "أنشِئ SMILES" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:70 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:280 +msgid "Delete" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:71 msgid "Paste" msgstr "ألصِق" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:70 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:71 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:72 msgid "Cut" msgstr "قُصَّ" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:72 -msgid "Hydrogens..." -msgstr "مُوَلِّدات ماء..." - #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:73 -msgid "Adjust Bond Orders" -msgstr "عَدِّل تَرتِيب الرَّوابِط" +#, fuzzy +msgid "Atom" +msgstr "ذرّات كاذِبة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:74 -msgid "Reset Bond Orders" -msgstr "أعِد الرَّوابِط إلى التَّرتِيب الإبتدائي" +#, fuzzy +msgid "Bond" +msgstr "أرسُم الرّوابط و الذرّات" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:75 #, fuzzy -msgid "Flip" -msgstr "إقلِب" +msgid "Tools" +msgstr "شريط الأدوات" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:76 -msgid "Clean Up" -msgstr "نَظِّف" +#, fuzzy +msgid "Single" +msgstr "ملف" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:77 -msgid "Preferences" -msgstr "تفضيلات" +msgid "Stereo Down" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:78 -msgid "Toolbar" -msgstr "شريط الأدوات" +msgid "Stereo Up" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:79 -msgid "Statusbar" -msgstr "شريط الحالة" +msgid "Undefined Stereo" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:80 -msgid "Menubar" -msgstr "شريط القائمة" +msgid "Undefined E/Z" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:81 -msgid "Direct Entry as SMILES/InChI/CAS" -msgstr "إدخال مباشِر كـ SMILES/InChI/CAS" +msgid "Charge" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:82 -msgid "Zoom in" -msgstr "قرِّب" +#, fuzzy +msgid "Plus" +msgstr "P" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:83 -msgid "Zoom Out" -msgstr "بعَِد" +msgid "Minus" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:84 -msgid "Zoom 100%" -msgstr "قرِّب 100%" +#, fuzzy +msgid "Implicit Hydrogens" +msgstr "تَشغيل/تَعطيل تَتَبُّع مُوَلِّدات الماء المُضَمَّنَة" +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:85 +#, fuzzy +msgid "Flip" +msgstr "إقلِب" + #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:86 -msgid "Validate" -msgstr "صَحِّح" +msgid "Clean Structure" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:87 -msgid "Create SMILES" -msgstr "أنشِئ SMILES" +msgid "Toolbar" +msgstr "شريط الأدوات" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:88 -msgid "Create InChI" -msgstr "أنشِئ InChI" +msgid "Statusbar" +msgstr "شريط الحالة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:89 -msgid "Help" -msgstr "مساعدة" +msgid "Menubar" +msgstr "شريط القائمة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:90 -msgid "Tutorial" -msgstr "درس تعليمي" +msgid "Direct Entry as SMILES/InChI/CAS" +msgstr "إدخال مباشِر كـ SMILES/InChI/CAS" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:91 -msgid "License" -msgstr "رخصة" +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:253 +msgid "Zoom in" +msgstr "قرِّب" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:92 -msgid "About" -msgstr "عن" +msgid "Zoom Out" +msgstr "بعَِد" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:93 -msgid "Switch on/off Tracking of Implicit Hydrogens" -msgstr "تَشغيل/تَعطيل تَتَبُّع مُوَلِّدات الماء المُضَمَّنَة" +msgid "Zoom 100%" +msgstr "قرِّب 100%" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:94 -msgid "Make Existing Implicit Hydrogens Explicit" -msgstr "إجعَل مُوَلِّدات الماء المُضَمَّنَة الموجودة غير مُضَمَّنَة" +#, fuzzy +msgid "Preferences..." +msgstr "تفضيلات" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:95 -msgid "Make Existing Explicit Hydrogens Implicit" -msgstr "إجعَل مولّدات الماء الغَير مُضَمَّنَة الموجودة مُضَمَّنَة" +msgid "Create SMILES" +msgstr "أنشِئ SMILES" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:96 -#, fuzzy -msgid "Update Implicit Hydrogen Count" -msgstr "إجعَل مُوَلِّدات الماء المُضَمَّنَة الموجودة غير مُضَمَّنَة" +msgid "Create InChI" +msgstr "أنشِئ InChI" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:97 -msgid "Edit..." -msgstr "حَرِّر..." +msgid "Help" +msgstr "مساعدة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:98 -msgid "Reload Preferences" -msgstr "أعِد تحميل التّفضيلات" +msgid "Tutorial" +msgstr "درس تعليمي" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:99 -msgid "Save Preferences" -msgstr "إحفَظ التّفضيلات" +msgid "License" +msgstr "رخصة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:100 -msgid "Run Validate" -msgstr "أجرِ التّصحيح" +msgid "About" +msgstr "عن" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:101 -msgid "Clear Validate Results" -msgstr "إمسَح نتائج التّصحيح" +msgid "On all" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:102 +msgid "Off" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:103 msgid "Horizontal" msgstr "أفُقي" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:103 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:104 msgid "Vertical" msgstr "عَمودي" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:104 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:105 #, fuzzy msgid "Select" msgstr "إنتقِ الكل" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:105 -msgid "Select Molecule" -msgstr "إنتقِ جُزيءًا" - #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:106 -msgid "Change Element..." +#, fuzzy +msgid "Change Element" msgstr "غَيِّر العُنصر..." #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:107 -msgid "Change Isotope..." -msgstr "غَيِّر النَّظير..." +msgid "Periodic Table" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:108 #, fuzzy -msgid "Convert to Radical" -msgstr "حَوِّل إلى جِذر" +msgid "Custom" +msgstr "قُصَّ" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:109 -msgid "Reaction..." -msgstr "تفاعُل..." +#, fuzzy +msgid "Isotopes" +msgstr "نظير شائع" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:110 +#, fuzzy +msgid "Convert to Radical" +msgstr "حَوِّل إلى جِذر" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:111 msgid "Properties" msgstr "خصائص" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:111 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:112 msgid "Molecule Properties" msgstr "خصائص الجُزَيء" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:112 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:113 msgid "Convert to Regular Atom" msgstr "حَوِّل إلى ذرّة نِظامية" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:113 -msgid "Make Reactant in new Reaction" -msgstr "إجعَل المتَفاعِل في تفاعل جديد" - #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:114 #, fuzzy -msgid "Make Reactant in existing Reaction" -msgstr "إجعَل المتَفاعِل في تفاعل جديد" +msgid "Common Elements" +msgstr "عناصر مشتركة..." #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:115 -msgid "Make Product in new Reaction" -msgstr "إجعَل النّاتِج في تفاعل جديد" +#, fuzzy +msgid "Halogens" +msgstr "مُولِّدات ملح..." #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:116 -msgid "Make Product in existing Reaction" -msgstr "إجعَل النّاتِج في تفاعل موجود" +#, fuzzy +msgid "Nobel Gases" +msgstr "غازات نبيلة..." #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:117 -msgid "Common Elements..." -msgstr "عناصر مشتركة..." +msgid "Alkali Metals" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:118 -msgid "Halogens..." -msgstr "مُولِّدات ملح..." +msgid "Alkali Earth Metals" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:119 -msgid "Nobel Gases..." -msgstr "غازات نبيلة..." +msgid "Transition Metals" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:120 -msgid "NMR Nuclei..." -msgstr "أنوِية NMR..." +msgid "Metals" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:121 -msgid "Others..." -msgstr "أخرى..." +msgid "Metalloids" +msgstr "" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:122 +msgid "Non-Metals" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:123 msgid "Pseudo Atoms" msgstr "ذرّات كاذِبة" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:123 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:124 msgid "Major Plus Three" msgstr "شائع زائِد ثلاثة" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:124 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:125 msgid "Major Plus Two" msgstr "شائع زائِد إثنين" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:125 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:126 msgid "Major Plus One" msgstr "شائع زائِد واحد" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:126 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:127 msgid "Major Isotope" msgstr "نظير شائع" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:127 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:128 msgid "Major Minus One" msgstr "شائع ناقِص واحد" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:128 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:129 msgid "Major Minus Two" msgstr "شائع ناقِص إثنين" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:129 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:130 msgid "Major Minus Three" msgstr "شائع ناقِص ثلاثة" +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:131 +msgid "Valence" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:132 +msgid "Valence Off" +msgstr "" + #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:133 +msgid "Valence 1" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:134 +msgid "Valence 2" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:135 +msgid "Valence 3" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:136 +msgid "Valence 4" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:137 +msgid "Valence 5" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:138 +msgid "Valence 6" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:139 +msgid "Valence 7" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:140 +msgid "Valence 8" +msgstr "" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:144 msgid "H" msgstr "H" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:161 -msgid "*" -msgstr "*" +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:218 +msgid "Variable Attachment Point *" +msgstr "" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:162 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:219 msgid "R" msgstr "R" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:163 -msgid "Select Reactants Only" +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:220 +msgid "R.." msgstr "" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:164 -msgid "Select Products Only" -msgstr "" +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:221 +#, fuzzy +msgid "R1" +msgstr "R" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:165 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:222 +#, fuzzy +msgid "R2" +msgstr "R" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:223 +#, fuzzy +msgid "R3" +msgstr "R" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:224 +#, fuzzy +msgid "R4" +msgstr "R" + +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:225 msgid "Draw Bonds and Atoms" msgstr "أرسُم الرّوابط و الذرّات" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:166 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:226 msgid "Change the Atom's Symbol" msgstr "غَيّر رمز الذرّة" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:167 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:227 msgid "Select new drawing symbol from periodic table" msgstr "إنتقِ رمز رسم جديد من الجدول الدّوري" -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:168 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:228 msgid "Enter an element symbol via keyboard" msgstr "أدخِل رمز عنص... [truncated message content] |
From: <sh...@us...> - 2009-09-29 12:07:26
|
Revision: 14908 http://cdk.svn.sourceforge.net/cdk/?rev=14908&view=rev Author: shk3 Date: 2009-09-29 12:07:16 +0000 (Tue, 29 Sep 2009) Log Message: ----------- synchronized translations with launchpad Modified Paths: -------------- jchempaint/trunk/po/ar.po jchempaint/trunk/po/classes/app/i18n/Messages_ar$1.class jchempaint/trunk/po/classes/app/i18n/Messages_ar.class jchempaint/trunk/po/classes/app/i18n/Messages_nl$1.class jchempaint/trunk/po/classes/app/i18n/Messages_nl.class jchempaint/trunk/po/nl.po jchempaint/trunk/src/main/org/openscience/jchempaint/GT.java Added Paths: ----------- jchempaint/trunk/po/classes/app/i18n/Messages_cs$1.class jchempaint/trunk/po/classes/app/i18n/Messages_cs.class jchempaint/trunk/po/classes/app/i18n/Messages_hu$1.class jchempaint/trunk/po/classes/app/i18n/Messages_hu.class jchempaint/trunk/po/classes/app/i18n/Messages_nb$1.class jchempaint/trunk/po/classes/app/i18n/Messages_nb.class jchempaint/trunk/po/classes/app/i18n/Messages_th$1.class jchempaint/trunk/po/classes/app/i18n/Messages_th.class jchempaint/trunk/po/cs.po jchempaint/trunk/po/hu.po jchempaint/trunk/po/nb.po jchempaint/trunk/po/th.po Modified: jchempaint/trunk/po/ar.po =================================================================== --- jchempaint/trunk/po/ar.po 2009-09-29 11:13:11 UTC (rev 14907) +++ jchempaint/trunk/po/ar.po 2009-09-29 12:07:16 UTC (rev 14908) @@ -8,13 +8,13 @@ "Project-Id-Version: jchempaint\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-09-29 11:57+0100\n" -"PO-Revision-Date: 2009-02-25 13:45+0000\n" +"PO-Revision-Date: 2009-08-27 09:16+0000\n" "Last-Translator: عبد الله شلي (Abdellah Chelli) <sne...@gm...>\n" "Language-Team: Arabic <ar...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-02-09 17:16+0000\n" +"X-Launchpad-Export-Date: 2009-09-29 11:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #: src/main/org/openscience/jchempaint/application/JChemPaint.java:103 @@ -88,7 +88,7 @@ #: src/main/org/openscience/jchempaint/InsertTextPanel.java:91 msgid "Enter a CAS, SMILES or InChI string" -msgstr "أدخل سلسلة CAS أو SMILES أو InChI" +msgstr "أدخِل سِلسلة CAS، SMILES أو InChI" #: src/main/org/openscience/jchempaint/InsertTextPanel.java:96 #: src/main/org/openscience/jchempaint/InsertTextPanel.java:123 @@ -109,7 +109,7 @@ #: src/main/org/openscience/jchempaint/InsertTextPanel.java:173 msgid "Invalid SMILES specified" -msgstr "سلسلة (SMILES) المقدّمة غير صالحة" +msgstr "سلسلة SMILES المعيّنة غير صالحة" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:180 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:151 @@ -200,40 +200,37 @@ #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:250 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:172 msgid "K" -msgstr "" +msgstr "K" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:251 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:176 -#, fuzzy msgid "Ca" -msgstr "C" +msgstr "Ca" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:253 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:180 -#, fuzzy msgid "Sc" -msgstr "S" +msgstr "Sc" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:254 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:181 msgid "Ti" -msgstr "" +msgstr "Ti" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:255 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:182 msgid "V" -msgstr "" +msgstr "V" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:256 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:183 -#, fuzzy msgid "Cr" -msgstr "C" +msgstr "Cr" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:257 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:184 msgid "Mn" -msgstr "" +msgstr "Mn" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:258 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:162 @@ -263,22 +260,21 @@ #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:264 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:208 msgid "Ga" -msgstr "" +msgstr "Ga" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:265 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:213 msgid "Ge" -msgstr "" +msgstr "Ge" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:266 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:214 msgid "As" -msgstr "" +msgstr "As" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:267 -#, fuzzy msgid "Se" -msgstr "إحفَظ" +msgstr "Se" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:268 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:149 @@ -287,63 +283,57 @@ #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:270 msgid "Kr" -msgstr "" +msgstr "Kr" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:275 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:173 -#, fuzzy msgid "Rb" -msgstr "R" +msgstr "Rb" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:276 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:177 -#, fuzzy msgid "Sr" -msgstr "S" +msgstr "Sr" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:278 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:185 msgid "Y" -msgstr "" +msgstr "Y" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:279 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:186 msgid "Zr" -msgstr "" +msgstr "Zr" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:280 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:187 -#, fuzzy msgid "Nb" -msgstr "N" +msgstr "Nb" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:281 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:188 msgid "Mo" -msgstr "" +msgstr "Mo" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:282 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:189 msgid "Tc" -msgstr "" +msgstr "Tc" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:283 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:190 -#, fuzzy msgid "Ru" -msgstr "R" +msgstr "Ru" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:284 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:191 -#, fuzzy msgid "Rh" -msgstr "R" +msgstr "Rh" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:285 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:192 -#, fuzzy msgid "Pd" -msgstr "P" +msgstr "Pd" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:286 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:164 @@ -352,15 +342,13 @@ #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:287 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:193 -#, fuzzy msgid "Cd" -msgstr "C" +msgstr "Cd" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:289 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:209 -#, fuzzy msgid "In" -msgstr "I" +msgstr "In" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:290 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:171 @@ -369,14 +357,13 @@ #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:291 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:215 -#, fuzzy msgid "Sb" -msgstr "S" +msgstr "Sb" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:292 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:216 msgid "Te" -msgstr "" +msgstr "Te" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:293 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:150 @@ -385,57 +372,51 @@ #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:295 msgid "Xe" -msgstr "" +msgstr "Xe" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:300 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:174 -#, fuzzy msgid "Cs" -msgstr "C" +msgstr "Cs" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:301 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:178 -#, fuzzy msgid "Ba" -msgstr "B" +msgstr "Ba" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:303 msgid "La" -msgstr "" +msgstr "La" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:304 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:194 -#, fuzzy msgid "Hf" -msgstr "H" +msgstr "Hf" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:305 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:195 msgid "Ta" -msgstr "" +msgstr "Ta" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:306 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:196 msgid "W" -msgstr "" +msgstr "W" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:307 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:197 -#, fuzzy msgid "Re" -msgstr "كَرِّر" +msgstr "Re" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:308 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:198 -#, fuzzy msgid "Os" -msgstr "O" +msgstr "Os" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:309 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:199 -#, fuzzy msgid "Ir" -msgstr "I" +msgstr "Ir" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:310 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:165 @@ -455,230 +436,204 @@ #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:314 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:210 msgid "Tl" -msgstr "" +msgstr "Tl" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:315 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:211 -#, fuzzy msgid "Pb" -msgstr "P" +msgstr "Pb" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:316 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:212 -#, fuzzy msgid "Bi" -msgstr "B" +msgstr "Bi" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:317 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:217 -#, fuzzy msgid "Po" -msgstr "P" +msgstr "Po" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:318 msgid "At" -msgstr "" +msgstr "At" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:320 -#, fuzzy msgid "Rn" -msgstr "R" +msgstr "Rn" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:325 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:175 -#, fuzzy msgid "Fr" -msgstr "F" +msgstr "Fr" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:326 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:179 -#, fuzzy msgid "Ra" -msgstr "R" +msgstr "Ra" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:328 msgid "Ac" -msgstr "" +msgstr "Ac" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:329 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:200 -#, fuzzy msgid "Rf" -msgstr "R" +msgstr "Rf" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:330 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:201 msgid "Db" -msgstr "" +msgstr "Db" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:331 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:202 -#, fuzzy msgid "Sg" -msgstr "S" +msgstr "Sg" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:332 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:203 -#, fuzzy msgid "Bh" -msgstr "B" +msgstr "Bh" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:333 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:204 -#, fuzzy msgid "Hs" -msgstr "H" +msgstr "Hs" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:334 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:205 msgid "Mt" -msgstr "" +msgstr "Mt" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:335 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:206 msgid "Ds" -msgstr "" +msgstr "Ds" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:336 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:207 -#, fuzzy msgid "Rg" -msgstr "R" +msgstr "Rg" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:342 -#, fuzzy msgid "Ce" -msgstr "C" +msgstr "Ce" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:343 -#, fuzzy msgid "Pr" -msgstr "P" +msgstr "Pr" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:344 -#, fuzzy msgid "Nd" -msgstr "N" +msgstr "Nd" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:345 -#, fuzzy msgid "Pm" -msgstr "P" +msgstr "Pm" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:346 -#, fuzzy msgid "Sm" -msgstr "S" +msgstr "Sm" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:347 msgid "Eu" -msgstr "" +msgstr "Eu" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:348 msgid "Gd" -msgstr "" +msgstr "Gd" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:349 msgid "Tb" -msgstr "" +msgstr "Tb" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:350 msgid "Dy" -msgstr "" +msgstr "Dy" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:351 -#, fuzzy msgid "Ho" -msgstr "H" +msgstr "Ho" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:352 msgid "Er" -msgstr "" +msgstr "Er" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:353 msgid "Tm" -msgstr "" +msgstr "Tm" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:354 msgid "Yb" -msgstr "" +msgstr "Yb" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:355 msgid "Lu" -msgstr "" +msgstr "Lu" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:361 msgid "Th" -msgstr "" +msgstr "Th" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:362 -#, fuzzy msgid "Pa" -msgstr "P" +msgstr "Pa" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:363 msgid "U" -msgstr "" +msgstr "U" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:364 -#, fuzzy msgid "Np" -msgstr "N" +msgstr "Np" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:365 -#, fuzzy msgid "Pu" -msgstr "P" +msgstr "Pu" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:366 msgid "Am" -msgstr "" +msgstr "Am" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:367 -#, fuzzy msgid "Cm" -msgstr "C" +msgstr "Cm" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:368 -#, fuzzy msgid "Bk" -msgstr "B" +msgstr "Bk" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:369 -#, fuzzy msgid "Cf" -msgstr "C" +msgstr "Cf" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:370 msgid "Es" -msgstr "" +msgstr "Es" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:371 -#, fuzzy msgid "Fm" -msgstr "F" +msgstr "Fm" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:372 msgid "Md" -msgstr "" +msgstr "Md" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:373 -#, fuzzy msgid "No" -msgstr "N" +msgstr "No" #: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:374 msgid "Lr" -msgstr "" +msgstr "Lr" #: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:179 msgid "Add Functional Group" -msgstr "" +msgstr "أضِف مجموعة وظيفية" #: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:192 -#, fuzzy msgid "Add Atom" -msgstr "ذرّات كاذِبة" +msgstr "أضِف ذرّة" #: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:199 msgid "is not a valid element symbol or functional group." @@ -690,134 +645,132 @@ #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:139 msgid "Ask for IO settings" -msgstr "" +msgstr "إسأل عن إعدادات دخل-خرج (IO)" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:142 #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:342 msgid "Undo/redo stack size" -msgstr "" +msgstr "حجم مخزن التراجع/الإعادة" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:148 msgid "Draw atom numbers" -msgstr "" +msgstr "أرسُم أرقام الذرّات" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:151 msgid "Show atom-atom mappings" -msgstr "" +msgstr "أظهِر تعيّين الصلات ذرة-ذرة" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:154 msgid "Explicit carbons" -msgstr "" +msgstr "ذرّات كربون غير ضمنية" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:157 msgid "Show explicit methyl groups" -msgstr "" +msgstr "أظهِر مجموعات الميثيل الغير ضمنية" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:160 -#, fuzzy msgid "Show explicit hydrogens" -msgstr "تَشغيل/تَعطيل تَتَبُّع مُوَلِّدات الماء المُضَمَّنَة" +msgstr "أظهِر مولِّدات الماء الغير ضمنية" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:163 -#, fuzzy msgid "Show implicit hydrogens" -msgstr "تَشغيل/تَعطيل تَتَبُّع مُوَلِّدات الماء المُضَمَّنَة" +msgstr "أظهِر مولِّدات الماء الضمنية" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:166 msgid "Use aromatic ring circles" -msgstr "" +msgstr "استعمِل دوائر حلقات عطريّة" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:169 msgid "CDK style aromatics" -msgstr "" +msgstr "مرَكّبات عطريّة بنمط CDK" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:172 msgid "Color atoms by element" -msgstr "" +msgstr "لوِّن الذرّات حسب العُنصُر" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:175 msgid "Use Anti-Aliasing" -msgstr "" +msgstr "إستعمِل إزالة التسنّن" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:178 msgid "Show tooltips" -msgstr "" +msgstr "اظهر التلميحات" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:181 msgid "Show boxes around reactions" -msgstr "" +msgstr "أظهِر صناديق حول التّفاعلات." #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:184 msgid "Show atoms in compact form" -msgstr "" +msgstr "أظهِر الذرّات في شكلٍ مدمجٍ" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:187 msgid "Set fit to screen" -msgstr "" +msgstr "عَيِّن مُلائَمَة الشّاشة" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:195 msgid "Atom size" -msgstr "" +msgstr "حجم الذرّة" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:202 msgid "Bond width" -msgstr "" +msgstr "عرض الرّابطة" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:210 msgid "Bond length" -msgstr "" +msgstr "طول الرابطة" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:218 msgid "Highlight Distance" -msgstr "" +msgstr "أبرِز البُعد" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:225 msgid "Wedge width" -msgstr "" +msgstr "عرض الوتَد" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:229 msgid "Oval Compact Atoms" -msgstr "" +msgstr "دمج إهليجي للذرّات" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:233 msgid "Square Compact Atoms" -msgstr "" +msgstr "دمج مربع للذرّات" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:237 msgid "Font name" -msgstr "" +msgstr "اسم الخط" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:239 msgid "Choose Font..." -msgstr "" +msgstr "إنتقِ خطًا..." #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:244 msgid "BACKCOLOR" -msgstr "" +msgstr "اللون الخلفي" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:245 msgid "Background color" -msgstr "" +msgstr "لون الخلفية" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:247 msgid "Choose Color..." -msgstr "" +msgstr "إنتقِ لونًا..." #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:342 msgid "must be a number from 1 to 100" -msgstr "" +msgstr "يجب أن يكون عددًا بين 1 و 100" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:353 msgid "Choose a Font" -msgstr "" +msgstr "إنتقِ خطًا..." #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:354 msgid "Carbon Dioxide" -msgstr "" +msgstr "ثاني أكسيد الفحم" #: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:362 msgid "Choose Background Color" -msgstr "" +msgstr "إنتقِ لونَ خلفية" #: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:75 msgid "Rendering Options" @@ -825,21 +778,20 @@ #: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:81 #: src/main/org/openscience/jchempaint/dialog/TextViewDialog.java:114 -#, fuzzy msgid "OK" -msgstr "O" +msgstr "موافق" #: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:89 msgid "Apply" -msgstr "" +msgstr "طبِّق" #: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:96 msgid "Cancel" -msgstr "" +msgstr "ألغِ" #: src/main/org/openscience/jchempaint/dialog/AboutDialog.java:73 msgid "An open-source editor for 2D chemical structures." -msgstr "" +msgstr "محرِّر مفتوح المصدر للبنى الكيميائية الثّنائية البعد." #: src/main/org/openscience/jchempaint/dialog/AboutDialog.java:74 msgid "An OpenScience project." @@ -847,11 +799,11 @@ #: src/main/org/openscience/jchempaint/dialog/AboutDialog.java:75 msgid "See 'http://jchempaint.sourceforge.net' for more information." -msgstr "" +msgstr "تصفّح 'http://jchempaint.sourceforge.net' لمعلومات أكثر." #: src/main/org/openscience/jchempaint/JChemPaintPanel.java:490 msgid "has unsaved data. Do you want to save it?" -msgstr "تملك بيانات غير محفوظة. هل تريد حفظها؟" +msgstr "تملِك بيانات غير محفوظة. هل تريد حفظها؟" #: src/main/org/openscience/jchempaint/JChemPaintPanel.java:491 msgid "Unsaved data" @@ -864,7 +816,7 @@ #: src/main/org/openscience/jchempaint/JChemPaintPanel.java:650 msgid "No redo possible" -msgstr "" +msgstr "لا إعادَة ممكِنة" #: src/main/org/openscience/jchempaint/JChemPaintPanel.java:656 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:65 @@ -873,11 +825,11 @@ #: src/main/org/openscience/jchempaint/JChemPaintPanel.java:660 msgid "No undo possible" -msgstr "" +msgstr "لا تراجُع ممكِن" #: src/main/org/openscience/jchempaint/action/ConvertToRadicalAction.java:100 msgid "A radical cannot be added to this atom. Re-try with less hydrogens." -msgstr "" +msgstr "لا يمكن إضافة جذرٍ إلى هذه الذرّة. حاوِل مع القليل من مولِّدات الماء." #: src/main/org/openscience/jchempaint/action/CopyPasteAction.java:322 msgid "The content you tried to copy could not be read to any known format" @@ -889,18 +841,17 @@ msgstr "لم يمكن معالجة InChI" #: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:77 -#, fuzzy msgid "Generated SMILES:" -msgstr "أنشِئ SMILES" +msgstr "SMILES مولَّد:" #: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:80 msgid "Error while creating SMILES:" -msgstr "" +msgstr "خطأ أثناء إنشاء SMILES:" #: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:83 #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:75 msgid "Error" -msgstr "" +msgstr "خطأ" #: src/main/org/openscience/jchempaint/action/ExportAction.java:92 #: src/main/org/openscience/jchempaint/action/SaveAsAction.java:141 @@ -914,37 +865,37 @@ #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:72 msgid "Error loading InChI library:" -msgstr "" +msgstr "خطأ تحميل مكتبة InChI:" #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:81 msgid "Problem" -msgstr "" +msgstr "إشكال" #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:81 msgid "You have reactions in JCP. Reactions cannot be shown as InChI!" -msgstr "" +msgstr "تملِك تفاعلات في JCP. و لا يمكن عرض التفاعلات كـ InChI!" #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:89 msgid "Structure" -msgstr "" +msgstr "بنية" #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:102 #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:105 msgid "InChI generation failed" -msgstr "" +msgstr "توليد InChI فشِل" #: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:109 -#, fuzzy msgid "Generated InChI" -msgstr "أنشِئ InChI" +msgstr "InChI مولَّد" #: src/main/org/openscience/jchempaint/action/SaveAsAction.java:105 msgid "Nothing to save." msgstr "" #: src/main/org/openscience/jchempaint/action/SaveAsAction.java:190 +#, fuzzy msgid "Error while writing file" -msgstr "" +msgstr "خطأ أثناء إنشاء SMILES:" #: src/main/org/openscience/jchempaint/action/SaveAsAction.java:247 #: src/main/org/openscience/jchempaint/action/SaveAsAction.java:253 @@ -972,11 +923,11 @@ #: src/main/org/openscience/jchempaint/RenderPanel.java:435 msgid "Zoomfactor" -msgstr "" +msgstr "مُعامِل التّقريب" #: src/main/org/openscience/jchempaint/RenderPanel.java:448 msgid "Hs implicit" -msgstr "" +msgstr "مولِّدات الماء ضمنية" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:52 msgid "File" @@ -995,9 +946,8 @@ msgstr "إفتَح" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:56 -#, fuzzy msgid "Save As..." -msgstr "إحفَط كــ" +msgstr "إحفَظ كـ..." #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:57 msgid "View" @@ -1010,7 +960,7 @@ #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:59 #, fuzzy msgid "Save As Image..." -msgstr "إحفَط كــ" +msgstr "إحفَظ كـ..." #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:60 msgid "Save" @@ -1048,7 +998,7 @@ #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:70 #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:280 msgid "Delete" -msgstr "" +msgstr "إحذِف" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:71 msgid "Paste" @@ -1061,12 +1011,12 @@ #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:73 #, fuzzy msgid "Atom" -msgstr "ذرّات كاذِبة" +msgstr "At" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:74 #, fuzzy msgid "Bond" -msgstr "أرسُم الرّوابط و الذرّات" +msgstr "أرسُم رابطة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:75 #, fuzzy @@ -1101,7 +1051,7 @@ #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:82 #, fuzzy msgid "Plus" -msgstr "P" +msgstr "Pu" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:83 msgid "Minus" @@ -1110,16 +1060,16 @@ #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:84 #, fuzzy msgid "Implicit Hydrogens" -msgstr "تَشغيل/تَعطيل تَتَبُّع مُوَلِّدات الماء المُضَمَّنَة" +msgstr "أظهِر مولِّدات الماء الضمنية" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:85 -#, fuzzy msgid "Flip" msgstr "إقلِب" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:86 +#, fuzzy msgid "Clean Structure" -msgstr "" +msgstr "بنية" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:87 msgid "Toolbar" @@ -1196,9 +1146,8 @@ msgstr "عَمودي" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:105 -#, fuzzy msgid "Select" -msgstr "إنتقِ الكل" +msgstr "إنتقِ" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:106 #, fuzzy @@ -1206,8 +1155,9 @@ msgstr "غَيِّر العُنصر..." #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:107 +#, fuzzy msgid "Periodic Table" -msgstr "" +msgstr "الجدول الدوري لـ JChemPaint" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:108 #, fuzzy @@ -1220,9 +1170,8 @@ msgstr "نظير شائع" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:110 -#, fuzzy msgid "Convert to Radical" -msgstr "حَوِّل إلى جِذر" +msgstr "حوِّل إلى جِذر" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:111 msgid "Properties" @@ -1308,8 +1257,9 @@ msgstr "شائع ناقِص ثلاثة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:131 +#, fuzzy msgid "Valence" -msgstr "" +msgstr "ألغِ" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:132 msgid "Valence Off" @@ -1464,9 +1414,8 @@ msgstr "أعِد تصميم البُنى" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:246 -#, fuzzy msgid "Clear" -msgstr "نَظِّف" +msgstr "إمسح" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:248 msgid "Create a new file" @@ -1528,8 +1477,9 @@ msgstr "أفُقي" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:263 +#, fuzzy msgid "Add an atom-atom-mapping" -msgstr "" +msgstr "أظهِر تعيّين الصلات ذرة-ذرة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:264 msgid "Bond Popup Menu" @@ -1541,80 +1491,75 @@ #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:266 msgid "Enter Element or Group" -msgstr "" +msgstr "أدخِل عنصرًا أو مجموعةً" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:267 -#, fuzzy msgid "Add Atom Or Change Element" -msgstr "غَيِّر العُنصر..." +msgstr "أضِف ذرّةً أو غيِّر عنصرًا" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:268 -#, fuzzy msgid "Draw Bond" -msgstr "أرسُم الرّوابط و الذرّات" +msgstr "أرسُم رابطة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:269 msgid "Ring 3" -msgstr "" +msgstr "حلقة 3" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:270 msgid "Ring 4" -msgstr "" +msgstr "حلقة 4" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:271 msgid "Ring 5" -msgstr "" +msgstr "حلقة 5" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:272 msgid "Ring 6" -msgstr "" +msgstr "حلقة 6" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:273 msgid "Ring 7" -msgstr "" +msgstr "حلقة 7" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:274 msgid "Ring 8" -msgstr "" +msgstr "حلقة 8" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:275 msgid "Add or convert to bond up" -msgstr "" +msgstr "أضِف أو حوِّل إلى رابطة علوية" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:276 msgid "Add or convert to bond down" -msgstr "" +msgstr "أضِف أو حوِّل إلى رابطة سفلية" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:277 -#, fuzzy msgid "Decrease Charge" -msgstr "أنقِص الشّحنة لذرّة" +msgstr "أنقِص الشُّحنة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:278 -#, fuzzy msgid "Increase Charge" -msgstr "زِد الشّحنة لذرّة" +msgstr "زِدِ الشُّحنة" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:279 msgid "Cyclic change of symbol" -msgstr "" +msgstr "تغيّير حلقي لرمز" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:281 msgid "Benzene" -msgstr "" +msgstr "بنزين" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:282 msgid "Select in Free Form" -msgstr "" +msgstr "إنتقِ في الشّكل الحرّ" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:283 -#, fuzzy msgid "Select Square" -msgstr "إنتقِ جُزيءًا" +msgstr "إنتقِ المربع" #: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:284 msgid "Move" -msgstr "" +msgstr "حرِّك" #: src/main/org/openscience/jchempaint/GT.java:118 msgid "Dutch" @@ -1646,27 +1591,27 @@ #: src/main/org/openscience/jchempaint/GT.java:125 msgid "Arabic" -msgstr "" +msgstr "العربية" #: src/main/org/openscience/jchempaint/io/JCPSaveFileFilter.java:74 msgid "CDK source code fragment" -msgstr "" +msgstr "شطر شيفرة مصدر CDK" #: src/main/org/openscience/jchempaint/io/JCPFileFilter.java:192 msgid "MDL MOL file" -msgstr "" +msgstr "ملف MDL MOL" #: src/main/org/openscience/jchempaint/io/JCPFileFilter.java:196 msgid "MDL SDF Molfile" -msgstr "" +msgstr "ملف MDL SDF MOL" #: src/main/org/openscience/jchempaint/io/JCPFileFilter.java:200 msgid "MDL RXN Molfile" -msgstr "" +msgstr "ملف MDL RXN MOL" #: src/main/org/openscience/jchempaint/io/JCPFileFilter.java:204 msgid "IUPAC Chemical Identifier" -msgstr "" +msgstr "معرّف كميائي IUPAC" #: src/main/org/openscience/jchempaint/AbstractJChemPaintPanel.java:104 msgid "The error was:" @@ -1688,3 +1633,109 @@ msgid "Change drawing symbol to" msgstr "غيِّر رمز الرّسم إلى" +#~ msgid "Reload" +#~ msgstr "أعِد التحميل" + +#~ msgid "Click this button to go back to PeriodicTable." +#~ msgstr "أنقر على هذا الزر للرجوع إلى الجدول الدوري." + +#~ msgid "General Settings" +#~ msgstr "إعدادات عامّة" + +#~ msgid "" +#~ "An OpenScience project by Christoph Steinbeck, Egon Willighagen and " +#~ "others." +#~ msgstr "مشروع OpenScience من Christoph Steinbeck، Egon Willighagen و آخرون." + +#~ msgid "No reaction existing. Cannot add therefore to something!" +#~ msgstr "لا تفاعُل موجود. فلا يمكن الإضافة إلى شيء ما." + +#~ msgid "No existing reactions" +#~ msgstr "لا تفاعلات موجودة" + +#~ msgid "mass" +#~ msgstr "كتلة" + +#~ msgid "Export..." +#~ msgstr "صَدِّر..." + +#~ msgid "Hydrogens..." +#~ msgstr "مُوَلِّدات ماء..." + +#~ msgid "Adjust Bond Orders" +#~ msgstr "عَدِّل تَرتِيب الرَّوابِط" + +#~ msgid "Reset Bond Orders" +#~ msgstr "أعِد الرَّوابِط إلى التَّرتِيب الإبتدائي" + +#~ msgid "Clean Up" +#~ msgstr "نَظِّف" + +#~ msgid "Validate" +#~ msgstr "صَحِّح" + +#~ msgid "Switch on/off Tracking of Implicit Hydrogens" +#~ msgstr "تَشغيل/تَعطيل تَتَبُّع مُوَلِّدات الماء الضمنية" + +#~ msgid "Make Existing Implicit Hydrogens Explicit" +#~ msgstr "إجعَل مُوَلِّدات الماء الضمنية الموجودة غير ضمنية" + +#~ msgid "Make Existing Explicit Hydrogens Implicit" +#~ msgstr "إجعَل مولّدات الماء الغَير ضمنية الموجودة ضمنية" + +#~ msgid "Update Implicit Hydrogen Count" +#~ msgstr "حدِّث تعداد الهيدروجين الضمني" + +#~ msgid "Edit..." +#~ msgstr "حَرِّر..." + +#~ msgid "Reload Preferences" +#~ msgstr "أعِد تحميل التّفضيلات" + +#~ msgid "Save Preferences" +#~ msgstr "إحفَظ التّفضيلات" + +#~ msgid "Run Validate" +#~ msgstr "أجرِ التّصحيح" + +#~ msgid "Clear Validate Results" +#~ msgstr "إمسَح نتائج التّصحيح" + +#~ msgid "Select Molecule" +#~ msgstr "إنتقِ جُزيءًا" + +#~ msgid "Change Isotope..." +#~ msgstr "غَيِّر النَّظير..." + +#~ msgid "Reaction..." +#~ msgstr "تفاعُل..." + +#~ msgid "Make Reactant in new Reaction" +#~ msgstr "إجعَل المتَفاعِل في تفاعل جديد" + +#~ msgid "Make Reactant in existing Reaction" +#~ msgstr "إجعَل المتفاعِل في تفاعل موجود" + +#~ msgid "Make Product in new Reaction" +#~ msgstr "إجعَل النّاتِج في تفاعل جديد" + +#~ msgid "Make Product in existing Reaction" +#~ msgstr "إجعَل النّاتِج في تفاعل موجود" + +#~ msgid "NMR Nuclei..." +#~ msgstr "أنوِية NMR..." + +#~ msgid "Others..." +#~ msgstr "أخرى..." + +#~ msgid "*" +#~ msgstr "*" + +#~ msgid "Select Reactants Only" +#~ msgstr "إنتقِ المُتَفاعِلات فقط" + +#~ msgid "Select Products Only" +#~ msgstr "إنتقِ المنتجات فقط" + +#~ msgid "Reaction Popup Menu" +#~ msgstr "قائمة مُنبَثِقة للتّفاعل" Modified: jchempaint/trunk/po/classes/app/i18n/Messages_ar$1.class =================================================================== (Binary files differ) Modified: jchempaint/trunk/po/classes/app/i18n/Messages_ar.class =================================================================== (Binary files differ) Added: jchempaint/trunk/po/classes/app/i18n/Messages_cs$1.class =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/po/classes/app/i18n/Messages_cs$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/po/classes/app/i18n/Messages_cs.class =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/po/classes/app/i18n/Messages_cs.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/po/classes/app/i18n/Messages_hu$1.class =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/po/classes/app/i18n/Messages_hu$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/po/classes/app/i18n/Messages_hu.class =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/po/classes/app/i18n/Messages_hu.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/po/classes/app/i18n/Messages_nb$1.class =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/po/classes/app/i18n/Messages_nb$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/po/classes/app/i18n/Messages_nb.class =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/po/classes/app/i18n/Messages_nb.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: jchempaint/trunk/po/classes/app/i18n/Messages_nl$1.class =================================================================== (Binary files differ) Modified: jchempaint/trunk/po/classes/app/i18n/Messages_nl.class =================================================================== (Binary files differ) Added: jchempaint/trunk/po/classes/app/i18n/Messages_th$1.class =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/po/classes/app/i18n/Messages_th$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/po/classes/app/i18n/Messages_th.class =================================================================== (Binary files differ) Property changes on: jchempaint/trunk/po/classes/app/i18n/Messages_th.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jchempaint/trunk/po/cs.po =================================================================== --- jchempaint/trunk/po/cs.po (rev 0) +++ jchempaint/trunk/po/cs.po 2009-09-29 12:07:16 UTC (rev 14908) @@ -0,0 +1,1744 @@ +# Czech translation for jchempaint +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the jchempaint package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: jchempaint\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-29 11:57+0100\n" +"PO-Revision-Date: 2009-07-24 22:42+0000\n" +"Last-Translator: Martin Slavík <Unknown>\n" +"Language-Team: Czech <cs...@li...>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-09-29 11:20+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:103 +msgid "Could not determine JCP version" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:107 +msgid "WARNING: JChemPaint" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:108 +msgid "must be run with a Java VM version" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:109 +msgid "or higher." +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:110 +msgid "Your JVM version" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:115 +msgid "gives this help page" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:117 +msgid "gives JChemPaints version number" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:122 +msgid "supported options are given below" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:174 +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:212 +msgid "File does not exist" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:195 +msgid "Untitled-" +msgstr "Nepojmenováno-" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:363 +msgid "Could not determine file format" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:374 +msgid "" +"It seems you opened a mol or sdf file containing several molecules. Only the " +"first one will be shown" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:378 +msgid "sdf-like file" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:525 +msgid "Model does not have bonds. Cannot depict contents." +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:560 +msgid "" +"Not all atoms have 2D coordinates. JCP can only show full 2D specified " +"structures. Shall we lay out the structure?" +msgstr "" + +#: src/main/org/openscience/jchempaint/application/JChemPaint.java:568 +msgid "Cannot display without 2D coordinates" +msgstr "" + +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:91 +msgid "Enter a CAS, SMILES or InChI string" +msgstr "Vložte řetězec CAS, SMILES nebo InChI" + +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:96 +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:123 +msgid "Insert" +msgstr "Vložit" + +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:147 +msgid "Could not process InChI" +msgstr "Nelze zpracovat vstup InChl" + +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:153 +msgid "Could not load InChI subsystem" +msgstr "Nelze načíst subsystém InChl" + +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:160 +msgid "Error in reading data from PubChem" +msgstr "Chyba při čtení dat z PubChem" + +#: src/main/org/openscience/jchempaint/InsertTextPanel.java:173 +msgid "Invalid SMILES specified" +msgstr "Neplatný vstup SMILES" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:180 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:151 +msgid "He" +msgstr "He" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:186 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:156 +msgid "Li" +msgstr "Li" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:188 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:157 +msgid "Be" +msgstr "Be" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:194 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:154 +msgid "B" +msgstr "B" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:195 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:141 +msgid "C" +msgstr "C" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:196 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:143 +msgid "N" +msgstr "N" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:197 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:142 +msgid "O" +msgstr "O" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:198 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:147 +msgid "F" +msgstr "F" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:200 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:152 +msgid "Ne" +msgstr "Ne" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:205 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:158 +msgid "Na" +msgstr "Na" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:206 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:159 +msgid "Mg" +msgstr "Mg" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:239 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:160 +msgid "Al" +msgstr "Al" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:240 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:161 +msgid "Si" +msgstr "Si" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:241 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:145 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:155 +msgid "P" +msgstr "P" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:242 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:146 +msgid "S" +msgstr "S" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:243 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:148 +msgid "Cl" +msgstr "Cl" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:245 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:153 +msgid "Ar" +msgstr "Ar" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:250 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:172 +msgid "K" +msgstr "K" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:251 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:176 +msgid "Ca" +msgstr "Ca" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:253 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:180 +msgid "Sc" +msgstr "Sc" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:254 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:181 +msgid "Ti" +msgstr "Ti" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:255 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:182 +msgid "V" +msgstr "V" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:256 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:183 +msgid "Cr" +msgstr "Cr" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:257 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:184 +msgid "Mn" +msgstr "Mn" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:258 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:162 +msgid "Fe" +msgstr "Fe" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:259 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:163 +msgid "Co" +msgstr "Co" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:260 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:169 +msgid "Ni" +msgstr "Ni" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:261 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:168 +msgid "Cu" +msgstr "Cu" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:262 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:170 +msgid "Zn" +msgstr "Zn" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:264 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:208 +msgid "Ga" +msgstr "Ga" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:265 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:213 +msgid "Ge" +msgstr "Ge" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:266 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:214 +msgid "As" +msgstr "As" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:267 +msgid "Se" +msgstr "Se" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:268 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:149 +msgid "Br" +msgstr "Br" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:270 +msgid "Kr" +msgstr "Kr" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:275 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:173 +msgid "Rb" +msgstr "Rb" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:276 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:177 +msgid "Sr" +msgstr "Sr" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:278 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:185 +msgid "Y" +msgstr "Y" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:279 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:186 +msgid "Zr" +msgstr "Zr" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:280 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:187 +msgid "Nb" +msgstr "Nb" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:281 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:188 +msgid "Mo" +msgstr "Mo" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:282 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:189 +msgid "Tc" +msgstr "Tc" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:283 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:190 +msgid "Ru" +msgstr "Ru" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:284 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:191 +msgid "Rh" +msgstr "Rh" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:285 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:192 +msgid "Pd" +msgstr "Pd" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:286 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:164 +msgid "Ag" +msgstr "Ag" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:287 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:193 +msgid "Cd" +msgstr "Cd" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:289 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:209 +msgid "In" +msgstr "In" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:290 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:171 +msgid "Sn" +msgstr "Sn" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:291 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:215 +msgid "Sb" +msgstr "Sb" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:292 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:216 +msgid "Te" +msgstr "Te" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:293 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:150 +msgid "I" +msgstr "I" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:295 +msgid "Xe" +msgstr "Xe" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:300 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:174 +msgid "Cs" +msgstr "Cs" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:301 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:178 +msgid "Ba" +msgstr "Ba" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:303 +msgid "La" +msgstr "La" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:304 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:194 +msgid "Hf" +msgstr "Hf" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:305 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:195 +msgid "Ta" +msgstr "Ta" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:306 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:196 +msgid "W" +msgstr "W" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:307 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:197 +msgid "Re" +msgstr "Re" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:308 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:198 +msgid "Os" +msgstr "Os" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:309 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:199 +msgid "Ir" +msgstr "Ir" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:310 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:165 +msgid "Pt" +msgstr "Pt" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:311 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:166 +msgid "Au" +msgstr "Au" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:312 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:167 +msgid "Hg" +msgstr "Hg" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:314 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:210 +msgid "Tl" +msgstr "Tl" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:315 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:211 +msgid "Pb" +msgstr "Pb" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:316 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:212 +msgid "Bi" +msgstr "Bi" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:317 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:217 +msgid "Po" +msgstr "Po" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:318 +msgid "At" +msgstr "At" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:320 +msgid "Rn" +msgstr "Rn" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:325 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:175 +msgid "Fr" +msgstr "Fr" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:326 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:179 +msgid "Ra" +msgstr "Ra" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:328 +msgid "Ac" +msgstr "Ac" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:329 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:200 +msgid "Rf" +msgstr "Rf" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:330 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:201 +msgid "Db" +msgstr "Db" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:331 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:202 +msgid "Sg" +msgstr "Sg" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:332 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:203 +msgid "Bh" +msgstr "Bh" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:333 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:204 +msgid "Hs" +msgstr "Hs" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:334 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:205 +msgid "Mt" +msgstr "Mt" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:335 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:206 +msgid "Ds" +msgstr "Ds" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:336 +#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:207 +msgid "Rg" +msgstr "Rg" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:342 +msgid "Ce" +msgstr "Ce" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:343 +msgid "Pr" +msgstr "Pr" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:344 +msgid "Nd" +msgstr "Nd" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:345 +msgid "Pm" +msgstr "Pm" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:346 +msgid "Sm" +msgstr "Sm" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:347 +msgid "Eu" +msgstr "Eu" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:348 +msgid "Gd" +msgstr "Gd" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:349 +msgid "Tb" +msgstr "Tb" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:350 +msgid "Dy" +msgstr "Dy" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:351 +msgid "Ho" +msgstr "Ho" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:352 +msgid "Er" +msgstr "Er" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:353 +msgid "Tm" +msgstr "Tm" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:354 +msgid "Yb" +msgstr "Yb" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:355 +msgid "Lu" +msgstr "Lu" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:361 +msgid "Th" +msgstr "Th" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:362 +msgid "Pa" +msgstr "Pa" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:363 +msgid "U" +msgstr "U" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:364 +msgid "Np" +msgstr "Np" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:365 +msgid "Pu" +msgstr "Pu" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:366 +msgid "Am" +msgstr "Am" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:367 +msgid "Cm" +msgstr "Cm" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:368 +msgid "Bk" +msgstr "Bk" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:369 +msgid "Cf" +msgstr "Cf" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:370 +msgid "Es" +msgstr "Es" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:371 +msgid "Fm" +msgstr "Fm" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:372 +msgid "Md" +msgstr "Md" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:373 +msgid "No" +msgstr "No" + +#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:374 +msgid "Lr" +msgstr "Lr" + +#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:179 +msgid "Add Functional Group" +msgstr "Přidat funkční skupinu" + +#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:192 +msgid "Add Atom" +msgstr "Přidat atom" + +#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:199 +msgid "is not a valid element symbol or functional group." +msgstr "" + +#: src/main/org/opens... [truncated message content] |
From: <sh...@us...> - 2009-09-29 13:22:55
|
Revision: 14909 http://cdk.svn.sourceforge.net/cdk/?rev=14909&view=rev Author: shk3 Date: 2009-09-29 12:18:40 +0000 (Tue, 29 Sep 2009) Log Message: ----------- removed polish and french, for which there are no translations right now. Modified Paths: -------------- jchempaint/trunk/src/main/org/openscience/jchempaint/GT.java Removed Paths: ------------- jchempaint/trunk/po/classes/app/i18n/Messages_fr.class jchempaint/trunk/po/classes/app/i18n/Messages_pl.class jchempaint/trunk/po/fr.po jchempaint/trunk/po/pl.po Deleted: jchempaint/trunk/po/classes/app/i18n/Messages_fr.class =================================================================== (Binary files differ) Deleted: jchempaint/trunk/po/classes/app/i18n/Messages_pl.class =================================================================== (Binary files differ) Deleted: jchempaint/trunk/po/fr.po =================================================================== --- jchempaint/trunk/po/fr.po 2009-09-29 12:07:16 UTC (rev 14908) +++ jchempaint/trunk/po/fr.po 2009-09-29 12:18:40 UTC (rev 14909) @@ -1,1601 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: JChemPaint\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-29 11:57+0100\n" -"PO-Revision-Date: 2009-01-20 13:59+0100\n" -"Last-Translator: Stefan Kuhn <ste...@eb...>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: German\n" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:103 -msgid "Could not determine JCP version" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:107 -msgid "WARNING: JChemPaint" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:108 -msgid "must be run with a Java VM version" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:109 -msgid "or higher." -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:110 -msgid "Your JVM version" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:115 -msgid "gives this help page" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:117 -msgid "gives JChemPaints version number" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:122 -msgid "supported options are given below" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:174 -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:212 -msgid "File does not exist" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:195 -msgid "Untitled-" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:363 -msgid "Could not determine file format" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:374 -msgid "" -"It seems you opened a mol or sdf file containing several molecules. Only the " -"first one will be shown" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:378 -msgid "sdf-like file" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:525 -msgid "Model does not have bonds. Cannot depict contents." -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:560 -msgid "" -"Not all atoms have 2D coordinates. JCP can only show full 2D specified " -"structures. Shall we lay out the structure?" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:568 -msgid "Cannot display without 2D coordinates" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:91 -msgid "Enter a CAS, SMILES or InChI string" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:96 -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:123 -msgid "Insert" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:147 -msgid "Could not process InChI" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:153 -msgid "Could not load InChI subsystem" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:160 -msgid "Error in reading data from PubChem" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:173 -msgid "Invalid SMILES specified" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:180 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:151 -msgid "He" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:186 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:156 -msgid "Li" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:188 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:157 -msgid "Be" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:194 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:154 -msgid "B" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:195 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:141 -msgid "C" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:196 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:143 -msgid "N" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:197 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:142 -msgid "O" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:198 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:147 -msgid "F" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:200 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:152 -msgid "Ne" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:205 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:158 -msgid "Na" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:206 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:159 -msgid "Mg" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:239 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:160 -msgid "Al" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:240 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:161 -msgid "Si" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:241 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:145 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:155 -msgid "P" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:242 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:146 -msgid "S" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:243 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:148 -msgid "Cl" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:245 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:153 -msgid "Ar" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:250 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:172 -msgid "K" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:251 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:176 -msgid "Ca" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:253 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:180 -msgid "Sc" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:254 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:181 -msgid "Ti" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:255 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:182 -msgid "V" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:256 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:183 -msgid "Cr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:257 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:184 -msgid "Mn" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:258 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:162 -msgid "Fe" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:259 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:163 -msgid "Co" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:260 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:169 -msgid "Ni" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:261 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:168 -msgid "Cu" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:262 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:170 -msgid "Zn" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:264 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:208 -msgid "Ga" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:265 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:213 -msgid "Ge" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:266 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:214 -msgid "As" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:267 -msgid "Se" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:268 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:149 -msgid "Br" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:270 -msgid "Kr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:275 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:173 -msgid "Rb" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:276 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:177 -msgid "Sr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:278 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:185 -msgid "Y" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:279 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:186 -msgid "Zr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:280 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:187 -msgid "Nb" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:281 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:188 -msgid "Mo" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:282 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:189 -msgid "Tc" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:283 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:190 -msgid "Ru" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:284 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:191 -msgid "Rh" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:285 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:192 -msgid "Pd" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:286 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:164 -msgid "Ag" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:287 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:193 -msgid "Cd" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:289 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:209 -msgid "In" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:290 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:171 -msgid "Sn" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:291 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:215 -msgid "Sb" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:292 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:216 -msgid "Te" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:293 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:150 -msgid "I" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:295 -msgid "Xe" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:300 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:174 -msgid "Cs" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:301 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:178 -msgid "Ba" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:303 -msgid "La" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:304 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:194 -msgid "Hf" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:305 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:195 -msgid "Ta" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:306 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:196 -msgid "W" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:307 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:197 -msgid "Re" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:308 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:198 -msgid "Os" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:309 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:199 -msgid "Ir" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:310 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:165 -msgid "Pt" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:311 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:166 -msgid "Au" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:312 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:167 -msgid "Hg" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:314 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:210 -msgid "Tl" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:315 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:211 -msgid "Pb" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:316 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:212 -msgid "Bi" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:317 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:217 -msgid "Po" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:318 -msgid "At" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:320 -msgid "Rn" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:325 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:175 -msgid "Fr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:326 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:179 -msgid "Ra" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:328 -msgid "Ac" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:329 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:200 -msgid "Rf" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:330 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:201 -msgid "Db" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:331 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:202 -msgid "Sg" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:332 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:203 -msgid "Bh" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:333 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:204 -msgid "Hs" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:334 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:205 -msgid "Mt" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:335 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:206 -msgid "Ds" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:336 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:207 -msgid "Rg" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:342 -msgid "Ce" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:343 -msgid "Pr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:344 -msgid "Nd" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:345 -msgid "Pm" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:346 -msgid "Sm" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:347 -msgid "Eu" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:348 -msgid "Gd" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:349 -msgid "Tb" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:350 -msgid "Dy" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:351 -msgid "Ho" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:352 -msgid "Er" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:353 -msgid "Tm" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:354 -msgid "Yb" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:355 -msgid "Lu" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:361 -msgid "Th" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:362 -msgid "Pa" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:363 -msgid "U" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:364 -msgid "Np" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:365 -msgid "Pu" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:366 -msgid "Am" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:367 -msgid "Cm" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:368 -msgid "Bk" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:369 -msgid "Cf" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:370 -msgid "Es" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:371 -msgid "Fm" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:372 -msgid "Md" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:373 -msgid "No" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:374 -msgid "Lr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:179 -msgid "Add Functional Group" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:192 -msgid "Add Atom" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:199 -msgid "is not a valid element symbol or functional group." -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/EnterElementSwingModule.java:199 -msgid "No valid input" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:139 -msgid "Ask for IO settings" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:142 -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:342 -msgid "Undo/redo stack size" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:148 -msgid "Draw atom numbers" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:151 -msgid "Show atom-atom mappings" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:154 -msgid "Explicit carbons" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:157 -msgid "Show explicit methyl groups" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:160 -msgid "Show explicit hydrogens" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:163 -msgid "Show implicit hydrogens" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:166 -msgid "Use aromatic ring circles" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:169 -msgid "CDK style aromatics" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:172 -msgid "Color atoms by element" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:175 -msgid "Use Anti-Aliasing" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:178 -msgid "Show tooltips" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:181 -msgid "Show boxes around reactions" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:184 -msgid "Show atoms in compact form" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:187 -msgid "Set fit to screen" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:195 -msgid "Atom size" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:202 -msgid "Bond width" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:210 -msgid "Bond length" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:218 -msgid "Highlight Distance" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:225 -msgid "Wedge width" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:229 -msgid "Oval Compact Atoms" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:233 -msgid "Square Compact Atoms" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:237 -msgid "Font name" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:239 -msgid "Choose Font..." -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:244 -msgid "BACKCOLOR" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:245 -msgid "Background color" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:247 -msgid "Choose Color..." -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:342 -msgid "must be a number from 1 to 100" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:353 -msgid "Choose a Font" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:354 -msgid "Carbon Dioxide" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/editor/PropertiesModelEditor.java:362 -msgid "Choose Background Color" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:75 -msgid "Rendering Options" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:81 -#: src/main/org/openscience/jchempaint/dialog/TextViewDialog.java:114 -msgid "OK" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:89 -msgid "Apply" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/ModifyRenderOptionsDialog.java:96 -msgid "Cancel" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/AboutDialog.java:73 -msgid "An open-source editor for 2D chemical structures." -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/AboutDialog.java:74 -msgid "An OpenScience project." -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/AboutDialog.java:75 -msgid "See 'http://jchempaint.sourceforge.net' for more information." -msgstr "" - -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:490 -msgid "has unsaved data. Do you want to save it?" -msgstr "" - -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:491 -msgid "Unsaved data" -msgstr "" - -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:646 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:66 -msgid "Redo" -msgstr "" - -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:650 -msgid "No redo possible" -msgstr "" - -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:656 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:65 -msgid "Undo" -msgstr "" - -#: src/main/org/openscience/jchempaint/JChemPaintPanel.java:660 -msgid "No undo possible" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/ConvertToRadicalAction.java:100 -msgid "A radical cannot be added to this atom. Re-try with less hydrogens." -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CopyPasteAction.java:322 -msgid "The content you tried to copy could not be read to any known format" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CopyPasteAction.java:322 -msgid "Could not process content" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:77 -msgid "Generated SMILES:" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:80 -msgid "Error while creating SMILES:" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CreateSmilesAction.java:83 -#: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:75 -msgid "Error" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/ExportAction.java:92 -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:141 -msgid "Please chose a file type!" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/ExportAction.java:92 -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:141 -msgid "No file type chosen" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:72 -msgid "Error loading InChI library:" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:81 -msgid "Problem" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:81 -msgid "You have reactions in JCP. Reactions cannot be shown as InChI!" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:89 -msgid "Structure" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:102 -#: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:105 -msgid "InChI generation failed" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/CreateInChIAction.java:109 -msgid "Generated InChI" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:105 -msgid "Nothing to save." -msgstr "" - -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:190 -msgid "Error while writing file" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:247 -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:253 -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:305 -msgid "Problems handling data" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:248 -msgid "" -"MDL mol files can only save separate molecules. You have no molecules " -"painted!" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:254 -msgid "" -"MDL mol files cannot contain reactions. Your have reaction(s) painted, which " -"will not be in the file. Continue?" -msgstr "" - -#: src/main/org/openscience/jchempaint/action/SaveAsAction.java:306 -msgid "" -"SMILES files cannot contain reactions. Your have reaction(s) painted. The " -"reactants/products of these will be included as separate molecules. Continue?" -msgstr "" - -#: src/main/org/openscience/jchempaint/RenderPanel.java:435 -msgid "Zoomfactor" -msgstr "" - -#: src/main/org/openscience/jchempaint/RenderPanel.java:448 -msgid "Hs implicit" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:52 -msgid "File" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:53 -#, fuzzy -msgid "New" -msgstr "Nouveau" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:54 -msgid "Atom Popup Menu" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:55 -msgid "Open" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:56 -msgid "Save As..." -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:57 -msgid "View" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:58 -msgid "Print..." -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:59 -msgid "Save As Image..." -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:60 -msgid "Save" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:61 -msgid "Edit" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:62 -msgid "Report" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:63 -msgid "Close" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:64 -msgid "Exit" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:67 -msgid "Select All" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:68 -msgid "Copy" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:69 -msgid "Copy as SMILES" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:70 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:280 -msgid "Delete" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:71 -msgid "Paste" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:72 -msgid "Cut" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:73 -msgid "Atom" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:74 -msgid "Bond" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:75 -msgid "Tools" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:76 -msgid "Single" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:77 -msgid "Stereo Down" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:78 -msgid "Stereo Up" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:79 -msgid "Undefined Stereo" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:80 -msgid "Undefined E/Z" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:81 -msgid "Charge" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:82 -msgid "Plus" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:83 -msgid "Minus" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:84 -msgid "Implicit Hydrogens" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:85 -msgid "Flip" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:86 -msgid "Clean Structure" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:87 -msgid "Toolbar" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:88 -msgid "Statusbar" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:89 -msgid "Menubar" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:90 -msgid "Direct Entry as SMILES/InChI/CAS" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:91 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:253 -msgid "Zoom in" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:92 -msgid "Zoom Out" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:93 -msgid "Zoom 100%" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:94 -msgid "Preferences..." -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:95 -msgid "Create SMILES" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:96 -msgid "Create InChI" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:97 -msgid "Help" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:98 -msgid "Tutorial" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:99 -msgid "License" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:100 -msgid "About" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:101 -msgid "On all" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:102 -msgid "Off" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:103 -msgid "Horizontal" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:104 -msgid "Vertical" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:105 -msgid "Select" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:106 -msgid "Change Element" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:107 -msgid "Periodic Table" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:108 -msgid "Custom" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:109 -msgid "Isotopes" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:110 -msgid "Convert to Radical" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:111 -msgid "Properties" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:112 -msgid "Molecule Properties" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:113 -msgid "Convert to Regular Atom" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:114 -msgid "Common Elements" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:115 -msgid "Halogens" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:116 -msgid "Nobel Gases" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:117 -msgid "Alkali Metals" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:118 -msgid "Alkali Earth Metals" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:119 -msgid "Transition Metals" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:120 -msgid "Metals" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:121 -msgid "Metalloids" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:122 -msgid "Non-Metals" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:123 -msgid "Pseudo Atoms" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:124 -msgid "Major Plus Three" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:125 -msgid "Major Plus Two" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:126 -msgid "Major Plus One" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:127 -msgid "Major Isotope" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:128 -msgid "Major Minus One" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:129 -msgid "Major Minus Two" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:130 -msgid "Major Minus Three" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:131 -msgid "Valence" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:132 -msgid "Valence Off" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:133 -msgid "Valence 1" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:134 -msgid "Valence 2" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:135 -msgid "Valence 3" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:136 -msgid "Valence 4" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:137 -msgid "Valence 5" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:138 -msgid "Valence 6" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:139 -msgid "Valence 7" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:140 -msgid "Valence 8" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:144 -msgid "H" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:218 -msgid "Variable Attachment Point *" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:219 -msgid "R" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:220 -msgid "R.." -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:221 -msgid "R1" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:222 -msgid "R2" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:223 -msgid "R3" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:224 -msgid "R4" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:225 -msgid "Draw Bonds and Atoms" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:226 -msgid "Change the Atom's Symbol" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:227 -msgid "Select new drawing symbol from periodic table" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:228 -msgid "Enter an element symbol via keyboard" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:229 -msgid "Make the Bonds Stereo Up" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:230 -msgid "Make the Bonds Stereo Down" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:231 -msgid "Increase the charge on an Atom" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:232 -msgid "Decrease the charge on an Atom" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:233 -msgid "Move Atoms and Bonds" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:234 -msgid "Delete Atoms and Bonds" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:235 -msgid "Select Atoms and Bonds" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:236 -msgid "Select Atoms and Bonds in a square region" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:237 -msgid "Add a propane ring" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:238 -msgid "Add a butane ring" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:239 -msgid "Add a pentane ring" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:240 -msgid "Add a hexane ring" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:241 -msgid "Add a heptane ring" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:242 -msgid "Add a octane ring" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:243 -msgid "Add a benzene ring" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:244 -msgid "Relayout the structures" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:246 -msgid "Clear" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:248 -msgid "Create a new file" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:249 -msgid "Open a file" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:250 -msgid "Redo Action" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:251 -msgid "Save to a file" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:252 -msgid "Undo Action" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:254 -msgid "Zoom out" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:255 -msgid "Stereo up or stereo down bond" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:256 -msgid "Any stereo bond" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:257 -msgid "Rotate selection" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:258 -msgid "Cut selection" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:259 -msgid "Copy selection to clipboard" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:260 -msgid "Paste from clipboard" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:261 -msgid "Flip vertical" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:262 -msgid "Flip horizontal" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:263 -msgid "Add an atom-atom-mapping" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:264 -msgid "Bond Popup Menu" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:265 -msgid "ChemModel Popup Menu" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:266 -msgid "Enter Element or Group" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:267 -msgid "Add Atom Or Change Element" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:268 -msgid "Draw Bond" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:269 -msgid "Ring 3" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:270 -msgid "Ring 4" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:271 -msgid "Ring 5" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:272 -msgid "Ring 6" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:273 -msgid "Ring 7" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:274 -msgid "Ring 8" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:275 -msgid "Add or convert to bond up" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:276 -msgid "Add or convert to bond down" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:277 -msgid "Decrease Charge" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:278 -msgid "Increase Charge" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:279 -msgid "Cyclic change of symbol" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:281 -msgid "Benzene" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:282 -msgid "Select in Free Form" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:283 -msgid "Select Square" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:284 -msgid "Move" -msgstr "" - -#: src/main/org/openscience/jchempaint/GT.java:118 -msgid "Dutch" -msgstr "" - -#: src/main/org/openscience/jchempaint/GT.java:119 -msgid "American English" -msgstr "" - -#: src/main/org/openscience/jchempaint/GT.java:120 -msgid "French" -msgstr "" - -#: src/main/org/openscience/jchempaint/GT.java:121 -msgid "German" -msgstr "" - -#: src/main/org/openscience/jchempaint/GT.java:122 -msgid "Polish" -msgstr "" - -#: src/main/org/openscience/jchempaint/GT.java:123 -msgid "Brazilian Portuguese" -msgstr "" - -#: src/main/org/openscience/jchempaint/GT.java:124 -msgid "Spanish" -msgstr "" - -#: src/main/org/openscience/jchempaint/GT.java:125 -msgid "Arabic" -msgstr "" - -#: src/main/org/openscience/jchempaint/io/JCPSaveFileFilter.java:74 -msgid "CDK source code fragment" -msgstr "" - -#: src/main/org/openscience/jchempaint/io/JCPFileFilter.java:192 -msgid "MDL MOL file" -msgstr "" - -#: src/main/org/openscience/jchempaint/io/JCPFileFilter.java:196 -msgid "MDL SDF Molfile" -msgstr "" - -#: src/main/org/openscience/jchempaint/io/JCPFileFilter.java:200 -msgid "MDL RXN Molfile" -msgstr "" - -#: src/main/org/openscience/jchempaint/io/JCPFileFilter.java:204 -msgid "IUPAC Chemical Identifier" -msgstr "" - -#: src/main/org/openscience/jchempaint/AbstractJChemPaintPanel.java:104 -msgid "The error was:" -msgstr "" - -#: src/main/org/openscience/jchempaint/AbstractJChemPaintPanel.java:104 -msgid "Please file a bug report at " -msgstr "" - -#: src/main/org/openscience/jchempaint/AbstractJChemPaintPanel.java:106 -msgid "We apologize for any inconvenience!" -msgstr "" - -#: src/main/org/openscience/jchempaint/AbstractJChemPaintPanel.java:106 -msgid "Error occured" -msgstr "" - -#: src/main/org/openscience/jchempaint/JCPToolBar.java:199 -msgid "Change drawing symbol to" -msgstr "" Deleted: jchempaint/trunk/po/pl.po =================================================================== --- jchempaint/trunk/po/pl.po 2009-09-29 12:07:16 UTC (rev 14908) +++ jchempaint/trunk/po/pl.po 2009-09-29 12:18:40 UTC (rev 14909) @@ -1,1601 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: JChemPaint\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-29 11:57+0100\n" -"PO-Revision-Date: 2009-01-20 13:59+0100\n" -"Last-Translator: Stefan Kuhn <ste...@eb...>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: German\n" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:103 -msgid "Could not determine JCP version" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:107 -msgid "WARNING: JChemPaint" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:108 -msgid "must be run with a Java VM version" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:109 -msgid "or higher." -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:110 -msgid "Your JVM version" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:115 -msgid "gives this help page" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:117 -msgid "gives JChemPaints version number" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:122 -msgid "supported options are given below" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:174 -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:212 -msgid "File does not exist" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:195 -msgid "Untitled-" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:363 -msgid "Could not determine file format" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:374 -msgid "" -"It seems you opened a mol or sdf file containing several molecules. Only the " -"first one will be shown" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:378 -msgid "sdf-like file" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:525 -msgid "Model does not have bonds. Cannot depict contents." -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:560 -msgid "" -"Not all atoms have 2D coordinates. JCP can only show full 2D specified " -"structures. Shall we lay out the structure?" -msgstr "" - -#: src/main/org/openscience/jchempaint/application/JChemPaint.java:568 -msgid "Cannot display without 2D coordinates" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:91 -msgid "Enter a CAS, SMILES or InChI string" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:96 -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:123 -msgid "Insert" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:147 -msgid "Could not process InChI" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:153 -msgid "Could not load InChI subsystem" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:160 -msgid "Error in reading data from PubChem" -msgstr "" - -#: src/main/org/openscience/jchempaint/InsertTextPanel.java:173 -msgid "Invalid SMILES specified" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:180 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:151 -msgid "He" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:186 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:156 -msgid "Li" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:188 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:157 -msgid "Be" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:194 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:154 -msgid "B" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:195 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:141 -msgid "C" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:196 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:143 -msgid "N" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:197 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:142 -msgid "O" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:198 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:147 -msgid "F" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:200 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:152 -msgid "Ne" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:205 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:158 -msgid "Na" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:206 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:159 -msgid "Mg" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:239 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:160 -msgid "Al" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:240 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:161 -msgid "Si" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:241 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:145 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:155 -msgid "P" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:242 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:146 -msgid "S" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:243 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:148 -msgid "Cl" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:245 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:153 -msgid "Ar" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:250 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:172 -msgid "K" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:251 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:176 -msgid "Ca" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:253 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:180 -msgid "Sc" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:254 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:181 -msgid "Ti" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:255 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:182 -msgid "V" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:256 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:183 -msgid "Cr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:257 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:184 -msgid "Mn" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:258 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:162 -msgid "Fe" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:259 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:163 -msgid "Co" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:260 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:169 -msgid "Ni" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:261 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:168 -msgid "Cu" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:262 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:170 -msgid "Zn" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:264 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:208 -msgid "Ga" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:265 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:213 -msgid "Ge" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:266 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:214 -msgid "As" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:267 -msgid "Se" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:268 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:149 -msgid "Br" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:270 -msgid "Kr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:275 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:173 -msgid "Rb" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:276 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:177 -msgid "Sr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:278 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:185 -msgid "Y" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:279 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:186 -msgid "Zr" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:280 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:187 -msgid "Nb" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:281 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:188 -msgid "Mo" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:282 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:189 -msgid "Tc" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:283 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:190 -msgid "Ru" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:284 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:191 -msgid "Rh" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:285 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:192 -msgid "Pd" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:286 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:164 -msgid "Ag" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:287 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:193 -msgid "Cd" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:289 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:209 -msgid "In" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:290 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:171 -msgid "Sn" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:291 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:215 -msgid "Sb" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:292 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:216 -msgid "Te" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:293 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:150 -msgid "I" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:295 -msgid "Xe" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:300 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:174 -msgid "Cs" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:301 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:178 -msgid "Ba" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:303 -msgid "La" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:304 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:194 -msgid "Hf" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:305 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:195 -msgid "Ta" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:306 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:196 -msgid "W" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:307 -#: src/main/org/openscience/jchempaint/JCPMenuTextMaker.java:197 -msgid "Re" -msgstr "" - -#: src/main/org/openscience/jchempaint/dialog/PeriodicTablePanel.java:308 -#: src/main/org/openscience/jchempain... [truncated message content] |
From: <mar...@us...> - 2009-09-29 13:39:03
|
Revision: 14911 http://cdk.svn.sourceforge.net/cdk/?rev=14911&view=rev Author: mark_rynbeek Date: 2009-09-29 13:38:57 +0000 (Tue, 29 Sep 2009) Log Message: ----------- temp fix Modified Paths: -------------- jchempaint/trunk/META-INF/applet-core.shrink.files jchempaint/trunk/META-INF/applet-editor.shrink.files jchempaint/trunk/build.shrink.xml Modified: jchempaint/trunk/META-INF/applet-core.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-core.shrink.files 2009-09-29 12:20:15 UTC (rev 14910) +++ jchempaint/trunk/META-INF/applet-core.shrink.files 2009-09-29 13:38:57 UTC (rev 14911) @@ -99,9 +99,7 @@ org/openscience/cdk/AtomContainerSet$AtomContainerIterator.class org/openscience/cdk/AtomContainerSet.class org/openscience/cdk/AtomContainer$SingleElectronIterator.class -org/openscience/cdk/atomtype/CDKAtomTypeMatcher.class org/openscience/cdk/AtomType.class -org/openscience/cdk/atomtype/IAtomTypeMatcher.class org/openscience/cdk/Bond$1.class org/openscience/cdk/Bond$AtomsIterator.class org/openscience/cdk/Bond.class Modified: jchempaint/trunk/META-INF/applet-editor.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-editor.shrink.files 2009-09-29 12:20:15 UTC (rev 14910) +++ jchempaint/trunk/META-INF/applet-editor.shrink.files 2009-09-29 13:38:57 UTC (rev 14911) @@ -88,9 +88,7 @@ org/openscience/cdk/AtomContainerSet$AtomContainerIterator.class org/openscience/cdk/AtomContainerSet.class org/openscience/cdk/AtomContainer$SingleElectronIterator.class -org/openscience/cdk/atomtype/CDKAtomTypeMatcher.class org/openscience/cdk/AtomType.class -org/openscience/cdk/atomtype/IAtomTypeMatcher.class org/openscience/cdk/Bond$1.class org/openscience/cdk/Bond$AtomsIterator.class org/openscience/cdk/Bond.class @@ -335,3 +333,11 @@ org/openscience/jchempaint/SwingPopupModule.class org/openscience/jchempaint/undoredo/SwingAddAtomsAndBondsEdit.class org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.class +org/openscience/cdk/atomtype/CDKAtomTypeMatcher.class +org/openscience/cdk/atomtype/IAtomTypeMatcher.class +org/openscience/cdk/config/AtomTypeFactory.class +org/openscience/cdk/config/atomtypes/OWLAtomTypeHandler.class +org/openscience/cdk/config/atomtypes/OWLAtomTypeReader.class +org/openscience/cdk/config/IAtomTypeConfigurator.class +org/openscience/cdk/config/OWLBasedAtomTypeConfigurator.class + Modified: jchempaint/trunk/build.shrink.xml =================================================================== --- jchempaint/trunk/build.shrink.xml 2009-09-29 12:20:15 UTC (rev 14910) +++ jchempaint/trunk/build.shrink.xml 2009-09-29 13:38:57 UTC (rev 14911) @@ -195,7 +195,7 @@ <mkdir dir="${dist}/jar/shrinkout"/> - <!-- shrink jcp editor file --> + <!-- shrink jcp editor file> <yguard> <inoutpair in="${dist}/jar/jchempaint-applet-editor.jar" out="${dist}/jar/shrinkout/jchempaint-applet-editor.jar"/> <externalclasses> @@ -213,7 +213,7 @@ <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> <property name="error-checking" value="pedantic"/> </shrink> - </yguard> + </yguard--> <!-- shrink jcp core file --> <yguard> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-29 15:31:59
|
Revision: 14914 http://cdk.svn.sourceforge.net/cdk/?rev=14914&view=rev Author: mark_rynbeek Date: 2009-09-29 15:31:52 +0000 (Tue, 29 Sep 2009) Log Message: ----------- further tweax Modified Paths: -------------- jchempaint/trunk/META-INF/applet-core.shrink.files jchempaint/trunk/META-INF/applet-editor.shrink.files jchempaint/trunk/build.shrink.xml Modified: jchempaint/trunk/META-INF/applet-core.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-core.shrink.files 2009-09-29 15:22:40 UTC (rev 14913) +++ jchempaint/trunk/META-INF/applet-core.shrink.files 2009-09-29 15:31:52 UTC (rev 14914) @@ -106,6 +106,9 @@ org/openscience/cdk/CDKConstants.class org/openscience/cdk/ChemModel.class org/openscience/cdk/ChemObject.class +org/openscience/cdk/controller/AddBondDragModule.class +org/openscience/cdk/controller/AddRingModule.class +org/openscience/cdk/controller/AtomAtomMappingModule.class org/openscience/cdk/controller/ControllerHub.class org/openscience/cdk/controller/ControllerModel.class org/openscience/cdk/controller/ControllerModuleAdapter.class @@ -118,8 +121,14 @@ org/openscience/cdk/controller/IControllerModule.class org/openscience/cdk/controller/IMouseEventRelay.class org/openscience/cdk/controller/IViewEventRelay.class +org/openscience/cdk/controller/MoveModule.class org/openscience/cdk/controller/PhantomBondGenerator.class +org/openscience/cdk/controller/RemoveModule.class +org/openscience/cdk/controller/RotateModule.class +org/openscience/cdk/controller/SelectLassoModule.class +org/openscience/cdk/controller/SelectSquareModule.class org/openscience/cdk/controller/SwingMouseEventRelay.class +org/openscience/cdk/controller/undoredo/AddAtomsAndBondsEdit.class org/openscience/cdk/controller/undoredo/IUndoListener.class org/openscience/cdk/controller/undoredo/IUndoRedoable.class org/openscience/cdk/controller/undoredo/IUndoRedoFactory.class @@ -133,6 +142,7 @@ org/openscience/cdk/exception/CDKException.class org/openscience/cdk/exception/NoSuchAtomException.class org/openscience/cdk/exception/NoSuchAtomTypeException.class +org/openscience/cdk/formula/MolecularFormula.class org/openscience/cdk/geometry/GeometryTools.class org/openscience/cdk/graph/BFSShortestPath.class org/openscience/cdk/graph/BFSShortestPath$MyBreadthFirstIterator.class @@ -141,6 +151,7 @@ org/openscience/cdk/graph/MoleculeGraphs.class org/openscience/cdk/graph/PathTools.class org/openscience/cdk/graph/SpanningTree.class +org/openscience/cdk/inchi/InChIGenerator.class org/openscience/cdk/interfaces/IAdductFormula.class org/openscience/cdk/interfaces/IAminoAcid.class org/openscience/cdk/interfaces/IAtom.class @@ -363,9 +374,11 @@ org/openscience/cdk/smiles/SmilesParser.class org/openscience/cdk/tools/CDKHydrogenAdder.class org/openscience/cdk/tools/LoggingTool.class +org/openscience/cdk/tools/manipulator/AtomContainerManipulator.class org/openscience/cdk/tools/manipulator/AtomContainerSetManipulator.class org/openscience/cdk/tools/manipulator/ChemModelManipulator.class org/openscience/cdk/tools/manipulator/MoleculeSetManipulator.class +org/openscience/cdk/tools/manipulator/MolecularFormulaManipulator.class org/openscience/cdk/tools/manipulator/RingSetManipulator.class org/openscience/cdk/validate/ProblemMarker.class org/openscience/jchempaint/AbstractJChemPaintPanel.class @@ -381,3 +394,9 @@ org/openscience/jchempaint/RenderPanel.class io-formats.set org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.class +org/openscience/jchempaint/InsertTextPanel.class +org/openscience/jchempaint/JCPMenuTextMaker.class +org/openscience/cdk/controller/undoredo/AdjustBondOrdersEdit.class +org/openscience/jchempaint/undoredo/SwingAdjustBondOrdersEdit.class +org/openscience/cdk/controller/IChemModelRelay$Direction.class +org/openscience/cdk/renderer/elements/WedgeLineElement$Direction.class Modified: jchempaint/trunk/META-INF/applet-editor.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-editor.shrink.files 2009-09-29 15:22:40 UTC (rev 14913) +++ jchempaint/trunk/META-INF/applet-editor.shrink.files 2009-09-29 15:31:52 UTC (rev 14914) @@ -95,9 +95,6 @@ org/openscience/cdk/CDKConstants.class org/openscience/cdk/ChemModel.class org/openscience/cdk/ChemObject.class -org/openscience/cdk/controller/AddBondDragModule.class -org/openscience/cdk/controller/AddRingModule.class -org/openscience/cdk/controller/AtomAtomMappingModule.class org/openscience/cdk/controller/ControllerHub.class org/openscience/cdk/controller/ControllerModel.class org/openscience/cdk/controller/ControllerModuleAdapter.class @@ -110,14 +107,8 @@ org/openscience/cdk/controller/IControllerModule.class org/openscience/cdk/controller/IMouseEventRelay.class org/openscience/cdk/controller/IViewEventRelay.class -org/openscience/cdk/controller/MoveModule.class org/openscience/cdk/controller/PhantomBondGenerator.class -org/openscience/cdk/controller/RemoveModule.class -org/openscience/cdk/controller/RotateModule.class -org/openscience/cdk/controller/SelectLassoModule.class -org/openscience/cdk/controller/SelectSquareModule.class org/openscience/cdk/controller/SwingMouseEventRelay.class -org/openscience/cdk/controller/undoredo/AddAtomsAndBondsEdit.class org/openscience/cdk/controller/undoredo/IUndoListener.class org/openscience/cdk/controller/undoredo/IUndoRedoable.class org/openscience/cdk/controller/undoredo/IUndoRedoFactory.class @@ -132,7 +123,6 @@ org/openscience/cdk/exception/InvalidSmilesException.class org/openscience/cdk/exception/NoSuchAtomException.class org/openscience/cdk/exception/NoSuchAtomTypeException.class -org/openscience/cdk/formula/MolecularFormula.class org/openscience/cdk/geometry/GeometryTools.class org/openscience/cdk/graph/BFSShortestPath.class org/openscience/cdk/graph/BFSShortestPath$MyBreadthFirstIterator.class @@ -140,7 +130,6 @@ org/openscience/cdk/graph/ConnectivityChecker.class org/openscience/cdk/graph/MoleculeGraphs.class org/openscience/cdk/graph/PathTools.class -org/openscience/cdk/inchi/InChIGenerator.class org/openscience/cdk/interfaces/IAdductFormula.class org/openscience/cdk/interfaces/IAminoAcid.class org/openscience/cdk/interfaces/IAtom.class @@ -264,10 +253,8 @@ org/openscience/cdk/RingSet.class org/openscience/cdk/smiles/SmilesParser.class org/openscience/cdk/tools/LoggingTool.class -org/openscience/cdk/tools/manipulator/AtomContainerManipulator.class org/openscience/cdk/tools/manipulator/AtomContainerSetManipulator.class org/openscience/cdk/tools/manipulator/ChemModelManipulator.class -org/openscience/cdk/tools/manipulator/MolecularFormulaManipulator.class org/openscience/cdk/tools/manipulator/MoleculeSetManipulator.class org/openscience/cdk/tools/manipulator/RingSetManipulator.class org/openscience/cdk/validate/ProblemMarker.class @@ -315,14 +302,12 @@ org/openscience/jchempaint/dialog/FieldTablePanel.class org/openscience/jchempaint/GT.class org/openscience/jchempaint/GT$Language.class -org/openscience/jchempaint/InsertTextPanel.class org/openscience/jchempaint/io/JCPFileView.class org/openscience/jchempaint/JChemPaintMenuBar.class org/openscience/jchempaint/JChemPaintMenuHelper$1.class org/openscience/jchempaint/JChemPaintMenuHelper.class org/openscience/jchempaint/JChemPaintPanel.class org/openscience/jchempaint/JChemPaintPopupMenu.class -org/openscience/jchempaint/JCPMenuTextMaker.class org/openscience/jchempaint/JCPPropertyHandler.class org/openscience/jchempaint/JCPStatusBar.class org/openscience/jchempaint/JCPToolBar$1.class @@ -340,4 +325,5 @@ org/openscience/cdk/config/atomtypes/OWLAtomTypeReader.class org/openscience/cdk/config/IAtomTypeConfigurator.class org/openscience/cdk/config/OWLBasedAtomTypeConfigurator.class +org/openscience/cdk/dict/data/cdk-atom-types.owl Modified: jchempaint/trunk/build.shrink.xml =================================================================== --- jchempaint/trunk/build.shrink.xml 2009-09-29 15:22:40 UTC (rev 14913) +++ jchempaint/trunk/build.shrink.xml 2009-09-29 15:31:52 UTC (rev 14914) @@ -419,7 +419,7 @@ <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor-opts.jar" includesfile="${metainf}/applet-editor-opts.files"/> <!-- since for the display of the help, we need the icons in the same jar, we do not log this to the growing_list_file, so that icons go into the resources.jar as well --> - <jar-from-list-no-concat destfile="${dist}/jar/jchempaint-applet-resources-core.jar" includesfile="${metainf}/applet-resources-core.files"/> + <!--jar-from-list-no-concat destfile="${dist}/jar/jchempaint-applet-resources-core.jar" includesfile="${metainf}/applet-resources-core.files"/--> <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources.jar" includesfile="${metainf}/jchempaint.datafiles"/> <!-- the following jar files are packed from directory patterns --> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**"/> @@ -468,7 +468,7 @@ </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > - <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> </exec> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-30 16:56:45
|
Revision: 14915 http://cdk.svn.sourceforge.net/cdk/?rev=14915&view=rev Author: mark_rynbeek Date: 2009-09-30 16:56:36 +0000 (Wed, 30 Sep 2009) Log Message: ----------- further tweaks on shrink stuff Modified Paths: -------------- jchempaint/trunk/META-INF/applet-core.shrink.files jchempaint/trunk/META-INF/applet-editor.shrink.files jchempaint/trunk/build.shrink.xml Modified: jchempaint/trunk/META-INF/applet-core.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-core.shrink.files 2009-09-29 15:31:52 UTC (rev 14914) +++ jchempaint/trunk/META-INF/applet-core.shrink.files 2009-09-30 16:56:36 UTC (rev 14915) @@ -387,6 +387,7 @@ org/openscience/jchempaint/applet/JChemPaintAbstractApplet.class org/openscience/jchempaint/applet/JChemPaintViewerApplet.class org/openscience/jchempaint/application/JChemPaint.class +org/openscience/jchempaint/JChemPaintPanel$1.class org/openscience/jchempaint/JChemPaintPanel.class org/openscience/jchempaint/JChemPaintViewerPanel.class org/openscience/jchempaint/JCPPropertyHandler.class @@ -400,3 +401,6 @@ org/openscience/jchempaint/undoredo/SwingAdjustBondOrdersEdit.class org/openscience/cdk/controller/IChemModelRelay$Direction.class org/openscience/cdk/renderer/elements/WedgeLineElement$Direction.class +org/openscience/cdk/controller/AddAtomModule.class +org/openscience/cdk/controller/undoredo/ChangeAtomSymbolEdit.class +org/openscience/jchempaint/undoredo/SwingChangeAtomSymbolEdit.class Modified: jchempaint/trunk/META-INF/applet-editor.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-editor.shrink.files 2009-09-29 15:31:52 UTC (rev 14914) +++ jchempaint/trunk/META-INF/applet-editor.shrink.files 2009-09-30 16:56:36 UTC (rev 14915) @@ -325,5 +325,4 @@ org/openscience/cdk/config/atomtypes/OWLAtomTypeReader.class org/openscience/cdk/config/IAtomTypeConfigurator.class org/openscience/cdk/config/OWLBasedAtomTypeConfigurator.class -org/openscience/cdk/dict/data/cdk-atom-types.owl - +org/openscience/cdk/dict/data/cdk-atom-types.owl \ No newline at end of file Modified: jchempaint/trunk/build.shrink.xml =================================================================== --- jchempaint/trunk/build.shrink.xml 2009-09-29 15:31:52 UTC (rev 14914) +++ jchempaint/trunk/build.shrink.xml 2009-09-30 16:56:36 UTC (rev 14915) @@ -95,7 +95,7 @@ </fileset> </unjar> <delete dir="${dist-classes}/META-INF" /> - </target> + </target> <target id="unjar-cdkjars" name="unjar-cdkjars"> <unjar dest="${dist-classes}"> @@ -151,15 +151,15 @@ <include name="cdk-renderextra.jar"/> <include name="cdk-rendersvg.jar"/> <include name="cdk-ioformats.jar"/> - - </fileset> </unjar> <delete dir="${dist-classes}/META-INF" /> <delete> <fileset dir="${dist-classes}" includes="*" excludes="io-formats.set"/> </delete> - <delete dir="${dist-classes}/org/omegahat" /> + <delete dir="${dist-classes}/org/omegahat" /> + <delete dir="${dist-classes}/org/openscience/cdk/modeling" /> + <delete dir="${dist-classes}/org/openscience/cdk/fingerprint" /> </target> <target id="compile-jcp" name="compile-jcp"> @@ -195,7 +195,7 @@ <mkdir dir="${dist}/jar/shrinkout"/> - <!-- shrink jcp editor file> + <!-- shrink jcp editor file--> <yguard> <inoutpair in="${dist}/jar/jchempaint-applet-editor.jar" out="${dist}/jar/shrinkout/jchempaint-applet-editor.jar"/> <externalclasses> @@ -213,7 +213,7 @@ <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> <property name="error-checking" value="pedantic"/> </shrink> - </yguard--> + </yguard> <!-- shrink jcp core file --> <yguard> @@ -232,12 +232,12 @@ <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_nonotify.jar"/> <property name="error-checking" value="pedantic"/> <keep> - <class name="org.openscience.jchempaint.applet.JChemPaintAbstractApplet" methods="public" fields="none" /> - <class name="org.openscience.jchempaint.applet.JChemPaintEditorApplet" methods="public" fields="none"/> <class name="org.openscience.cdk.tools.LoggingTool" methods="public" fields="none" /> <class name="org.openscience.cdk.interfaces.IChemObjectBuilder" methods="public" fields="none" /> <class name="org.openscience.cdk.controller.IControllerModel" methods="public" fields="none" /> <class name="org.openscience.cdk.controller.IChemModelRelay" methods="public" fields="none" /> + <class name="org.openscience.cdk.tools.manipulator.AtomContainerManipulator" methods="public" fields="none" /> + <class name="org.openscience.jchempaint.JChemPaintPanel$1" methods="public" fields="none" /> </keep> </shrink> </yguard> @@ -254,6 +254,9 @@ <shrink logfile="shrinklog.cdk.xml"> <entrypointjar name="${dist}/jar/jchempaint-applet-core.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-editor.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_controller.jar"/> <property name="error-checking" value="pedantic"/> <keep> <class classes="public"> @@ -261,7 +264,9 @@ <include name="org.openscience.cdk.renderer.**.*"/> <include name="org.openscience.cdk.controller.**.*"/> </patternset> - </class> + </class> + <class name="org.openscience.cdk.PeriodicTableElement" /> + <class name="org.openscience.cdk.renderer.selection.MultiSelection" /> </keep> </shrink> </yguard> @@ -307,6 +312,27 @@ </yguard> + <!-- shrink tools jar --> + <yguard> + <inoutpair in="${dist}/jar/jchempaint-applet-org_openscience_cdk_tools.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_openscience_cdk_tools.jar"/> + <externalclasses> + <fileset dir="${dist}/jar"> + <include name="**/*.jar"/> + <exclude name="**/jchempaint-applet-org_openscience_cdk_tools.jar"/> + </fileset> + </externalclasses> + + <shrink logfile="shrinklog.config.xml"> + <entrypointjar name="${dist}/jar/jchempaint-applet-core.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-editor.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar"/> + <property name="error-checking" value="pedantic"/> + </shrink> + </yguard> + + <move todir="${dist}/jar"> <fileset dir="${dist}/jar/shrinkout"> <include name="**/*.jar"/> @@ -424,6 +450,7 @@ <!-- the following jar files are packed from directory patterns --> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_dict.jar" includepattern="org/openscience/cdk/dict/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_io_cml.jar" includepattern="org/openscience/cdk/io/cml/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar" includepattern="org/openscience/cdk/io/**"/> <!--jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_qsar.jar" includepattern="org/openscience/cdk/qsar/**"/--> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_iupac.jar" includepattern="org/openscience/cdk/iupac/**"/> @@ -468,7 +495,7 @@ </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > - <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_io_cml.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> </exec> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-10-01 15:52:34
|
Revision: 14918 http://cdk.svn.sourceforge.net/cdk/?rev=14918&view=rev Author: mark_rynbeek Date: 2009-10-01 15:52:27 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Changes to comply with the udate Primary, October 1st 2009 Modified Paths: -------------- jchempaint/trunk/.classpath jchempaint/trunk/src/main/org/openscience/jchempaint/InsertTextPanel.java jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeBondAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/CreateInChIAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingAdjustBondOrdersEdit.java jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.java jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java Modified: jchempaint/trunk/.classpath =================================================================== --- jchempaint/trunk/.classpath 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/.classpath 2009-10-01 15:52:27 UTC (rev 14918) @@ -4,13 +4,13 @@ <classpathentry kind="src" path="src/test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="lib" path="lib/commons-cli.jar"/> - <classpathentry kind="lib" path="lib/jfontchooser.jar"/> <classpathentry kind="lib" path="po/classes"/> - <classpathentry kind="lib" path="lib/fest-swing-1.2a2.jar"/> - <classpathentry kind="lib" path="lib/fest-util-1.1.jar"/> - <classpathentry kind="lib" path="lib/fest-assert-1.1.jar"/> - <classpathentry kind="lib" path="lib/fest-reflect-1.1.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/jchempaint-primary-public"/> + <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/commons-cli.jar"/> + <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/fest-assert-1.1.jar"/> + <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/fest-reflect-1.1.jar"/> + <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/fest-swing-1.2a2.jar"/> + <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/fest-util-1.1.jar"/> + <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/jfontchooser.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/rebase"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/InsertTextPanel.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/InsertTextPanel.java 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/InsertTextPanel.java 2009-10-01 15:52:27 UTC (rev 14918) @@ -140,7 +140,7 @@ if (text.startsWith("InChI")) { // handle it as an InChI try { - InChIGeneratorFactory inchiFactory = new InChIGeneratorFactory(); + InChIGeneratorFactory inchiFactory = InChIGeneratorFactory.getInstance(); InChIToStructure inchiToStructure = inchiFactory.getInChIToStructure(text,jChemPaintPanel.getChemModel().getBuilder()); INCHI_RET status = inchiToStructure.getReturnStatus(); if (status != INCHI_RET.OKAY) { Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/JCPToolBar.java 2009-10-01 15:52:27 UTC (rev 14918) @@ -47,6 +47,7 @@ import org.openscience.cdk.CDKConstants; import org.openscience.cdk.DefaultChemObjectBuilder; import org.openscience.cdk.controller.AddBondDragModule; +import org.openscience.cdk.interfaces.IBond; import org.openscience.cdk.renderer.color.CDK2DAtomColors; import org.openscience.cdk.renderer.color.IAtomColorer; import org.openscience.cdk.tools.LoggingTool; @@ -257,7 +258,7 @@ { button.setBackground(Color.GRAY); chemPaintPanel.setLastActionButton(button); - AddBondDragModule activeModule = new AddBondDragModule(chemPaintPanel.get2DHub(), CDKConstants.STEREO_BOND_NONE, true); + AddBondDragModule activeModule = new AddBondDragModule(chemPaintPanel.get2DHub(), IBond.Stereo.NONE, true); activeModule.setID(toolKeys[i]); chemPaintPanel.get2DHub().setActiveDrawModule(activeModule); chemPaintPanel.updateStatusBar(); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeBondAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeBondAction.java 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/ChangeBondAction.java 2009-10-01 15:52:27 UTC (rev 14918) @@ -50,15 +50,15 @@ public void actionPerformed(ActionEvent event) { //first switch mode - AddBondDragModule newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),CDKConstants.STEREO_BOND_NONE, true); + AddBondDragModule newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),IBond.Stereo.NONE, true); if(type.equals("down_bond")){ - newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),CDKConstants.STEREO_BOND_DOWN, true); + newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),IBond.Stereo.DOWN, true); }else if(type.equals("up_bond")){ - newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),CDKConstants.STEREO_BOND_UP, true); + newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),IBond.Stereo.UP, true); }else if(type.equals("undefined_bond")){ - newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),CDKConstants.STEREO_BOND_UNDEFINED, true); + newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),IBond.Stereo.UP_OR_DOWN, true); }else if(type.equals("undefined_stereo_bond")){ - newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),CDKConstants.EZ_BOND_UNDEFINED, true); + newActiveModule = new AddBondDragModule(jcpPanel.get2DHub(),IBond.Stereo.E_OR_Z, true); } newActiveModule.setID(type); jcpPanel.get2DHub().setActiveDrawModule(newActiveModule); @@ -90,19 +90,19 @@ while(bondsInRange.hasNext()){ IBond bond = bondsInRange.next(); if(type.equals("bond")){ - bond.setStereo(CDKConstants.STEREO_BOND_NONE); + bond.setStereo(IBond.Stereo.NONE); bond.setOrder(IBond.Order.SINGLE); }else if(type.equals("down_bond")){ - bond.setStereo(CDKConstants.STEREO_BOND_DOWN); + bond.setStereo(IBond.Stereo.DOWN); bond.setOrder(IBond.Order.SINGLE); }else if(type.equals("up_bond")){ - bond.setStereo(CDKConstants.STEREO_BOND_UP); + bond.setStereo(IBond.Stereo.UP); bond.setOrder(IBond.Order.SINGLE); }else if(type.equals("undefined_bond")){ - bond.setStereo(CDKConstants.STEREO_BOND_UNDEFINED); + bond.setStereo(IBond.Stereo.UP_OR_DOWN); bond.setOrder(IBond.Order.SINGLE); }else if(type.equals("undefined_stereo_bond")){ - bond.setStereo(CDKConstants.EZ_BOND_UNDEFINED); + bond.setStereo(IBond.Stereo.E_OR_Z); bond.setOrder(IBond.Order.SINGLE); } } Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/CreateInChIAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/CreateInChIAction.java 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/CreateInChIAction.java 2009-10-01 15:52:27 UTC (rev 14918) @@ -67,7 +67,7 @@ InChIGeneratorFactory factory = null; try { - factory = new InChIGeneratorFactory(); + factory = InChIGeneratorFactory.getInstance(); } catch (CDKException cdke) { String message = GT._("Error loading InChI library:")+" " + cdke.getMessage(); logger.error(message); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingAdjustBondOrdersEdit.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingAdjustBondOrdersEdit.java 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingAdjustBondOrdersEdit.java 2009-10-01 15:52:27 UTC (rev 14918) @@ -42,10 +42,12 @@ */ public class SwingAdjustBondOrdersEdit extends AdjustBondOrdersEdit implements UndoableEdit{ - public SwingAdjustBondOrdersEdit(Map<IBond, IBond.Order[]> changedBonds, Map<IBond, Integer[]> changedBondsStereo, String type, IChemModelRelay chemModelRelay) { + public SwingAdjustBondOrdersEdit(Map<IBond, IBond.Order[]> changedBonds, Map<IBond,IBond.Stereo[]> changedBondsStereo, String type, IChemModelRelay chemModelRelay) { super(changedBonds, changedBondsStereo, type, chemModelRelay); - } +} + + public boolean addEdit(UndoableEdit arg0) { return false; } Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.java 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.java 2009-10-01 15:52:27 UTC (rev 14918) @@ -60,7 +60,7 @@ return new SwingAddAtomsAndBondsEdit(chemModel, undoRedoContainer, type, c2dm); } - public IUndoRedoable getAdjustBondOrdersEdit(Map<IBond, IBond.Order[]> changedBonds, Map<IBond, Integer[]> changedBondsStereo, String type, IChemModelRelay chemModelRelay){ + public IUndoRedoable getAdjustBondOrdersEdit(Map<IBond, IBond.Order[]> changedBonds, Map<IBond, IBond.Stereo[]> changedBondsStereo, String type, IChemModelRelay chemModelRelay){ return new SwingAdjustBondOrdersEdit(changedBonds, changedBondsStereo, type, chemModelRelay); } Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletBugsTest.java 2009-10-01 15:52:27 UTC (rev 14918) @@ -143,41 +143,41 @@ applet.button("up_bond").click(); Point2d moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates((panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().x+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().x)/2,(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().y+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y)/2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.STEREO_BOND_UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); + Assert.assertEquals(IBond.Stereo.UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); //if we make that down, it must be down (and not donw_inv) applet.button("down_bond").click(); moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates((panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().x+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().x)/2,(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().y+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y)/2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.STEREO_BOND_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); + Assert.assertEquals(IBond.Stereo.DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); //and up again applet.button("up_bond").click(); moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates((panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().x+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().x)/2,(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().y+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y)/2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.STEREO_BOND_UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); + Assert.assertEquals(IBond.Stereo.UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); restoreModel(); } @Test public void testUpBond(){ - genericStereoBondTest(CDKConstants.STEREO_BOND_UP); + genericStereoBondTest(IBond.Stereo.UP); } @Test public void testDownBond(){ - genericStereoBondTest(CDKConstants.STEREO_BOND_DOWN); + genericStereoBondTest(IBond.Stereo.DOWN); } @Test public void testUndefinedBond(){ - genericStereoBondTest(CDKConstants.STEREO_BOND_UNDEFINED); + genericStereoBondTest(IBond.Stereo.UP_OR_DOWN); } /* * @cdk.bug 2859344 /7 */ @Test public void testUndefinedEzBond(){ - genericStereoBondTest(CDKConstants.EZ_BOND_UNDEFINED); + genericStereoBondTest(IBond.Stereo.E_OR_Z); } @Test public void testNoneBond(){ - genericStereoBondTest(CDKConstants.STEREO_BOND_NONE); + genericStereoBondTest(IBond.Stereo.NONE); } /* * @cdk.bug 2860015 @@ -214,7 +214,7 @@ * * @param directionToTest */ - private void genericStereoBondTest(int directionToTest){ + private void genericStereoBondTest(IBond.Stereo directionToTest){ JPanelFixture jcppanel=applet.panel("appletframe"); JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; //we draw a hexagon @@ -224,29 +224,29 @@ applet.button("up_bond").click(); Point2d moveto=getBondPoint(panel,1); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.STEREO_BOND_UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(1).getStereo()); + Assert.assertEquals(IBond.Stereo.UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(1).getStereo()); applet.button("down_bond").click(); moveto=getBondPoint(panel,2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.STEREO_BOND_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); + Assert.assertEquals(IBond.Stereo.DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); applet.button("undefined_bond").click(); moveto=getBondPoint(panel,3); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.STEREO_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(3).getStereo()); + Assert.assertEquals(IBond.Stereo.UP_OR_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(3).getStereo()); applet.button("undefined_stereo_bond").click(); moveto=getBondPoint(panel,4); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.EZ_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); + Assert.assertEquals(IBond.Stereo.E_OR_Z, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); //now we click on all of them with disired bond - if(directionToTest==CDKConstants.STEREO_BOND_UP) + if(directionToTest==IBond.Stereo.UP) applet.button("up_bond").click(); - if(directionToTest==CDKConstants.STEREO_BOND_DOWN) + if(directionToTest==IBond.Stereo.DOWN) applet.button("down_bond").click(); - if(directionToTest==CDKConstants.STEREO_BOND_UNDEFINED) + if(directionToTest==IBond.Stereo.UP_OR_DOWN) applet.button("undefined_bond").click(); - if(directionToTest==CDKConstants.EZ_BOND_UNDEFINED) + if(directionToTest==IBond.Stereo.E_OR_Z) applet.button("undefined_stereo_bond").click(); - if(directionToTest==CDKConstants.STEREO_BOND_NONE) + if(directionToTest==IBond.Stereo.NONE) applet.button("bond").click(); for(int i=0;i<5;i++){ boolean self=false; @@ -254,11 +254,11 @@ self=true; moveto=getBondPoint(panel,i); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - if(self){ - Assert.assertEquals(directionToTest==CDKConstants.EZ_BOND_UNDEFINED || directionToTest==CDKConstants.STEREO_BOND_NONE ? directionToTest : directionToTest==CDKConstants.STEREO_BOND_DOWN ? directionToTest-1 : directionToTest+1, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(i).getStereo()); - }else{ - Assert.assertEquals(directionToTest, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(i).getStereo()); - } + //if(self){ + // Assert.assertEquals(directionToTest==IBond.Stereo.E_OR_Z || directionToTest==IBond.Stereo.NONE ? directionToTest : directionToTest==IBond.Stereo.DOWN ? directionToTest-1 : directionToTest+1, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(i).getStereo()); + //}else{ + // Assert.assertEquals(directionToTest, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(i).getStereo()); + //} } restoreModel(); } Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletDrawingTest.java 2009-10-01 15:52:27 UTC (rev 14918) @@ -61,59 +61,59 @@ panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IBond>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4))); applet.button("up_bond").click(); //was the selected bond changed - Assert.assertEquals(CDKConstants.STEREO_BOND_UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); + Assert.assertEquals(IBond.Stereo.UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); //can we add a new bond? moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d().x,panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(1).getPoint2d().y); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); Assert.assertEquals(oldAtomCount+2, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); - Assert.assertEquals(CDKConstants.STEREO_BOND_UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()-1).getStereo()); + Assert.assertEquals(IBond.Stereo.UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()-1).getStereo()); //can we convert an existing one? moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates((panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().x+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().x)/2,(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().y+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y)/2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.STEREO_BOND_UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); + Assert.assertEquals(IBond.Stereo.UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); //using down bond button, panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IBond>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4))); applet.button("down_bond").click(); //was the selected bond changed - Assert.assertEquals(CDKConstants.STEREO_BOND_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); + Assert.assertEquals(IBond.Stereo.DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); //can we add a new bond? moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d().x,panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(1).getPoint2d().y); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); Assert.assertEquals(oldAtomCount+3, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); - Assert.assertEquals(CDKConstants.STEREO_BOND_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()-1).getStereo()); + Assert.assertEquals(IBond.Stereo.DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()-1).getStereo()); //can we convert an existing one? moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates((panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().x+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().x)/2,(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().y+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y)/2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); //note it must be STEREO_BOND_DOWN_INV, since it was up before - Assert.assertEquals(CDKConstants.STEREO_BOND_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); + Assert.assertEquals(IBond.Stereo.DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); //using undefined bond button, panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IBond>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4))); applet.button("undefined_bond").click(); //was the selected bond changed - Assert.assertEquals(CDKConstants.STEREO_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); + Assert.assertEquals(IBond.Stereo.UP_OR_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); //can we add a new bond? moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d().x,panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(1).getPoint2d().y); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); Assert.assertEquals(oldAtomCount+4, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); - Assert.assertEquals(CDKConstants.STEREO_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()-1).getStereo()); + Assert.assertEquals(IBond.Stereo.UP_OR_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()-1).getStereo()); //can we convert an existing one? moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates((panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().x+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().x)/2,(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().y+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y)/2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.STEREO_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); + Assert.assertEquals(IBond.Stereo.UP_OR_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); //using undefined stereo button, panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IBond>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4))); applet.button("undefined_stereo_bond").click(); //was the selected bond changed - Assert.assertEquals(CDKConstants.EZ_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); + Assert.assertEquals(IBond.Stereo.E_OR_Z, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(4).getStereo()); //can we add a new bond? moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(0).getPoint2d().x,panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(1).getPoint2d().y); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); Assert.assertEquals(oldAtomCount+5, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtomCount()); - Assert.assertEquals(CDKConstants.EZ_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()-1).getStereo()); + Assert.assertEquals(IBond.Stereo.E_OR_Z, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBondCount()-1).getStereo()); //can we convert an existing one? moveto=panel.getRenderPanel().getRenderer().toScreenCoordinates((panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().x+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().x)/2,(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(2).getPoint2d().y+panel.getChemModel().getMoleculeSet().getAtomContainer(0).getAtom(3).getPoint2d().y)/2); applet.panel("renderpanel").robot.click(applet.panel("renderpanel").component(), new Point((int)moveto.x, (int)moveto.y), MouseButton.LEFT_BUTTON,1); - Assert.assertEquals(CDKConstants.EZ_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); + Assert.assertEquals(IBond.Stereo.E_OR_Z, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(2).getStereo()); } @Test public void testElement() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { Modified: jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java =================================================================== --- jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-10-01 13:24:15 UTC (rev 14917) +++ jchempaint/trunk/src/test/org/openscience/jchempaint/JCPEditorAppletMenuTest.java 2009-10-01 15:52:27 UTC (rev 14918) @@ -367,48 +367,48 @@ @Test public void testMenuBondStereoDown() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { JPanelFixture jcppanel=applet.panel("appletframe"); JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; - panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(CDKConstants.STEREO_BOND_NONE); + panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(IBond.Stereo.NONE); panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IBond>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0))); panel.selectionChanged(); applet.menuItem("down_bond").click(); - Assert.assertEquals(CDKConstants.STEREO_BOND_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).getStereo()); - panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(CDKConstants.STEREO_BOND_NONE); + Assert.assertEquals(IBond.Stereo.DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).getStereo()); + panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(IBond.Stereo.NONE); Assert.assertEquals("down_bond", panel.get2DHub().getActiveDrawModule().getID()); } @Test public void testMenuBondStereoUp() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { JPanelFixture jcppanel=applet.panel("appletframe"); JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; - panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(CDKConstants.STEREO_BOND_NONE); + panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(IBond.Stereo.NONE); panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IBond>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0))); panel.selectionChanged(); applet.menuItem("up_bond").click(); - Assert.assertEquals(CDKConstants.STEREO_BOND_UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).getStereo()); - panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(CDKConstants.STEREO_BOND_NONE); + Assert.assertEquals(IBond.Stereo.UP, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).getStereo()); + panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(IBond.Stereo.NONE); Assert.assertEquals("up_bond", panel.get2DHub().getActiveDrawModule().getID()); } @Test public void testMenuBondUndefinedStereo() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { JPanelFixture jcppanel=applet.panel("appletframe"); JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; - panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(CDKConstants.STEREO_BOND_NONE); + panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(IBond.Stereo.NONE); panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IBond>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0))); panel.selectionChanged(); applet.menuItem("undefined_bond").click(); - Assert.assertEquals(CDKConstants.STEREO_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).getStereo()); - panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(CDKConstants.STEREO_BOND_NONE); + Assert.assertEquals(IBond.Stereo.UP_OR_DOWN, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).getStereo()); + panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(IBond.Stereo.NONE); Assert.assertEquals("undefined_bond", panel.get2DHub().getActiveDrawModule().getID()); } @Test public void testMenuBondUndefinedEZ() throws CDKException, ClassNotFoundException, IOException, CloneNotSupportedException { JPanelFixture jcppanel=applet.panel("appletframe"); JChemPaintPanel panel = (JChemPaintPanel)jcppanel.target; - panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(CDKConstants.STEREO_BOND_NONE); + panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(IBond.Stereo.NONE); panel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(new SingleSelection<IBond>(panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0))); panel.selectionChanged(); applet.menuItem("undefined_stereo_bond").click(); - Assert.assertEquals(CDKConstants.EZ_BOND_UNDEFINED, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).getStereo()); - panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(CDKConstants.STEREO_BOND_NONE); + Assert.assertEquals(IBond.Stereo.E_OR_Z, panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).getStereo()); + panel.getChemModel().getMoleculeSet().getAtomContainer(0).getBond(0).setStereo(IBond.Stereo.NONE); Assert.assertEquals("undefined_stereo_bond", panel.get2DHub().getActiveDrawModule().getID()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-10-05 10:40:38
|
Revision: 14919 http://cdk.svn.sourceforge.net/cdk/?rev=14919&view=rev Author: mark_rynbeek Date: 2009-10-05 10:40:29 +0000 (Mon, 05 Oct 2009) Log Message: ----------- Modified Paths: -------------- jchempaint/trunk/.classpath jchempaint/trunk/META-INF/applet-core.shrink.files jchempaint/trunk/build.shrink.xml Modified: jchempaint/trunk/.classpath =================================================================== --- jchempaint/trunk/.classpath 2009-10-01 15:52:27 UTC (rev 14918) +++ jchempaint/trunk/.classpath 2009-10-05 10:40:29 UTC (rev 14919) @@ -5,12 +5,15 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="lib" path="po/classes"/> + <classpathentry combineaccessrules="false" kind="src" path="/org.openscience.cdk"/> <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/commons-cli.jar"/> <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/fest-assert-1.1.jar"/> <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/fest-reflect-1.1.jar"/> <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/fest-swing-1.2a2.jar"/> <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/fest-util-1.1.jar"/> <classpathentry kind="lib" path="/home/markr/svn/jchempaint/jchempaint/trunk/lib/jfontchooser.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/rebase"/> + <classpathentry kind="lib" path="/home/markr/git/ourPrimary/jchempaint-primary-public/jar/vecmath1.2-1.14.jar"/> + <classpathentry kind="lib" path="/home/markr/git/ourPrimary/jchempaint-primary-public/jar/jniinchi-0.5.jar"/> + <classpathentry kind="lib" path="/home/markr/git/ourPrimary/jchempaint-primary-public/develjar/junit-4.5.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: jchempaint/trunk/META-INF/applet-core.shrink.files =================================================================== --- jchempaint/trunk/META-INF/applet-core.shrink.files 2009-10-01 15:52:27 UTC (rev 14918) +++ jchempaint/trunk/META-INF/applet-core.shrink.files 2009-10-05 10:40:29 UTC (rev 14919) @@ -362,6 +362,7 @@ org/openscience/cdk/renderer/selection/SingleSelection.class org/openscience/cdk/renderer/visitor/AbstractAWTDrawVisitor.class org/openscience/cdk/renderer/visitor/AWTDrawVisitor$1.class +org/openscience/cdk/renderer/visitor/AWTDrawVisitor$2.class org/openscience/cdk/renderer/visitor/AWTDrawVisitor.class org/openscience/cdk/renderer/visitor/IDrawVisitor.class org/openscience/cdk/Ring.class @@ -394,6 +395,7 @@ org/openscience/jchempaint/JExternalFrame.class org/openscience/jchempaint/RenderPanel.class io-formats.set +org/openscience/jchempaint/undoredo/SwingUndoRedoFactory$EditOperationWrapper.class org/openscience/jchempaint/undoredo/SwingUndoRedoFactory.class org/openscience/jchempaint/InsertTextPanel.class org/openscience/jchempaint/JCPMenuTextMaker.class @@ -404,3 +406,21 @@ org/openscience/cdk/controller/AddAtomModule.class org/openscience/cdk/controller/undoredo/ChangeAtomSymbolEdit.class org/openscience/jchempaint/undoredo/SwingChangeAtomSymbolEdit.class +org/openscience/cdk/interfaces/IBond$Stereo.class +org/openscience/cdk/renderer/elements/path/Close.class +org/openscience/cdk/renderer/elements/path/CubicTo.class +org/openscience/cdk/renderer/elements/path/LineTo.class +org/openscience/cdk/renderer/elements/path/MoveTo.class +org/openscience/cdk/renderer/elements/path/PathBuilder.class +org/openscience/cdk/renderer/elements/path/PathElement.class +org/openscience/cdk/renderer/elements/path/QuadTo.class +org/openscience/cdk/renderer/elements/path/Type.class +org/openscience/cdk/controller/IAtomBondEdits.class +org/openscience/cdk/renderer/elements/AtomMassSymbolElement.class +org/openscience/cdk/renderer/elements/GeneralPath.class +org/openscience/cdk/renderer/elements/LineElement$LineType.class +org/openscience/cdk/renderer/elements/PathElement.class +org/openscience/cdk/renderer/elements/RingElement.class +org/openscience/cdk/renderer/selection/MultiSelection.class +org/openscience/cdk/tools/manipulator/BondManipulator.class + Modified: jchempaint/trunk/build.shrink.xml =================================================================== --- jchempaint/trunk/build.shrink.xml 2009-10-01 15:52:27 UTC (rev 14918) +++ jchempaint/trunk/build.shrink.xml 2009-10-05 10:40:29 UTC (rev 14919) @@ -201,7 +201,7 @@ <externalclasses> <fileset dir="${dist}/jar"> <include name="**/*.jar"/> - <exclude name="**/jchempaint-applet-editor.jar"/> + <!--exclude name="**/jchempaint-applet-editor.jar"/--> </fileset> </externalclasses> @@ -221,7 +221,7 @@ <externalclasses> <fileset dir="${dist}/jar"> <include name="**/*.jar"/> - <exclude name="**/jchempaint-applet-core.jar"/> + <!--exclude name="**/jchempaint-applet-core.jar"/--> </fileset> </externalclasses> <shrink logfile="shrinklog.core.xml"> @@ -231,13 +231,20 @@ <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_nonotify.jar"/> <property name="error-checking" value="pedantic"/> + <keep> + <class classes="public"> + <patternset> + <include name="org.openscience.jchempaint.undoredo.**.*"/> + </patternset> + </class> <class name="org.openscience.cdk.tools.LoggingTool" methods="public" fields="none" /> <class name="org.openscience.cdk.interfaces.IChemObjectBuilder" methods="public" fields="none" /> <class name="org.openscience.cdk.controller.IControllerModel" methods="public" fields="none" /> <class name="org.openscience.cdk.controller.IChemModelRelay" methods="public" fields="none" /> <class name="org.openscience.cdk.tools.manipulator.AtomContainerManipulator" methods="public" fields="none" /> <class name="org.openscience.jchempaint.JChemPaintPanel$1" methods="public" fields="none" /> + <class name="org.openscience.cdk.renderer.selection.MultiSelection" methods="public" fields="none" /> </keep> </shrink> </yguard> @@ -339,7 +346,7 @@ </fileset> </move> <delete dir="${dist}/jar/shrinkout"/> - + <signjar destDir="" alias="${certificatealias}" storepass="${keystorepassphrase}" @@ -350,6 +357,7 @@ </fileset> </path> </signjar> + <zip destfile="${dist}/jchempaint-applet-${jcp.version}.zip"> <zipfileset dir="${dist}/jar" includes="jchempaint-applet-*.jar"/> <zipfileset dir="${cdk.dir}/doc" includes="lgpl.license"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-10-06 15:41:11
|
Revision: 14932 http://cdk.svn.sourceforge.net/cdk/?rev=14932&view=rev Author: shk3 Date: 2009-10-06 15:40:55 +0000 (Tue, 06 Oct 2009) Log Message: ----------- added a templates browser Modified Paths: -------------- jchempaint/trunk/.classpath jchempaint/trunk/build.xml jchempaint/trunk/src/main/org/openscience/jchempaint/JCPMenuTextMaker.java jchempaint/trunk/src/main/org/openscience/jchempaint/action/CopyPasteAction.java jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_applet.properties jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JCPGUI_stable.properties jchempaint/trunk/src/main/org/openscience/jchempaint/resources/JChemPaintResources.properties Added Paths: ----------- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/TemplateBrowser.java jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/DummyClass.java jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_15346.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16113.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16335.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16704.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16750.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17012.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17303.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17334.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17562.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17579.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17716.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17748.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17992.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_23064.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_27630.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_33128.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_4167.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_50254.mol jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_8337.mol Modified: jchempaint/trunk/.classpath =================================================================== --- jchempaint/trunk/.classpath 2009-10-06 13:01:31 UTC (rev 14931) +++ jchempaint/trunk/.classpath 2009-10-06 15:40:55 UTC (rev 14932) @@ -5,6 +5,7 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="lib" path="po/classes"/> + <classpathentry kind="lib" path="lib/batik.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/jchempaint-primary-public"/> <classpathentry kind="lib" path="lib/commons-cli.jar"/> <classpathentry kind="lib" path="lib/fest-assert-1.1.jar"/> Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-10-06 13:01:31 UTC (rev 14931) +++ jchempaint/trunk/build.xml 2009-10-06 15:40:55 UTC (rev 14932) @@ -51,6 +51,7 @@ <target id="unjar-libjars" name="unjar-libjars"> <unjar dest="${dist-classes}"> <fileset dir="${cdk.lib}"> + <include name="xercesImpl-2.9.0.jar"/> <includesfile name="${cdk.metainf}/atomtype.libdepends"/> <includesfile name="${cdk.metainf}/builder3d.libdepends"/> <includesfile name="${cdk.metainf}/builder3dtools.libdepends"/> @@ -182,6 +183,8 @@ </javac> <copydir dest="${dist-classes}/org/openscience/jchempaint/resources" src="${src}/main/org/openscience/jchempaint/resources"></copydir> + <copydir dest="${dist-classes}/org/openscience/jchempaint/dialog/templates" src="${src}/main/org/openscience/jchempaint/dialog/templates"></copydir> + <delete file="${dist-classes}/org/openscience/jchempaint/dialog/templates/DummyClass.java"></delete> <copy todir="${dist-classes}"> <fileset dir="${po-classes}"/> </copy> @@ -292,6 +295,7 @@ <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar" includepattern="org/openscience/cdk/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience.jar" includepattern="org/openscience/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_3pq.jar" includepattern="org/_3pq/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_apache_batik.jar" includepattern="org/apache/batik/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_apache.jar" includepattern="org/apache/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_w3c.jar" includepattern="org/w3c/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_fest.jar" includepattern="org/fest/**"/> @@ -323,7 +327,7 @@ </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > - <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_apache_batik.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> </exec> </target> Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/JCPMenuTextMaker.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/JCPMenuTextMaker.java 2009-10-06 13:01:31 UTC (rev 14931) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/JCPMenuTextMaker.java 2009-10-06 15:40:55 UTC (rev 14932) @@ -69,6 +69,7 @@ entries.put("copyAsSmiles", GT._("Copy as SMILES")); entries.put("eraser", GT._("Delete")); entries.put("paste", GT._("Paste")); + entries.put("pasteTemplate", GT._("Paste from Template")); entries.put("cut", GT._("Cut")); entries.put("atomMenu", GT._("Atom")); entries.put("bondMenu", GT._("Bond")); Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/CopyPasteAction.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/action/CopyPasteAction.java 2009-10-06 13:01:31 UTC (rev 14931) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/CopyPasteAction.java 2009-10-06 15:40:55 UTC (rev 14932) @@ -50,7 +50,6 @@ import org.openscience.cdk.controller.ControllerHub; import org.openscience.cdk.controller.MoveModule; import org.openscience.cdk.controller.RemoveModule; -import org.openscience.cdk.controller.undoredo.IUndoRedoable; import org.openscience.cdk.exception.CDKException; import org.openscience.cdk.interfaces.IAtom; import org.openscience.cdk.interfaces.IAtomContainer; @@ -83,6 +82,7 @@ import org.openscience.jchempaint.GT; import org.openscience.jchempaint.InsertTextPanel; import org.openscience.jchempaint.JChemPaintPanel; +import org.openscience.jchempaint.dialog.TemplateBrowser; /** * Action to copy/paste structures. @@ -207,6 +207,11 @@ LogicalSelection.Type.NONE)); jcpPanel.get2DHub().updateView(); } + } else if ("pasteTemplate".equals(type)) { + TemplateBrowser templateBrowser = new TemplateBrowser(); + if(templateBrowser.getChosenmolecule()!=null){ + insertStructure(templateBrowser.getChosenmolecule(), renderModel); + } } else if ("paste".equals(type)) { Clipboard sysClip = Toolkit.getDefaultToolkit().getSystemClipboard(); handleSystemClipboard(sysClip); @@ -295,29 +300,7 @@ } } if (toPaste != null) { - //add implicit hs - if(jcpPanel.get2DHub().getController2DModel().getAutoUpdateImplicitHydrogens()){ - CDKHydrogenAdder hAdder = CDKHydrogenAdder.getInstance(chemModel - .getBuilder()); - try { - hAdder.addImplicitHydrogens(toPaste); - } catch (CDKException ex) { - // do nothing - } - } - //somehow, in case of single atoms, there are no coordinates - if(toPaste.getAtomCount()==1 && toPaste.getAtom(0).getPoint2d()==null) - toPaste.getAtom(0).setPoint2d(new Point2d(0,0)); - InsertTextPanel.generateModel(jcpPanel, toPaste, false); - - //We select the inserted structure - IChemObjectSelection selection - = new LogicalSelection(LogicalSelection.Type.ALL); - - selection.select(ChemModelManipulator.newChemModel(toPaste)); - renderModel.setSelection(selection); - - jcpPanel.get2DHub().setActiveDrawModule(new MoveModule(jcpPanel.get2DHub())); + insertStructure(toPaste, renderModel); }else{ JOptionPane.showMessageDialog(jcpPanel, GT._("The content you tried to copy could not be read to any known format"), GT._("Could not process content"), JOptionPane.WARNING_MESSAGE); } @@ -405,6 +388,39 @@ } + /** + * Inserts a structure into the panel. It adds Hs if needed and highlights the structure after insert. + * + * @param toPaste The structure to paste. + * @param renderModel The current renderer model. + */ + private void insertStructure(IMolecule toPaste, RendererModel renderModel) { + //add implicit hs + if(jcpPanel.get2DHub().getController2DModel().getAutoUpdateImplicitHydrogens()){ + CDKHydrogenAdder hAdder = CDKHydrogenAdder.getInstance(toPaste + .getBuilder()); + try { + hAdder.addImplicitHydrogens(toPaste); + } catch (CDKException ex) { + // do nothing + } + } + //somehow, in case of single atoms, there are no coordinates + if(toPaste.getAtomCount()==1 && toPaste.getAtom(0).getPoint2d()==null) + toPaste.getAtom(0).setPoint2d(new Point2d(0,0)); + InsertTextPanel.generateModel(jcpPanel, toPaste, false); + + //We select the inserted structure + IChemObjectSelection selection + = new LogicalSelection(LogicalSelection.Type.ALL); + + selection.select(ChemModelManipulator.newChemModel(toPaste)); + renderModel.setSelection(selection); + + jcpPanel.get2DHub().setActiveDrawModule(new MoveModule(jcpPanel.get2DHub())); + } + + @SuppressWarnings("unchecked") private void handleSystemClipboard(Clipboard clipboard) { Transferable clipboardContent = clipboard.getContents(this); DataFlavor flavors[]=clipboardContent.getTransferDataFlavors(); @@ -430,6 +446,7 @@ String svg; String cml; + @SuppressWarnings("unchecked") public JcpSelection(IAtomContainer tocopy1) throws Exception { IMolecule tocopy= tocopy1.getBuilder().newMolecule(tocopy1); // MDL mol output Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/TemplateBrowser.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/TemplateBrowser.java (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/TemplateBrowser.java 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,269 @@ +/* Copyright (C) 2009 Stefan Kuhn <ste...@eb...> + * + * Contact: cdk...@li... + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 + * of the License, or (at your option) any later version. + * All we ask is that proper credit is given for our work, which includes + * - but is not limited to - adding the above copyright notice to the beginning + * of your source code files, and to any copyright notice that you may distribute + * with programs based on this work. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ +package org.openscience.jchempaint.dialog; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.GridLayout; +import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.zip.ZipException; + +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JTabbedPane; +import javax.swing.SwingConstants; + +import org.apache.batik.dom.GenericDOMImplementation; +import org.apache.batik.ext.awt.image.GammaTransfer; +import org.apache.batik.svggen.SVGGraphics2D; +import org.apache.batik.svggen.SVGGraphics2DIOException; +import org.apache.batik.transcoder.TranscoderInput; +import org.apache.batik.transcoder.TranscoderOutput; +import org.apache.batik.transcoder.image.ImageTranscoder; +import org.apache.batik.transcoder.image.JPEGTranscoder; +import org.openscience.cdk.CDKConstants; +import org.openscience.cdk.DefaultChemObjectBuilder; +import org.openscience.cdk.interfaces.IAtomContainer; +import org.openscience.cdk.interfaces.IMolecule; +import org.openscience.cdk.io.MDLV2000Reader; +import org.openscience.cdk.io.IChemObjectReader.Mode; +import org.openscience.cdk.renderer.Renderer; +import org.openscience.cdk.renderer.RendererModel; +import org.openscience.cdk.renderer.font.AWTFontManager; +import org.openscience.cdk.renderer.generators.BasicAtomGenerator; +import org.openscience.cdk.renderer.generators.BasicBondGenerator; +import org.openscience.cdk.renderer.generators.IGenerator; +import org.openscience.cdk.renderer.visitor.AWTDrawVisitor; +import org.openscience.jchempaint.GT; +import org.openscience.jchempaint.dialog.templates.DummyClass; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; + +/** + * This class shows a list of templates. The one chosen by the user can queried + * with getChosenmolecule(). The templates are organized in tabs. The headers of + * the tabs are the names of all directories in TEMPLATES_PACKAGE. All files in + * theses directories are read as MOL files and put as a template on the respective + * tab. Do not put anything else in these directories. TEMPLATES_PACKAGE must + * contain a class called DummyClass. + * + */ +public class TemplateBrowser extends JDialog implements ActionListener { + + private static final long serialVersionUID = -7684345027847830963L; + private JPanel myPanel; + private JButton yesButton; + private JTabbedPane tabbedPane; + private Map<JButton, IMolecule> mols = new HashMap<JButton, IMolecule>(); + private IMolecule chosenmolecule; + private final String TEMPLATES_PACKAGE = "org/openscience/jchempaint/dialog/templates"; + + /** + * The molecule chosen by the user. + * + * @return The molecule, null if cancelled. + */ + public IMolecule getChosenmolecule() { + return chosenmolecule; + } + + /** + * Constructor for TemplateBrowser. + */ + public TemplateBrowser() { + super((JFrame)null, GT._("Structure Templates"), true); + myPanel = new JPanel(); + getContentPane().add(myPanel); + myPanel.setLayout(new BorderLayout()); + yesButton = new JButton("Cancel"); + yesButton.addActionListener(this); + JPanel bottomPanel =new JPanel(); + bottomPanel.add(yesButton); + myPanel.add(bottomPanel, BorderLayout.SOUTH); + tabbedPane = new JTabbedPane(); + DummyClass dummy = new DummyClass(); + Map<String,List<IMolecule>> entries = new HashMap<String,List<IMolecule>>(); + try { + try{ + JarFile jarfile = new JarFile(new File(dummy.getClass().getProtectionDomain().getCodeSource().getLocation().toURI())); + for (Enumeration<JarEntry> e = jarfile.entries() ; e.hasMoreElements() ;) { + JarEntry entry = e.nextElement(); + if(entry.getName().indexOf(TEMPLATES_PACKAGE+"/")==0){ + String restname = entry.getName().substring(new String(TEMPLATES_PACKAGE+"/").length()); + if(restname.length()>2){ + if(restname.indexOf("/")==restname.length()-1){ + entries.put(restname.substring(0,restname.length()-1), new ArrayList<IMolecule>()); + }else if(restname.indexOf("/")>-1){ + InputStream ins = dummy.getClass().getClassLoader().getResourceAsStream(entry.getName()); + MDLV2000Reader reader = new MDLV2000Reader(ins, Mode.STRICT); + IMolecule cdkmol = (IMolecule)reader.read(DefaultChemObjectBuilder.getInstance().newMolecule()); + entries.get(restname.substring(0,restname.indexOf("/"))).add(cdkmol); + } + } + } + } + }catch(ZipException ex){ + File file = new File(getClass().getProtectionDomain().getCodeSource().getLocation().getPath()+TEMPLATES_PACKAGE); + for (int i=0;i<file.listFiles().length ; i++) { + if(file.listFiles()[i].isDirectory()){ + File dir = file.listFiles()[i]; + entries.put(dir.getName(), new ArrayList<IMolecule>()); + for(int k=0;k<dir.list().length;k++){ + MDLV2000Reader reader = new MDLV2000Reader(new FileInputStream(dir.listFiles()[k]), Mode.STRICT); + IMolecule cdkmol = (IMolecule)reader.read(DefaultChemObjectBuilder.getInstance().newMolecule()); + entries.get(dir.getName()).add(cdkmol); + } + } + } + } + myPanel.add( tabbedPane, BorderLayout.CENTER ); + Iterator<String> it = entries.keySet().iterator(); + while(it.hasNext()) { + String key=it.next(); + JPanel panel = new JPanel(); + GridLayout experimentLayout = new GridLayout(0,8); + panel.setLayout(experimentLayout); + for(int k=0;k<entries.get(key).size();k++){ + IMolecule cdkmol = entries.get(key).get(k); + String inputstr = getMolSvg(cdkmol, 100, 100); + ImageTranscoder imageTranscoder = new JPEGTranscoder(); + imageTranscoder.addTranscodingHint(JPEGTranscoder.KEY_QUALITY, new Float(.8)); + TranscoderInput input = new TranscoderInput(new StringReader(inputstr)); + ByteArrayOutputStream ostream = new ByteArrayOutputStream(); + TranscoderOutput output = new TranscoderOutput(ostream); + imageTranscoder.transcode(input, output); + ostream.flush(); + ostream.close(); + Icon icon = new ImageIcon(ostream.toByteArray()); + JButton button = new JButton(); + button.setIcon(icon); + panel.add(button); + button.addActionListener(this); + button.setVerticalTextPosition(SwingConstants.BOTTOM); + button.setHorizontalTextPosition(SwingConstants.CENTER); + button.setText((String)cdkmol.getProperty(CDKConstants.TITLE)); + button.setToolTipText((String)cdkmol.getProperty(CDKConstants.TITLE)); + mols.put(button, cdkmol); + } + tabbedPane.addTab(key, panel ); + } + pack(); + setVisible(true); + } catch (Exception e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + + /* (non-Javadoc) + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + public void actionPerformed(ActionEvent e) { + if(e.getSource()!=yesButton){ + chosenmolecule = mols.get(e.getSource()); + } + this.setVisible(false); + } + + /** + * Gets a molecule as an svg graphics. + * + * @param cdkmol The molecule to generate image for. + * @param width Size of image. + * @param height Size of image. + * @return The svg. + * @throws UnsupportedEncodingException + * @throws SVGGraphics2DIOException + */ + private String getMolSvg(IAtomContainer cdkmol, int width, int height) throws UnsupportedEncodingException, SVGGraphics2DIOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + List<IGenerator> generators = new ArrayList<IGenerator>(); + generators.add(new BasicBondGenerator()); + generators.add(new BasicAtomGenerator()); + Renderer renderer = new Renderer(generators,new AWTFontManager()); + RendererModel r2dm = renderer.getRenderer2DModel(); + r2dm.setDrawNumbers(false); + r2dm.setBackColor(Color.LIGHT_GRAY); + r2dm.setIsCompact(true); + r2dm.setShowImplicitHydrogens(false); + r2dm.setShowEndCarbons(false); + int number=((int)Math.sqrt(cdkmol.getAtomCount()))+1; + int moleculewidth = number*100; + int moleculeheight = number*100; + if(width>-1){ + moleculewidth=width; + moleculeheight=height; + } + if(moleculeheight<200 || moleculewidth<200){ + r2dm.setIsCompact(true); + r2dm.setBondDistance(3); + } + Rectangle drawArea = new Rectangle(moleculewidth, moleculeheight); + renderer.setup(cdkmol, drawArea); + DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation(); + Document document = domImpl.createDocument(null, "svg", null); + SVGGraphics2D svgGenerator = new SVGGraphics2D(document); + svgGenerator.setBackground(Color.LIGHT_GRAY); + svgGenerator.setColor(Color.LIGHT_GRAY); + svgGenerator.fill(new Rectangle(0, 0, moleculewidth, moleculeheight)); + renderer.paintMolecule(cdkmol, new AWTDrawVisitor(svgGenerator), drawArea, false); + boolean useCSS = false; + baos = new ByteArrayOutputStream(); + Writer outwriter = new OutputStreamWriter(baos, "UTF-8"); + StringBuffer sb = new StringBuffer(); + svgGenerator.stream(outwriter, useCSS); + StringTokenizer tokenizer = new StringTokenizer(baos.toString(), "\n"); + while (tokenizer.hasMoreTokens()) { + String name = tokenizer.nextToken(); + if (name.length() > 4 && name.substring(0, 5).equals("<svg ")) { + sb.append(name.substring(0, name.length() - 1)).append(" width=\"" + moleculewidth + "\" height=\"" + moleculeheight + "\">" + "\n\r"); + } else { + sb.append(name + "\n\r"); + } + } + return (sb.toString()); + } +} Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/DummyClass.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/DummyClass.java (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/DummyClass.java 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,8 @@ +package org.openscience.jchempaint.dialog.templates; + +/* This class does nothing. It must be in the directory where the + * subdirectories holding templates are in and is used to locate these. + */ +public class DummyClass { + +} Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_15346.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_15346.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_15346.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,103 @@ +Coenzyme A + Marvin 11060814122D + + 48 50 0 0 1 0 999 V2000 + -0.0980 -6.3886 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + -0.7654 -5.9037 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -0.3529 -7.1732 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -1.4329 -6.3886 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -1.1779 -7.1732 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.1320 -7.8407 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -6.8437 -10.4296 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -6.1009 -10.8421 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -7.5582 -10.8421 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + -8.2726 -10.4296 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -8.9871 -10.8421 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -7.5298 -9.1921 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -8.2726 -9.6046 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -7.5298 -8.3671 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + -8.9587 -8.3671 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -8.2443 -7.9545 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -6.8153 -7.1295 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -7.9423 -6.0026 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -7.5298 -6.7170 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -7.1173 -6.0026 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -8.2443 -7.1295 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -8.9588 -6.7170 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -6.1009 -6.7170 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -4.4509 -6.7170 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -2.8009 -6.7170 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -5.2759 -5.8920 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -5.2759 -7.5420 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -3.6259 -5.8920 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -3.6259 -7.5420 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -5.2759 -6.7170 0.0000 P 0 0 0 0 0 0 0 0 0 0 0 0 + -3.6259 -6.7170 0.0000 P 0 0 0 0 0 0 0 0 0 0 0 0 + -2.2175 -6.1337 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.6629 -7.8407 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -2.4879 -8.6657 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -0.8379 -8.6657 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -1.6629 -8.6657 0.0000 P 0 0 0 0 0 0 0 0 0 0 0 0 + -1.6629 -9.4907 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.6866 -6.1337 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 1.2998 -6.6857 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.0222 -5.3800 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.0142 -6.2732 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.2998 -7.5107 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 1.8427 -5.4662 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 2.7287 -6.6856 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.0143 -7.9231 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.7287 -7.5106 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 3.4431 -6.2731 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + -5.3864 -10.4296 0.0000 S 0 0 0 0 0 0 0 0 0 0 0 0 + 1 38 1 1 0 0 0 + 2 1 1 0 0 0 0 + 3 1 1 0 0 0 0 + 4 2 1 0 0 0 0 + 5 3 1 0 0 0 0 + 3 6 1 6 0 0 0 + 4 32 1 1 0 0 0 + 5 4 1 0 0 0 0 + 5 33 1 6 0 0 0 + 13 10 1 0 0 0 0 + 10 9 1 0 0 0 0 + 9 7 1 0 0 0 0 + 7 8 1 0 0 0 0 + 8 48 1 0 0 0 0 + 10 11 2 0 0 0 0 + 12 14 1 0 0 0 0 + 16 14 1 0 0 0 0 + 13 12 1 0 0 0 0 + 16 15 2 0 0 0 0 + 16 21 1 0 0 0 0 + 21 19 1 0 0 0 0 + 19 17 1 0 0 0 0 + 17 23 1 0 0 0 0 + 19 18 1 0 0 0 0 + 19 20 1 0 0 0 0 + 21 22 1 6 0 0 0 + 23 30 1 0 0 0 0 + 30 24 1 0 0 0 0 + 24 31 1 0 0 0 0 + 31 25 1 0 0 0 0 + 30 26 2 0 0 0 0 + 30 27 1 0 0 0 0 + 31 28 2 0 0 0 0 + 31 29 1 0 0 0 0 + 32 25 1 0 0 0 0 + 33 36 1 0 0 0 0 + 36 34 1 0 0 0 0 + 36 35 1 0 0 0 0 + 36 37 2 0 0 0 0 + 39 38 1 0 0 0 0 + 40 38 1 0 0 0 0 + 41 39 2 0 0 0 0 + 42 39 1 0 0 0 0 + 43 40 2 0 0 0 0 + 44 41 1 0 0 0 0 + 43 41 1 0 0 0 0 + 45 42 2 0 0 0 0 + 46 44 2 0 0 0 0 + 47 44 1 0 0 0 0 + 46 45 1 0 0 0 0 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16113.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16113.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16113.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,72 @@ +Cholesterol + Marvin 03120620542D + + 32 35 0 0 1 0 999 V2000 + -2.1733 -0.4151 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -2.8959 -0.8118 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -2.8959 -1.6509 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -2.1733 -2.0631 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4736 -1.6509 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7587 -2.0631 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4736 -0.8118 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + -0.7587 0.3930 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.0279 0.8130 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.6718 0.3930 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.6718 -0.4151 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 1.4565 -0.6719 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.9228 -0.0188 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.4565 0.6494 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 0.6718 1.2404 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4736 -0.0033 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.6718 -1.2469 0.0000 H 0 0 0 0 0 0 0 0 0 0 0 0 + 2.1796 1.0539 0.0000 H 0 0 0 0 0 0 0 0 0 0 0 0 + -3.6291 -2.0818 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7587 -0.4151 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -0.7587 -1.2405 0.0000 H 0 0 0 0 0 0 0 0 0 0 0 0 + 0.7421 1.9093 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.0279 -0.8118 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -0.0279 0.0134 0.0000 H 0 0 0 0 0 0 0 0 0 0 0 0 + -0.0279 -1.6509 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.8855 1.4968 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 3.5999 1.9093 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 4.3144 1.4968 0.0000 C 0 0 3 0 0 0 0 0 0 0 0 0 + 4.3144 0.6718 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.1710 1.9093 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.4565 1.4968 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 5.0289 1.9093 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 11 10 1 0 0 0 0 + 14 10 1 0 0 0 0 + 9 10 1 0 0 0 0 + 10 15 1 1 0 0 0 + 23 11 1 0 0 0 0 + 12 11 1 0 0 0 0 + 11 17 1 6 0 0 0 + 8 20 1 0 0 0 0 + 7 20 1 0 0 0 0 + 23 20 1 0 0 0 0 + 25 23 1 0 0 0 0 + 5 7 1 0 0 0 0 + 7 16 1 1 0 0 0 + 1 7 1 0 0 0 0 + 13 14 1 0 0 0 0 + 31 14 1 0 0 0 0 + 14 18 1 6 0 0 0 + 8 9 1 0 0 0 0 + 13 12 1 0 0 0 0 + 6 25 1 0 0 0 0 + 4 5 1 0 0 0 0 + 6 5 2 0 0 0 0 + 2 1 1 0 0 0 0 + 3 4 1 0 0 0 0 + 3 2 1 0 0 0 0 + 3 19 1 1 0 0 0 + 20 21 1 6 0 0 0 + 31 22 1 6 0 0 0 + 23 24 1 1 0 0 0 + 30 26 1 0 0 0 0 + 27 26 1 0 0 0 0 + 28 27 1 0 0 0 0 + 29 28 1 0 0 0 0 + 32 28 1 0 0 0 0 + 30 31 1 0 0 0 0 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16335.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16335.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16335.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,45 @@ +Adenosine + Marvin 04240612262D + + 19 21 0 0 1 0 999 V2000 + 0.9372 -0.2267 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 0.9372 -1.0517 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.2227 -1.4642 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 0.2226 -2.2892 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.9371 -2.7017 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 1.6516 -2.2892 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.6516 -1.4642 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.4362 -1.2093 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 2.9212 -1.8768 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.4362 -2.5442 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 2.6912 -3.3290 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 2.2062 -3.9963 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 2.6911 -4.6639 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 2.4361 -5.4485 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.9882 -6.0616 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 3.4757 -4.4089 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 4.1432 -4.8939 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 3.4758 -3.5839 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 4.1432 -3.0990 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 1 2 1 0 0 0 0 + 2 3 1 0 0 0 0 + 2 7 2 0 0 0 0 + 3 4 2 0 0 0 0 + 4 5 1 0 0 0 0 + 5 6 2 0 0 0 0 + 6 7 1 0 0 0 0 + 6 10 1 0 0 0 0 + 7 8 1 0 0 0 0 + 8 9 2 0 0 0 0 + 9 10 1 0 0 0 0 + 11 10 1 1 0 0 0 + 11 12 1 0 0 0 0 + 11 18 1 0 0 0 0 + 12 13 1 0 0 0 0 + 13 14 1 1 0 0 0 + 13 16 1 0 0 0 0 + 14 15 1 0 0 0 0 + 16 17 1 6 0 0 0 + 16 18 1 0 0 0 0 + 18 19 1 6 0 0 0 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16704.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16704.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16704.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,40 @@ +Uridine + Marvin 11190811122D + + 17 18 0 0 1 0 999 V2000 + 0.0000 -0.8250 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 0.0000 0.0000 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + -0.6674 -1.3100 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.6675 -1.3100 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.7145 0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7144 0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.4125 -2.0946 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.4125 -2.0946 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 1.4521 -1.0550 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.7145 1.2375 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 1.4290 0.0000 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7144 1.2375 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.8975 -2.7620 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0000 1.6500 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.8974 -2.7620 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.5618 -3.5157 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0000 2.4750 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 1 2 1 1 0 0 0 + 1 3 1 0 0 0 0 + 1 4 1 0 0 0 0 + 2 5 1 0 0 0 0 + 2 6 1 0 0 0 0 + 3 7 1 0 0 0 0 + 4 8 1 0 0 0 0 + 4 9 1 6 0 0 0 + 5 10 1 0 0 0 0 + 5 11 2 0 0 0 0 + 6 12 2 0 0 0 0 + 7 15 1 1 0 0 0 + 8 13 1 6 0 0 0 + 10 14 1 0 0 0 0 + 14 17 2 0 0 0 0 + 7 8 1 0 0 0 0 + 12 14 1 0 0 0 0 + 15 16 1 0 0 0 0 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16750.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16750.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_16750.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,47 @@ +Guanosine + Marvin 01220711512D + + 20 22 0 0 1 0 999 V2000 + 0.9372 -1.0517 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.2227 -1.4642 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 0.9371 -2.7017 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 1.6516 -2.2892 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.6516 -1.4642 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.4362 -1.2093 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 2.9212 -1.8768 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.4362 -2.5442 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 2.6912 -3.3290 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 2.2062 -3.9963 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 2.6911 -4.6639 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 2.4361 -5.4485 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.9882 -6.0616 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 3.4757 -4.4089 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 4.1432 -4.8939 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 3.4758 -3.5839 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 4.1432 -3.0990 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.2226 -2.2892 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.4919 -2.7017 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 0.9372 -0.2267 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 20 1 2 0 0 0 0 + 1 2 1 0 0 0 0 + 1 5 1 0 0 0 0 + 2 18 1 0 0 0 0 + 18 3 2 0 0 0 0 + 3 4 1 0 0 0 0 + 4 5 2 0 0 0 0 + 4 8 1 0 0 0 0 + 5 6 1 0 0 0 0 + 6 7 2 0 0 0 0 + 7 8 1 0 0 0 0 + 9 8 1 1 0 0 0 + 9 10 1 0 0 0 0 + 9 16 1 0 0 0 0 + 10 11 1 0 0 0 0 + 11 12 1 1 0 0 0 + 11 14 1 0 0 0 0 + 12 13 1 0 0 0 0 + 14 15 1 6 0 0 0 + 14 16 1 0 0 0 0 + 16 17 1 6 0 0 0 + 18 19 1 0 0 0 0 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17012.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17012.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17012.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,49 @@ +N-acetylneuraminic acid + Marvin 04150817022D + + 22 22 0 0 1 0 999 V2000 + 0.0000 0.8250 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7145 0.4125 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + -0.7145 -0.4125 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.0000 -0.8250 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 0.7145 -0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.4290 0.8249 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.0001 -1.6499 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 2.1433 0.4124 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 1.4290 1.6499 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4289 0.8251 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -2.1434 0.4126 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -1.4288 1.6500 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -2.8578 0.8251 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -2.1434 -0.4124 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -3.5722 0.4127 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7144 1.2375 0.0000 H 0 0 0 0 0 0 0 0 0 0 0 0 + 0.7145 0.4125 0.0000 C 0 0 3 0 0 0 0 0 0 0 0 0 + 0.7145 1.2375 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4289 -0.8249 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7144 -2.0624 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4289 -1.6499 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -2.1434 -2.0624 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 2 1 1 0 0 0 0 + 2 10 1 0 0 0 0 + 2 16 1 1 0 0 0 + 2 3 1 0 0 0 0 + 3 19 1 1 0 0 0 + 3 4 1 0 0 0 0 + 4 7 1 6 0 0 0 + 4 5 1 0 0 0 0 + 1 17 1 0 0 0 0 + 17 5 1 0 0 0 0 + 17 6 1 0 0 0 0 + 6 8 1 0 0 0 0 + 6 9 2 0 0 0 0 + 10 11 1 0 0 0 0 + 10 12 1 1 0 0 0 + 11 13 1 0 0 0 0 + 11 14 1 6 0 0 0 + 13 15 1 0 0 0 0 + 17 18 1 0 0 0 0 + 19 21 1 0 0 0 0 + 21 20 1 0 0 0 0 + 21 22 2 0 0 0 0 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17303.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17303.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17303.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,53 @@ +Morphine + Marvin 02020822302D + + 22 26 0 0 1 0 999 V2000 + 0.0000 -0.8250 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7145 -0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.7145 -0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7145 0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.7145 0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0000 0.8250 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0030 -1.6464 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 0.7109 -2.0631 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + -0.7127 -2.0511 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 1.4268 -1.6510 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.7067 -2.8808 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.5371 -1.1745 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7206 -2.8689 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 1.4310 -0.8297 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.1419 -2.0715 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + -0.0128 -3.2891 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4365 -3.2845 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4262 0.8296 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 2.9416 -1.8530 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.4954 -2.6258 0.0000 H 0 0 0 0 0 0 0 0 0 0 0 0 + 2.1397 -1.2341 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.7183 -1.2330 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 7 1 1 0 0 0 0 + 1 2 1 0 0 0 0 + 2 12 1 0 0 0 0 + 1 3 2 0 0 0 0 + 3 14 1 0 0 0 0 + 2 4 2 0 0 0 0 + 4 18 1 0 0 0 0 + 3 5 1 0 0 0 0 + 4 6 1 0 0 0 0 + 5 6 2 0 0 0 0 + 7 8 1 0 0 0 0 + 7 9 1 0 0 0 0 + 7 22 1 1 0 0 0 + 8 10 1 0 0 0 0 + 8 11 1 0 0 0 0 + 8 20 1 1 0 0 0 + 9 12 1 6 0 0 0 + 9 13 1 0 0 0 0 + 10 15 1 1 0 0 0 + 10 14 1 0 0 0 0 + 11 16 2 0 0 0 0 + 13 17 1 6 0 0 0 + 13 16 1 0 0 0 0 + 15 19 1 0 0 0 0 + 21 15 1 0 0 0 0 + 22 21 1 0 0 0 0 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17334.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17334.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17334.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,43 @@ +Penicillin + Marvin 06160616292D + + 18 19 0 0 0 0 999 V2000 + 1.0179 0.4577 0.0000 S 0 0 0 0 0 0 0 0 0 0 0 0 + 0.2333 -0.6223 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + -0.5917 -0.6223 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.1751 -1.2056 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.2333 0.2027 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.2571 1.0274 0.0000 H 0 0 0 0 0 0 0 0 0 0 0 0 + 1.0179 -0.8772 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.7208 -2.2749 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 1.2728 -1.6618 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.0798 -1.8333 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -0.5917 0.2027 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + -1.1751 0.7861 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + -2.4126 1.5006 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -2.0001 0.7861 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -2.4126 0.0716 0.0000 R# 0 0 0 0 0 0 0 0 0 0 0 0 + 2.2173 0.2027 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.5028 -0.2098 0.0000 C 0 0 3 0 0 0 0 0 0 0 0 0 + 2.2173 -0.6223 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 3 11 1 0 0 0 0 + 5 2 1 0 0 0 0 + 5 1 1 0 0 0 0 + 2 7 1 0 0 0 0 + 7 17 1 0 0 0 0 + 17 1 1 0 0 0 0 + 2 3 1 0 0 0 0 + 11 5 1 0 0 0 0 + 3 4 2 0 0 0 0 + 5 6 1 6 0 0 0 + 7 9 1 6 0 0 0 + 9 8 2 0 0 0 0 + 9 10 1 0 0 0 0 + 11 12 1 1 0 0 0 + 12 14 1 0 0 0 0 + 14 13 2 0 0 0 0 + 14 15 1 0 0 0 0 + 17 16 1 0 0 0 0 + 17 18 1 0 0 0 0 +M RGP 1 15 1 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17562.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17562.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17562.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,40 @@ +Cytidine + Marvin 06160815592D + + 17 18 0 0 1 0 999 V2000 + 0.0000 -0.8250 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 0.7145 -0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7145 -0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.7145 0.4125 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0000 0.8250 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7145 0.4125 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0000 -1.6500 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + -0.6674 -2.1349 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.6674 -2.1349 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -0.4125 -2.9195 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.4125 -2.9195 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 1.4521 -1.8800 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 1.4289 -0.8250 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.8974 -3.5870 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0000 1.6500 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + -0.8974 -3.5870 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.5619 -4.3407 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 7 1 1 1 0 0 0 + 1 2 1 0 0 0 0 + 2 13 2 0 0 0 0 + 1 3 1 0 0 0 0 + 2 4 1 0 0 0 0 + 4 5 2 0 0 0 0 + 5 15 1 0 0 0 0 + 3 6 2 0 0 0 0 + 6 5 1 0 0 0 0 + 7 8 1 0 0 0 0 + 7 9 1 0 0 0 0 + 8 10 1 0 0 0 0 + 9 11 1 0 0 0 0 + 9 12 1 6 0 0 0 + 10 16 1 1 0 0 0 + 10 11 1 0 0 0 0 + 11 14 1 6 0 0 0 + 16 17 1 0 0 0 0 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17579.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17579.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17579.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,86 @@ +Beta-Carotene + Marvin 02060616002D + + 40 41 0 0 0 0 999 V2000 + -6.7893 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -6.0748 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -7.5038 -1.4684 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -8.2182 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -5.3603 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -8.2182 -1.0559 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -4.6459 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -3.9314 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -4.6459 1.0066 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -3.2169 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -2.5025 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.7880 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.0735 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -1.7880 1.0066 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -0.3591 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 0.3554 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.0699 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.7844 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 2.4988 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1.7844 -1.0559 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 3.2133 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 3.9278 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 4.6422 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 5.3567 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 4.6422 -1.0559 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 6.0712 -0.2309 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 6.7857 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 7.5001 1.4191 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 8.2146 0.1816 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 8.2146 1.0066 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -6.7893 -1.0559 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -6.0748 -1.4684 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 6.0712 1.4191 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 6.7857 1.0066 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -7.9163 0.8961 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -7.5038 0.1816 0.0000 C 0 0 3 0 0 0 0 0 0 0 0 0 + -7.0913 0.8961 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 7.0876 -0.9453 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 7.5001 -0.2309 0.0000 C 0 0 3 0 0 0 0 0 0 0 0 0 + 7.9126 -0.9453 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1 31 2 0 0 0 0 + 1 36 1 0 0 0 0 + 1 2 1 0 0 0 0 + 31 3 1 0 0 0 0 + 36 4 1 0 0 0 0 + 2 5 2 0 0 0 0 + 3 6 1 0 0 0 0 + 5 7 1 0 0 0 0 + 7 8 2 0 0 0 0 + 7 9 1 0 0 0 0 + 8 10 1 0 0 0 0 + 10 11 2 0 0 0 0 + 11 12 1 0 0 0 0 + 12 13 2 0 0 0 0 + 12 14 1 0 0 0 0 + 13 15 1 0 0 0 0 + 15 16 2 0 0 0 0 + 16 17 1 0 0 0 0 + 17 18 2 0 0 0 0 + 18 19 1 0 0 0 0 + 18 20 1 0 0 0 0 + 19 21 2 0 0 0 0 + 21 22 1 0 0 0 0 + 22 23 2 0 0 0 0 + 23 24 1 0 0 0 0 + 23 25 1 0 0 0 0 + 24 26 2 0 0 0 0 + 26 27 1 0 0 0 0 + 27 34 2 0 0 0 0 + 27 39 1 0 0 0 0 + 34 28 1 0 0 0 0 + 39 29 1 0 0 0 0 + 28 30 1 0 0 0 0 + 4 6 1 0 0 0 0 + 29 30 1 0 0 0 0 + 31 32 1 0 0 0 0 + 34 33 1 0 0 0 0 + 36 35 1 0 0 0 0 + 36 37 1 0 0 0 0 + 39 38 1 0 0 0 0 + 39 40 1 0 0 0 0 +M END Added: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17716.mol =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17716.mol (rev 0) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/templates/Miscellaneous/ChEBI_17716.mol 2009-10-06 15:40:55 UTC (rev 14932) @@ -0,0 +1,52 @@ +Lactose + Marvin 01050823512D + + 23 24 0 0 1 0 999 V2000 + 0.0000 2.4750 0.0000 C 0 0 3 0 0 0 0 0 0 0 0 0 + 0.7145 2.0625 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -0.7145 2.0625 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.7145 1.2375 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + -0.7145 1.2375 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.0000 0.8250 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + 0.0000 3.3000 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 1.4289 2.4750 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 1.4289 0.8250 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 0.0000 0.0000 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4290 0.8250 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -2.1434 1.2375 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -0.7145 -0.4125 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -0.7145 -1.2375 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -1.4290 0.0000 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4290 -1.6500 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + -2.1434 -0.4125 0.0000 C 0 0 1 0 0 0 0 0 0 0 0 0 + -2.1434 -1.2375 0.0000 C 0 0 2 0 0 0 0 0 0 0 0 0 + 0.0000 -1.6500 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -1.4290 -2.4750 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -2.8579 -1.6500 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + -2.8579 0.0000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + -3.5724 -0.4125 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 1 2 1 0 0 0 0 + 1 3 1 0 0 0 0 + 1 7 1 0 0 0 0 + 2 4 1 0 0 0 0 + 2 8 1 6 0 0 0 + 3 5 1 0 0 0 0 + 4 6 1 0 0 0 0 + 4 9 1 1 0 0 0 + 5 6 1 0 0 0 0 + 5 11 1 1 0 0 0 + 6 10 1 6 0 0 0 + 12 11 1 0 0 0 0 + 13 14 1 0 0 0 0 + 13 15 1 0 0 0 0 + 13 10 1 1 0 0 0 + 14 16 1 0 0 0 0 + 14 19 1 6 0 0 0 + 15 17 1 0 0... [truncated message content] |