Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Release 2.6.0
Merge from branch '2.5.x'
  • Loading branch information
goglepox committed Jan 29, 2013
2 parents 5690f0c + 5f8f86f commit 122c6b5
Show file tree
Hide file tree
Showing 54 changed files with 1,332 additions and 289 deletions.
19 changes: 10 additions & 9 deletions features/net.bioclipse.r.walware_feature/feature.xml
Expand Up @@ -2,22 +2,23 @@
<feature
id="net.bioclipse.r.walware_feature"
label="Walware-RJ modules"
version="1.0"
version="1.1.0.qualifier"
provider-name="Bioclipse">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
This feature includes the RJ framework modules from Walware.de,
<description>
This feature includes the RJ framework modules from Walware.de,
that are used in the R integration of Bioclipse.
Version 1.0 points to the latest current version of the modules required for RJ 1.0
Version 1.1 points to the latest current version of the modules
required for RJ 1.1
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
<copyright>
Copyright (c) 2009 The Bioclipse Project Team and others.
All rights reserved.
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
<license url="http://www.eclipse.org/legal/epl-v10.html">
This feature and the accompanying materials are made available under the terms of the Eclipse Public License.
</license>

<plugin
Expand Down
16 changes: 13 additions & 3 deletions features/net.bioclipse.r_feature/feature.xml
Expand Up @@ -2,13 +2,13 @@
<feature
id="net.bioclipse.r_feature"
label="Bioclipse-R Integration"
version="2.5.0.qualifier"
provider-name="The Bioclipse Project"
version="2.6.0.vqualifier"
provider-name="bioclipse.net"
plugin="net.bioclipse.r">
<install-handler library="net.bioclipse.r/"/>

<description>
Feature that extends Bioclipse with R support.
Integration with the statistical language R.
</description>

<copyright>
Expand All @@ -23,6 +23,16 @@
id="net.bioclipse.r.walware_feature"
version="0.0.0"/>

<includes
id="net.bioclipse.statistics_feature"
version="0.0.0"/>

<requires>
<import plugin="net.bioclipse.jama"/>
<import plugin="net.bioclipse.statistics"/>
<import plugin="slf4j.api"/>
</requires>

<plugin
id="net.bioclipse.r"
download-size="0"
Expand Down
7 changes: 4 additions & 3 deletions features/net.bioclipse.statistics_feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="net.bioclipse.statistics_feature"
label="Bioclipse Statistics"
version="2.5.0.qualifier"
version="2.6.0.vqualifier"
provider-name="The Bioclipse Project"
plugin="net.bioclipse.statistics">
<install-handler library="net.bioclipse.statistics/"/>
Expand All @@ -12,10 +12,11 @@
</description>

<copyright>
Various authors.
Copyright (c) 2009 The Bioclipse Project Team and others.
All rights reserved.
</copyright>

<license>
<license url="http://www.eclipse.org/legal/epl-v10.html">
The Eclipse Public License + exception to allow GPL plugins to use this feature as explained in the first Bioclipse paper.
</license>

Expand Down
2 changes: 1 addition & 1 deletion plugins/net.bioclipse.chart/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Bioclipse Charts
Bundle-SymbolicName: net.bioclipse.chart;singleton:=true
Bundle-Version: 2.5.0.qualifier
Bundle-Version: 2.6.0.vqualifier
Bundle-Vendor: The Bioclipse Team
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
5 changes: 3 additions & 2 deletions plugins/net.bioclipse.r.business/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: R Manager Plugin
Bundle-SymbolicName: net.bioclipse.r.business; singleton:=true
Bundle-Version: 2.5.0.qualifier
Bundle-Version: 2.6.0.vqualifier
Bundle-Activator: net.bioclipse.r.business.Activator
Bundle-Vendor: The Bioclipse Project
Export-Package: net.bioclipse.r.business
Expand All @@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.core.runtime,
net.bioclipse.r,
net.bioclipse.business,
net.bioclipse.statistics,
org.eclipse.ui
org.eclipse.ui,
org.eclipse.core.expressions
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: de.walware.rj.data,
de.walware.rj.servi,
Expand Down
Expand Up @@ -49,27 +49,5 @@ public interface IRBusinessManager extends IBioclipseManager {
public String ls();

@Recorded
@PublishedMethod(
methodSummary = "Handles selection and editor content execution"
)
public String evalSnippet(String seltext);

@Recorded
@PublishedMethod(
methodSummary = "Passes source(filepath) to eval"
)
public String source(String filepath);

@Recorded
@PublishedMethod(
methodSummary = "Splits a string on newline and semicolon " +
"and returns a String array of commmands"
)
public String[] parseCommand(String command);
@Recorded
@PublishedMethod(
methodSummary = "Gets the boolean " +
"noting if we have the right R version"
)
public boolean getRightRVersion();
}

0 comments on commit 122c6b5

Please sign in to comment.