Relase 2.6.1

Merge branch '2.6.1'
bioclipse · Sep 30, 2013 · 897d6fa · 897d6fa
2 parents 05b6fa7 + dc058e5
commit 897d6fa
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 7 deletions.
diff --git a/features/net.bioclipse.balloon_feature/feature.xml b/features/net.bioclipse.balloon_feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="net.bioclipse.balloon_feature"
       label="Balloon"
-      version="2.6.0.vqualifier"
+      version="2.6.1.qualifier"
       provider-name="bioclipse.net"
       plugin="net.bioclipse.balloon.business"
       os="linux,macosx,win32">

diff --git a/net.bioclipse.balloon_releng/buckminster.cspec b/net.bioclipse.balloon_releng/buckminster.cspec
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cspec xmlns="http://www.eclipse.org/buckminster/CSpec-1.0" name="net.bioclipse.balloon_releng" componentType="buckminster" version="2.6.1">
+    <dependencies>
+        <dependency name="net.bioclipse.balloon_site" componentType="eclipse.feature" versionDesignator="0.0.1"/>
+        <dependency name="org.slf4j.api" componentType="osgi.bundle"/>
+        <dependency name="log4j.over.slf4j" componentType="osgi.bundle"/>
+        <dependency name="org.eclipse.swt" componentType="osgi.bundle"/>
+        <dependency name="org.eclipse.rcp" componentType="eclipse.feature"/>
+        <!--
+        <dependency name="slf4j.api" componentType="osgi.bundle"/>
+        <dependency name="jcl.over.slf4j" componentType="osgi.bundle"/>
+        <dependency name="log4j.over.slf4j" componentType="osgi.bundle"/>
+        -->
+    </dependencies>
+    <actions>
+      <public name="site.mirror.p2" actor="p2SiteMirror">
+        <prerequisites>
+          <attribute name="site.p2" alias="site"/>
+        </prerequisites>
+        <products base="${bioclipse.mirror}/${bioclipse.mirror.name}" upToDatePolicy="ACTOR" />
+      </public>
+    </actions>
+    <groups>
+        <public name="site.p2">
+            <attribute name="site.p2" component="net.bioclipse.balloon_site"/>
+        </public>
+    </groups>
+</cspec>
diff --git a/plugins/net.bioclipse.balloon.business/META-INF/MANIFEST.MF b/plugins/net.bioclipse.balloon.business/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Balloon
 Bundle-SymbolicName: net.bioclipse.balloon.business;singleton:=true
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Activator: net.bioclipse.balloon.business.Activator
 Bundle-Vendor: The Bioclipse Team
 Require-Bundle: org.eclipse.ui,

diff --git a/...et.bioclipse.balloon.business/src/net/bioclipse/balloon/handlers/BalloonGen3DHandler.java b/...et.bioclipse.balloon.business/src/net/bioclipse/balloon/handlers/BalloonGen3DHandler.java
@@ -103,6 +103,18 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
                                      .getContentType().isKindOf( cmlType ) ) {
                     String output =balloon.generate3Dcoordinates( input.getRawLocation()
                                     .toOSString() );
+                    Display.getDefault().syncExec( new Runnable(){
+                        public void run() {
+                            for (IResource res : final_foldersToRefresh){
+                                try {
+                                    res.refreshLocal( IResource.DEPTH_ONE, new NullProgressMonitor() );
+                                } catch ( CoreException e ) {
+                                    logger.error( "Could not refresh resource: " + res + " - " + e.getMessage() );
+                                }
+                            }
+
+                        }
+                    });
                     ICDKManager cdk = net.bioclipse.cdk.business.Activator
                     					.getDefault().getJavaCDKManager();
                     List<ICDKMolecule> molecules = cdk.loadMolecules(output);

diff --git a/plugins/net.bioclipse.balloon.linux/META-INF/MANIFEST.MF b/plugins/net.bioclipse.balloon.linux/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ballon Linux
 Bundle-SymbolicName: net.bioclipse.balloon.linux
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Vendor: The Bioclipse Team
 Fragment-Host: net.bioclipse.balloon
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/net.bioclipse.balloon.macosx/META-INF/MANIFEST.MF b/plugins/net.bioclipse.balloon.macosx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Balloon Mac OS X
 Bundle-SymbolicName: net.bioclipse.balloon.macosx
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Vendor: The Bioclipse Team
 Fragment-Host: net.bioclipse.balloon
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/net.bioclipse.balloon.tests/META-INF/MANIFEST.MF b/plugins/net.bioclipse.balloon.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Balloon Tests
 Bundle-SymbolicName: net.bioclipse.balloon.tests
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Vendor: The Bioclispe Team
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/plugins/net.bioclipse.balloon.win32/META-INF/MANIFEST.MF b/plugins/net.bioclipse.balloon.win32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ballon Win32
 Bundle-SymbolicName: net.bioclipse.balloon.win32
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Vendor: The Bioclipse Team
 Fragment-Host: net.bioclipse.balloon
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/net.bioclipse.balloon/META-INF/MANIFEST.MF b/plugins/net.bioclipse.balloon/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Eclipse-ExtensibleAPI: true
 Bundle-ManifestVersion: 2
 Bundle-Name: Balloon
 Bundle-SymbolicName: net.bioclipse.balloon
-Bundle-Version: 2.6.0.vqualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Activator: net.bioclipse.balloon.Activator
 Bundle-Vendor: The Bioclipse Project
 Require-Bundle: org.eclipse.ui,