xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #3356 remove OBE register buddies from collaboration" into omaha_14.4.1

Browse source 
Former-commit-id: f39c06c87b [formerly 8bb8625edf] [formerly 2a097da5c2] [formerly f39c06c87b [formerly 8bb8625edf] [formerly 2a097da5c2] [formerly 0de385006d [formerly 2a097da5c2 [formerly 91942c044f4c4462a2a76192047c40448754c2ec]]]]
Former-commit-id: 0de385006d
Former-commit-id: 3c14121270 [formerly acb9909b35] [formerly 93d4310ee038b2e247ae182ac8131e45d2309c5d [formerly c6a5a6145e]]
Former-commit-id: fd1f289da72208f802b4cc2c89d5d0505b40344b [formerly f1d071ad10]
Former-commit-id: 4d031466de
This commit is contained in:
Nate Jensen 2014-09-03 10:50:02 -05:00 • committed by Gerrit Code Review
commit cf7031f00e
12 changed files with 5 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.uf.viz.collaboration.comm/.settings/org.eclipse.jdt.core.prefs
View file

@ -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

3
cave/com.raytheon.uf.viz.collaboration.comm/META-INF/MANIFEST.MF
View file

@ -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,

8
cave/com.raytheon.uf.viz.collaboration.display/.settings/org.eclipse.jdt.core.prefs
View file

@ -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

1
cave/com.raytheon.uf.viz.collaboration.display/META-INF/MANIFEST.MF
View file

@ -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,

8
cave/com.raytheon.uf.viz.collaboration.pointdata/.settings/org.eclipse.jdt.core.prefs
View file

@ -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

6
cave/com.raytheon.uf.viz.collaboration.pointdata/META-INF/MANIFEST.MF
View file

@ -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

30
cave/com.raytheon.uf.viz.collaboration.pointdata/src/com/raytheon/uf/viz/collaboration/pointdata/Activator.java
View file

@ -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;
}
}

1
cave/com.raytheon.uf.viz.collaboration.radar/META-INF/MANIFEST.MF
View file

@ -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",

12
cave/com.raytheon.uf.viz.collaboration.ui/.settings/org.eclipse.jdt.core.prefs
View file

@ -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

3
cave/com.raytheon.uf.viz.collaboration.ui/META-INF/MANIFEST.MF
View file

@ -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,

8
cave/com.raytheon.uf.viz.remote.graphics/.settings/org.eclipse.jdt.core.prefs
View file

@ -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

3
cave/com.raytheon.uf.viz.remote.graphics/META-INF/MANIFEST.MF
View file

@ -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",