- * + * * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Apr 9, 2009 njensen Initial creation - * + * Jan 9, 2013 15648 ryu Update colormap when new discrete colrmap is selected. + * *- * + * * @author njensen * @version 1.0 */ @@ -74,8 +73,6 @@ public class DiscreteDisplayUtil { private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(DiscreteDisplayUtil.class); - private static Map
* SOFTWARE HISTORY * Date Ticket# Engineer Description @@ -84,14 +91,16 @@ import com.vividsolutions.jts.geom.Coordinate; * Aug 20, 2008 dglazesk Updated for the new ColorMap interface * Aug 20, 2012 1079 randerso Changed to display all discrete values for * non-overlapping discretes - * + * Jan 9, 2013 15661 ryu Set font for drawing regular Wx/discrete parm labels. + * Jan 10, 2013 15548 ryu Update colorbar when new discrete colormap is selected + * *- * + * * @author chammack * @version 1.0 */ public class DiscreteColorbar implements IColorBarDisplay, - IGridDataChangedListener { + IGridDataChangedListener, IColorMapParametersListener { private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(DiscreteColorbar.class); @@ -126,9 +135,11 @@ public class DiscreteColorbar implements IColorBarDisplay, private boolean lastIscMode; + private ColorMapParameters cmParams; + /** * Constructor for the Discrete Color Bar - * + * * @param parm * The parm * @param colorbarResource @@ -143,16 +154,31 @@ public class DiscreteColorbar implements IColorBarDisplay, this.lastIscMode = parm.getDataManager().getParmManager().iscMode(); parm.getListeners().addGridChangedListener(this); + cmParams = getColorMapParameters(); + cmParams.addListener(this); + } + + private ColorMapParameters getColorMapParameters() { + DataManager dataManager = parm.getDataManager(); + ISpatialDisplayManager spatialDisplayManager = dataManager + .getSpatialDisplayManager(); + ResourcePair resourcePair = spatialDisplayManager + .getResourcePair(parm); + AbstractVizResource resource = resourcePair.getResource(); + ColorMapParameters params = resource.getCapability( + ColorMapCapability.class).getColorMapParameters(); + return params; } /* * (non-Javadoc) - * + * * @see com.raytheon.viz.gfe.rsc.colorbar.IColorBarDisplay#dispose() */ @Override public void dispose() { parm.getListeners().removeGridChangedListener(this); + cmParams.removeListener(this); } @Override @@ -160,9 +186,14 @@ public class DiscreteColorbar implements IColorBarDisplay, lastTime = null; } + @Override + public void colorMapChanged() { + lastTime = null; + } + /** * Gets the Discrete Color map. - * + * * @return Returns the color map used for the discrete data. */ public static ColorMap getFallbackColorMap() { @@ -171,7 +202,7 @@ public class DiscreteColorbar implements IColorBarDisplay, /* * (non-Javadoc) - * + * * @see * com.raytheon.viz.core.drawables.IRenderable#paint(com.raytheon.viz.core * .IGraphicsTarget, com.raytheon.viz.core.drawables.PaintProperties) @@ -395,7 +426,7 @@ public class DiscreteColorbar implements IColorBarDisplay, * Labels that do not fit their designated band on the bar will be * truncated. Pickup value text will always be displayed in full, so any * text it overlaps will not be drawn. - * + * * @param target * The graphics target on which to draw * @param colorTable @@ -516,6 +547,7 @@ public class DiscreteColorbar implements IColorBarDisplay, true); dstring.setText(truncatedLabel, seColorBarTextColor); dstring.setCoordinates(labelLoc, center); + dstring.font = colorbarResource.getColorbarWxLabelFont(); target.drawStrings(dstring); } } @@ -525,7 +557,7 @@ public class DiscreteColorbar implements IColorBarDisplay, /** * Draws the colorbar once colors and patterns have been decided. - * + * * @param target * The graphics target on which to draw. * @param pixelExtent @@ -625,7 +657,7 @@ public class DiscreteColorbar implements IColorBarDisplay, /* * (non-Javadoc) - * + * * @see * com.raytheon.viz.gfe.rsc.colorbar.IColorBarDisplay#getValueAt(double[], * int) diff --git a/cave/com.raytheon.viz.hydro/localization/bundles/hydro/zeroToThreeHourRadarQPF.xml b/cave/com.raytheon.viz.hydro/localization/bundles/hydro/zeroToThreeHourRadarQPF.xml index 0c51ac0cf1..5a71b3e87d 100644 --- a/cave/com.raytheon.viz.hydro/localization/bundles/hydro/zeroToThreeHourRadarQPF.xml +++ b/cave/com.raytheon.viz.hydro/localization/bundles/hydro/zeroToThreeHourRadarQPF.xml @@ -35,7 +35,7 @@
* SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Nov 13, 2006 chammack Initial Creation. - * + * Jan 9, 2013 15648 ryu Fix NPE on closing color editor. + * *- * + * * @author chammack * @version 1 */ @@ -54,7 +55,7 @@ public class ColorEditDialogAction extends AbstractRightClickAction { /* * (non-Javadoc) - * + * * @see org.eclipse.jface.action.Action#run() */ @Override @@ -76,7 +77,8 @@ public class ColorEditDialogAction extends AbstractRightClickAction { .getCurrentWindow().getShell(), container, getSelectedRsc(), false, false); - container.refresh(); + if (container != null) + container.refresh(); } } diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorEditComposite.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorEditComposite.java index 4de6de8d50..6425b3e379 100644 --- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorEditComposite.java +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorEditComposite.java @@ -1,19 +1,19 @@ /** * This software was developed and / or modified by Raytheon Company, * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * + * * U.S. EXPORT CONTROLLED TECHNICAL DATA * This software product contains export-restricted data whose * export/transfer/disclosure is restricted by U.S. law. Dissemination * to non-U.S. persons whether in the United States or abroad requires * an export license or other authorization. - * + * * Contractor Name: Raytheon Company * Contractor Address: 6825 Pine Street, Suite 340 * Mail Stop B8 * Omaha, NE 68106 * 402.291.0100 - * + * * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ @@ -33,17 +33,20 @@ import com.raytheon.uf.common.colormap.ColorMap; /** * Composite for colormap editing - * + * *
- * + * * SOFTWARE HISTORY - * + * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Nov 18, 2010 mschenke Initial creation - * + * Jan 10, 2013 15648 ryu Editing GFE discrete colormap: a check button + * is added and duplicate entries in the colormap + * are removed when it is selected. + * *- * + * * @author mschenke * @version 1.0 */ @@ -76,6 +79,11 @@ public class ColorEditComposite extends Composite implements IColorWheelAction, */ private Button hsbRdo; + /** + * GFE discrete check button. + */ + private Button gfeDiscreteCheck; + /** * Title for the upper color wheel. */ @@ -125,6 +133,9 @@ public class ColorEditComposite extends Composite implements IColorWheelAction, true)); // lowerColorWheel.setColor(colorArray.get(colorArray.size() - 1)); lowerColorWheel.setColor(initial); + + // Create the GFE discrete check button. + createGFEDiscreteButton(); } /** @@ -168,6 +179,32 @@ public class ColorEditComposite extends Composite implements IColorWheelAction, }); } + /** + * Create the GFE discrete check button. + */ + private void createGFEDiscreteButton() { + // Create a group to contain the RGB and HSB radio buttons. + Group discreteGroup = new Group(getParent(), SWT.NONE); + + RowLayout groupRowLayout = new RowLayout(); + groupRowLayout.marginLeft = 10; + groupRowLayout.marginRight = 10; + groupRowLayout.spacing = 10; + discreteGroup.setLayout(groupRowLayout); + discreteGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + // Create the discrete check button. + gfeDiscreteCheck = new Button(discreteGroup, SWT.CHECK); + gfeDiscreteCheck.setText("GFE Discrete"); + gfeDiscreteCheck.setSelection(false); + gfeDiscreteCheck.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + updateColorMap(); + } + }); + } + /** * Change the upper and lower color wheel objects to display either RGB or * HSB. @@ -185,7 +222,7 @@ public class ColorEditComposite extends Composite implements IColorWheelAction, /** * Fill the area between the sliders in the color bar using the color data * provided. - * + * * @param colorData * The color data object containing the RGB color and the alpha * value. @@ -200,7 +237,7 @@ public class ColorEditComposite extends Composite implements IColorWheelAction, * Set the color where the top or bottom slider is pointing. The color wheel * title is used to determine if the color is from the upper color wheel or * the lower color wheel. - * + * * @param colorData * The color data object containing the RGB color and the alpha * value. @@ -221,7 +258,7 @@ public class ColorEditComposite extends Composite implements IColorWheelAction, * A callback method used by the ColorBar class. This method is called to * update the upper or lower color wheel when the mouse is clicked in the * color bar and moved around. - * + * * @param colorData * The color data object containing the RGB color and the alpha * value. @@ -242,6 +279,9 @@ public class ColorEditComposite extends Composite implements IColorWheelAction, */ public void updateColorMap() { colorMap = ColorUtil.buildColorMap(colorBar.getCurrentColors(), null); + if (isGFEDiscrete()) { + colorMap.removeDuplicates(); + } callback.updateColorMap(colorMap); } @@ -277,4 +317,8 @@ public class ColorEditComposite extends Composite implements IColorWheelAction, return colorMap; } + public boolean isGFEDiscrete() { + return gfeDiscreteCheck.getSelection(); + } + } diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorEditDialog.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorEditDialog.java index 4775079360..2bc8c059ab 100644 --- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorEditDialog.java +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorEditDialog.java @@ -1,19 +1,19 @@ /** * This software was developed and / or modified by Raytheon Company, * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * + * * U.S. EXPORT CONTROLLED TECHNICAL DATA * This software product contains export-restricted data whose * export/transfer/disclosure is restricted by U.S. law. Dissemination * to non-U.S. persons whether in the United States or abroad requires * an export license or other authorization. - * + * * Contractor Name: Raytheon Company * Contractor Address: 6825 Pine Street, Suite 340 * Mail Stop B8 * Omaha, NE 68106 * 402.291.0100 - * + * * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ @@ -69,7 +69,7 @@ import com.raytheon.viz.ui.editor.ISelectedPanesChangedListener; /** * This is the main dialog for the Color Edit Dialog. - * + * *
* SOFTWARE HISTORY * Date Ticket# Engineer Description @@ -77,9 +77,12 @@ import com.raytheon.viz.ui.editor.ISelectedPanesChangedListener; * lvenable Initial Creation. * Jul 24, 2007 njensen Hooked into backend. * Oct 17, 2012 1229 rferrel Changes for non-blocking SaveColorMapDialog. - * + * Jan 10, 2013 15648 ryu Editing GFE discrete colormap: a check button + * is added and duplicate entries in the colormap + * are removed when it is selected. + * *- * + * * @author lvenable * @version 1.0 */ @@ -172,7 +175,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /** * Constructor. - * + * * @param parent * Parent shell. */ @@ -606,7 +609,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see * com.raytheon.uf.viz.core.IVizEditorChangedListener#editorChanged(com. * raytheon.uf.viz.core.IDisplayPaneContainer) @@ -626,7 +629,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @seecom.raytheon.uf.viz.core.IRenderableDisplayChangedListener# * renderableDisplayChanged(com.raytheon.uf.viz.core.IDisplayPane, * com.raytheon.uf.viz.core.drawables.IRenderableDisplay, @@ -647,7 +650,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see * com.raytheon.uf.viz.core.rsc.ResourceList.RemoveListener#notifyRemove * (com.raytheon.uf.viz.core.drawables.ResourcePair) @@ -667,7 +670,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see * com.raytheon.uf.viz.core.rsc.ResourceList.AddListener#notifyAdd(com.raytheon * .uf.viz.core.drawables.ResourcePair) @@ -684,7 +687,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see * com.raytheon.uf.viz.core.rsc.IResourceDataChanged#resourceChanged(com * .raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType, @@ -713,7 +716,7 @@ public class ColorEditDialog extends CaveSWTDialog implements } /** - * + * * @param display */ private void removeListeners(IRenderableDisplay display) { @@ -723,7 +726,7 @@ public class ColorEditDialog extends CaveSWTDialog implements } /** - * + * * @param rl */ private void removeListeners(ResourceList rl) { @@ -759,7 +762,7 @@ public class ColorEditDialog extends CaveSWTDialog implements } /** - * + * * @param display */ private void addListeners(IRenderableDisplay display) { @@ -769,7 +772,7 @@ public class ColorEditDialog extends CaveSWTDialog implements } /** - * + * * @param rl */ private void addListeners(ResourceList rl) { @@ -793,7 +796,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see * com.raytheon.viz.ui.editor.ISelectedPaneChangedListener#selectedPaneChanged * (java.lang.String, com.raytheon.uf.viz.core.IDisplayPane) @@ -836,10 +839,18 @@ public class ColorEditDialog extends CaveSWTDialog implements } } + private ColorMap getColorMap() { + ColorMap cm = (ColorMap) cap.getColorMapParameters().getColorMap(); + if (colorEditComp.isGFEDiscrete()) { + cm.removeDuplicates(); + } + return cm; + } + private void officeSaveAs() { if (mustCreate(officeSaveAsDialog)) { - officeSaveAsDialog = new SaveColorMapDialog(shell, (ColorMap) cap - .getColorMapParameters().getColorMap(), true, + officeSaveAsDialog = new SaveColorMapDialog(shell, + getColorMap(), true, currentColormapName); officeSaveAsDialog.setCloseCallback(new ICloseCallback() { @@ -859,8 +870,8 @@ public class ColorEditDialog extends CaveSWTDialog implements private void saveAs() { if (mustCreate(saveAsDialog)) { - saveAsDialog = new SaveColorMapDialog(shell, (ColorMap) cap - .getColorMapParameters().getColorMap(), false, + saveAsDialog = new SaveColorMapDialog(shell, + getColorMap(), false, currentColormapName); saveAsDialog.setCloseCallback(new ICloseCallback() { @@ -879,7 +890,7 @@ public class ColorEditDialog extends CaveSWTDialog implements } private void save() { - ColorMap cm = (ColorMap) cap.getColorMapParameters().getColorMap(); + ColorMap cm = getColorMap(); try { ColorUtil.saveColorMapLocal(cm, currentColormapName, false); } catch (VizException e1) { @@ -914,7 +925,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see * com.raytheon.viz.ui.dialogs.colordialog.IColorBarAction#updateColor(com * .raytheon.viz.ui.dialogs.colordialog.ColorData, boolean) @@ -926,7 +937,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see * com.raytheon.viz.ui.dialogs.colordialog.IColorWheelAction#setColor(com * .raytheon.viz.ui.dialogs.colordialog.ColorData, java.lang.String) @@ -938,7 +949,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see * com.raytheon.viz.ui.dialogs.colordialog.IColorWheelAction#fillColor(com * .raytheon.viz.ui.dialogs.colordialog.ColorData) @@ -950,7 +961,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see com.raytheon.viz.ui.dialogs.colordialog.IColorEditCompCallback# * colorMapUpdated(com.raytheon.uf.common.colormap.ColorMap) */ @@ -987,7 +998,7 @@ public class ColorEditDialog extends CaveSWTDialog implements /* * (non-Javadoc) - * + * * @see com.raytheon.viz.ui.dialogs.colordialog.IColorEditCompCallback# * getColorMapParameters() */ diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java index b1a4f10b66..9c21bb76bd 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java @@ -127,6 +127,8 @@ import com.vividsolutions.jts.geom.Polygon; * but lock immediate cause, implemented in individual template. * Nov 02, 2012 DR 15455 Qinglu Lin Added warngenLayer.setWarningAction() in resetPressed() * and in updateListSelected(). + * Dec 20, 2012 DR 15537 Qinglu Lin Changed the assigned value to trackEditable from false + * to true in boxSelected(). * * * @@ -1246,7 +1248,7 @@ public class WarngenDialog extends CaveSWTDialog implements */ private void boxSelected() { boxEditable = !polygonLocked; - trackEditable = false; + trackEditable = true; warngenLayer.getStormTrackState().editable = trackEditable; warngenLayer.setBoxEditable(boxEditable); warngenLayer.issueRefresh(); diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java index 788a54976a..54c9e5d715 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java @@ -131,7 +131,9 @@ import com.vividsolutions.jts.io.WKTReader; * Nov 30, 2012 15571 Qinglu Lin For NEW, assigned simulatedTime to TMLtime; For COR, used stormLocs * in oldWarn. * Dec 17, 2012 15571 Qinglu Lin For hydro products, resolved issue caused by calling wkt.read(loc) - * while loc is null. + * while loc is null. + * Jan 8, 2013 15664 Qinglu Lin Appended selectedAction to handler.handle()'s argument list. + * * * * @author njensen @@ -790,7 +792,7 @@ public class TemplateRunner { String text = script.toString(); WarningTextHandler handler = WarningTextHandlerFactory.getHandler( selectedAction, text, config.getAutoLockText()); - String handledText = handler.handle(text, areas, cancelareas); + String handledText = handler.handle(text, areas, cancelareas, selectedAction); return handledText; } diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java index 174fb80d0a..8379232b92 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java @@ -29,6 +29,11 @@ import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; +import com.raytheon.uf.common.dataplugin.warning.WarningRecord.WarningAction; +import com.raytheon.uf.common.dataplugin.warning.util.FileUtil; +import com.raytheon.uf.common.status.IUFStatusHandler; +import com.raytheon.uf.common.status.UFStatus; +import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.viz.texteditor.util.VtecObject; import com.raytheon.viz.texteditor.util.VtecUtil; import com.raytheon.viz.warngen.gis.AffectedAreas; @@ -44,6 +49,10 @@ import com.raytheon.viz.warngen.gis.AffectedAreas; * ------------ ---------- ----------- -------------------------- * Sep 24, 2012 15332 jsanchez Initial creation * Oct 18, 2012 15332 jsanchez Updated the find method. + * Jan 8, 2013 15664 Qinglu Lin Appended WarningAction to lock()'s parameter list; + * moved the following methods from InitialLockingBehavior to this class: + * bulletIndices(), header(), firstBullet(), secondBullet(), getImmediateCausesPtrn(); + * updated body(), header(), and secondBullet(); * * * @@ -81,6 +90,13 @@ abstract public class AbstractLockingBehavior implements ICommonPatterns { + "|(TORNADO WARNING)|(MARINE WEATHER STATEMENT)|(SHORT TERM FORECAST)" + "|(SPECIAL WEATHER STATEMENT)|(SPECIAL MARINE WARNING)"; + private static final transient IUFStatusHandler statusHandler = UFStatus + .getHandler(AbstractLockingBehavior.class); + + private static Pattern immediateCausePtrn = null; + + protected WarningAction action = null; + /** * Locks the particular strings in the texts based on common patterns and * the affected areas. @@ -91,8 +107,9 @@ abstract public class AbstractLockingBehavior implements ICommonPatterns { * @return */ public String lock(String text, AffectedAreas[] affectedAreas, - AffectedAreas[] canceledAreas) { + AffectedAreas[] canceledAreas, WarningAction action) { this.text = text; + this.action = action; intialize(affectedAreas, canceledAreas); ugc(); htec(); @@ -110,10 +127,166 @@ abstract public class AbstractLockingBehavior implements ICommonPatterns { return this.text; } + protected void body() { + header(); + firstBullet(); + secondBullet(); + } + /** - * Calls the sub classes implementation of the body method. + * Helper method to determine the index of each bullet. + * + * @return */ - abstract protected void body(); + private Integer[] bulletIndices() { + List
* SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Aug 20, 2008 bclements Initial creation + * Jan 10, 2013 15648 ryu Added equals() method. *- * + * * @author bclements * @version 1.0 */ @@ -102,4 +103,18 @@ public class Color { public void setGreen(float f) { green = f; } + + @Override + public boolean equals(Object obj) { + if (obj instanceof Color) { + Color c = (Color) obj; + if (alpha == c.alpha && + red == c.red && + blue == c.blue && + green == c.green) + return true; + } + + return false; + } } diff --git a/edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/ColorMap.java b/edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/ColorMap.java index 9bb6922a70..bea147d247 100644 --- a/edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/ColorMap.java +++ b/edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/ColorMap.java @@ -1,19 +1,19 @@ /** * This software was developed and / or modified by Raytheon Company, * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * + * * U.S. EXPORT CONTROLLED TECHNICAL DATA * This software product contains export-restricted data whose * export/transfer/disclosure is restricted by U.S. law. Dissemination * to non-U.S. persons whether in the United States or abroad requires * an export license or other authorization. - * + * * Contractor Name: Raytheon Company * Contractor Address: 6825 Pine Street, Suite 340 * Mail Stop B8 * Omaha, NE 68106 * 402.291.0100 - * + * * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ @@ -37,11 +37,11 @@ import com.raytheon.uf.common.serialization.ISerializableObject; /** * Implementation of a colormap - * + * *
- * + * * SOFTWARE HISTORY - * + * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Feb 5, 2007 chammack Initial Creation. @@ -49,9 +49,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject; * Aug 20, 2008 bclement Added JaXB annotations and color class * Aug 20, 2008 dglazesk Added some interface pieces to make this more * usable - * + * Jan 10, 2013 15648 ryu Added removeDuplicates() method. + * *- * + * * @author chammack * @version 1 */ @@ -80,8 +81,8 @@ public class ColorMap extends AbstractColorMap implements ISerializableObject { } /** - * - * + * + * */ public ColorMap(String name, float[] red, float[] green, float[] blue) { this.colors = new ArrayList
+ * Implementation note: The given stream handler will be used at least
+ * twice: Once to determine the length, another to actually send the
+ * content. This is done because pypies does not accept chunked requests
+ * bodies.
+ *
+ * @param address
+ * @param handler the handler responsible for generating the message to be posted
+ * @return
+ * @throws CommunicationException
+ */
+ public byte[] postBinary(String address, OStreamHandler handler) throws CommunicationException {
+ class OStreamEntity extends AbstractHttpEntity {
+ OStreamHandler handler;
+ long contentLength = -1;
+
+ public OStreamEntity(OStreamHandler handler) {
+ this.handler = handler;
+ }
+
+ @Override
+ public InputStream getContent() throws IOException,
+ IllegalStateException {
+ throw new IllegalStateException("OStreamEntity does not support getContent().");
+ }
+
+ @Override
+ public long getContentLength() {
+ if (contentLength < 0) {
+ class CountingStream extends OutputStream {
+ long count;
+
+ @Override
+ public void write(int b) throws IOException {
+ ++count;
+ }
+
+ @Override
+ public void write(byte[] b) throws IOException {
+ count += b.length;
+ }
+
+ @Override
+ public void write(byte[] b, int off, int len)
+ throws IOException {
+ count += len;
+ }
+ }
+
+ CountingStream cs = new CountingStream();
+ try {
+ handler.writeToStream(cs);
+ contentLength = cs.count;
+ } catch (CommunicationException e) {
+ // ignore
+ }
+ }
+ return contentLength;
+ }
+
+ @Override
+ public boolean isRepeatable() {
+ return true;
+ }
+
+ @Override
+ public boolean isStreaming() {
+ return false;
+ }
+
+ @Override
+ public void writeTo(OutputStream stream) throws IOException {
+ try {
+ handler.writeToStream(stream);
+ } catch (CommunicationException e) {
+ throw new IOException(e.getMessage(), e.getCause());
+ }
+ }
+ }
+
+ OStreamEntity entity = new OStreamEntity(handler);
+ HttpPost put = new HttpPost(address);
+ put.setEntity(entity);
+
+ return executePostMethod(put);
+ }
+
/**
* Post a string to an endpoint and stream the result back.
*
@@ -592,6 +683,15 @@ public class HttpClient {
throws CommunicationException;
}
+ /**
+ * Responsible for writing HTTP content to a stream. May be called
+ * more than once for a given entity. See postBinary(String, OStreamHandler)
+ * for details.
+ */
+ public static interface OStreamHandler {
+ public void writeToStream(OutputStream os) throws CommunicationException;
+ }
+
/**
* Automatically reads a stream into a byte array and stores the byte array
* in byteResult. Should only be used internally in HttpClient with
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
index 0b614003f1..faf88b060d 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
@@ -61,6 +61,7 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory;
* Apr 11, 2012 #14691 Qinglu Lin For marine warnings, getFeAreaField() returns null.
* So, do not add the returned value of getFeAreaField()
* to areaFields.
+ * Jan 9, 2013 15600 Qinglu Lin Execute "timezones = myTimeZones;" even if timezones != null.
*
*
*
@@ -118,9 +119,7 @@ public class GeospatialFactory {
GeospatialData[] parentAreas = dataSet.getParentAreas();
GeospatialData[] myTimeZones = dataSet.getTimezones();
if (myTimeZones != null && myTimeZones.length > 0) {
- if (timezones == null) {
- timezones = myTimeZones;
- }
+ timezones = myTimeZones;
for (GeospatialData tz : myTimeZones) {
tz.prepGeom = PreparedGeometryFactory.prepare(tz.geometry);
diff --git a/edexOsgi/com.raytheon.uf.common.pypies/src/com/raytheon/uf/common/pypies/PyPiesDataStore.java b/edexOsgi/com.raytheon.uf.common.pypies/src/com/raytheon/uf/common/pypies/PyPiesDataStore.java
index 5f5e864c21..e1c1eca3fe 100644
--- a/edexOsgi/com.raytheon.uf.common.pypies/src/com/raytheon/uf/common/pypies/PyPiesDataStore.java
+++ b/edexOsgi/com.raytheon.uf.common.pypies/src/com/raytheon/uf/common/pypies/PyPiesDataStore.java
@@ -2,11 +2,13 @@ package com.raytheon.uf.common.pypies;
import java.io.File;
import java.io.FileNotFoundException;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import com.raytheon.uf.common.comm.CommunicationException;
import com.raytheon.uf.common.comm.HttpClient;
import com.raytheon.uf.common.datastorage.DuplicateRecordStorageException;
import com.raytheon.uf.common.datastorage.IDataStore;
@@ -31,6 +33,8 @@ import com.raytheon.uf.common.pypies.response.ErrorResponse;
import com.raytheon.uf.common.pypies.response.FileActionResponse;
import com.raytheon.uf.common.pypies.response.RetrieveResponse;
import com.raytheon.uf.common.pypies.response.StoreResponse;
+import com.raytheon.uf.common.serialization.DynamicSerializationManager;
+import com.raytheon.uf.common.serialization.DynamicSerializationManager.SerializationType;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.util.FileUtil;
@@ -66,6 +70,7 @@ import com.raytheon.uf.common.util.FileUtil;
* ------------ ---------- ----------- --------------------------
* May 27, 2010 njensen Initial creation
* Oct 01, 2010 rjpeter Added logging of requests over 300ms
+ * Mon 07, 2013 DR 15294 D. Friedman Stream large requests
*
*
* @author njensen
@@ -76,6 +81,8 @@ public class PyPiesDataStore implements IDataStore {
private static final long SIMPLE_LOG_TIME = 300;
+ private static final long HUGE_REQUEST = 1024 * 1024 * 25;
+
protected static String address = null;
protected List