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

Omaha #3612 Fixed Thin client plugin blacklist

Browse source 
Change-Id: I989656df46a6ebd9dd64c41f44f9335591848d42

Former-commit-id: b3f42acd1a8fc814b7fa1e094f1f39f8a374567d
This commit is contained in:
Max Schenkelberg 2014-10-27 13:06:31 -05:00
parent 8d25cfcc94
commit 629d56f480
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 java.util.List;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.application.WorkbenchAdvisor;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
import com.raytheon.uf.common.comm.HttpClient; 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.localization.ThinClientLocalizationInitializer;
import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants; import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
import com.raytheon.uf.viz.thinclient.refresh.TimedRefresher; 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.AbstractAWIPSComponent;
import com.raytheon.viz.ui.personalities.awips.CAVE; import com.raytheon.viz.ui.personalities.awips.CAVE;
@ -178,12 +178,11 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent# * @see com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent#
* getWorkbenchAdvisor() * createAWIPSWorkbenchAdvisor()
*/ */
@Override @Override
protected WorkbenchAdvisor getWorkbenchAdvisor() { protected AWIPSWorkbenchAdvisor createAWIPSWorkbenchAdvisor() {
// Use custom workbench advisor, will add thin client preferences page
return new ThinClientWorkbenchAdvisor(); 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() * getWorkbenchAdvisor()
*/ */
@Override @Override
protected WorkbenchAdvisor getWorkbenchAdvisor() { protected final WorkbenchAdvisor getWorkbenchAdvisor() {
WorkbenchAdvisor workbenchAdvisor = null; WorkbenchAdvisor workbenchAdvisor = null;
if ((getRuntimeModes() & WORKBENCH) != 0) { if ((getRuntimeModes() & WORKBENCH) != 0) {
workbenchAdvisor = new AWIPSWorkbenchAdvisor(); workbenchAdvisor = createAWIPSWorkbenchAdvisor();
} else if (!isNonUIComponent()) { } else if (!isNonUIComponent()) {
workbenchAdvisor = new HiddenWorkbenchAdvisor(getComponentName(), workbenchAdvisor = new HiddenWorkbenchAdvisor(getComponentName(),
this); this);
@ -141,6 +141,14 @@ public abstract class AbstractAWIPSComponent extends CAVEApplication {
return workbenchAdvisor; 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) * (non-Javadoc)
* *