Changed.

Bio7 · Jun 30, 2016 · d80dccc · d80dccc
1 parent 19d708c
commit d80dccc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 29 deletions.
diff --git a/com.eco.bio7.WorldWind/META-INF/MANIFEST.MF b/com.eco.bio7.WorldWind/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.0.0
 Bundle-Activator: worldw.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- com.eco.bio7.image;bundle-version="1.5.5",
+ com.eco.bio7.image;bundle-version="1.51.4",
  com.eco.bio7.javaedit;bundle-version="2.0.0",
  com.eco.bio7.libs;bundle-version="2.0.0",
  com.eco.bio7.os,

diff --git a/com.eco.bio7.browser/META-INF/MANIFEST.MF b/com.eco.bio7.browser/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources;bundle-version="3.8.1",
  org.eclipse.ui.ide;bundle-version="3.8.1",
  com.eco.bio7.libs;bundle-version="2.0.0",
- com.eco.bio7.scenebuilder;bundle-version="2.0.0",
+ com.eco.bio7.scenebuilder;bundle-version="2.2.0",
  com.eco.bio7.jfxswt;bundle-version="2.0.0";resolution:=optional,
  com.eco.bio7.util;bundle-version="2.0.0",
  org.eclipse.ui.views

diff --git a/com.eco.bio7.libs/build.properties b/com.eco.bio7.libs/build.properties
@@ -10,7 +10,6 @@ bin.includes = META-INF/,\
                jtwain.dll,\
                gpl.txt,\
                classification/,\
-               libgluegen-rt.so,\
                libjogl.so,\
                libjogl_awt.so,\
                libjogl_cg.so,\
@@ -40,18 +39,11 @@ bin.includes = META-INF/,\
                physics/,\
                GDAL_License.txt,\
                data/,\
-               Excel/,\
-               libs/,\
                math/,\
                processing/,\
                R/,\
-               R/REngine.jar,\
-               R/RserveEngine.jar,\
-               Excel/poi-3.12-20150511.jar,\
-               Excel/poi-ooxml-3.12-20150511.jar,\
-               Excel/poi-ooxml-schemas-3.12-20150511.jar,\
-               libs/org.eclipse.nebula.visualization.widgets_1.0.0.201410030023.jar,\
-               libs/org.eclipse.nebula.visualization.xygraph_1.0.0.201410030023.jar
+               Excel/,\
+               libs/
 src.includes = .classpath,\
                .settings/,\
                META-INF/,\

diff --git a/com.eco.bio7.os/build.properties b/com.eco.bio7.os/build.properties
@@ -2,14 +2,9 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/,\
                src/,\
                win/,\
                bin/,\
                build.properties,\
                .settings/,\
-               lib/jna-platform-4.1.0.jar,\
-               lib/pty4j-0.5.jar,\
-               lib/purejavacomm-0.0.17.jar,\
-               lib/guava-14.0.1.jar,\
-               lib/log4j-1.2.14.jar
+               lib/
diff --git a/com.eco.bio7/META-INF/MANIFEST.MF b/com.eco.bio7/META-INF/MANIFEST.MF
@@ -197,8 +197,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gef,
  org.eclipse.core.filesystem;bundle-version="1.3.200",
  com.eco.bio7.pythonedit;bundle-version="2.0.0",
- Bundled_R;bundle-version="3.2.0",
- com.eco.bio7.image;bundle-version="1.5.5",
+ Bundled_R;bundle-version="3.3.1",
+ com.eco.bio7.image;bundle-version="1.51.4",
  com.eco.bio7.WorldWind;bundle-version="2.0.0",
  com.eco.bio7.albireo;bundle-version="2.1.0",
  com.eco.bio7.browser;bundle-version="2.0.0",
@@ -209,7 +209,7 @@ Require-Bundle: org.eclipse.ui,
  com.eco.bio7.redit;bundle-version="2.0.0",
  com.eco.bio7.util;bundle-version="2.0.0",
  org.eclipse.e4.core.contexts;bundle-version="1.3.100",
- com.eco.bio7.scenebuilder;bundle-version="2.0.0",
+ com.eco.bio7.scenebuilder;bundle-version="2.2.0",
  com.eco.bio7.os;bundle-version="2.0.0",
  org.eclipse.jdt.launching;bundle-version="3.7.100",
  org.eclipse.jdt.ui;bundle-version="3.9.100",

diff --git a/com.eco.bio7/build.properties b/com.eco.bio7/build.properties
@@ -41,11 +41,9 @@ bin.includes = icons/,\
                Bio7.ini,\
                bin/,\
                bio7.icns,\
-               libs/,\
-               libs/jython-standalone-2.7.0.jar,\
-               libs/py4j0.10.1.jar,\
                /com.eco.bio7/plugin_customization.ini,\
-               css/e4_default_win7.css
+               css/e4_default_win7.css,\
+               libs/
 jars.compile.order = 
 src.includes = META-INF/,\
                bin/,\

diff --git a/com.eco.bio7/src/com/eco/bio7/rcp/ApplicationActionBarAdvisor.java b/com.eco.bio7/src/com/eco/bio7/rcp/ApplicationActionBarAdvisor.java
@@ -237,7 +237,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 
 	private IContributionItem showViewItem;
 
-	private IWorkbenchAction switchWorkspaceAction;
+	//private IWorkbenchAction switchWorkspaceAction;
 
 	private IWorkbenchAction refreshAction;
 
@@ -438,8 +438,8 @@ protected void makeActions(final IWorkbenchWindow window) {
 		generateControllerAction = new GenerateControllerAction("Generate Controller Class");
 		register(generateControllerAction);
 
-		switchWorkspaceAction = IDEActionFactory.OPEN_WORKSPACE.create(window);
-		register(switchWorkspaceAction);
+		/*switchWorkspaceAction = IDEActionFactory.OPEN_WORKSPACE.create(window);
+		register(switchWorkspaceAction);*/
 
 		refreshAction = ActionFactory.REFRESH.create(window);
 		register(refreshAction);
@@ -778,7 +778,7 @@ public void menuAboutToShow(IMenuManager m) {
 		fileMenu.add(saveall);
 		fileMenu.add(saveas);
 		fileMenu.add(refreshAction);
-		fileMenu.add(switchWorkspaceAction);
+		//fileMenu.add(switchWorkspaceAction);
 		fileMenu.add(new Separator());
 		fileMenu.add(Import);
 		fileMenu.add(Export);