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

Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1

Browse source 
Former-commit-id: b3767167c7 [formerly 86f0ed23c1 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]
Former-commit-id: 86f0ed23c1
Former-commit-id: 489fec4b25
This commit is contained in:
Brian.Dyke 2014-08-26 11:45:37 -04:00
commit acc3321457
12 changed files with 65 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java
View file

@ -28,6 +28,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.localization.LocalizationUtil;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.viz.core.procedures.Procedure;
import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.OpenProcedureListDlg;
import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureDlg;
@ -47,7 +49,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Sep 13, 2007 chammack Initial Creation.
* Oct 16, 2012 1229 rferrel Change to use ProcedureDlg.displayDialog.
* Oct 16, 2012 1229 rferrel Changes for non-blocking ProcedureListDlg.
* Jun 7, 2013 2074 mnash Don't open the dialog if no procedures are deserialized
* Jun 07, 2013 2074 mnash Don't open the dialog if no procedures are deserialized
* Aug 11, 2014 3480 bclement added logging
* </pre>
*
* @author chammack
@ -57,6 +60,9 @@ public class OpenAWIPSProcedure extends AbstractHandler {
private OpenProcedureListDlg dialog;
private static final IUFStatusHandler log = UFStatus
.getHandler(OpenAWIPSProcedure.class);
/*
* (non-Javadoc)
*
@ -78,6 +84,8 @@ public class OpenAWIPSProcedure extends AbstractHandler {
Procedure p = (Procedure) LoadSerializedXml
.deserialize(f);
if (p != null) {
log.info("Loading display file: "
+ f.getAbsolutePath());
ProcedureDlg.displayDialog(LocalizationUtil
.extractName(selectedFile.getName()), p,
VizWorkbenchManager.getInstance()

2
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
View file

@ -102,6 +102,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
* Jan 16, 2013 DR 15367 D. Friedman Enable save button for Up/Down changes.
* Feb 25, 2013 1640 bsteffen Dispose old display in BundleLoader
* Jun 7, 2013 2074 mnash Remove resource if doesn't instantiate correctly
* Aug 11, 2014 3480 bclement added info logging when procedure is loaded
* </pre>
*
* @author unknown
@ -863,6 +864,7 @@ public class ProcedureDlg extends CaveSWTDialog {
}
private void load(final Bundle b) {
statusHandler.info("Loading bundle: " + b.getName());
String editorName = null;
if (b.getDisplays().length > 0) {
editorName = DescriptorMap.getEditorId(b.getDisplays()[0]

16
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
View file

@ -21,8 +21,8 @@ package com.raytheon.viz.core.gl;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.util.LinkedList;
import java.util.List;
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
@ -41,6 +41,8 @@ import javax.media.opengl.GL;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 17, 2012 bsteffen Initial creation
* Aug 13, 2014 3510 bclement changed autoDisposers to map,
* remove auto if dispose called with disposer
*
* </pre>
*
@ -51,7 +53,7 @@ public class GLDisposalManager {
private static ReferenceQueue<Object> refQueue = new ReferenceQueue<Object>();
private static List<GLAutoDisposer> autoDisposers = new LinkedList<GLAutoDisposer>();
private static Map<GLDisposer, GLAutoDisposer> autoDisposers = new IdentityHashMap<GLDisposer, GLAutoDisposer>();
private static Queue<GLDisposer> disposeQueue = new LinkedBlockingQueue<GLDisposer>();
@ -65,6 +67,7 @@ public class GLDisposalManager {
*/
private static void dispose(GLDisposer disposer) {
disposeQueue.add(disposer);
autoDisposers.remove(disposer);
}
/**
@ -73,7 +76,8 @@ public class GLDisposalManager {
* the disposer must have no references to object. Object should be the only
* thing using these GL resources, this will not work for anything which
* might be shared by multiple objects. This will also result in the dispose
* method of the disposer being called more than once so it should clear any
* method of the disposer being called more than once so it should be
* idempotent.
*
* @param disposer
* - a disposer that will be called when object is garbage
@ -82,7 +86,7 @@ public class GLDisposalManager {
* - an object which uses a gl resource.
*/
public static void autoDispose(GLDisposer disposer, Object object) {
autoDisposers.add(new GLAutoDisposer(object, disposer));
autoDisposers.put(disposer, new GLAutoDisposer(object, disposer));
}
/**
@ -99,7 +103,7 @@ public class GLDisposalManager {
}
GLAutoDisposer autoDisposer = (GLAutoDisposer) refQueue.poll();
while (autoDisposer != null) {
autoDisposers.remove(autoDisposer);
autoDisposers.remove(autoDisposer.disposer);
autoDisposer.disposer.dispose();
autoDisposer = (GLAutoDisposer) refQueue.poll();
}

9
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
View file

@ -95,6 +95,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
* Feb 27, 2013 DCS 152 jgerth/elau Support for WWLLN and multiple sources
* Jan 21, 2014 2667 bclement renamed record's lightSource field to source
* Jun 6, 2014 DR 17367 D. Friedman Fix cache object usage.
* Aug 19, 2014 3542 bclement fixed strike count clipping issue
*
* </pre>
*
@ -378,7 +379,13 @@ public class LightningResource extends
if (magnification == 0.0) magnification=(float) 0.01;
IExtent extent = paintProps.getView().getExtent();
/*
* we only want strikes that are visible so we have to filter any
* strikes that aren't in both the clipping pane and the view
*/
IExtent viewExtent = paintProps.getView().getExtent();
IExtent clipExtent = paintProps.getClippingPane();
IExtent extent = viewExtent.intersection(clipExtent);
CacheObject<LightningFrameMetadata, LightningFrame> cacheObject = cacheObjectMap
.get(this.lastPaintedTime);

3
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
View file

@ -66,6 +66,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
* Mar 21, 2013 1638 mschenke Added method to load procedure to window
* Oct 22, 2013 2491 bsteffen Switch serialization to
* ProcedureXmlManager
* Aug 11, 2014 3480 bclement added info logging to execute()
*
* </pre>
*
@ -95,6 +96,8 @@ public class LoadSerializedXml extends AbstractHandler {
String fileName = fd.getFilterPath() + File.separator
+ fd.getFileName();
statusHandler.info("Loading display file: " + fileName);
Object obj = deserialize(new File(fileName));
try {
if (obj != null) {

7
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
View file

@ -41,6 +41,8 @@ import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPartReference;
import org.eclipse.ui.IWorkbenchWindow;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.viz.ui.VizWorkbenchManager;
/**
@ -55,6 +57,7 @@ import com.raytheon.viz.ui.VizWorkbenchManager;
* ------------ ---------- ----------- --------------------------
* Apr 21, 2010 mschenke Initial creation
* Mar 21, 2013 1638 mschenke Added method to get managed perspectives
* Aug 11, 2014 3480 bclement added log message in perspectiveOpened()
*
* </pre>
*
@ -64,6 +67,9 @@ import com.raytheon.viz.ui.VizWorkbenchManager;
public class VizPerspectiveListener implements IPerspectiveListener4 {
private static final IUFStatusHandler log = UFStatus
.getHandler(VizPerspectiveListener.class);
private static final String PERSPECTIVE_MANAGER_EXTENSION = "com.raytheon.viz.ui.perspectiveManager";
private static final String PERSPECTIVE_ID = "perspectiveId";
@ -257,6 +263,7 @@ public class VizPerspectiveListener implements IPerspectiveListener4 {
@Override
public void perspectiveOpened(IWorkbenchPage page,
IPerspectiveDescriptor perspective) {
log.info("Opened perspective: " + perspective.getId());
}
@Override

9
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
View file

@ -16,11 +16,16 @@
<vbSource key="DGEX185" category="Volume" />
<vbSource key="ECMWF-HiRes" category="Volume" />
<vbSource key="ECMF-NorthernHemisphere" category="Volume" />
<vbSource key="GFS229" category="Volume" />
<!-- Old version being replaced by GFS229
<vbSource key="AVN203" category="Volume" />
-->
<vbSource key="GFS201" category="Volume" />
<vbSource key="GFS212" category="Volume" />
<!--Old version being replaced by GFS229
<vbSource key="AVN225" category="Volume" />
<vbSource key="GFS213" category="Volume" />
-->
<vbSource key="ENSEMBLE" category="Volume" views="PLANVIEW TIMESERIES"/>
<vbSource key="AVN-NorthernHemisphere" category="Volume" />
<vbSource key="HiResW-ARW-AK" category="Volume" />
@ -34,7 +39,9 @@
<vbSource key="HiResW-NMM-SJU" category="Volume" />
<vbSource key="HiResW-NMM-West" category="Volume" />
<vbSource key="HRRR" category="Volume" />
<!-- Old version being replaced by GFS229
<vbSource key="MRF204" category="Volume" />
-->
<vbSource key="LAMPQPF" category="Volume" />
<vbSource key="LAPS" category="Volume" />
<vbSource key="ETA218" category="Volume" />
@ -49,7 +56,9 @@
<vbSource key="RUC130" category="Volume" />
<vbSource key="RUC236" category="Volume" />
<vbSource key="GFS161" category="Volume" />
<!-- Old version being replaced by GFS229
<vbSource key="MRF205" category="Volume" />
-->
<vbSource key="SREF212" category="Volume" views="PLANVIEW TIMESERIES"/>
<vbSource key="UKMET-NorthernHemisphere" category="Volume" />
<vbSource key="radar" name="Radar" category="Volume" />

4
edexOsgi/build.edex/build.xml
View file

@ -118,6 +118,10 @@
<param name="feature"
value="com.raytheon.uf.edex.dataprovideragent.feature" />
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.remote.script.feature" />
</antcall>
<!-- SPECIAL CASE -->
<if>

4
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
View file

@ -56,6 +56,7 @@ import com.raytheon.uf.common.util.mapping.MultipleMappingException;
* Apr 30, 2013 1961 bsteffen Add ability to disable grib tables.
* Oct 14, 2013 2473 bsteffen Remove lookup of deprecated grib files.
* Apr 25, 2014 2874 bsteffen Add processType
* Jul 30, 2014 3455 bsteffen Allow model matching with no grid defined.
*
*
* </pre>
@ -148,6 +149,9 @@ public class GribModelLookup {
return model;
}
}
} else {
String key = toKey(center, subcenter, null, process, processType);
return models.get(key);
}
return null;
}

5
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
View file

@ -60,6 +60,11 @@
<datasetId>GFS201</datasetId>
<dt>6</dt>
</info>
<info>
<title>GFS1degGbl</title>
<datasetId>GFS229</datasetId>
<dt>3</dt>
</info>
<info>
<title>gfsLR</title>
<datasetId>mrfNH</datasetId>

2
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
View file

@ -1650,7 +1650,7 @@
</model>
<model>
<name>gfs</name>
<name>GFS229</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>229</grid>

6
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
View file

@ -31,7 +31,7 @@ import java.util.regex.Pattern;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.AppenderBase;
import ch.qos.logback.core.UnsynchronizedAppenderBase;
import ch.qos.logback.core.spi.AppenderAttachable;
/**
@ -44,7 +44,7 @@ import ch.qos.logback.core.spi.AppenderAttachable;
* ------------ ---------- ----------- --------------------------
* Aug 25, 2010 rjpeter Initial creation
* Jun 24, 2013 2142 njensen Changes for logback compatibility
*
* Aug 22, 2014 3534 rjpeter Extend UnsynchronizedAppenderBase.
* </pre>
*
* @author rjpeter
@ -52,7 +52,7 @@ import ch.qos.logback.core.spi.AppenderAttachable;
*/
public class ThreadBasedAppender<E extends ILoggingEvent> extends
AppenderBase<E> implements AppenderAttachable<E> {
UnsynchronizedAppenderBase<E> implements AppenderAttachable<E> {
private Map<String, Appender<E>> appenderMap = new HashMap<String, Appender<E>>();
private Map<String, List<Pattern>> threadPatterns = new HashMap<String, List<Pattern>>();