Menu
▾
▴
[Cdk-commits] SF.net SVN: cdk:[13154] jchempaint/trunk
|
From: <sh...@us...> - 2008-11-20 16:51:53
|
Revision: 13154
http://cdk.svn.sourceforge.net/cdk/?rev=13154&view=rev
Author: shk3
Date: 2008-11-20 16:51:50 +0000 (Thu, 20 Nov 2008)
Log Message:
-----------
jcp compiles with jchempaint-primary branch
Modified Paths:
--------------
jchempaint/trunk/META-INF/MANIFEST.MF
jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java
Added Paths:
-----------
jchempaint/trunk/src/main/org/openscience/jchempaint/applet/
jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintApplet.java
jchempaint/trunk/src/main/org/openscience/jchempaint/application/
jchempaint/trunk/src/main/org/openscience/jchempaint/application/JChemPaint.java
Removed Paths:
-------------
jchempaint/trunk/src/main/org/openscience/jchempaint/Main.java
Modified: jchempaint/trunk/META-INF/MANIFEST.MF
===================================================================
--- jchempaint/trunk/META-INF/MANIFEST.MF 2008-11-20 16:38:48 UTC (rev 13153)
+++ jchempaint/trunk/META-INF/MANIFEST.MF 2008-11-20 16:51:50 UTC (rev 13154)
@@ -6,6 +6,6 @@
Bundle-ClassPath: .
Bundle-Vendor: The Chemistry Development Kit Project
Export-Package: org.openscience.jchempaint
-Require-Bundle: org.openscience.cdk;bundle-version="1.1.0"
+Require-Bundle: org.openscience.cdk.jcp;bundle-version="1.1.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Deleted: jchempaint/trunk/src/main/org/openscience/jchempaint/Main.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/Main.java 2008-11-20 16:38:48 UTC (rev 13153)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/Main.java 2008-11-20 16:51:50 UTC (rev 13154)
@@ -1,41 +0,0 @@
-package org.openscience.jchempaint;
-
-import javax.swing.JFrame;
-
-import org.openscience.cdk.DefaultChemObjectBuilder;
-import org.openscience.cdk.interfaces.IAtomContainer;
-import org.openscience.cdk.interfaces.IMolecule;
-import org.openscience.cdk.layout.StructureDiagramGenerator;
-import org.openscience.cdk.smiles.SmilesParser;
-
-public class Main {
-
- public static IAtomContainer makeMolecule(String smiles) {
- SmilesParser parser = new SmilesParser(DefaultChemObjectBuilder.getInstance());
- try {
- IMolecule mol = parser.parseSmiles(smiles);
-
- StructureDiagramGenerator generator = new StructureDiagramGenerator();
- generator.setMolecule(mol);
- generator.generateCoordinates();
-
- return (IAtomContainer) generator.getMolecule();
- } catch (Exception e) {
- return null;
- }
- }
-
- public static void main(String[] args) {
- JFrame f = new JFrame("TestApp");
-
- IAtomContainer ac = Main.makeMolecule("C1=CC=CC=C1");
- if (ac == null) {
- System.exit(0);
- }
- RenderPanel p = new RenderPanel(ac);
- f.add(p);
- f.pack();
- f.setVisible(true);
- }
-
-}
Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2008-11-20 16:38:48 UTC (rev 13153)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2008-11-20 16:51:50 UTC (rev 13154)
@@ -14,6 +14,7 @@
import org.openscience.cdk.controller.SwingMouseEventRelay;
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.renderer.IntermediateRenderer;
+import org.openscience.cdk.tools.manipulator.ChemModelManipulator;
public class RenderPanel extends JPanel implements IViewEventRelay {
@@ -34,8 +35,9 @@
}
public RenderPanel(IAtomContainer ac) {
- this();
this.ac = ac;
+ this.setupMachinery();
+ this.setupPanel();
}
private void setupMachinery() {
@@ -44,8 +46,7 @@
this.controllerModel = new Controller2DModel();
// connect the Renderer to the Hub
- this.hub = new Controller2DHub(this.controllerModel, this.renderer, this);
- this.hub.addAtomContainer(ac);
+ this.hub = new Controller2DHub(this.controllerModel, this.renderer, ChemModelManipulator.newChemModel(ac),this);
// connect mouse events from Panel to the Hub
this.mouseEventRelay = new SwingMouseEventRelay(this.hub);
Added: jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintApplet.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintApplet.java (rev 0)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/applet/JChemPaintApplet.java 2008-11-20 16:51:50 UTC (rev 13154)
@@ -0,0 +1,42 @@
+package org.openscience.jchempaint.applet;
+
+import javax.swing.JFrame;
+
+import org.openscience.cdk.DefaultChemObjectBuilder;
+import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IMolecule;
+import org.openscience.cdk.layout.StructureDiagramGenerator;
+import org.openscience.cdk.smiles.SmilesParser;
+import org.openscience.jchempaint.RenderPanel;
+
+public class JChemPaintApplet {
+
+ public static IAtomContainer makeMolecule(String smiles) {
+ SmilesParser parser = new SmilesParser(DefaultChemObjectBuilder.getInstance());
+ try {
+ IMolecule mol = parser.parseSmiles(smiles);
+
+ StructureDiagramGenerator generator = new StructureDiagramGenerator();
+ generator.setMolecule(mol);
+ generator.generateCoordinates();
+
+ return (IAtomContainer) generator.getMolecule();
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public static void main(String[] args) {
+ JFrame f = new JFrame("TestApp");
+
+ IAtomContainer ac = JChemPaintApplet.makeMolecule("C1=CC=CC=C1");
+ if (ac == null) {
+ System.exit(0);
+ }
+ RenderPanel p = new RenderPanel(ac);
+ f.add(p);
+ f.pack();
+ f.setVisible(true);
+ }
+
+}
Added: jchempaint/trunk/src/main/org/openscience/jchempaint/application/JChemPaint.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/application/JChemPaint.java (rev 0)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/application/JChemPaint.java 2008-11-20 16:51:50 UTC (rev 13154)
@@ -0,0 +1,42 @@
+package org.openscience.jchempaint.application;
+
+import javax.swing.JFrame;
+
+import org.openscience.cdk.DefaultChemObjectBuilder;
+import org.openscience.cdk.interfaces.IAtomContainer;
+import org.openscience.cdk.interfaces.IMolecule;
+import org.openscience.cdk.layout.StructureDiagramGenerator;
+import org.openscience.cdk.smiles.SmilesParser;
+import org.openscience.jchempaint.RenderPanel;
+
+public class JChemPaint {
+
+ public static IAtomContainer makeMolecule(String smiles) {
+ SmilesParser parser = new SmilesParser(DefaultChemObjectBuilder.getInstance());
+ try {
+ IMolecule mol = parser.parseSmiles(smiles);
+
+ StructureDiagramGenerator generator = new StructureDiagramGenerator();
+ generator.setMolecule(mol);
+ generator.generateCoordinates();
+
+ return (IAtomContainer) generator.getMolecule();
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public static void main(String[] args) {
+ JFrame f = new JFrame("TestApp");
+
+ IAtomContainer ac = JChemPaint.makeMolecule("C1=CC=CC=C1");
+ if (ac == null) {
+ System.exit(0);
+ }
+ RenderPanel p = new RenderPanel(ac);
+ f.add(p);
+ f.pack();
+ f.setVisible(true);
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|