Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2006-01-13 06:37:34 +0000
committerslewis2006-01-13 06:37:34 +0000
commit1363281b99661fcf8b219355cf2f7c09ce01cac7 (patch)
tree2123d573693b697e6006270a8100b3314b450208 /framework/bundles/org.eclipse.ecf.discovery/src
parentaac219daf9a14ef2ea01e6c398a05c99d4d6a7d8 (diff)
downloadorg.eclipse.ecf-1363281b99661fcf8b219355cf2f7c09ce01cac7.tar.gz
org.eclipse.ecf-1363281b99661fcf8b219355cf2f7c09ce01cac7.tar.xz
org.eclipse.ecf-1363281b99661fcf8b219355cf2f7c09ce01cac7.zip
Changes to SharedObjectDescription and ECF plugin initialization. Also removed plugin id static variable from most plugins
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.discovery/src')
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryPlugin.java2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/Trace.java7
2 files changed, 4 insertions, 5 deletions
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryPlugin.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryPlugin.java
index 09b0b093c..1433e0fa8 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryPlugin.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryPlugin.java
@@ -22,8 +22,6 @@ public class DiscoveryPlugin extends Plugin {
//Resource bundle.
private ResourceBundle resourceBundle;
- public static final String PLUGIN_ID = "org.eclipse.ecf.discovery";
-
/**
* The constructor.
*/
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/Trace.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/Trace.java
index 0d2f872aa..a5c22eaae 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/Trace.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/Trace.java
@@ -25,7 +25,8 @@ public class Trace {
static {
try {
ON = Platform.inDebugMode();
- String val = System.getProperty(DiscoveryPlugin.PLUGIN_ID+".Trace");
+ String bundleName = DiscoveryPlugin.getDefault().getBundle().getSymbolicName();
+ String val = System.getProperty(bundleName+".Trace");
if (val != null) {
setTrace(true);
isEclipse = false;
@@ -33,11 +34,11 @@ public class Trace {
System.out.println("WARNING: Eclipse platform not available for trace...overridden by system property org.eclipse.ecf.Trace");
} else {
isEclipse = true;
- pluginName = DiscoveryPlugin.PLUGIN_ID;
+ pluginName = bundleName;
}
} catch (Exception e) {
try {
- String val = System.getProperty(DiscoveryPlugin.PLUGIN_ID+".Trace");
+ String val = System.getProperty("org.eclipse.ecf.discovery.Trace");
if (val != null) {
setTrace(true);
isEclipse = false;

Back to the top