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

Merge "Omaha #3266 remove redbook menu util's use of dataURIs" into omaha_14.4.1

Browse source 
Former-commit-id: 13a194bbbe01dce46d4fceec127e42c8a106a096
This commit is contained in:
Nate Jensen 2014-06-10 10:45:04 -05:00 • committed by Gerrit Code Review
commit 156744e43d
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/menu/RedbookMenuUtil.java
View file

@ -55,6 +55,7 @@ import com.raytheon.uf.edex.plugin.redbook.ingest.xml.RedbookMenusXML;
* Mar 14, 2014 2855 mpduff Refactored common code. * Mar 14, 2014 2855 mpduff Refactored common code.
* Mar 19, 2014 2860 mpduff Implemented Redbook UpperAir. * Mar 19, 2014 2860 mpduff Implemented Redbook UpperAir.
* Apr 30, 2014 2860 mpduff Fixed instances of empty substitution tags. * Apr 30, 2014 2860 mpduff Fixed instances of empty substitution tags.
* Jun 09, 2014 3266 njensen Removed reference to dataURIs
* *
* </pre> * </pre>
* *
@ -98,8 +99,7 @@ public abstract class RedbookMenuUtil extends AbstractMenuUtil {
*/ */
protected void createContext() { protected void createContext() {
try { try {
Class[] classes = new Class[] { RedbookMenusXML.class }; JAXBContext jax = JAXBContext.newInstance(RedbookMenusXML.class);
JAXBContext jax = JAXBContext.newInstance(classes);
this.unmarshaller = jax.createUnmarshaller(); this.unmarshaller = jax.createUnmarshaller();
} catch (JAXBException e) { } catch (JAXBException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
@ -188,8 +188,6 @@ public abstract class RedbookMenuUtil extends AbstractMenuUtil {
commonBundleMenuContribution.substitutions = subList commonBundleMenuContribution.substitutions = subList
.toArray(new VariableSubstitution[subList.size()]); .toArray(new VariableSubstitution[subList.size()]);
commonBundleMenuContribution.dataURIs = dataUriList
.toArray(new String[dataUriList.size()]);
} }
return commonBundleMenuContribution; return commonBundleMenuContribution;