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

Issue #1996 remove tear offs from GFE by adding a field to enable by perspective

Browse source 
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1

Former-commit-id: 7666c93bd833f935c6b1635adeb385c2fa4e04cc
This commit is contained in:
Matt Nash 2013-05-31 11:16:56 -05:00
parent 3700d27fbf
commit 7895dfa2e4
7 changed files with 169 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
View file

@ -2170,4 +2170,11 @@
value="purge">
</path>
</extension>
<extension
point="com.raytheon.uf.viz.ui.menus.tearoffperspective">
<tearoffperspective
enabled="true"
perspectiveId="com.raytheon.uf.viz.d2d.ui.perspectives.D2D5Pane">
</tearoffperspective>
</extension>
</plugin>

1
cave/com.raytheon.uf.viz.ui.menus/plugin.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension-point id="tearoffperspective" name="tearoffperspective" schema="schema/tearoffperspective.exsd"/>
<extension
point="com.raytheon.uf.viz.localization.localizationpath">
<path

106
cave/com.raytheon.uf.viz.ui.menus/schema/tearoffperspective.exsd Normal file
View file

@ -0,0 +1,106 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="com.raytheon.uf.viz.ui.menus" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
<meta.schema plugin="com.raytheon.uf.viz.ui.menus" id="com.raytheon.uf.viz.ui.menus.tearoff" name="tearoffperspective"/>
</appinfo>
<documentation>
[Enter description of this extension point.]
</documentation>
</annotation>
<element name="extension">
<annotation>
<appinfo>
<meta.element />
</appinfo>
</annotation>
<complexType>
<sequence>
<element ref="tearoffperspective"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="id" type="string">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string">
<annotation>
<documentation>
</documentation>
<appinfo>
<meta.attribute translatable="true"/>
</appinfo>
</annotation>
</attribute>
</complexType>
</element>
<element name="tearoffperspective">
<complexType>
<attribute name="perspectiveId" type="string" use="required">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
<attribute name="enabled" type="boolean" use="required">
<annotation>
<documentation>
</documentation>
</annotation>
</attribute>
</complexType>
</element>
<annotation>
<appinfo>
<meta.section type="since"/>
</appinfo>
<documentation>
[Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="examples"/>
</appinfo>
<documentation>
[Enter extension point usage example here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
[Enter API information here.]
</documentation>
</annotation>
<annotation>
<appinfo>
<meta.section type="implementation"/>
</appinfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
</annotation>
</schema>

44
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuListener.java
View file

@ -23,6 +23,11 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.ContributionItem;
@ -43,6 +48,7 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.viz.ui.VizWorkbenchManager;
import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
/**
* Menu listener that adds item to menu which will open dialog which is the menu
@ -72,14 +78,35 @@ public class TearOffMenuListener implements IMenuListener2 {
public static final String TEAROFF_PREFERENCE_ID = "tearoffmenus";
private static final String TEAROFF_DISABLED_PERSPECTIVES = "com.raytheon.uf.viz.ui.menus.tearoffperspective";
private static final IUFStatusHandler statusHandler = UFStatus
.getHandler(TearOffMenuListener.class);
.getHandler(TearOffMenuListener.class);
private static boolean enabled;
private static List<String> enabledPerspectives;
static {
final IPreferenceStore store = com.raytheon.uf.viz.core.Activator
.getDefault().getPreferenceStore();
enabled = store.getBoolean(TEAROFF_PREFERENCE_ID);
enabledPerspectives = new ArrayList<String>();
IExtensionRegistry registry = Platform.getExtensionRegistry();
IExtensionPoint point = registry
.getExtensionPoint(TEAROFF_DISABLED_PERSPECTIVES);
if (point != null) {
IExtension[] extensions = point.getExtensions();
for (IExtension extension : extensions) {
for (IConfigurationElement element : extension
.getConfigurationElements()) {
if (Boolean.valueOf(element.getAttribute("enabled"))) {
enabledPerspectives.add(element
.getAttribute("perspectiveId"));
}
}
}
}
store.addPropertyChangeListener(new IPropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent event) {
@ -149,9 +176,12 @@ public class TearOffMenuListener implements IMenuListener2 {
private Object getPerspectiveKey(IMenuManager manager) {
String perspectiveId = "";
try {
perspectiveId = VizWorkbenchManager.getInstance().getCurrentWindow().getActivePage().getPerspective().getId();
perspectiveId = VizWorkbenchManager.getInstance()
.getCurrentWindow().getActivePage().getPerspective()
.getId();
} catch (Exception e) {
statusHandler.handle(Priority.EVENTA, "Failed to get current perspective ID", e);
statusHandler.handle(Priority.EVENTA,
"Failed to get current perspective ID", e);
}
return perspectiveId + "::" + getKey(manager);
}
@ -210,7 +240,13 @@ public class TearOffMenuListener implements IMenuListener2 {
*/
@Override
public boolean isVisible() {
return super.isVisible() && enabled;
String currPerspective = VizPerspectiveListener
.getCurrentPerspectiveManager().getPerspectiveId();
boolean currPerspectiveEnabled = false;
if (enabledPerspectives.contains(currPerspective)) {
currPerspectiveEnabled = true;
}
return super.isVisible() && enabled && currPerspectiveEnabled;
}
}

3
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/GFEEditAreaMenu.java
View file

@ -30,7 +30,6 @@ import org.eclipse.ui.actions.CompoundContributionItem;
import org.eclipse.ui.menus.CommandContributionItem;
import org.eclipse.ui.menus.CommandContributionItemParameter;
import com.raytheon.uf.viz.ui.menus.widgets.tearoff.TearOffMenuListener;
import com.raytheon.viz.gfe.GFEPreference;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.IReferenceSetManager;
@ -81,7 +80,7 @@ public class GFEEditAreaMenu extends CompoundContributionItem {
MenuManager mm = new MenuManager(group);
menuMgr.add(mm);
mm.addMenuListener(new TearOffMenuListener(mm));
// mm.addMenuListener(new TearOffMenuListener(mm));
int count = 0;
for (String ref : refMgr.getGroupData(group)) {
Map<String, String> parms = new HashMap<String, String>();

7
cave/com.raytheon.viz.hydro/plugin.xml
View file

@ -990,4 +990,11 @@
key="hydroTimeSeries">
</component>
</extension>
<extension
point="com.raytheon.uf.viz.ui.menus.tearoffperspective">
<tearoffperspective
enabled="true"
perspectiveId="com.raytheon.viz.hydro.HydroPerspective">
</tearoffperspective>
</extension>
</plugin>

7
cave/com.raytheon.viz.mpe.ui/plugin.xml
View file

@ -1916,4 +1916,11 @@
key="autodqc">
</component>
</extension>
<extension
point="com.raytheon.uf.viz.ui.menus.tearoffperspective">
<tearoffperspective
enabled="true"
perspectiveId="com.raytheon.viz.mpe.ui.MPEPerspective">
</tearoffperspective>
</extension>
</plugin>