diff --git a/cave/com.raytheon.uf.viz.collaboration.comm/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.collaboration.comm/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index dd47374322..0000000000 --- a/cave/com.raytheon.uf.viz.collaboration.comm/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Feb 24 08:50:10 CST 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/cave/com.raytheon.uf.viz.collaboration.comm/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.collaboration.comm/META-INF/MANIFEST.MF index 94affcc88b..f2bfc647e8 100644 --- a/cave/com.raytheon.uf.viz.collaboration.comm/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.collaboration.comm/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: com.raytheon.uf.viz.collaboration.comm;singleton:=true Bundle-Version: 1.14.0.qualifier Bundle-Activator: com.raytheon.uf.viz.collaboration.comm.Activator Bundle-Vendor: RAYTHEON -Eclipse-RegisterBuddy: com.raytheon.uf.viz.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.core.runtime, org.apache.commons.lang, diff --git a/cave/com.raytheon.uf.viz.collaboration.display/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.collaboration.display/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c94506db44..0000000000 --- a/cave/com.raytheon.uf.viz.collaboration.display/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Apr 27 11:08:58 CDT 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/cave/com.raytheon.uf.viz.collaboration.display/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.collaboration.display/META-INF/MANIFEST.MF index 4dc3f555d2..8030aaf2ce 100644 --- a/cave/com.raytheon.uf.viz.collaboration.display/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.collaboration.display/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Bundle-Activator: com.raytheon.uf.viz.collaboration.display.Activator Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy -Eclipse-RegisterBuddy: com.raytheon.uf.viz.core Require-Bundle: org.eclipse.core.runtime, com.raytheon.uf.viz.core, com.raytheon.viz.ui, diff --git a/cave/com.raytheon.uf.viz.collaboration.pointdata/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.collaboration.pointdata/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b485d5b5e6..0000000000 --- a/cave/com.raytheon.uf.viz.collaboration.pointdata/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Apr 27 12:09:01 CDT 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/cave/com.raytheon.uf.viz.collaboration.pointdata/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.collaboration.pointdata/META-INF/MANIFEST.MF index cebe041fcd..7772eab10e 100644 --- a/cave/com.raytheon.uf.viz.collaboration.pointdata/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.collaboration.pointdata/META-INF/MANIFEST.MF @@ -2,15 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Collaboration Point data Bundle-SymbolicName: com.raytheon.uf.viz.collaboration.pointdata;singleton:=true -Bundle-Version: 1.0.0.qualifier -Bundle-Activator: com.raytheon.uf.viz.collaboration.pointdata.Activator +Bundle-Version: 1.14.0.qualifier Bundle-Vendor: RAYTHEON -Eclipse-RegisterBuddy: com.raytheon.uf.viz.core Require-Bundle: org.eclipse.core.runtime, com.raytheon.uf.viz.core;bundle-version="1.12.1174", com.raytheon.uf.viz.collaboration.display;bundle-version="1.0.0", com.raytheon.uf.viz.remote.graphics;bundle-version="1.0.0", com.raytheon.viz.pointdata;bundle-version="1.12.1174", com.google.guava;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy diff --git a/cave/com.raytheon.uf.viz.collaboration.pointdata/src/com/raytheon/uf/viz/collaboration/pointdata/Activator.java b/cave/com.raytheon.uf.viz.collaboration.pointdata/src/com/raytheon/uf/viz/collaboration/pointdata/Activator.java deleted file mode 100644 index fad93d1a79..0000000000 --- a/cave/com.raytheon.uf.viz.collaboration.pointdata/src/com/raytheon/uf/viz/collaboration/pointdata/Activator.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.raytheon.uf.viz.collaboration.pointdata; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class Activator implements BundleActivator { - - private static BundleContext context; - - static BundleContext getContext() { - return context; - } - - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext bundleContext) throws Exception { - Activator.context = bundleContext; - } - - /* - * (non-Javadoc) - * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext bundleContext) throws Exception { - Activator.context = null; - } - -} diff --git a/cave/com.raytheon.uf.viz.collaboration.radar/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.collaboration.radar/META-INF/MANIFEST.MF index 0e3f34595d..5e14b22aca 100644 --- a/cave/com.raytheon.uf.viz.collaboration.radar/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.collaboration.radar/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 1.14.0.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy -Eclipse-RegisterBuddy: com.raytheon.uf.viz.core Require-Bundle: com.raytheon.uf.viz.core;bundle-version="1.14", com.raytheon.viz.radar;bundle-version="1.14", com.raytheon.uf.viz.remote.graphics;bundle-version="1.14", diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.collaboration.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 73d5ac30b1..0000000000 --- a/cave/com.raytheon.uf.viz.collaboration.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Wed Feb 15 10:54:29 CST 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.collaboration.ui/META-INF/MANIFEST.MF index 177e6fa54e..178184a825 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.collaboration.ui/META-INF/MANIFEST.MF @@ -4,8 +4,7 @@ Bundle-Name: Collaboration UI Plugin Bundle-SymbolicName: com.raytheon.uf.viz.collaboration.ui;singleton:=true Bundle-Version: 1.14.0 Bundle-Activator: com.raytheon.uf.viz.collaboration.ui.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Eclipse-RegisterBuddy: com.raytheon.uf.viz.core +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: com.raytheon.uf.viz.collaboration.ui Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/cave/com.raytheon.uf.viz.remote.graphics/.settings/org.eclipse.jdt.core.prefs b/cave/com.raytheon.uf.viz.remote.graphics/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bb4ea4f95f..0000000000 --- a/cave/com.raytheon.uf.viz.remote.graphics/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Mon Mar 05 15:58:59 CST 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/cave/com.raytheon.uf.viz.remote.graphics/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.remote.graphics/META-INF/MANIFEST.MF index 3760201478..68a8d0f628 100644 --- a/cave/com.raytheon.uf.viz.remote.graphics/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.remote.graphics/META-INF/MANIFEST.MF @@ -5,9 +5,8 @@ Bundle-SymbolicName: com.raytheon.uf.viz.remote.graphics;singleton:=true Bundle-Version: 1.14.1.qualifier Bundle-Activator: com.raytheon.uf.viz.remote.graphics.Activator Bundle-Vendor: RAYTHEON -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy -Eclipse-RegisterBuddy: com.raytheon.uf.viz.core Eclipse-BuddyPolicy: dependent Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", com.raytheon.uf.viz.core;bundle-version="1.14.3",