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

Merge "Omaha #3612 Fixed Thin client plugin blacklist" into omaha_14.4.1

Browse source 
Former-commit-id: 3660d4a0c5 [formerly b731fa2258] [formerly 9973cc8340] [formerly 9973cc8340 [formerly 714c42a24d]] [formerly 3660d4a0c5 [formerly b731fa2258] [formerly 9973cc8340] [formerly 9973cc8340 [formerly 714c42a24d]] [formerly ced3e75600 [formerly 9973cc8340 [formerly 714c42a24d] [formerly ced3e75600 [formerly 370411bb2ca890457e0630804c3a6b0b46080c3a]]]]]
Former-commit-id: ced3e75600
Former-commit-id: f970a51f55 [formerly e069fb94b6] [formerly 39334f2fa0] [formerly d253dfebdc683462d8e928b30d6ca680573d23eb [formerly 2ca0b76990fbd1971ac0ad59c24535e635e5edcb] [formerly 39334f2fa0 [formerly 2626b9ff33]]]
Former-commit-id: 7d839f747f1b1f2e9e2399a104da64f5a81e78bf [formerly 76c847eac005ce02dafd5644cba488b3c5770877] [formerly 2600b1d3b5 [formerly 33ba8a4a6c]]
Former-commit-id: fe949b61711f90d55a799aeb348adef4b55ba7cc [formerly 2600b1d3b5]
Former-commit-id: 7dfe8b909f
This commit is contained in:
Nate Jensen 2014-10-27 13:34:22 -05:00 • committed by Gerrit Code Review
commit 3356c412d8
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java
View file

@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.application.WorkbenchAdvisor;
import org.osgi.framework.Bundle;
import com.raytheon.uf.common.comm.HttpClient;
@ -52,6 +51,7 @@ import com.raytheon.uf.viz.thinclient.localization.LocalizationCachePersistence;
import com.raytheon.uf.viz.thinclient.localization.ThinClientLocalizationInitializer;
import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
import com.raytheon.uf.viz.thinclient.refresh.TimedRefresher;
import com.raytheon.viz.ui.personalities.awips.AWIPSWorkbenchAdvisor;
import com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent;
import com.raytheon.viz.ui.personalities.awips.CAVE;
@ -178,12 +178,11 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
/*
* (non-Javadoc)
*
* @see com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent#
* getWorkbenchAdvisor()
* @see com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent#
* createAWIPSWorkbenchAdvisor()
*/
@Override
protected WorkbenchAdvisor getWorkbenchAdvisor() {
// Use custom workbench advisor, will add thin client preferences page
protected AWIPSWorkbenchAdvisor createAWIPSWorkbenchAdvisor() {
return new ThinClientWorkbenchAdvisor();
}

12
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java
View file

@ -122,10 +122,10 @@ public abstract class AbstractAWIPSComponent extends CAVEApplication {
* getWorkbenchAdvisor()
*/
@Override
protected WorkbenchAdvisor getWorkbenchAdvisor() {
protected final WorkbenchAdvisor getWorkbenchAdvisor() {
WorkbenchAdvisor workbenchAdvisor = null;
if ((getRuntimeModes() & WORKBENCH) != 0) {
workbenchAdvisor = new AWIPSWorkbenchAdvisor();
workbenchAdvisor = createAWIPSWorkbenchAdvisor();
} else if (!isNonUIComponent()) {
workbenchAdvisor = new HiddenWorkbenchAdvisor(getComponentName(),
this);
@ -141,6 +141,14 @@ public abstract class AbstractAWIPSComponent extends CAVEApplication {
return workbenchAdvisor;
}
/**
* @return A new instance of {@link AWIPSWorkbenchAdvisor} to use for the
* component's {@link WorkbenchAdvisor}
*/
protected AWIPSWorkbenchAdvisor createAWIPSWorkbenchAdvisor() {
return new AWIPSWorkbenchAdvisor();
}
/*
* (non-Javadoc)
*