Merge branch '2.5.x' of git://github.com/bioclipse/bioclipse.cheminfo…

…rmatics into 2.5.x
bioclipse · Jun 5, 2012 · f119da6 · f119da6
2 parents b7bf20b + c81b81d
commit f119da6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/features/net.bioclipse.chemoinformatics_feature/feature.xml b/features/net.bioclipse.chemoinformatics_feature/feature.xml
@@ -230,4 +230,11 @@ The Eclipse Public License accompanies this distribution, and is available at ht
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.xmlpull.xpp3"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/plugins/net.bioclipse.cdk.jchempaint/plugin.xml b/plugins/net.bioclipse.cdk.jchempaint/plugin.xml
@@ -714,7 +714,7 @@
        </toolbar>
     </menuContribution>
     <menuContribution
-          locationURI="popup:net.bioclipse.cdk.ui.editors.jchempaint?after=additions">
+          locationURI="popup:net.bioclipse.cdk.ui.editors.jchempaint?after=edits">
        <menu
              label="Change Element">
           <menu

diff --git a/...et.bioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/editor/JChemPaintEditor.java b/...et.bioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/editor/JChemPaintEditor.java
@@ -107,8 +107,8 @@
 import org.openscience.cdk.io.formats.IResourceFormat;
 import org.openscience.cdk.io.formats.MDLV2000Format;
 import org.openscience.cdk.renderer.RendererModel;
-import org.openscience.cdk.renderer.generators.IGenerator;
 import org.openscience.cdk.renderer.generators.AtomNumberGenerator.WillDrawAtomNumbers;
+import org.openscience.cdk.renderer.generators.IGenerator;
 import org.openscience.cdk.renderer.selection.AbstractSelection;
 import org.openscience.cdk.renderer.selection.IChemObjectSelection;
 import org.openscience.cdk.renderer.selection.MultiSelection;
@@ -120,6 +120,7 @@ public class JChemPaintEditor extends EditorPart implements ISelectionListener ,
 
     private Logger logger = Logger.getLogger(JChemPaintEditor.class);
 
+    public static final String     contextMenuId               = "net.bioclipse.cdk.ui.editors.jchempaint";
     public static final String STRUCUTRE_CHANGED_EVENT="structure_changed";
     public static final String MODEL_LOADED = "net.bioclipse.jchempaint.load.model";
 
@@ -434,10 +435,10 @@ public void updateMenu(RendererModel model) {
 
     private void createMenu() {
 
-        MenuManager menuMgr = new MenuManager();
+        MenuManager menuMgr = new MenuManager( contextMenuId, contextMenuId );
+        menuMgr.add( new GroupMarker( "edits" ) );
         menuMgr.add( new GroupMarker( IWorkbenchActionConstants.MB_ADDITIONS ) );
-        getSite().registerContextMenu("net.bioclipse.cdk.ui.editors.jchempaint",
-                                      menuMgr, widget );
+        getSite().registerContextMenu( contextMenuId, menuMgr, widget );
 
         menu = menuMgr.createContextMenu( widget );
         widget.setMenu( menu );

diff --git a/...net.bioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/outline/JCPOutlinePage.java b/...net.bioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/outline/JCPOutlinePage.java
@@ -59,6 +59,7 @@ public void createControl(Composite parent) {
 
         Tree tree = treeViewer.getTree();
         MenuManager menuMgr = new MenuManager();
+        menuMgr.add( new GroupMarker( "edits" ) );
         menuMgr.add( new GroupMarker( IWorkbenchActionConstants.MB_ADDITIONS ) );
         getSite().registerContextMenu("net.bioclipse.cdk.ui.editors.jchempaint",
                                       menuMgr, treeViewer );

diff --git a/plugins/net.bioclipse.cml/META-INF/MANIFEST.MF b/plugins/net.bioclipse.cml/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  net.bioclipse.ui,
  org.eclipse.swt,
- org.eclipse.ui
+ org.eclipse.ui,
+ org.xmlpull.xpp3;bundle-version="1.1.4"
 Bundle-ClassPath: .
 Bundle-Activator: net.bioclipse.cml.managers.Activator
 Bundle-ActivationPolicy: lazy
@@ -23,4 +24,4 @@ Export-Package: net.bioclipse.cml.handlers,
 Import-Package: nu.xom;version="1.1.0",
  org.xmlcml.cml.base,
  org.xmlcml.cml.element,
- org.xmlpull.v1;version="[0.0.0,1.0.0)"
+ org.xmlpull.v1