getting rid of bundle data
diff --git a/bundles/org.eclipse.e4.languages.javascript.framework/scripts/Bundle.js b/bundles/org.eclipse.e4.languages.javascript.framework/scripts/Bundle.js
index f165f5d..4d863fa 100644
--- a/bundles/org.eclipse.e4.languages.javascript.framework/scripts/Bundle.js
+++ b/bundles/org.eclipse.e4.languages.javascript.framework/scripts/Bundle.js
@@ -1,6 +1,8 @@
-orion.Bundle = function(framework, bundleData) {
+orion.Bundle = function(framework, bundleId, location, headers) {
this._framework = framework;
- this._bundleData = bundleData;
+ this._bundleId = bundleId;
+ this._location = location;
+ this._headers = headers || eval("(" + orion.Framework._fetch(location + "/META-INF/manifest.json") + ")"); //naughty
this._name = null;
this._version = null;
this._singleton = false;
@@ -13,15 +15,14 @@
this._bundleContext = null;
this._script = null;
- var headers = bundleData.getHeaders();
- this._parseName(headers.name);
- this._parseVersion(headers.version);
- this._parseSingleton(headers.singleton);
- this._parseImports(headers.imports);
- this._parseExports(headers.exports);
- this._parseResources(headers.resources);
- this._parsePath(headers.path);
- this._parseGlobals(headers.globals);
+ this._parseName(this._headers.name);
+ this._parseVersion(this._headers.version);
+ this._parseSingleton(this._headers.singleton);
+ this._parseImports(this._headers.imports);
+ this._parseExports(this._headers.exports);
+ this._parseResources(this._headers.resources);
+ this._parsePath(this._headers.path);
+ this._parseGlobals(this._headers.globals);
};
orion.Bundle.UNINSTALLED = 1;
@@ -36,13 +37,13 @@
return this._version;
},
getBundleId : function() {
- return this._bundleData.getBundleId();
+ return this._bundleId;
},
getLocation : function() {
- return this._bundleData.getLocation();
+ return this._location;
},
getHeaders : function() {
- return this._bundleData.getHeaders();
+ return this._headers;
},
getState : function() {
return this._state;
@@ -249,14 +250,14 @@
},
_parsePath : function(header) {
if (!header) {
- this._script = this._bundleData.getHeaders().script || "";
+ this._script = this._headers.script || "";
return;
}
var scripts = [];
for ( var i = 0; i < header.length; i++) {
var path = header[i];
if (path === ".") {
- scripts[i] = this._bundleData.getHeaders().script || "";
+ scripts[i] = this._headers.script || "";
} else {
var scriptURL = this.getResource(path);
scripts[i] = orion.Framework._fetch(scriptURL);
diff --git a/bundles/org.eclipse.e4.languages.javascript.framework/scripts/BundleData.js b/bundles/org.eclipse.e4.languages.javascript.framework/scripts/BundleData.js
deleted file mode 100644
index 1f1c7a6..0000000
--- a/bundles/org.eclipse.e4.languages.javascript.framework/scripts/BundleData.js
+++ /dev/null
@@ -1,17 +0,0 @@
-orion.BundleData = function(bundleId, location, headers) {
- this._bundleId = bundleId;
- this._location = location;
- this._headers = headers || eval("(" + orion.Framework._fetch(location + "/META-INF/manifest.json") + ")"); //naughty
-};
-
-orion.BundleData.prototype = {
- getBundleId : function() {
- return this._bundleId;
- },
- getLocation : function() {
- return this._location;
- },
- getHeaders : function() {
- return this._headers;
- }
-};
diff --git a/bundles/org.eclipse.e4.languages.javascript.framework/scripts/Framework.js b/bundles/org.eclipse.e4.languages.javascript.framework/scripts/Framework.js
index da56a86..d03c0b5 100644
--- a/bundles/org.eclipse.e4.languages.javascript.framework/scripts/Framework.js
+++ b/bundles/org.eclipse.e4.languages.javascript.framework/scripts/Framework.js
@@ -24,8 +24,7 @@
if (location === null)
throw "location cannot be null";
- var bundleData = new orion.BundleData(this._currentBundleId, location, headers);
- var bundle = new orion.Bundle(this, bundleData);
+ var bundle = new orion.Bundle(this, this._currentBundleId, location, headers);
for ( var i = 0; i < this._installOrderBundles.length; i++) {
if (bundle.equals(this._installOrderBundles[i]))
diff --git a/bundles/org.eclipse.e4.languages.javascript.framework/scripts/__global.js b/bundles/org.eclipse.e4.languages.javascript.framework/scripts/__global.js
index e25a6d2..02ef404 100644
--- a/bundles/org.eclipse.e4.languages.javascript.framework/scripts/__global.js
+++ b/bundles/org.eclipse.e4.languages.javascript.framework/scripts/__global.js
@@ -1,3 +1,2 @@
var orion = orion || {};
(function() {orion.global = this;})();
-
