Issue #1967 fix annoying warnings, remove unused preferences page

Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: ed7b0fc8c5 [formerly ed7b0fc8c5 [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]
Former-commit-id: 3f85aeb00a
Former-commit-id: 0b48f54f47
This commit is contained in:
Nate Jensen 2013-05-28 14:30:26 -05:00
parent 95371e7ec0
commit e7f6bee025
3 changed files with 40 additions and 24 deletions

View file

@ -354,27 +354,6 @@ F | 1.8 |-459.67| 4 | | |..|8000F0FF| | 0 | 5
</contourLabeling> </contourLabeling>
</contourStyle> </contourStyle>
</styleRule> </styleRule>
<!-- Rule for temperature grids 2m AGL -->
<styleRule>
<paramLevelMatches>
<parameter>T</parameter>
<parameter>DpT</parameter>
<rangeLevel units="AGL">
<upper>2</upper>
<lower>2</lower>
</rangeLevel>
</paramLevelMatches>
<contourStyle>
<displayUnits>F</displayUnits>
<range scale="LINEAR">
<minValue>-100</minValue>
<maxValue>115</maxValue>
</range>
<contourLabeling>
<increment>20</increment>
</contourLabeling>
</contourStyle>
</styleRule>
<!-- * T, TxSM, DpT, TW, TV, Tmean, DpTmean <!-- * T, TxSM, DpT, TW, TV, Tmean, DpTmean
C | 1 |-273.15| 4 | | |..|8000F0FF| | 0 | 2 C | 1 |-273.15| 4 | | |..|8000F0FF| | 0 | 2
--> -->

View file

@ -361,4 +361,18 @@
install-size="0" install-size="0"
version="0.0.0"/> version="0.0.0"/>
<plugin
id="org.eclipse.wst.validation.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.wst.common.frameworks.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

View file

@ -25,6 +25,7 @@ import java.util.Set;
import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtension;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.IPreferenceNode;
import org.eclipse.jface.preference.PreferenceManager; import org.eclipse.jface.preference.PreferenceManager;
import org.eclipse.ui.IPerspectiveDescriptor; import org.eclipse.ui.IPerspectiveDescriptor;
import org.eclipse.ui.IPerspectiveRegistry; import org.eclipse.ui.IPerspectiveRegistry;
@ -46,10 +47,11 @@ import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 7/1/06 chammack Initial Creation. * 7/1/06 chammack Initial Creation.
* Mar 5, 2013 1753 njensen Added shutdown printout * Mar 5, 2013 1753 njensen Added shutdown printout
* May 28, 2013 1967 njensen Remove unused subnode preferences
* *
* </pre> * </pre>
* *
@ -166,6 +168,7 @@ public class VizWorkbenchAdvisor extends WorkbenchAdvisor {
* Removes options from the rcp preferences menu * Removes options from the rcp preferences menu
*/ */
private void removeExtraPreferences() { private void removeExtraPreferences() {
// remove top level preference pages
PreferenceManager preferenceManager = PlatformUI.getWorkbench() PreferenceManager preferenceManager = PlatformUI.getWorkbench()
.getPreferenceManager(); .getPreferenceManager();
preferenceManager.remove("org.eclipse.team.ui.TeamPreferences"); preferenceManager.remove("org.eclipse.team.ui.TeamPreferences");
@ -174,6 +177,26 @@ public class VizWorkbenchAdvisor extends WorkbenchAdvisor {
preferenceManager.remove("org.eclipse.debug.ui.DebugPreferencePage"); preferenceManager.remove("org.eclipse.debug.ui.DebugPreferencePage");
preferenceManager preferenceManager
.remove("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage"); .remove("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage");
preferenceManager.remove("ValidationPreferencePage");
// remove subnode preference pages
IPreferenceNode[] topNodes = preferenceManager.getRootSubNodes();
for (IPreferenceNode root : topNodes) {
String rootId = root.getId();
if (rootId.equals("org.eclipse.ui.preferencePages.Workbench")) {
root.remove("org.eclipse.search.preferences.SearchPreferencePage");
root.remove("org.eclipse.ui.preferencePages.Workspace");
} else if (rootId.equals("org.python.pydev.prefs")) {
root.remove("org.python.pydev.ui.pythonpathconf.interpreterPreferencesPageJython");
root.remove("org.python.pydev.ui.pythonpathconf.interpreterPreferencesPageIronpython");
root.remove("org.python.pydev.prefs.pylint");
root.remove("org.python.pydev.prefs.pyunitPage");
root.remove("org.python.pydev.jython.ui.JyScriptingPreferencesPage");
} else if (rootId.equals("org.eclipse.wst.xml.ui.preferences.xml")) {
root.remove("org.eclipse.wst.xml.core.ui.XMLCatalogPreferencePage");
}
}
} }
/* /*