+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 21, 2012 0743 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public interface IPresenterView { + + /** + * Performs initialization of the view. + */ + void init(); + + /** + * Display a popup message. + * + * @param title + * the title + * @param message + * the message + */ + void displayPopup(String title, String message); + + /** + * Display an error popup message. + * + * @param title + * the title + * @param message + * the message + */ + void displayErrorPopup(String title, String message); + + /** + * Display a cancel/ok popup. + * + * @param title + * the title + * @param message + * the message + * + * @return boolean true if OK clicked, false if Cancel + */ + boolean displayOkCancelPopup(String title, String message); +} diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/ButtonConf.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/ButtonConf.java new file mode 100644 index 0000000000..9b55e191e7 --- /dev/null +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/ButtonConf.java @@ -0,0 +1,113 @@ +/** + * 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. + **/ +package com.raytheon.uf.viz.core.presenter.components; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * GUI implementation independent representation of a button. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 24, 2012 223 mpduff Initial creation. + * + *+ * + * @author mpduff + * @version 1.0 + */ + +public class ButtonConf extends LabeledWidgetConf { + /** + * Button enabled flag; + */ + private final boolean enabled; + + /** + * Event handler for the button. + */ + private final Runnable onClickAction; + + /** + * Constructor. + * + * @param enabled + * @param displayText + * @param toolTipText + * @param onClickAction + */ + public ButtonConf(boolean enabled, String displayText, String toolTipText, + Runnable onClickAction) { + super(displayText, toolTipText); + + this.enabled = enabled; + this.onClickAction = onClickAction; + } + + /** + * @return the enabled + */ + public boolean isEnabled() { + return enabled; + } + + /** + * @return the onClickAction + */ + public Runnable getOnClickAction() { + return onClickAction; + } + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + HashCodeBuilder builder = new HashCodeBuilder(); + builder.append(enabled); + builder.append(onClickAction); + builder.appendSuper(super.hashCode()); + + return builder.toHashCode(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof ButtonConf) { + ButtonConf other = (ButtonConf) obj; + + EqualsBuilder builder = new EqualsBuilder(); + builder.append(enabled, other.enabled); + builder.append(onClickAction, other.onClickAction); + builder.appendSuper(super.equals(obj)); + + return builder.isEquals(); + } + return super.equals(obj); + } +} diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/CheckBoxConf.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/CheckBoxConf.java new file mode 100644 index 0000000000..e9d67ceda3 --- /dev/null +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/CheckBoxConf.java @@ -0,0 +1,99 @@ +/** + * 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. + **/ +package com.raytheon.uf.viz.core.presenter.components; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * GUI implementation independent representation of a checkbox. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 15, 2012 0743 djohnson Initial creation. + * Aug 29, 2012 0223 mpduff Extend WidgetConf. + * + *+ * + * @author djohnson + * @version 1.0 + */ +public class CheckBoxConf extends LabeledWidgetConf { + private final boolean initiallyChecked; + + private final Runnable onCheckedChangeAction; + + public CheckBoxConf(String displayText, boolean initiallyChecked, + String toolTipText, Runnable onCheckedChangeAction) { + super(displayText, toolTipText); + + this.initiallyChecked = initiallyChecked; + this.onCheckedChangeAction = onCheckedChangeAction; + } + + /** + * @return the initiallyChecked + */ + public boolean isInitiallyChecked() { + return initiallyChecked; + } + + /** + * @return the onCheckedChangeAction + */ + public Runnable getOnCheckedChangeAction() { + return onCheckedChangeAction; + } + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + HashCodeBuilder builder = new HashCodeBuilder(); + builder.append(initiallyChecked); + builder.append(onCheckedChangeAction); + builder.appendSuper(super.hashCode()); + + return builder.toHashCode(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof CheckBoxConf) { + CheckBoxConf other = (CheckBoxConf) obj; + + EqualsBuilder builder = new EqualsBuilder(); + builder.append(initiallyChecked, other.initiallyChecked); + builder.append(onCheckedChangeAction, other.onCheckedChangeAction); + builder.appendSuper(super.equals(obj)); + + return builder.isEquals(); + } + return super.equals(obj); + } +} diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/ComboBoxConf.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/ComboBoxConf.java new file mode 100644 index 0000000000..063b1ded5c --- /dev/null +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/ComboBoxConf.java @@ -0,0 +1,114 @@ +/** + * 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. + **/ +package com.raytheon.uf.viz.core.presenter.components; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * GUI implementation independent representation of a combo box. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 16, 2012 0743 djohnson Initial creation + * Aug 29, 2012 0223 mpduff Extend WidgetConf. + * Sep 07, 2012 1102 djohnson Add missing getter for toolTipText. + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public class ComboBoxConf extends WidgetConf { + public static final String SELECT_ONE = "Select One"; + + public static final String NONE_AVAILABLE = "None Available"; + + private final boolean readOnly; + + private final Runnable onSelectionAction; + + /** + * Constructor setting up configuration. + * + * @param readOnly + * whether or not the combo box should be read only + * @param toolTipText + * the tool tip text + * @param onSelectionAction + * on selection action + */ + public ComboBoxConf(boolean readOnly, String toolTipText, + Runnable onSelectionAction) { + super(toolTipText); + this.readOnly = readOnly; + this.onSelectionAction = onSelectionAction; + } + + /** + * @return the readOnly + */ + public boolean isReadOnly() { + return readOnly; + } + + /** + * @return the onSelectionAction + */ + public Runnable getOnSelectionAction() { + return onSelectionAction; + } + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + HashCodeBuilder builder = new HashCodeBuilder(); + builder.append(readOnly); + builder.append(onSelectionAction); + builder.appendSuper(super.hashCode()); + + return builder.toHashCode(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof ComboBoxConf) { + ComboBoxConf other = (ComboBoxConf) obj; + + EqualsBuilder builder = new EqualsBuilder(); + builder.append(readOnly, other.readOnly); + builder.append(onSelectionAction, other.onSelectionAction); + builder.appendSuper(super.equals(obj)); + + return builder.isEquals(); + } + return super.equals(obj); + } +} diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/LabeledWidgetConf.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/LabeledWidgetConf.java new file mode 100644 index 0000000000..8a76f6522e --- /dev/null +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/LabeledWidgetConf.java @@ -0,0 +1,92 @@ +/** + * 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. + **/ +package com.raytheon.uf.viz.core.presenter.components; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * Configuration object for SWT widgets that have displayed text. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Sep 18, 2012 223 mpduff Initial creation + * + *+ * + * @author mpduff + * @version 1.0 + */ + +public class LabeledWidgetConf extends WidgetConf { + /** Display text */ + protected String displayText; + + /** + * Constructor. + * + * @param displayText + * @param tooltipText + */ + public LabeledWidgetConf(String displayText, String toolTipText) { + super(toolTipText); + this.displayText = displayText; + } + + /** + * @return the displayText + */ + public String getDisplayText() { + return displayText; + } + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + HashCodeBuilder builder = new HashCodeBuilder(); + builder.append(displayText); + builder.appendSuper(super.hashCode()); + + return builder.toHashCode(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof CheckBoxConf) { + CheckBoxConf other = (CheckBoxConf) obj; + + EqualsBuilder builder = new EqualsBuilder(); + builder.append(displayText, other.displayText); + builder.appendSuper(super.equals(obj)); + + return builder.isEquals(); + } + return super.equals(obj); + } +} diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/ListConf.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/ListConf.java new file mode 100644 index 0000000000..65f879d9b6 --- /dev/null +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/ListConf.java @@ -0,0 +1,136 @@ +/** + * 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. + **/ +package com.raytheon.uf.viz.core.presenter.components; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * Configuration object for org.eclipse.swt.widgets.List objects. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Sep 12, 2012 223 mpduff Initial creation + * + *+ * + * @author mpduff + * @version 1.0 + */ + +public class ListConf extends WidgetConf { + private String[] items; + + private boolean singleSelect = true; + + private final int width; + + private final int height; + + public ListConf(String toolTipText, String[] items, boolean singleSelect, int width, int height) { + super(toolTipText); + + this.items = items; + this.singleSelect = singleSelect; + this.width = width; + this.height = height; + } + + /** + * @param items the items to set + */ + public void setItems(String[] items) { + this.items = items; + } + + /** + * @return the items + */ + public String[] getItems() { + return items; + } + + /** + * @param singleSelect the singleSelect to set + */ + public void setSingleSelect(boolean singleSelect) { + this.singleSelect = singleSelect; + } + + /** + * @return the singleSelect + */ + public boolean isSingleSelect() { + return singleSelect; + } + + /** + * @return the width + */ + public int getWidth() { + return width; + } + + /** + * @return the height + */ + public int getHeight() { + return height; + } + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + HashCodeBuilder builder = new HashCodeBuilder(); + builder.append(items); + builder.append(singleSelect); + builder.append(width); + builder.append(height); + builder.appendSuper(super.hashCode()); + + return builder.toHashCode(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof CheckBoxConf) { + ListConf other = (ListConf) obj; + + EqualsBuilder builder = new EqualsBuilder(); + builder.append(items, other.getItems()); + builder.append(singleSelect, other.isSingleSelect()); + builder.append(width, other.getWidth()); + builder.append(height, other.getHeight()); + builder.appendSuper(super.equals(obj)); + + return builder.isEquals(); + } + return super.equals(obj); + } +} diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/WidgetConf.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/WidgetConf.java new file mode 100644 index 0000000000..944b07999d --- /dev/null +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/presenter/components/WidgetConf.java @@ -0,0 +1,88 @@ +/** + * 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. + **/ +package com.raytheon.uf.viz.core.presenter.components; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * Base class for the widget configuration classes. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 26, 2012 223 mpduff Initial creation + * + *+ * + * @author mpduff + * @version 1.0 + */ + +public abstract class WidgetConf { + public static final Runnable DO_NOTHING = new Runnable() { + @Override + public void run() { + } + }; + + protected String toolTipText; + + public WidgetConf(String toolTipText) { + this.toolTipText = toolTipText; + } + + /** + * @return the toolTipText + */ + public String getToolTipText() { + return toolTipText; + } + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + HashCodeBuilder builder = new HashCodeBuilder(); + builder.append(toolTipText); + + return builder.toHashCode(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof WidgetConf) { + WidgetConf other = (WidgetConf) obj; + + EqualsBuilder builder = new EqualsBuilder(); + builder.append(toolTipText, other.toolTipText); + + return builder.isEquals(); + } + return super.equals(obj); + } +} diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/requests/ThriftClient.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/requests/ThriftClient.java index 22bcb88135..71b0967b3c 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/requests/ThriftClient.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/requests/ThriftClient.java @@ -17,6 +17,7 @@ import com.raytheon.uf.common.auth.resp.UserNotAuthorized; import com.raytheon.uf.common.comm.CommunicationException; import com.raytheon.uf.common.comm.HttpClient; import com.raytheon.uf.common.comm.NetworkStatistics; +import com.raytheon.uf.common.serialization.ExceptionWrapper; import com.raytheon.uf.common.serialization.SerializationException; import com.raytheon.uf.common.serialization.SerializationUtil; import com.raytheon.uf.common.serialization.comm.IServerRequest; @@ -24,7 +25,6 @@ import com.raytheon.uf.common.serialization.comm.RemoteServiceRequest; import com.raytheon.uf.common.serialization.comm.RequestWrapper; import com.raytheon.uf.common.serialization.comm.ServiceException; import com.raytheon.uf.common.serialization.comm.response.ServerErrorResponse; -import com.raytheon.uf.common.serialization.comm.util.ExceptionWrapper; import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.auth.UserController; import com.raytheon.uf.viz.core.exception.VizCommunicationException; diff --git a/cave/com.raytheon.uf.viz.cots.feature/feature.xml b/cave/com.raytheon.uf.viz.cots.feature/feature.xml index d0caabd398..5117e262e7 100644 --- a/cave/com.raytheon.uf.viz.cots.feature/feature.xml +++ b/cave/com.raytheon.uf.viz.cots.feature/feature.xml @@ -360,4 +360,18 @@ version="0.0.0" unpack="false"/> +
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * May 31, 2012 mpduff Initial creation + * + *+ * + * @author mpduff + * @version 1.0 + */ + +public class ButtonImages { + + /** + * Parent composite. + */ + private Composite parent; + + /** + * Parent display. + */ + private Display parentDisplay; + + /** + * Array of button images. + */ + private Image[] buttonArray; + + /** + * Button image enumeration that identifies which image to use. + */ + public enum ButtonImage { + AddAll, Add, Remove, RemoveAll, Up, Down + }; + + /** + * Constructor. + * + * @param parent + * Parent composite. + */ + public ButtonImages(Composite parent) { + this.parent = parent; + parentDisplay = parent.getDisplay(); + + addDisposeToParent(); + + createButtonImages(); + } + + /** + * Add a dispose listener to the parent composite. When the parent composite + * is disposed, the images will be disposed of. + */ + private void addDisposeToParent() { + parent.addDisposeListener(new DisposeListener() { + @Override + public void widgetDisposed(DisposeEvent e) { + for (Image img : buttonArray) { + img.dispose(); + } + } + }); + } + + /** + * Create the button images. + */ + private void createButtonImages() { + int imgWidthSm = 12; + int imgWidth = 24; + int imgHeight = 12; + Image tmpImg; + + GC gc; + + buttonArray = new Image[ButtonImage.values().length]; + + for (int i = 0; i < ButtonImage.values().length; i++) { + if (ButtonImage.values()[i] == ButtonImage.Up || ButtonImage.values()[i] == ButtonImage.Down) { + buttonArray[i] = new Image(parentDisplay, imgWidthSm, imgHeight); + } + else { + buttonArray[i] = new Image(parentDisplay, imgWidth, imgHeight); + } + } + + /* + * Add all image + */ + tmpImg = new Image(parent.getDisplay(), imgWidth, imgHeight); + gc = new GC(tmpImg); + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_WHITE)); + gc.fillRectangle(0, 0, imgWidth, imgHeight); + gc.dispose(); + + ImageData idata = tmpImg.getImageData(); + + int whitePixel = idata.palette.getPixel(new RGB(255, 255, 255)); + idata.transparentPixel = whitePixel; + Image transparentIdeaImage = new Image(parent.getDisplay(), idata); + + gc = new GC(transparentIdeaImage); + drawAddAllImage(gc, imgWidth, imgHeight); + gc.dispose(); + + buttonArray[ButtonImage.AddAll.ordinal()] = transparentIdeaImage; + tmpImg.dispose(); + + /* + * Add image + */ + tmpImg = new Image(parent.getDisplay(), imgWidth, imgHeight); + gc = new GC(tmpImg); + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_WHITE)); + gc.fillRectangle(0, 0, imgWidth, imgHeight); + gc.dispose(); + + idata = tmpImg.getImageData(); + + whitePixel = idata.palette.getPixel(new RGB(255, 255, 255)); + idata.transparentPixel = whitePixel; + transparentIdeaImage = new Image(parent.getDisplay(), idata); + + gc = new GC(transparentIdeaImage); + drawAddImage(gc, imgWidth, imgHeight); + gc.dispose(); + + buttonArray[ButtonImage.Add.ordinal()] = transparentIdeaImage; + tmpImg.dispose(); + + /* + * Remove image + */ + tmpImg = new Image(parent.getDisplay(), imgWidth, imgHeight); + gc = new GC(tmpImg); + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_WHITE)); + gc.fillRectangle(0, 0, imgWidth, imgHeight); + gc.dispose(); + + idata = tmpImg.getImageData(); + + whitePixel = idata.palette.getPixel(new RGB(255, 255, 255)); + idata.transparentPixel = whitePixel; + transparentIdeaImage = new Image(parent.getDisplay(), idata); + + gc = new GC(transparentIdeaImage); + drawRemoveImage(gc, imgWidth, imgHeight); + gc.dispose(); + + buttonArray[ButtonImage.Remove.ordinal()] = transparentIdeaImage; + tmpImg.dispose(); + + /* + * Remove all image + */ + tmpImg = new Image(parent.getDisplay(), imgWidth, imgHeight); + gc = new GC(tmpImg); + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_WHITE)); + gc.fillRectangle(0, 0, imgWidth, imgHeight); + gc.dispose(); + + idata = tmpImg.getImageData(); + + whitePixel = idata.palette.getPixel(new RGB(255, 255, 255)); + idata.transparentPixel = whitePixel; + transparentIdeaImage = new Image(parent.getDisplay(), idata); + + gc = new GC(transparentIdeaImage); + drawRemoveAllImage(gc, imgWidth, imgHeight); + gc.dispose(); + + buttonArray[ButtonImage.RemoveAll.ordinal()] = transparentIdeaImage; + tmpImg.dispose(); + + /* + * Move up image + */ + tmpImg = new Image(parent.getDisplay(), imgWidthSm, imgHeight); + gc = new GC(tmpImg); + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_WHITE)); + gc.fillRectangle(0, 0, imgWidthSm, imgHeight); + gc.dispose(); + + idata = tmpImg.getImageData(); + + whitePixel = idata.palette.getPixel(new RGB(255, 255, 255)); + idata.transparentPixel = whitePixel; + transparentIdeaImage = new Image(parent.getDisplay(), idata); + + gc = new GC(transparentIdeaImage); + drawMoveUpImage(gc, imgWidthSm, imgHeight); + gc.dispose(); + + buttonArray[ButtonImage.Up.ordinal()] = transparentIdeaImage; + tmpImg.dispose(); + + /* + * Move down image + */ + tmpImg = new Image(parent.getDisplay(), imgWidthSm, imgHeight); + gc = new GC(tmpImg); + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_WHITE)); + gc.fillRectangle(0, 0, imgWidthSm, imgHeight); + gc.dispose(); + + idata = tmpImg.getImageData(); + + whitePixel = idata.palette.getPixel(new RGB(255, 255, 255)); + idata.transparentPixel = whitePixel; + transparentIdeaImage = new Image(parent.getDisplay(), idata); + + gc = new GC(transparentIdeaImage); + drawMoveDownImage(gc, imgWidthSm, imgHeight); + gc.dispose(); + + buttonArray[ButtonImage.Down.ordinal()] = transparentIdeaImage; + tmpImg.dispose(); + } + + /** + * Draw the "add all" image. + * + * @param gc + * Graphics context. + * @param imgWidth + * Image width. + * @param imgHeight + * Image height. + */ + private void drawAddAllImage(GC gc, int imgWidth, int imgHeight) { + gc.setAntialias(SWT.ON); + + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_BLACK)); + + // Draw the left arrow + int[] pointArray = new int[] { 10, 6, 1, 1, 1, 10, 10, 6 }; + gc.fillPolygon(pointArray); + + // Draw the right arrow + pointArray = new int[] { 22, 6, 13, 1, 13, 10, 22, 6 }; + gc.fillPolygon(pointArray); + } + + /** + * Draw the "add" image. + * + * @param gc + * Graphics context. + * @param imgWidth + * Image width. + * @param imgHeight + * Image height. + */ + private void drawAddImage(GC gc, int imgWidth, int imgHeight) { + gc.setAntialias(SWT.ON); + + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_BLACK)); + + // Draw the add arrow + int[] pointArray = new int[] { 17, 6, 8, 1, 8, 10, 17, 6 }; + gc.fillPolygon(pointArray); + } + + /** + * Draw the "remove" image. + * + * @param gc + * Graphics context. + * @param imgWidth + * Image width. + * @param imgHeight + * Image height. + */ + private void drawRemoveImage(GC gc, int imgWidth, int imgHeight) { + gc.setAntialias(SWT.ON); + + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_BLACK)); + + // Draw the add arrow + int[] pointArray = new int[] { 8, 6, 17, 1, 17, 10, 8, 6 }; + gc.fillPolygon(pointArray); + } + + /** + * Draw the "remove all" image. + * + * @param gc + * Graphics context. + * @param imgWidth + * Image width. + * @param imgHeight + * Image height. + */ + private void drawRemoveAllImage(GC gc, int imgWidth, int imgHeight) { + gc.setAntialias(SWT.ON); + + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_BLACK)); + + // Draw the left arrow + int[] pointArray = new int[] { 1, 6, 10, 1, 10, 10, 1, 6 }; + gc.fillPolygon(pointArray); + + // Draw the right arrow + pointArray = new int[] { 13, 6, 22, 1, 22, 10, 13, 6 }; + gc.fillPolygon(pointArray); + } + + /** + * Draw the "move up" image. + * + * @param gc + * Graphics context. + * @param imgWidth + * Image width. + * @param imgHeight + * Image height. + */ + private void drawMoveUpImage(GC gc, int imgWidth, int imgHeight) { + gc.setAntialias(SWT.ON); + + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_BLACK)); + + // Draw the add arrow + int[] pointArray = new int[] { 1, 10, 6, 1, 11, 10, 1, 10 }; + gc.fillPolygon(pointArray); + } + + /** + * Draw the "move down" image. + * + * @param gc + * Graphics context. + * @param imgWidth + * Image width. + * @param imgHeight + * Image height. + */ + private void drawMoveDownImage(GC gc, int imgWidth, int imgHeight) { + gc.setAntialias(SWT.ON); + + gc.setBackground(parentDisplay.getSystemColor(SWT.COLOR_BLACK)); + + // Draw the add arrow + int[] pointArray = new int[] { 1, 1, 6, 10, 11, 1, 1, 1 }; + gc.fillPolygon(pointArray); + } + + /** + * Get the image associated with the specified button image. + * + * @param bi + * Button image identifier. + * @return The associated button image. + */ + public Image getImage(ButtonImage bi) { + return this.buttonArray[bi.ordinal()]; + } +} diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java new file mode 100644 index 0000000000..cda0de1e9b --- /dev/null +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java @@ -0,0 +1,945 @@ +/** + * 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. + **/ +package com.raytheon.viz.ui.widgets.duallist; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.TreeMap; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.MouseAdapter; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.List; + +import com.raytheon.viz.ui.widgets.duallist.ButtonImages.ButtonImage; + +/** + * SWT Dual List Widget. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Feb 13, 2012 mpduff Initial creation + * Feb 14, 2012 lvenable Update code. + * Aug 08, 2012 863 jpiatt Added checks for selection changes. + * Aug 10, 2012 1002 mpduff Fixed sorting of numeric data on move left. + * Sep 07, 2012 684 mpduff Deselect selection prior to selecting new items. + * + *+ * + * @author mpduff + * @version 1.0 + */ + +public class DualList extends Composite { + + /** + * Available List widget + */ + private List availableList; + + /** + * Selected List Widget + */ + private List selectedList; + + /** + * Dual List data/configuration object + */ + private DualListConfig config = new DualListConfig(); + + /** + * Button to move an item from the left list to the right list. + */ + private Button moveRightBtn; + + /** + * Button to move all items from the left list to the right list. + */ + private Button moveAllRightBtn; + + /** + * Button to move an item from the right list to the left list. + */ + private Button moveLeftBtn; + + /** + * Button to move all items from the right list to the left list. + */ + private Button moveAllLeftBtn; + + /** + * Move a selected item in the selected list up in the list. + */ + private Button moveUpBtn; + + /** + * Move a selected item in the selected list down in the list. + */ + private Button moveDownBtn; + + /** + * Callback when data has been selected or unselected. + */ + private IUpdate updateCallback = null; + + /** + * Number of columns. + */ + private int numberOfColumns = 3; + + /** + * Button Images. + */ + private ButtonImages btnImg; + + /** + * Button Height. + */ + private int buttonHeight = SWT.DEFAULT; + + /** + * Button Width. + */ + private final int buttonWidth = 45; + + /** + * Move left flag. + */ + boolean moveLeft = false; + + /** + * Move All flag. + */ + boolean moveAllLeft = false; + + /** + * Constructor + * + * @param parent + * Parent container + * @param style + * SWT Style + * @param config + * Data/Configuration object + */ + public DualList(Composite parent, int style, DualListConfig config) { + this(parent, style, config, null); + } + + /** + * Constructor + * + * @param parent + * Parent container + * @param style + * SWT Style + * @param config + * Data/Configuration object + * @param cb + * Update Callback + * + */ + public DualList(Composite parent, int style, DualListConfig config, + IUpdate cb) { + super(parent, style); + this.config = config; + this.updateCallback = cb; + init(); + } + + /** + * Initialize the controls. + */ + private void init() { + // Create the button image class + btnImg = new ButtonImages(this); + + if (config.getListHeight() <= 90) { + buttonHeight = 20; + } + + // Determine how many columns need to be on the layout. + // The default is three. + if (config.isShowUpDownBtns()) { + numberOfColumns = 4; + } + + GridLayout gl = new GridLayout(numberOfColumns, false); + gl.marginWidth = 2; + gl.marginHeight = 2; + GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); + this.setLayout(gl); + this.setLayoutData(gd); + + createListLabels(); + createAvailableListControl(); + createAddRemoveControls(); + createSelectedListControl(); + + if (config.isShowUpDownBtns()) { + createMoveUpDownControls(); + } + + populateLists(); + } + + /** + * Create the labels that will appear above the list controls. + */ + private void createListLabels() { + // Available label + GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, false, false); + gd.horizontalIndent = 3; + + Label availableLbl = new Label(this, SWT.NONE); + availableLbl.setText(config.getAvailableListText()); + availableLbl.setLayoutData(gd); + + new Label(this, SWT.NONE); + + // Selected label + gd = new GridData(SWT.DEFAULT, SWT.DEFAULT, false, false); + gd.horizontalIndent = 3; + + Label selectedLbl = new Label(this, SWT.NONE); + selectedLbl.setText(config.getSelectedListText()); + selectedLbl.setLayoutData(gd); + + if (numberOfColumns == 4) { + new Label(this, SWT.NONE); + } + + } + + /** + * Create the available list control. + */ + private void createAvailableListControl() { + + GridData listData = new GridData(SWT.FILL, SWT.FILL, true, true); + listData.widthHint = config.getListWidth(); + listData.heightHint = config.getListHeight(); + availableList = new List(this, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL + | SWT.H_SCROLL); + availableList.setLayoutData(listData); + availableList.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + if (availableList.getSelectionCount() > 0) { + moveRightBtn.setEnabled(true); + } else { + moveRightBtn.setEnabled(false); + } + } + }); + + availableList.addMouseListener(new MouseAdapter() { + @Override + public void mouseDown(MouseEvent arg0) { + if (arg0.button == 3) { + if (config.getMenuData() != null + && config.getMenuData().isShowMenu()) { + showAvailableListMenu(); + } + } + } + }); + } + + /** + * Create the add and remove controls. + */ + private void createAddRemoveControls() { + /* + * Add and Remove Buttons + */ + GridData selectData = new GridData(SWT.DEFAULT, SWT.CENTER, false, true); + GridLayout selectLayout = new GridLayout(1, false); + selectLayout.verticalSpacing = 2; + + Composite selectComp = new Composite(this, SWT.NONE); + selectComp.setLayout(selectLayout); + selectComp.setLayoutData(selectData); + + // Left/Right buttons + GridData btnData = new GridData(buttonWidth, buttonHeight); + + moveAllRightBtn = new Button(selectComp, SWT.PUSH); + moveAllRightBtn.setImage(btnImg.getImage(ButtonImage.AddAll)); + moveAllRightBtn.setLayoutData(btnData); + moveAllRightBtn.setEnabled(false); + moveAllRightBtn.setToolTipText("Move all items right"); + moveAllRightBtn.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + handleMoveAllRight(); + if (updateCallback != null) { + updateCallback.selectionChanged(); + } + } + }); + + btnData = new GridData(buttonWidth, buttonHeight); + moveRightBtn = new Button(selectComp, SWT.PUSH); + moveRightBtn.setImage(btnImg.getImage(ButtonImage.Add)); + moveRightBtn.setLayoutData(btnData); + moveRightBtn.setEnabled(false); + moveRightBtn.setToolTipText("Move selected item(s) right"); + moveRightBtn.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + handleMoveRight(); + if (updateCallback != null) { + updateCallback.selectionChanged(); + } + } + }); + + btnData = new GridData(buttonWidth, buttonHeight); + moveLeftBtn = new Button(selectComp, SWT.PUSH); + moveLeftBtn.setImage(btnImg.getImage(ButtonImage.Remove)); + moveLeftBtn.setLayoutData(btnData); + moveLeftBtn.setEnabled(false); + moveLeftBtn.setToolTipText("Move selected item(s) left"); + moveLeftBtn.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + handleMoveLeft(); + if (updateCallback != null) { + updateCallback.selectionChanged(); + } + } + }); + + btnData = new GridData(buttonWidth, buttonHeight); + moveAllLeftBtn = new Button(selectComp, SWT.PUSH); + moveAllLeftBtn.setImage(btnImg.getImage(ButtonImage.RemoveAll)); + moveAllLeftBtn.setLayoutData(btnData); + moveAllLeftBtn.setEnabled(false); + moveAllLeftBtn.setToolTipText("Move all items left"); + moveAllLeftBtn.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + handleMoveAllLeft(true); + if (updateCallback != null) { + updateCallback.selectionChanged(); + } + } + }); + } + + /** + * Create the selected list control. + */ + private void createSelectedListControl() { + GridData listData = new GridData(SWT.FILL, SWT.FILL, true, true); + listData.widthHint = config.getListWidth(); + listData.heightHint = config.getListHeight(); + + selectedList = new List(this, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL + | SWT.H_SCROLL); + selectedList.setLayoutData(listData); + selectedList.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + if (selectedList.getSelectionCount() > 0) { + moveLeftBtn.setEnabled(true); + } else { + moveLeftBtn.setEnabled(false); + } + + enableDisableUpDownButtons(); + } + }); + + selectedList.addMouseListener(new MouseAdapter() { + @Override + public void mouseDown(MouseEvent arg0) { + if (arg0.button == 3) { + if (config.getMenuData() != null + && config.getMenuData().isShowMenu()) { + showSelectedListMenu(); + } + } + } + }); + + } + + /** + * Create the move up/down controls + */ + private void createMoveUpDownControls() { + + GridData actionData = new GridData(SWT.DEFAULT, SWT.CENTER, false, true); + GridLayout actionLayout = new GridLayout(1, false); + Composite actionComp = new Composite(this, SWT.NONE); + actionComp.setLayout(actionLayout); + actionComp.setLayoutData(actionData); + + GridData btnData = new GridData(buttonWidth, buttonHeight); + + moveUpBtn = new Button(actionComp, SWT.PUSH); + moveUpBtn.setImage(btnImg.getImage(ButtonImage.Up)); + moveUpBtn.setLayoutData(btnData); + moveUpBtn.setEnabled(false); + moveUpBtn.setToolTipText("Move item up in the list"); + moveUpBtn.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + handleMoveUp(); + } + }); + + btnData = new GridData(buttonWidth, buttonHeight); + moveDownBtn = new Button(actionComp, SWT.PUSH); + moveDownBtn.setImage(btnImg.getImage(ButtonImage.Down)); + moveDownBtn.setLayoutData(btnData); + moveDownBtn.setEnabled(false); + moveDownBtn.setToolTipText("Move item down in the list"); + moveDownBtn.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + handleMoveDown(); + } + }); + } + + /** + * Set FullList. + * + * @param fullList + * all users listed in notification table + */ + public void setFullList(ArrayList
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * May 31, 2012 mpduff Initial creation. + * Aug 10, 2012 1002 mpduff Added numeric flag for sorting. + * + *+ * + * @author mpduff + * @version 1.0 + */ + +public class DualListConfig { + + /** + * Available list text set to a default. + */ + private String availableListText = "Available:"; + + /** + * Selected list text set to a default. + */ + private String selectedListText = "Selected:"; + + /** + * Width of the list controls. + */ + private int listWidth = 100; + + /** + * Height of the list controls. + */ + private int listHeight = 125; + + /** + * Flag to determine if the up/down buttons should be shown. + */ + private boolean showUpDownBtns = false; + + /** + * List of items that should initially appear in the selected item list. + */ + private List
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jun 1, 2012 mpduff Initial creation + * + *+ * + * @author mpduff + * @version 1.0 + */ + +public interface IMenuData { + /** + * Show a popup menu on the list right click + * + * @param shell The shell + * @param menuText The menu text + */ + public void showListMenu(Shell shell, String menuText); + + /** + * Show a popup menu. + * + * @return true to show menu, false to not show a menu + */ + public boolean isShowMenu(); + + /** + * Get the list menu text. + * + * @return the menu text + */ + public String getMenuText(); + + /** + * Set the list selection. + * + * @param string The selection + */ + public void setListSelection(String string); +} diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/IUpdate.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/IUpdate.java new file mode 100644 index 0000000000..0c8916d9de --- /dev/null +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/IUpdate.java @@ -0,0 +1,54 @@ +/** + * 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. + **/ +package com.raytheon.viz.ui.widgets.duallist; + +/** + * TODO Add Description + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * May 31, 2012 mpduff Initial creation. + * Aug 08, 2012 863 jpiatt Added selectedChange method for clean & dirty checks. + * + *+ * + * @author mpduff + * @version 1.0 + */ + +public interface IUpdate { + /** + * Method called when a control has items or when the control becomes empty. + * + * @param entries + * Entries flag. True if there are entries, false if there are no + * entries. + */ + void hasEntries(boolean entries); + + /** + * Method called when a change in selection occurs. + */ + public void selectionChanged(); +} diff --git a/cave/ohd.hseb.common/.classpath b/cave/ohd.hseb.common/.classpath index 78fc66cee2..3385703d78 100644 --- a/cave/ohd.hseb.common/.classpath +++ b/cave/ohd.hseb.common/.classpath @@ -7,7 +7,6 @@
@@ -971,8 +942,7 @@ public final class Util { * * @return the converted object */ - @SuppressWarnings("unchecked") - public static Object getObjForStr(String string, Class aClass) { + public static Object getObjForStr(String string, Class aClass) { Object retValue = null; diff --git a/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java b/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java index 75684652dd..50eb0cc65a 100644 --- a/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java +++ b/edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java @@ -119,7 +119,7 @@ public class EDEXLocalizationAdapter implements ILocalizationAdapter { } } - private String getSiteName() { + protected String getSiteName() { String site = PropertiesFactory.getInstance().getEnvProperties() .getEnvValue("SITENAME"); @@ -176,12 +176,7 @@ public class EDEXLocalizationAdapter implements ILocalizationAdapter { @Override public File getPath(LocalizationContext context, String fileName) { - String baseDir = null; - - EnvProperties env = PropertiesFactory.getInstance().getEnvProperties(); - - String utilityDir = new File(env.getEnvValue("UTILITYDIR")) - .getAbsolutePath(); + File utilityDir = getUtilityDir(); if (context.getLocalizationLevel() == LocalizationLevel.UNKNOWN) { throw new IllegalArgumentException( @@ -191,11 +186,11 @@ public class EDEXLocalizationAdapter implements ILocalizationAdapter { // TODO: Check for invalid type / level combinations // Change the above condition and add invalid type / level checking // if needed - } else { - baseDir = utilityDir + File.separator + context.toPath(); } - return new File(baseDir + File.separator + fileName); + File baseDir = new File(utilityDir, context.toPath()); + + return new File(baseDir, fileName); } /* @@ -212,6 +207,17 @@ public class EDEXLocalizationAdapter implements ILocalizationAdapter { return type; } + /** + * Get the file reference to the utility directory. + * + * @return the file reference to the utility directory + */ + protected File getUtilityDir() { + EnvProperties env = PropertiesFactory.getInstance().getEnvProperties(); + + return new File(env.getEnvValue("UTILITYDIR")); + } + /** * Create ListResponse metadata *
diff --git a/edexOsgi/com.raytheon.edex.common/unit-test/com/raytheon/edex/subscription/TestSubscriptionManager.java b/edexOsgi/com.raytheon.edex.common/unit-test/com/raytheon/edex/subscription/TestSubscriptionManager.java deleted file mode 100644 index 030daa352d..0000000000 --- a/edexOsgi/com.raytheon.edex.common/unit-test/com/raytheon/edex/subscription/TestSubscriptionManager.java +++ /dev/null @@ -1,157 +0,0 @@ -/** - * 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. - **/ -package com.raytheon.edex.subscription; - -import static com.raytheon.edex.subscription.AddScriptAction.addScript; -import static com.raytheon.edex.subscription.DeleteScriptAction.deleteScript; -import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; - -import org.jmock.Expectations; -import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; -import org.jmock.integration.junit4.JUnit4Mockery; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import com.raytheon.edex.db.dao.ISubscriber; -import com.raytheon.edex.exception.SubscriptionException; -import com.raytheon.uf.edex.database.DataAccessLayerException; - - - -/** - * - *
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * - * - *- * - * @author mfegan - * @version 1 - */ -@RunWith(JMock.class) -public class TestSubscriptionManager { - Mockery context = new JUnit4Mockery(); - /* the test fixture */ - SubscriptionManager manager; - String goodKey = "/.+?/METAR/KDBN/.+"; - String badKey = "/.+?/METAR/KQKQ/.+"; - String scriptID1 = "TEST 1"; - String scriptID2 = "TEST 2"; - StringBuffer script1 = new StringBuffer("This is test script 1"); - StringBuffer script2 = new StringBuffer("This is test script 2"); - String subNotFound = "No subscriptions exist for requested URI"; - String[] subscriptions = {goodKey}; - Subscription goodScript; - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception { - manager = new SubscriptionManager(); - final ISubscriber dataLayer = context.mock(ISubscriber.class); - goodScript = new Subscription(goodKey,scriptID1,script1); - // expections - context.checking(new Expectations() {{ - allowing (dataLayer).getSubscriptions(); - will(returnValue(subscriptions)); - allowing (dataLayer).getSubscription(goodKey); - will(returnValue(goodScript)); - allowing (dataLayer).getSubscription(badKey); - will(throwException(new DataAccessLayerException(subNotFound))); - allowing (dataLayer).manageSubscriptions(with(instanceOf(Subscription.class)), - with(equal(ISubscriber.SUBSCRIBE_MODE_SAVE))); - will(addScript(goodScript,scriptID2,script2)); - allowing (dataLayer).manageSubscriptions(with(instanceOf(Subscription.class)), - with(equal(ISubscriber.SUBSCRIBE_MODE_DELETE))); - will(deleteScript(goodScript,scriptID2)); - allowing (dataLayer).manageSubscriptions(with(instanceOf(Subscription.class)), - with(equal(ISubscriber.SUBSCRIBE_MODE_UPDATE))); - will(returnValue(null)); - }}); - // manager.setDataLayer(dataLayer); - - } - - /** - * @throws java.lang.Exception - */ - @After - public void tearDown() throws Exception { - manager = null; - - - } - - /** - * Test method for {@link com.raytheon.edex.subscription.SubscriptionManager#subscribe(java.lang.String, java.lang.String, java.lang.Object)}. - */ - @Test - public void testSubscribe() throws SubscriptionException { - manager.subscribe(goodKey, scriptID2, script2); - Subscription s = manager.getSubscription(goodKey); - assertNotNull("Checking Subscription retrieval - good subscription",s); - assertEquals("Checking Subscription script count",2,s.getCount()); - Script t = s.getScript(scriptID1); - assertSame("Checkin script 1",script1,t.getScript()); - t = s.getScript(scriptID2); - assertSame("Checking script 2",script2,t.getScript()); - } - - /** - * Test method for {@link com.raytheon.edex.subscription.SubscriptionManager#subscribe(java.lang.String, java.lang.String, java.lang.Object)}. - */ - @Test(expected=SubscriptionException.class) - public void testSubscribe_bad() throws SubscriptionException { - manager.subscribe(goodKey, scriptID1, script1); - } - - /** - * Test method for {@link com.raytheon.edex.subscription.SubscriptionManager#getSubscription(java.lang.String)}. - */ - @Test - public void testGetSubscription() { - Subscription s = manager.getSubscription(goodKey); - assertNotNull("Checking Subscription retrieval - good subscription",s); - assertEquals("Checking Subscription script count",1,s.getCount()); - - - } - /** - * Test method for {@link com.raytheon.edex.subscription.SubscriptionManager#getSubscription(java.lang.String)}. - */ - @Test - public void testGetSubscription_error() { - Subscription s = manager.getSubscription(badKey); - assertNull("Checking Subscription retrieval - bad subscription",s); - } -} diff --git a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml index 4fb553e514..aadba52a15 100644 --- a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml +++ b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml @@ -103,4 +103,5 @@
* * SOFTWARE HISTORY + * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Apr 11, 2007 chammack Initial Creation. + * Sep 19, 2012 bgonzale Initial creation * ** - * @author chammack + * @author bgonzale * @version 1.0 */ -public class PreferencesHandler extends AbstractHandler { - /* - * (non-Javadoc) +public class AbstractGfePrivilegedRequest extends AbstractPrivilegedRequest { + private final static String DEFAULT_ROLEID = "com.raytheon.localization.site/common_static/gfe"; + + @DynamicSerializeElement + private String roleId; + + /** * - * @see - * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands - * .ExecutionEvent) */ - @Override - public Object execute(ExecutionEvent arg0) throws ExecutionException { - - String prefPageId = "gov.noaa.nws.ncep.ui.pgen.Preferences"; - - PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn( - null, prefPageId, new String[] { prefPageId }, null); - dialog.open(); - return null; + public AbstractGfePrivilegedRequest() { + roleId = DEFAULT_ROLEID; + } + + /** + * @return the roleId + */ + public String getRoleId() { + return roleId; + } + + /** + * @param roleId + * the roleId to set + */ + public void setRoleId(String roleId) { + this.roleId = roleId; } } diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CheckPermissionsRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CheckPermissionsRequest.java index 53a110b3e7..bc93c7a4f0 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CheckPermissionsRequest.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/CheckPermissionsRequest.java @@ -19,9 +19,7 @@ **/ package com.raytheon.uf.common.dataplugin.gfe.request; -import com.raytheon.uf.common.auth.user.IUser; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; -import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; /** * TODO Add Description @@ -41,31 +39,9 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; */ @DynamicSerialize -public class CheckPermissionsRequest extends AbstractGfeRequest { - - @DynamicSerializeElement - private IUser user; +public class CheckPermissionsRequest extends AbstractGfePrivilegedRequest { public CheckPermissionsRequest() { } - public CheckPermissionsRequest(IUser user) { - this.user = user; - } - - /** - * @return the user - */ - public IUser getUser() { - return user; - } - - /** - * @param user - * the user to set - */ - public void setUser(IUser user) { - this.user = user; - } - } diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExportConfRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExportConfRequest.java index 339e341ba4..2530314a07 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExportConfRequest.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/ExportConfRequest.java @@ -19,7 +19,6 @@ **/ package com.raytheon.uf.common.dataplugin.gfe.request; -import com.raytheon.uf.common.auth.req.AbstractPrivilegedRequest; import com.raytheon.uf.common.auth.user.IUser; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @@ -42,7 +41,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; */ @DynamicSerialize -public class ExportConfRequest extends AbstractPrivilegedRequest { +public class ExportConfRequest extends AbstractGfePrivilegedRequest { @DynamicSerializeElement private String site; @@ -71,5 +70,4 @@ public class ExportConfRequest extends AbstractPrivilegedRequest { this.site = site; } - } diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/META-INF/MANIFEST.MF index 004ced58e9..b037b91337 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/META-INF/MANIFEST.MF @@ -26,5 +26,6 @@ Import-Package: com.raytheon.uf.common.dataplugin.grid, com.raytheon.uf.common.gridcoverage.exception, com.raytheon.uf.common.parameter Export-Package: com.raytheon.uf.common.dataplugin.grib, - com.raytheon.uf.common.dataplugin.grib.request + com.raytheon.uf.common.dataplugin.grib.request, + com.raytheon.uf.common.dataplugin.grib.subgrid Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java index dc13c6cad0..6ee04be5fc 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java @@ -22,6 +22,8 @@ package com.raytheon.uf.common.dataplugin.grib; import java.util.Arrays; import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -38,6 +40,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import com.raytheon.uf.common.dataplugin.IDecoderGettable; +import com.raytheon.uf.common.dataplugin.IPrecomputedRange; import com.raytheon.uf.common.dataplugin.annotations.DataURI; import com.raytheon.uf.common.dataplugin.persist.IHDFFilePathProvider; import com.raytheon.uf.common.dataplugin.persist.IPersistable; @@ -69,7 +72,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @XmlAccessorType(XmlAccessType.NONE) @DynamicSerialize public class GribRecord extends PersistablePluginDataObject implements - IPersistable, ISpatialEnabled { + IPersistable, ISpatialEnabled, IPrecomputedRange { private static final long serialVersionUID = 1L; @@ -171,6 +174,16 @@ public class GribRecord extends PersistablePluginDataObject implements @DynamicSerializeElement private Integer resCompFlags; + @Column + @XmlAttribute + @DynamicSerializeElement + private double dataMin; + + @Column + @XmlAttribute + @DynamicSerializeElement + private double dataMax; + /** * Creates an empty GribRecord */ @@ -240,6 +253,22 @@ public class GribRecord extends PersistablePluginDataObject implements return null; } + @Override + public Date getPersistenceTime() { + Calendar c = getInsertTime(); + if (c == null) + return null; + + return c.getTime(); + } + + @Override + public void setPersistenceTime(Date persistTime) { + Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT")); + c.setTime(persistTime); + setInsertTime(c); + } + @Override public ISpatialObject getSpatialObject() { return modelInfo.getLocation(); @@ -475,11 +504,42 @@ public class GribRecord extends PersistablePluginDataObject implements this.resCompFlags = resCompFlags; } - @Override public void setId(int id) { this.id = id; } + /** + * @return the dataMin + */ + @Override + public double getDataMin() { + return dataMin; + } + + /** + * @param dataMin + * the dataMin to set + */ + public void setDataMin(double dataMin) { + this.dataMin = dataMin; + } + + /** + * @return the dataMax + */ + @Override + public double getDataMax() { + return dataMax; + } + + /** + * @param dataMax + * the dataMax to set + */ + public void setDataMax(double dataMax) { + this.dataMax = dataMax; + } + @Override public int hashCode() { final int prime = 31; @@ -506,15 +566,12 @@ public class GribRecord extends PersistablePluginDataObject implements @Override public boolean equals(Object obj) { - if (this == obj) { + if (this == obj) return true; - } - if (obj == null) { + if (obj == null) return false; - } - if (getClass() != obj.getClass()) { + if (getClass() != obj.getClass()) return false; - } GribRecord other = (GribRecord) obj; if (!this.dataTime.getRefTimeAsCalendar().equals( other.getDataTime().getRefTimeAsCalendar())) { @@ -527,59 +584,42 @@ public class GribRecord extends PersistablePluginDataObject implements return false; } - if (gridVersion != other.gridVersion) { + if (gridVersion != other.gridVersion) return false; - } - if (!Arrays.equals(hybridCoordList, other.hybridCoordList)) { + if (!Arrays.equals(hybridCoordList, other.hybridCoordList)) return false; - } - if (hybridGrid != other.hybridGrid) { + if (hybridGrid != other.hybridGrid) return false; - } - if (isVector != other.isVector) { + if (isVector != other.isVector) return false; - } - if (!Arrays.equals(localSection, other.localSection)) { + if (!Arrays.equals(localSection, other.localSection)) return false; - } - if (localSectionUsed != other.localSectionUsed) { + if (localSectionUsed != other.localSectionUsed) return false; - } - if (localTableVersion != other.localTableVersion) { + if (localTableVersion != other.localTableVersion) return false; - } - if (masterTableVersion != other.masterTableVersion) { + if (masterTableVersion != other.masterTableVersion) return false; - } if (modelInfo == null) { - if (other.modelInfo != null) { + if (other.modelInfo != null) return false; - } - } else if (!modelInfo.equals(other.modelInfo)) { + } else if (!modelInfo.equals(other.modelInfo)) return false; - } - if (processedDataType != other.processedDataType) { + if (processedDataType != other.processedDataType) return false; - } - if (productionStatus != other.productionStatus) { + if (productionStatus != other.productionStatus) return false; - } - if (refTimeSignificance != other.refTimeSignificance) { + if (refTimeSignificance != other.refTimeSignificance) return false; - } if (resCompFlags == null) { - if (other.resCompFlags != null) { + if (other.resCompFlags != null) return false; - } - } else if (!resCompFlags.equals(other.resCompFlags)) { + } else if (!resCompFlags.equals(other.resCompFlags)) return false; - } - if (thinnedGrid != other.thinnedGrid) { + if (thinnedGrid != other.thinnedGrid) return false; - } - if (!Arrays.equals(thinnedPts, other.thinnedPts)) { + if (!Arrays.equals(thinnedPts, other.thinnedPts)) return false; - } return true; } diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/GridInfoRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/GridInfoRecord.java index 5b6f3c02b7..70457c8047 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/GridInfoRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/GridInfoRecord.java @@ -60,7 +60,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Table(name = "grid_info") @SequenceGenerator(name = "GRIDINFO_GENERATOR", sequenceName = "gridinfo_seq", allocationSize = 1) @DynamicSerialize -public class GridInfoRecord extends PersistableDataObject { +public class GridInfoRecord extends PersistableDataObject
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Sep 19, 2012 bgonzale Initial creation + * + *+ * + * @author bgonzale + * @version 1.0 + */ + +public class AuthorizationException extends Exception { + + private static final long serialVersionUID = 1L; + + /** + * + */ + public AuthorizationException() { + } + + /** + * @param message + */ + public AuthorizationException(String message) { + super(message); + } + + /** + * @param cause + */ + public AuthorizationException(Throwable cause) { + super(cause); + } + + /** + * @param message + * @param cause + */ + public AuthorizationException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/exception/RoleApplicationNotFoundException.java b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/exception/RoleApplicationNotFoundException.java new file mode 100644 index 0000000000..4c317cb05a --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/exception/RoleApplicationNotFoundException.java @@ -0,0 +1,71 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.plugin.nwsauth.exception; + +/** + * Exception when the application id for a role is not found. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Sep 18, 2012 bgonzale Initial creation + * + *+ * + * @author bgonzale + * @version 1.0 + */ + +public class RoleApplicationNotFoundException extends AuthorizationException { + + private static final long serialVersionUID = 1L; + + /** + * + */ + public RoleApplicationNotFoundException() { + } + + /** + * @param message + */ + public RoleApplicationNotFoundException(String message) { + super(message); + } + + /** + * @param cause + */ + public RoleApplicationNotFoundException(Throwable cause) { + super(cause); + } + + /** + * @param message + * @param cause + */ + public RoleApplicationNotFoundException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/roles/IRole.java b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/roles/IRole.java similarity index 96% rename from edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/roles/IRole.java rename to edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/roles/IRole.java index 2246d4bcf0..e8cb749336 100644 --- a/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/roles/IRole.java +++ b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/roles/IRole.java @@ -17,7 +17,7 @@ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for * further licensing information. **/ -package com.raytheon.uf.edex.auth.roles; +package com.raytheon.uf.common.plugin.nwsauth.roles; import com.raytheon.uf.common.auth.user.IUser; diff --git a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/roles/IRoleStorage.java b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/roles/IRoleStorage.java new file mode 100644 index 0000000000..e479bf4573 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/roles/IRoleStorage.java @@ -0,0 +1,71 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.plugin.nwsauth.roles; + +import com.raytheon.uf.common.plugin.nwsauth.exception.AuthorizationException; + +/** + * Storage class for roles. NOTE, ALL ROLES IDS SHOULD BE TREATED AS + * CASE-INSENSITIVE + * + *
+ * + * SOFTWARE HISTORY + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * May 18, 2010 mschenke Initial creation + * + *+ * + * @author mschenke + * @version 1.0 + */ + +public interface IRoleStorage { + + /** + * Determine if the permission is valid for the user in the application. + * + * @param permission + * The permissions id + * @param user + * The user id + * @param application + * The application + * + * @return true if the permission is authorized for the user in the + * specified application + * @throws AuthorizationException + */ + public boolean isAuthorized(String permission, String user, + String application) throws AuthorizationException; + + /** + * Get all the defined permissions for this application. + * + * @param application + * The application + * + * @return String[] of permissions + * @throws AuthorizationException + */ + public String[] getAllDefinedPermissions(String application) + throws AuthorizationException; +} diff --git a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/NwsRoleData.java b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/NwsRoleData.java new file mode 100644 index 0000000000..6dd1df05b6 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/NwsRoleData.java @@ -0,0 +1,305 @@ +package com.raytheon.uf.common.plugin.nwsauth.xml; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlRootElement; + +import com.raytheon.uf.common.serialization.ISerializableObject; +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +@XmlRootElement(name = "nwsRoleData") +@XmlAccessorType(XmlAccessType.NONE) +@DynamicSerialize +public class NwsRoleData implements ISerializableObject { + @DynamicSerializeElement + @XmlElement(name = "application") + private String application; + + @DynamicSerializeElement + @XmlElements({ @XmlElement(name = "permission", type = PermissionXML.class) }) + private List
+ * + * SOFTWARE HISTORY + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * May 25, 2010 rgeorge Initial creation + * + *+ * + * @author rgeorge + * @version 1.0 + */ +public class NwsRoleStorage implements IRoleStorage { + private static NwsRoleStorage instance = null; + + private Map
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * May 18, 2012 mpduff Initial creation. + * Oct 2, 2012 1237 jpiatt Allow for null description. + * + *+ * + * @author mpduff + * @version 1.0 + */ +@XmlAccessorType(XmlAccessType.NONE) +@DynamicSerialize +public class PermissionXML implements ISerializableObject { + + @DynamicSerializeElement + @XmlAttribute(name = "id") + private String id; + + @DynamicSerializeElement + @XmlElement(name = "description", type = String.class) + private String description; + + /** + * Get the permission id. + * + * @return the id + */ + public String getId() { + return id; + } + + /** + * Set the permission id. + * + * @param id + * the id to set + */ + public void setId(String id) { + this.id = id; + } + + /** + * Get the permission description. + * + * @return the description + */ + public String getDescription() { + return description; + } + + /** + * Set the permission description. + * + * @param description + * the description to set + */ + public void setDescription(String description) { + this.description = (description == null) ? null : description.trim(); + } +} diff --git a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java new file mode 100644 index 0000000000..e7837915a3 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java @@ -0,0 +1,120 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.plugin.nwsauth.xml; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; + +import com.raytheon.uf.common.serialization.ISerializableObject; +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + +/** + * Role element + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * May 18, 2012 mpduff Initial creation + * + *+ * + * @author mpduff + * @version 1.0 + */ +@XmlAccessorType(XmlAccessType.NONE) +@DynamicSerialize +public class RoleXML implements ISerializableObject { + @DynamicSerializeElement + @XmlAttribute(name = "roleId") + private String roleId; + + @DynamicSerializeElement + @XmlElement(name = "roleDescription", type = String.class) + private String roleDescription = null; + + @DynamicSerializeElement + @XmlElements({ @XmlElement(name = "rolePermission", type = String.class) }) + private List
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * May 18, 2012 mpduff Initial creation + * + *+ * + * @author mpduff + * @version 1.0 + */ +@XmlAccessorType(XmlAccessType.NONE) +@DynamicSerialize +public class UserXML implements IUser, ISerializableObject { + @DynamicSerializeElement + @XmlAttribute(name = "userId") + private String userId; + + @DynamicSerializeElement + @XmlElements({ @XmlElement(name = "userPermission", type = String.class) }) + private List
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Sep 14, 2012 1169 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ +public abstract class BaseSerializationContext implements + ISerializationContext, IDeserializationContext { + protected final DynamicSerializationManager serializationManager; + + /** + * Constructor. + * + * @param serializationManager + * the serialization manager + */ + public BaseSerializationContext( + DynamicSerializationManager serializationManager) { + this.serializationManager = serializationManager; + } + + /** + * {@inheritDoc} + */ + @Override + public Object readObject() throws SerializationException { + return this.serializationManager.deserialize(this); + } + + /** + * {@inheritDoc} + * + * @throws SerializationException + */ + @Override + public void writeObject(Object obj) throws SerializationException { + this.serializationManager.serialize(this, obj); + } +} diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/BuiltInTypeSupport.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/BuiltInTypeSupport.java index 9aa034d9ef..8f694f3a35 100644 --- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/BuiltInTypeSupport.java +++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/BuiltInTypeSupport.java @@ -20,11 +20,19 @@ package com.raytheon.uf.common.serialization; import java.math.BigDecimal; +import java.math.BigInteger; import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.TimeZone; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + /** * Provides serialization support for certain Java built-in classes * @@ -32,7 +40,11 @@ import java.util.TimeZone; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Sep 3, 2008 #1448 chammack Initial creation + * Sep 03, 2008 #1448 chammack Initial creation + * Mar 27, 2012 #428 dgilling Add support for built-in + * classes used by data delivery's + * registry service. + * Sep 14, 2012 #1169 djohnson Add {@link ThrowableSerializer}. * * * @author chammack @@ -130,6 +142,45 @@ public class BuiltInTypeSupport { } } + /** + * Serialization for {@link javax.xml.datatype.XMLGregorianCalendar} + * + * + * @author dgilling + * @version 1.0 + */ + public static class XMLGregorianCalendarSerializer implements + ISerializationTypeAdapter
* SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 13, 2008 #1448 chammack Initial creation
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Aug 13, 2008 #1448 chammack Initial creation
+ * Mar 27, 2012 #428 dgilling Add support for built-in
+ * classes used by data delivery's
+ * registry service.
+ * Sep 28, 2012 #1195 djohnson Add ability to specify adapter at field level.
* Oct 08, 2012 #1251 dgilling Ensure type registered with
* serialization adapter is encoded
* in serialization stream.
@@ -113,6 +125,7 @@ public class DynamicSerializationManager {
// TODO: Can the registration of adapters that require dependencies be
// moved to a separate plugin somehow?
registerAdapter(GregorianCalendar.class, new CalendarSerializer());
+ registerAdapter(XMLGregorianCalendarImpl.class, new BuiltInTypeSupport.XMLGregorianCalendarSerializer());
registerAdapter(Date.class, new DateSerializer());
registerAdapter(Timestamp.class, new TimestampSerializer());
registerAdapter(java.sql.Date.class,
@@ -121,12 +134,20 @@ public class DynamicSerializationManager {
registerAdapter(Coordinate.class, new CoordAdapter());
registerAdapter(BigDecimal.class,
new BuiltInTypeSupport.BigDecimalSerializer());
+ registerAdapter(BigInteger.class,
+ new BuiltInTypeSupport.BigIntegerSerializer());
registerAdapter(Geometry.class, new GeometryTypeAdapter());
+ registerAdapter(Polygon.class, new GeometryTypeAdapter());
+ registerAdapter(MultiPolygon.class, new GeometryTypeAdapter());
+ registerAdapter(Point.class, new GeometryTypeAdapter());
registerAdapter(Envelope.class, new JTSEnvelopeAdapter());
registerAdapter(GridGeometry2D.class, new GridGeometry2DAdapter());
registerAdapter(GeneralGridGeometry.class, new GridGeometryAdapter());
registerAdapter(EnumSet.class, new EnumSetAdapter());
registerAdapter(StackTraceElement.class, new StackTraceElementAdapter());
+ registerAdapter(Duration.class, new BuiltInTypeSupport.DurationSerializer());
+ registerAdapter(QName.class, new BuiltInTypeSupport.QNameSerializer());
+ registerAdapter(Throwable.class, new BuiltInTypeSupport.ThrowableSerializer());
// These two are OBE by BufferAdapter and should be deleted sometime
registerAdapter(ByteBuffer.class, new ByteBufferAdapter());
registerAdapter(FloatBuffer.class, new FloatBufferAdapter());
@@ -256,7 +277,7 @@ public class DynamicSerializationManager {
throws SerializationException {
return ((ThriftSerializationContext) ctx).deserializeMessage();
}
-
+
public static void registerAdapter(Class clazz,
ISerializationTypeAdapter adapter) {
SerializationMetadata md = new SerializationMetadata();
@@ -269,7 +290,7 @@ public class DynamicSerializationManager {
}
serializedAttributes.put(md.adapterStructName, md);
}
-
+
/**
* Inspect a class and return the metadata for the object
*
@@ -281,6 +302,7 @@ public class DynamicSerializationManager {
* the class
* @return the metadata
*/
+ @SuppressWarnings("rawtypes")
public static SerializationMetadata inspect(Class c) {
// Check for base types
@@ -370,17 +392,30 @@ public class DynamicSerializationManager {
if (annotation != null) {
String fieldName = field.getName();
- attribs.serializedAttributes.add(field.getName());
+ attribs.serializedAttributes.add(fieldName);
+
+ // Can be specified at field or class level
+ Class fieldAdapter = null;
if (serializeAdapterTag == null) {
- serializeAdapterTag = field.getType()
+ // Adapter specified at field level
+ if (annotation.value() != ISerializationTypeAdapter.class) {
+ fieldAdapter = annotation.value();
+ } else {
+ // Adapter specified at class level
+ serializeAdapterTag = field
+ .getType()
.getAnnotation(
DynamicSerializeTypeAdapter.class);
+ if (serializeAdapterTag != null) {
+ fieldAdapter = serializeAdapterTag
+ .factory();
+ }
+ }
}
- if (serializeAdapterTag != null) {
+ if (fieldAdapter != null) {
try {
attribs.attributesWithFactories.put(fieldName,
- serializeAdapterTag.factory()
- .newInstance());
+ fieldAdapter.newInstance());
} catch (Exception e) {
throw new RuntimeException(
"Factory could not be instantiated", e);
diff --git a/edexOsgi/com.raytheon.uf.common.serialization.comm/src/com/raytheon/uf/common/serialization/comm/util/ExceptionWrapper.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/ExceptionWrapper.java
similarity index 94%
rename from edexOsgi/com.raytheon.uf.common.serialization.comm/src/com/raytheon/uf/common/serialization/comm/util/ExceptionWrapper.java
rename to edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/ExceptionWrapper.java
index 6b460f8c6b..da8527f8bb 100644
--- a/edexOsgi/com.raytheon.uf.common.serialization.comm/src/com/raytheon/uf/common/serialization/comm/util/ExceptionWrapper.java
+++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/ExceptionWrapper.java
@@ -17,9 +17,7 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
-package com.raytheon.uf.common.serialization.comm.util;
-
-import com.raytheon.uf.common.serialization.SerializableExceptionWrapper;
+package com.raytheon.uf.common.serialization;
/**
* Class used to wrap/unwrap throwables in a serializable form to be transported
@@ -31,6 +29,7 @@ import com.raytheon.uf.common.serialization.SerializableExceptionWrapper;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 10, 2009 mschenke Initial creation
+ * Sep 14, 2012 1169 djohnson Moved to com.raytheon.uf.common.serialization
*
*
*
diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/IDeserializationContext.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/IDeserializationContext.java
index 5e546f9200..8acfd9ed24 100644
--- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/IDeserializationContext.java
+++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/IDeserializationContext.java
@@ -24,9 +24,10 @@ package com.raytheon.uf.common.serialization;
*
* * SOFTWARE HISTORY - * Date Ticket# Engineer Description + * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Aug 12, 2008 chammack Initial creation + * Aug 12, 2008 chammack Initial creation + * Sep 14, 2012 1169 djohnson Added readObject(). * ** @@ -41,7 +42,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract boolean readBool() throws SerializationException; + boolean readBool() throws SerializationException; /** * Read a byte @@ -49,7 +50,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract byte readByte() throws SerializationException; + byte readByte() throws SerializationException; /** * Read a short @@ -57,7 +58,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract short readI16() throws SerializationException; + short readI16() throws SerializationException; /** * Read an int @@ -65,7 +66,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract int readI32() throws SerializationException; + int readI32() throws SerializationException; /** * Read a long @@ -73,7 +74,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract long readI64() throws SerializationException; + long readI64() throws SerializationException; /** * Read a double @@ -81,7 +82,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract double readDouble() throws SerializationException; + double readDouble() throws SerializationException; /** * Read a double array @@ -89,7 +90,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract double[] readDoubleArray() throws SerializationException; + double[] readDoubleArray() throws SerializationException; /** * Read a float @@ -97,7 +98,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract float readFloat() throws SerializationException; + float readFloat() throws SerializationException; /** * Read a string @@ -105,7 +106,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract String readString() throws SerializationException; + String readString() throws SerializationException; /** * Read a binary blob @@ -113,7 +114,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract byte[] readBinary() throws SerializationException; + byte[] readBinary() throws SerializationException; /** * Read a float array @@ -121,7 +122,7 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract float[] readFloatArray() throws SerializationException; + float[] readFloatArray() throws SerializationException; /** * Read a message header @@ -129,13 +130,21 @@ public interface IDeserializationContext { * @return * @throws SerializationException */ - public abstract String readMessageStart() throws SerializationException; + String readMessageStart() throws SerializationException; /** * Read a message footer * * @throws SerializationException */ - public abstract void readMessageEnd() throws SerializationException; + void readMessageEnd() throws SerializationException; + /** + * Read an object. + * + * @return the read object + * + * @throws SerializationException + */ + Object readObject() throws SerializationException; } diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/ISerializationContext.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/ISerializationContext.java index 5fda8c537a..2ea75e5a18 100644 --- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/ISerializationContext.java +++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/ISerializationContext.java @@ -24,9 +24,10 @@ package com.raytheon.uf.common.serialization; * *
* SOFTWARE HISTORY - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Aug 7, 2008 chammack Initial creation + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 07, 2008 chammack Initial creation + * Sep 14, 2012 1169 djohnson Added writeObject(OBject). * ** @@ -42,7 +43,7 @@ public interface ISerializationContext { * @param b * @throws SerializationException */ - public abstract void writeBool(boolean b) throws SerializationException; + void writeBool(boolean b) throws SerializationException; /** * Write a byte @@ -50,7 +51,7 @@ public interface ISerializationContext { * @param b * @throws SerializationException */ - public abstract void writeByte(byte b) throws SerializationException; + void writeByte(byte b) throws SerializationException; /** * Write a short @@ -58,7 +59,7 @@ public interface ISerializationContext { * @param i16 * @throws SerializationException */ - public abstract void writeI16(short i16) throws SerializationException; + void writeI16(short i16) throws SerializationException; /** * Write an int @@ -66,7 +67,7 @@ public interface ISerializationContext { * @param i32 * @throws SerializationException */ - public abstract void writeI32(int i32) throws SerializationException; + void writeI32(int i32) throws SerializationException; /** * Write a long @@ -74,7 +75,7 @@ public interface ISerializationContext { * @param i64 * @throws SerializationException */ - public abstract void writeI64(long i64) throws SerializationException; + void writeI64(long i64) throws SerializationException; /** * Write a double @@ -82,7 +83,7 @@ public interface ISerializationContext { * @param dub * @throws SerializationException */ - public abstract void writeDouble(double dub) throws SerializationException; + void writeDouble(double dub) throws SerializationException; /** * Write a double array @@ -90,7 +91,7 @@ public interface ISerializationContext { * @param dub * @throws SerializationException */ - public abstract void writeDoubleArray(double[] dubs) + void writeDoubleArray(double[] dubs) throws SerializationException; /** @@ -99,7 +100,7 @@ public interface ISerializationContext { * @param flt * @throws SerializationException */ - public abstract void writeFloat(float flt) throws SerializationException; + void writeFloat(float flt) throws SerializationException; /** * Write a string @@ -107,7 +108,7 @@ public interface ISerializationContext { * @param str * @throws SerializationException */ - public abstract void writeString(String str) throws SerializationException; + void writeString(String str) throws SerializationException; /** * Write a binary blob @@ -115,7 +116,7 @@ public interface ISerializationContext { * @param bin * @throws SerializationException */ - public abstract void writeBinary(byte[] bin) throws SerializationException; + void writeBinary(byte[] bin) throws SerializationException; /** * Write a float array @@ -123,7 +124,7 @@ public interface ISerializationContext { * @param floats * @throws SerializationException */ - public abstract void writeFloatArray(float[] floats) + void writeFloatArray(float[] floats) throws SerializationException; /** @@ -132,7 +133,7 @@ public interface ISerializationContext { * @param messageName * @throws SerializationException */ - public abstract void writeMessageStart(String messageName) + void writeMessageStart(String messageName) throws SerializationException; /** @@ -140,6 +141,14 @@ public interface ISerializationContext { * * @throws SerializationException */ - public abstract void writeMessageEnd() throws SerializationException; + void writeMessageEnd() throws SerializationException; + /** + * Write another object. + * + * @param obj + * the object + * @throws SerializationException + */ + void writeObject(Object obj) throws SerializationException; } diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/MapEntryType.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/MapEntryType.java new file mode 100644 index 0000000000..1fbc74d1a2 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/MapEntryType.java @@ -0,0 +1,77 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.serialization; + +import java.util.Map; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; + +/** + * Used by Jaxb to represent a {@link Map.Entry}. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 31, 2012 955 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ + +@XmlAccessorType(XmlAccessType.NONE) +public class MapEntryType
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 31, 2012 955 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public class MapType
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 31, 2012 955 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ +public class XmlGenericMapAdapter
* SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Aug 7, 2008 chammack Initial creation + * Aug 07, 2008 chammack Initial creation + * Sep 28, 2012 1195 djohnson Add value() to specify a type adapter. * ** @@ -48,4 +54,6 @@ import java.lang.annotation.Target; @Target(ElementType.FIELD) @Documented public @interface DynamicSerializeElement { + @SuppressWarnings("rawtypes") + Class value() default ISerializationTypeAdapter.class; } diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java index 6a96c50acc..c1458a4661 100644 --- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java +++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/thrift/ThriftSerializationContext.java @@ -42,11 +42,10 @@ import com.facebook.thrift.protocol.TMessage; import com.facebook.thrift.protocol.TSet; import com.facebook.thrift.protocol.TStruct; import com.facebook.thrift.protocol.TType; +import com.raytheon.uf.common.serialization.BaseSerializationContext; import com.raytheon.uf.common.serialization.DynamicSerializationManager; import com.raytheon.uf.common.serialization.DynamicSerializationManager.EnclosureType; import com.raytheon.uf.common.serialization.DynamicSerializationManager.SerializationMetadata; -import com.raytheon.uf.common.serialization.IDeserializationContext; -import com.raytheon.uf.common.serialization.ISerializationContext; import com.raytheon.uf.common.serialization.ISerializationTypeAdapter; import com.raytheon.uf.common.serialization.SerializationCache; import com.raytheon.uf.common.serialization.SerializationException; @@ -62,8 +61,10 @@ import com.raytheon.uf.common.serialization.SerializationException; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Aug 12, 2008 #1448 chammack Initial creation - * Jun 17, 2010 #5091 njensen Optimized primitive arrays - * Mar 1, 2011 njensen Restructured deserializeArray() + * Jun 17, 2010 #5091 njensen Optimized primitive arrays + * Mar 01, 2011 njensen Restructured deserializeArray() + * Sep 14, 2012 #1169 djohnson Add ability to write another object into the stream directly. + * Sep 28, 2012 #1195 djohnson Add ability to specify adapter at field level. * * * @@ -72,17 +73,14 @@ import com.raytheon.uf.common.serialization.SerializationException; */ // Warnings are suppressed in this class because generics cause issues with the // extensive use of reflection. The erased objects are used instead. -@SuppressWarnings("unchecked") -public class ThriftSerializationContext implements ISerializationContext, - IDeserializationContext { +@SuppressWarnings({ "unchecked", "rawtypes" }) +public class ThriftSerializationContext extends BaseSerializationContext { /** The tag that is used to indicate the value of an enumeration */ private static final String ENUM_VALUE_TAG = "__enumValue__"; private final SelfDescribingBinaryProtocol protocol; - private final DynamicSerializationManager serializationManager; - private static Map
* SOFTWARE HISTORY - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jul 16, 2008 randerso Initial creation + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 16, 2008 randerso Initial creation + * Aug 24, 2012 0743 djohnson Add option to use milliseconds for operations, change to singleton. * ** @@ -42,7 +44,7 @@ import java.util.TimeZone; * @version 1.0 */ -public class SimulatedTime { +public final class SimulatedTime { /** * The system global simulated time instance */ @@ -95,7 +97,7 @@ public class SimulatedTime { * Creates a simulated time that matches real time. * */ - public SimulatedTime() { + private SimulatedTime() { setRealTime(); } @@ -111,8 +113,24 @@ public class SimulatedTime { * @param isFrozen * true to freeze time */ - public SimulatedTime(Date date, double scale, boolean isFrozen) { - setTime(date); + private SimulatedTime(Date date, double scale, boolean isFrozen) { + this(date.getTime(), scale, isFrozen); + } + + /** + * Creates a simulated time starting at the specified time with + * acceleration/deceleration, optionally frozen. + * + * @param millis + * starting time in milliseconds + * @param scale + * 1.0 for normal time rate, >1.0 for accelerated time < 1.0 for + * decelerated time. If negative time will run backward. + * @param isFrozen + * true to freeze time + */ + public SimulatedTime(long millis, double scale, boolean isFrozen) { + setTime(millis); this.scale = scale; this.isFrozen = isFrozen; } @@ -142,11 +160,14 @@ public class SimulatedTime { * @return current simulated time */ public Date getTime() { + return new Date(getMillis()); + } + + public long getMillis() { if (isFrozen) { - return new Date(frozenTime); + return frozenTime; } else { - return new Date(Math.round((now() - baseTime) * scale) + baseTime - + offset); + return Math.round((now() - baseTime) * scale) + baseTime + offset; } } @@ -156,11 +177,20 @@ public class SimulatedTime { * @param date */ public void setTime(Date date) { + setTime(date.getTime()); + } + + /** + * Set the current simulated time + * + * @param millis + */ + public void setTime(long millis) { if (isFrozen) { - frozenTime = date.getTime(); + frozenTime = millis; } else { baseTime = now(); - offset = date.getTime() - baseTime; + offset = millis - baseTime; } } @@ -206,7 +236,7 @@ public class SimulatedTime { } if (isFrozen) { - frozenTime = getTime().getTime(); + frozenTime = getMillis(); } else { baseTime = now(); offset = frozenTime - baseTime; diff --git a/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/AbstractTimer.java b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/AbstractTimer.java new file mode 100644 index 0000000000..284831f894 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/AbstractTimer.java @@ -0,0 +1,108 @@ +package com.raytheon.uf.common.time.util; + +import net.jcip.annotations.NotThreadSafe; + +/** + * + * Provides the basic {@link ITimer} implementation, such as the state machine + * functionality. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 16, 2012 0743 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ +@NotThreadSafe +abstract class AbstractTimer implements ITimer { + private long start; + + private long stop; + + private long elapsedTime; + + /** + * {@inheritDoc} + */ + @Override + public void start() { + if (isTimerStopped()) { + elapsedTime += (stop - start); + stop = 0; + } else if (isTimerStarted()) { + throw new IllegalStateException( + "A timer that is running must be stopped before start() is called again!"); + } + this.start = getCurrentTime(); + } + + /** + * {@inheritDoc} + */ + @Override + public void stop() { + if (!isTimerStarted()) { + throw new IllegalStateException( + "Timer must be started before it can be stopped!"); + } + // If the timer has already been stopped, don't change the time + if (!isTimerStopped()) { + this.stop = getCurrentTime(); + } + } + + /** + * {@inheritDoc} + */ + @Override + public long getElapsedTime() { + long currentOrStopTime = (isTimerRunning()) ? getCurrentTime() : stop; + return (currentOrStopTime - start) + elapsedTime; + } + + /** + * {@inheritDoc} + */ + @Override + public void reset() { + start = 0; + stop = 0; + elapsedTime = 0; + } + + protected abstract long getCurrentTime(); + + /** + * Check whether the timer is actively running. + * + * @return true if the timer is running + */ + private boolean isTimerRunning() { + return isTimerStarted() && !isTimerStopped(); + } + + /** + * Check whether the timer was started. + * + * @return true if the timer was started + */ + private boolean isTimerStarted() { + return start > 0; + } + + /** + * Check whether the timer is stopped. + * + * @return true if the timer is stopped + */ + private boolean isTimerStopped() { + return stop > 0; + } +} diff --git a/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimeStrategy.java b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimeStrategy.java new file mode 100644 index 0000000000..c2f55698e1 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimeStrategy.java @@ -0,0 +1,28 @@ +package com.raytheon.uf.common.time.util; + +/** + * + * Denotes a strategy to retrieve the current time. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 16, 2012 0743 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ +interface ITimeStrategy { + + /** + * Retrieves the current time in milliseconds. + * + * @return the current time in milliseconds + */ + long currentTimeMillis(); +} \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimer.java b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimer.java new file mode 100644 index 0000000000..0a028176ad --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimer.java @@ -0,0 +1,50 @@ +package com.raytheon.uf.common.time.util; + +/** + * + * Defines a timer that can be started and stopped. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 16, 2012 0743 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ +public interface ITimer { + + /** + * Start the time on the timer. + * + * @throws IllegalStateException + * if the timer is already running, or has been stopped and not + * reset + */ + void start() throws IllegalStateException; + + /** + * Stop the time on the timer. + * + * @throws IllegalStateException + * if the timer hasn't been started + */ + void stop() throws IllegalStateException; + + /** + * Get the elapsed time, in milliseconds. + * + * @return the elapsed time in milliseconds + */ + long getElapsedTime(); + + /** + * Reset the timer. + */ + void reset(); +} diff --git a/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ImmutableDate.java b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ImmutableDate.java new file mode 100644 index 0000000000..eb18ca0520 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ImmutableDate.java @@ -0,0 +1,203 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.time.util; + +import java.util.Date; + +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import net.jcip.annotations.Immutable; + +import com.raytheon.uf.common.serialization.IDeserializationContext; +import com.raytheon.uf.common.serialization.ISerializationContext; +import com.raytheon.uf.common.serialization.ISerializationTypeAdapter; +import com.raytheon.uf.common.serialization.SerializationException; +import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeTypeAdapter; +import com.raytheon.uf.common.time.SimulatedTime; + +/** + * An {@link Immutable} version of {@link Date}. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 15, 2012 0743 djohnson Initial creation + * Sep 19, 2012 0726 jspinks Added XmlJavaTypeAdaptor annotation + * + *+ * + * @author djohnson + * @version 1.0 + */ +@XmlJavaTypeAdapter(value=ImmutableDateAdapter.class) +@Immutable +@DynamicSerialize +@DynamicSerializeTypeAdapter(factory = ImmutableDate.class) +public final class ImmutableDate extends Date implements + ISerializationTypeAdapter
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Sep 19, 2012 726 jspinks Initial creation + * + *+ * + * @version 1.0 + */ +public class ImmutableDateAdapter extends XmlAdapter
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Aug 16, 2012 0743 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ +@NotThreadSafe +class TimerImpl extends AbstractTimer { + + /** + * {@inheritDoc} + */ + @Override + protected long getCurrentTime() { + return TimeUtil.currentTimeMillis(); + } +} diff --git a/edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF index d4b62e6588..698f935620 100644 --- a/edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF @@ -5,9 +5,12 @@ Bundle-SymbolicName: com.raytheon.uf.common.util Bundle-Version: 1.12.1174.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="1.0.0" +Require-Bundle: org.junit;bundle-version="1.0.0", + org.apache.commons.beanutils;bundle-version="1.8.3", + com.raytheon.uf.common.status;bundle-version="1.12.1174" Export-Package: com.raytheon.uf.common.util, com.raytheon.uf.common.util.cache, com.raytheon.uf.common.util.header, - com.raytheon.uf.common.util.registry + com.raytheon.uf.common.util.registry, + com.raytheon.uf.common.util.session Import-Package: org.apache.commons.lang diff --git a/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/CollectionUtil.java b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/CollectionUtil.java new file mode 100644 index 0000000000..c9b21378ae --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/CollectionUtil.java @@ -0,0 +1,84 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.util; + +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + + +/** + * Utility class for collection types. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 13, 2012 740 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public final class CollectionUtil { + + private CollectionUtil() { + + } + + /** + * Check whether an array is null or empty. + * + * @param array + * the array + * @return true if the array is null or empty + */ + public static
* * SOFTWARE HISTORY + * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * May 18, 2010 mschenke Initial creation + * Jul 5, 2012 740 djohnson Initial creation * ** - * @author mschenke + * @author djohnson * @version 1.0 */ -public interface IRoleStorage { +public final class ExceptionUtil { + + private ExceptionUtil() { + } /** - * Given the (case insensitive) role id, return the role object + * Retrieve the root cause of a {@link Throwable} chain. * - * @param roleId - * @return + * @param t + * the throwable + * @return the root cause */ - public IRole lookupRole(String roleId); + public static Throwable getRootCause(Throwable t) { + Throwable result = t; - /** - * Given the role, determine if it is the default role - * - * @param role - * @return - */ - public boolean isDefaultRole(IRole role); + while (result.getCause() != null) { + result = result.getCause(); + } + + return result; + } } diff --git a/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java index d96e390326..1c606eb9e8 100644 --- a/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java +++ b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java @@ -49,7 +49,7 @@ import java.util.zip.GZIPOutputStream; * return false when unable to * obtain directory listing. * Sep 16, 2008 1250 jelkins Added join function - * - AWIPS2 Baseline Repository -------- + * Jun 28, 2012 0819 djohnson Add write method. * Jul 06, 2012 798 jkorman Added more robust {@link #copyFile}. Added methods * to create temporary directories and files. * @@ -619,6 +619,24 @@ public class FileUtil { public static boolean isValidFilename(String fileName) { return VALID_FILENAME.matcher(fileName).matches(); } + + /** + * Write the contents of an input stream to a file. + * + * @param is + * the input stream to read from + * @param file + * the file to write to + * @throws IOException + */ + public static void write(InputStream is, File file) throws IOException { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + + int read = 0; + while ((read = is.read()) != -1) { + os.write(read); + } + } /** * Copy a file from one location to another. The file copy may begin at some diff --git a/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/PropertiesUtil.java b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/PropertiesUtil.java new file mode 100644 index 0000000000..3f2dc3db28 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/PropertiesUtil.java @@ -0,0 +1,107 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.util; + +import java.io.Closeable; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.Properties; + +/** + * Utility class to work with {@link Properties}. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jun 28, 2012 819 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public final class PropertiesUtil { + + /** + * Prevent instantiation. + */ + private PropertiesUtil() { + } + + /** + * Read an input stream to load a {@link Properties} instance. + * + * @param is + * the input stream + * @return the Properties + * @throws IOException + * on error reading the {@link InputStream} + */ + public static Properties read(InputStream is) throws IOException { + Reader reader = null; + try { + reader = new InputStreamReader(is); + + Properties properties = new Properties(); + properties.load(reader); + + return properties; + } finally { + close(reader); + } + } + + /** + * Read a {@link File} to load a {@link Properties} instance. + * + * @param file + * the file to read + * @return the Properties + * @throws IOException + * on error reading the {@link File} + */ + public static Properties read(File file) throws IOException { + InputStream is = null; + try { + is = new FileInputStream(file); + return read(is); + } finally { + close(is); + } + } + + public static void close(Closeable closeable) { + if (closeable != null) { + try { + closeable.close(); + } catch (IOException e) { + // Nothing to do, closing... + } + } + } +} diff --git a/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ReflectionException.java b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ReflectionException.java new file mode 100644 index 0000000000..30d12bd487 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ReflectionException.java @@ -0,0 +1,58 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.util; + +/** + * A wrapper runtime exception for problems that occur with reflection. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 10, 2012 634 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public class ReflectionException extends RuntimeException { + + private static final long serialVersionUID = -6622684607744047392L; + + public ReflectionException() { + super(); + } + + public ReflectionException(String message, Throwable cause) { + super(message, cause); + } + + public ReflectionException(String message) { + super(message); + } + + public ReflectionException(Throwable cause) { + super(cause); + } +} diff --git a/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ReflectionUtil.java b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ReflectionUtil.java new file mode 100644 index 0000000000..ca1c59b811 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ReflectionUtil.java @@ -0,0 +1,228 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.util; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import org.apache.commons.beanutils.PropertyUtils; + +/** + * Reflection utilities. + * + *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Jul 10, 2012 634 djohnson Initial creation
+ * Jul 10, 2012 455 djohnson Move in methods from RegistryUtil,
+ * fix setter method to use parameter types.
+ * Sep 28, 2012 1195 djohnson Add {@link #forName(String)}.
+ *
+ *
+ *
+ * @author djohnson
+ * @version 1.0
+ */
+public final class ReflectionUtil {
+
+ private static ConcurrentMap+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Sep 26, 2012 1195 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ +public interface SessionContext { + /** + * Open the context, called by {@link SessionManager} when the context is + * initially created for a thread. + */ + void open(); + + /** + * Close the context, called by {@link SessionManager} when the context is + * destroyed for a thread. + */ + void close(); +} diff --git a/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/session/SessionManager.java b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/session/SessionManager.java new file mode 100644 index 0000000000..556b9f81e2 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/session/SessionManager.java @@ -0,0 +1,182 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.util.session; + +import java.util.HashMap; +import java.util.Map; + +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.uf.common.util.ReflectionUtil; + +/** + * Provides the functionality to manage a 'session'. Each thread has its own + * instance of the context. 1..N open requests can be made, and once the Nth + * close request comes in the session is closed. All data related to the session + * is stored in the sub-class of {@link SessionContext}. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Sep 26, 2012 1195 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public final class SessionManager { + + private static final IUFStatusHandler statusHandler = UFStatus + .getHandler(SessionManager.class); + + /** + * Inner-class used to hold the SessionContext tracking data. + */ + private static class SessionContextTracker { + private int openRequests; + private final SessionContext sessionContext; + + /** + * Constructor. + * + * @param sessionContext + * the session context to track + */ + private SessionContextTracker(SessionContext sessionContext) { + this.sessionContext = sessionContext; + } + } + + /** + * Kept in a ThreadLocal to avoid synchronization expenditures. + */ + private static final ThreadLocal
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Jul 13, 2012 740 djohnson Initial creation
+ * Jul 26, 2012 955 djohnson Add isNullOrEmpty for {@link Collection}s.
+ *
+ *
+ *
+ * @author djohnson
+ * @version 1.0
+ */
+
+public class CollectionUtilTest {
+
+ @Test
+ public void testIsNullOrEmptyReturnsTrueForNullArray() {
+ String[] array = null;
+ assertTrue(CollectionUtil.isNullOrEmpty(array));
+ }
+
+ @Test
+ public void testIsNullOrEmptyReturnsTrueForEmptyArray() {
+ String[] array = new String[0];
+ assertTrue(CollectionUtil.isNullOrEmpty(array));
+ }
+
+ @Test
+ public void testIsNullOrEmptyReturnsFalseForNonEmptyArray() {
+ String[] array = new String[] { "" };
+ assertFalse(CollectionUtil.isNullOrEmpty(array));
+ }
+
+ @Test
+ public void testIsNullOrEmptyReturnsTrueForNullCollection() {
+ assertTrue(CollectionUtil.isNullOrEmpty((Collection) null));
+ }
+
+ @Test
+ public void testIsNullOrEmptyReturnsTrueForEmptyCollection() {
+ assertTrue(CollectionUtil.isNullOrEmpty(Collections.emptyList()));
+ }
+
+ @Test
+ public void testIsNullOrEmptyReturnsFalseForNonEmptyCollection() {
+ assertFalse(CollectionUtil.isNullOrEmpty(Arrays.asList("not empty")));
+ }
+}
diff --git a/edexOsgi/com.raytheon.uf.common.util/unit-test/com/raytheon/uf/common/util/ExceptionUtilTest.java b/edexOsgi/com.raytheon.uf.common.util/unit-test/com/raytheon/uf/common/util/ExceptionUtilTest.java
new file mode 100644
index 0000000000..35ea8d6d30
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.util/unit-test/com/raytheon/uf/common/util/ExceptionUtilTest.java
@@ -0,0 +1,64 @@
+/**
+ * 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.
+ **/
+package com.raytheon.uf.common.util;
+
+import static org.junit.Assert.assertSame;
+
+import java.io.FileNotFoundException;
+
+import org.junit.Test;
+
+/**
+ * Test {@link ExceptionUtil}.
+ *
+ * + * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 5, 2012 740 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public class ExceptionUtilTest { + + @Test + public void testGettingRootCauseGoesNLevelsDeep() { + final FileNotFoundException root = new FileNotFoundException("root"); + final Throwable t = new Throwable(new IllegalArgumentException( + new IllegalStateException(root))); + + assertSame("Didn't get the correct exception for the root cause!", + root, ExceptionUtil.getRootCause(t)); + } + + @Test + public void testGettingRootCauseWillReturnParameterIfNoCauseFound() { + final FileNotFoundException root = new FileNotFoundException(); + + assertSame("Didn't get the correct exception for the root cause!", + root, ExceptionUtil.getRootCause(root)); + } +} diff --git a/edexOsgi/com.raytheon.uf.common.util/unit-test/com/raytheon/uf/common/util/PropertiesUtilTest.java b/edexOsgi/com.raytheon.uf.common.util/unit-test/com/raytheon/uf/common/util/PropertiesUtilTest.java new file mode 100644 index 0000000000..8397b32dcc --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.util/unit-test/com/raytheon/uf/common/util/PropertiesUtilTest.java @@ -0,0 +1,90 @@ +/** + * 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. + **/ +package com.raytheon.uf.common.util; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +import org.junit.Test; + +/** + * Test {@link PropertiesUtil}. + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jun 28, 2012 819 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public class PropertiesUtilTest { + + private static final Class
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 10, 2012 634 djohnson Initial creation + * + *+ * + * @author djohnson + * @version 1.0 + */ +public class ReflectionUtilTest { + + private static final String NON_EXISTANT = "nonExistant"; + + @Test + public void testNewInstanceOfAssignableTypeWithInterface() { + List list = ReflectionUtil.newInstanceOfAssignableType(List.class, + ArrayList.class.getName()); + assertTrue(list instanceof ArrayList); + } + + @Test(expected = ReflectionException.class) + public void testNewInstanceOfAssignableTypeThrowsReflectionExceptionOnIncompatibleCast() { + ReflectionUtil.newInstanceOfAssignableType(List.class, + HashSet.class.getName()); + } + + @Test(expected = ReflectionException.class) + public void testNewInstanceOfAssignableTypeThrowsReflectionExceptionOnInvalidClassname() { + ReflectionUtil.newInstanceOfAssignableType(List.class, NON_EXISTANT); + } + + @Test + public void testGetterRetrievesGetPrefixedValue() { + byte[] expected = new byte[] { 't', 'e', 's', 't' }; + String value = new String(expected); + + byte[] actual = (byte[]) ReflectionUtil.getter(value, "bytes"); + + assertArrayEquals( + "Did not receive the expected value from the getter!", + expected, actual); + } + + @Test + public void testGetterWithCastResult() { + byte[] expected = new byte[] { 't', 'e', 's', 't' }; + String value = new String(expected); + + byte[] actual = ReflectionUtil.getter(byte[].class, value, "bytes"); + + assertArrayEquals( + "Did not receive the expected value from the getter!", + expected, actual); + } + + @Test + public void testGetterRetrievesIsPrefixedValue() { + List
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 13, 2012 740 djohnson Initial creation + * Aug 20, 2012 0743 djohnson Disambiguate method call. + * + *+ * + * @author djohnson + * @version 1.0 + */ + +public class StringUtilTest { + + @Test + public void testJoinedStringsUseJoinCharacter() + { + assertEquals("1,2,3", + StringUtil.join(new String[] { "1", "2", "3" }, ',')); + } + + @Test + public void testJoinReturnsNullForNullArrayOfStrings() { + assertNull(StringUtil.join((Object[]) null, ',')); + } + + @Test + public void testJoinReturnsNullForZeroLengthArray() { + assertNull(StringUtil.join(new String[0], ',')); + } + +} diff --git a/edexOsgi/com.raytheon.uf.edex.auth/.classpath b/edexOsgi/com.raytheon.uf.edex.auth/.classpath index ad32c83a78..b614cf5821 100644 --- a/edexOsgi/com.raytheon.uf.edex.auth/.classpath +++ b/edexOsgi/com.raytheon.uf.edex.auth/.classpath @@ -3,5 +3,6 @@
* Data types which must be persisted to the database must have an associated
* dao which extends this class. Each class needing a dao must also extend the
- * PersistableDataObject class.
+ * PersistableDataObject
* NOTE: Direct instantiation of this class is discouraged. Use
* DaoPool.getInstance().borrowObject() for retrieving all data access objects
@@ -96,6 +95,7 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
* ------------ ---------- ----------- --------------------------
* 7/24/07 353 bphillip Initial Check in
* 5/14/08 1076 brockwoo Fix for distinct with multiple properties
+ * Oct 10, 2012 1261 djohnson Incorporate changes to DaoConfig, add generic to {@link IPersistableDataObject}.
*
*
*
@@ -103,7 +103,9 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
* @version 1
*/
public class CoreDao extends HibernateDaoSupport {
- protected static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(CoreDao.class);
+ protected static final IUFStatusHandler statusHandler = UFStatus
+ .getHandler(CoreDao.class);
+
/**
* The Hibernate transaction manager. Methods do not directly use this
* class. Instead, use the Transaction template
@@ -113,11 +115,6 @@ public class CoreDao extends HibernateDaoSupport {
/** The convenience wrapper for the Hibernate transaction manager */
protected final TransactionTemplate txTemplate;
- /**
- * The cache region to store query
- */
- private final String QUERY_CACHE_REGION = "Queries";
-
/** The class associated with this dao */
protected Class daoClass;
@@ -132,16 +129,11 @@ public class CoreDao extends HibernateDaoSupport {
* has been assigned
*/
public CoreDao(DaoConfig config) {
- txManager = (HibernateTransactionManager) EDEXUtil
- .getESBComponent(config.getTxManagerName());
+ this.txManager = config.getTxManager();
txTemplate = new TransactionTemplate(txManager);
- // SessionFactory sf = ((DatabaseSessionFactoryBean)
- // EDEXUtil.getESBComponent("&" + config
- // .getSessionFactoryName())).getMoreBetterSessionFactory();
- setSessionFactory((SessionFactory) EDEXUtil.getESBComponent(config
- .getSessionFactoryName()));
+ setSessionFactory(config.getSessionFactory());
- daoClass = config.getDaoClassName();
+ this.daoClass = config.getDaoClass();
getHibernateTemplate().setCacheQueries(true);
}
@@ -192,7 +184,7 @@ public class CoreDao extends HibernateDaoSupport {
* @param obj
* The object to be persisted to the database
*/
- public void saveOrUpdate(final PersistableDataObject obj) {
+ public
* Null if not found
*/
- public PersistableDataObject queryById(final Serializable id) {
- PersistableDataObject retVal = (PersistableDataObject) txTemplate
+ public
* This object contains the required information to correctly instantiate a
@@ -31,14 +36,15 @@ package com.raytheon.uf.edex.database.dao;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * 12/11/07 600 bphillip Initial Check in
- *
+ * 12/11/07 600 bphillip Initial Check in
+ * Oct 10, 2012 1261 djohnson Add ability for test overriding of bean lookups.
+ *
*
*
* @author bphillip
* @version 1
*/
-public class DaoConfig {
+public abstract class DaoConfig {
/** The default database name */
public static final String DEFAULT_DB_NAME = "metadata";
@@ -49,6 +55,21 @@ public class DaoConfig {
/** The transaction manager suffix */
private static final String TX_MANAGER = "TxManager";
+ // @VisibleForTesting
+ static SpringBeanLocator DEFAULT_LOCATOR = new SpringBeanLocator() {
+ @Override
+ public
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Oct 10, 2012 1261 djohnson Initial creation
+ *
+ *
+ *
+ * @author djohnson
+ * @version 1.0
+ */
+public interface SpringBeanLocator {
+
+ /**
+ * Lookup a Spring bean by its name.
+ *
+ * @param
- * Objects of this class are typically created from Symbol or SymbolLocationSet
- * elements using the DisplayElementFactory class.
- *
+ * Objects of this class are typically created from Symbol or SymbolLocationSet elements using the
+ * DisplayElementFactory class.
* @author sgilbert
- *
+ *
*/
public class SymbolSetElement implements IDisplayable {
- /*
- * The raster image to be displayed
- */
- private IImage raster;
+ /*
+ * The raster image to be displayed
+ */
+ private IImage raster;
+
+ /*
+ * targets properties used for zoom and extent info
+ */
+ private PaintProperties paintProps;
+
+ /*
+ * Array of plot locations in pixel coordinates
+ */
+ private double[][] locations;
+ private Coordinate ul = new Coordinate(), ur= new Coordinate(), lr= new Coordinate(), ll= new Coordinate();
+
+ /**
+ * Constructor used to set an image and its associated locations
+ * @param raster Rater image to display
+ * @param paintProps paint properties for the target
+ * @param locations pixel coordinate locations to display the image
+ */
+ public SymbolSetElement(IImage raster, PaintProperties paintProps,
+ double[][] locations ) {
+ this.raster = raster;
+ this.paintProps = paintProps;
+ this.locations = locations;
+ }
- /*
- * targets properties used for zoom and extent info
- */
- private PaintProperties paintProps;
+ /**
+ * disposes the resources held by the raster image
+ * @see gov.noaa.nws.ncep.ui.pgen.display.IDisplayable#dispose()
+ */
+ @Override
+ public void dispose() {
- /*
- * Array of plot locations in pixel coordinates
- */
- private double[][] locations;
+ raster.dispose();
- private Coordinate ul = new Coordinate(), ur = new Coordinate(),
- lr = new Coordinate(), ll = new Coordinate();
+ }
- /**
- * Constructor used to set an image and its associated locations
- *
- * @param raster
- * Rater image to display
- * @param paintProps
- * paint properties for the target
- * @param locations
- * pixel coordinate locations to display the image
- */
- public SymbolSetElement(IImage raster, PaintProperties paintProps,
- double[][] locations) {
- this.raster = raster;
- this.paintProps = paintProps;
- this.locations = locations;
- }
+ /**
+ * Plots the image to the specified graphics target at the various locations
+ * @see gov.noaa.nws.ncep.ui.pgen.display.IDisplayable#draw(com.raytheon.viz.core.IGraphicsTarget)
+ */
+ @Override
+ public void draw(IGraphicsTarget target) {
- /**
- * disposes the resources held by the raster image
- *
- * @see gov.noaa.nws.ncep.ui.pgen.display.IDisplayable#dispose()
- */
- @Override
- public void dispose() {
+ double[] loc = new double[3];
- raster.dispose();
+ /*
+ * Scale image
+ */
+ double halfWidth;
+ double halfHeight;
+ double screenToWorldRatio = paintProps.getCanvasBounds().width
+ / paintProps.getView().getExtent().getWidth();
+ double scale = 0.5 / screenToWorldRatio ;
+ if ( raster instanceof GLImage ) {
+ halfWidth = ((GLImage)raster).getImage().getWidth() * scale;
+ halfHeight = ((GLImage)raster).getImage().getHeight() * scale;
+ }
+ else {
+ halfWidth = raster.getWidth() * scale;
+ halfHeight = raster.getHeight() * scale;
+ }
- }
-
- /**
- * Plots the image to the specified graphics target at the various locations
- *
- * @see gov.noaa.nws.ncep.ui.pgen.display.IDisplayable#draw(com.raytheon.viz.core.IGraphicsTarget)
- */
- @Override
- public void draw(IGraphicsTarget target) {
-
- double[] loc = new double[3];
-
- /*
- * Scale image
- */
- double halfWidth;
- double halfHeight;
-
- IExtent screenExtentInPixels = paintProps.getView().getExtent();
-
- double screenToWorldRatio = paintProps.getCanvasBounds().width
- / paintProps.getView().getExtent().getWidth();
- double scale = 0.5 / screenToWorldRatio;
- halfWidth = raster.getWidth() * scale;
- halfHeight = raster.getHeight() * scale;
-
- /*
- * draw raster image at each location
- */
- for (int j = 0; j < locations.length; j++) {
- loc = locations[j];
- if (loc == null || !screenExtentInPixels.contains(loc))
- continue;
- ul.x = loc[0] - halfWidth;
- ul.y = loc[1] - halfHeight;
- ur.x = loc[0] + halfWidth;
- ur.y = loc[1] - halfHeight;
- lr.x = loc[0] + halfWidth;
- lr.y = loc[1] + halfHeight;
- ll.x = loc[0] - halfWidth;
- ll.y = loc[1] + halfHeight;
- PixelCoverage extent = new PixelCoverage(ul, ur, lr, ll);
- /*
- * PixelCoverage extent = new PixelCoverage(new
- * Coordinate(loc[0]-halfWidth,loc[1]-halfHeight), new
- * Coordinate(loc[0]+halfWidth,loc[1]-halfHeight), new
- * Coordinate(loc[0]+halfWidth,loc[1]+halfHeight), new
- * Coordinate(loc[0]-halfWidth,loc[1]+halfHeight));
- */
- try {
- target.drawRaster(raster, extent, paintProps);
- } catch (VizException ve) {
- ve.printStackTrace();
- }
- }
- }
+ /*
+ * draw raster image at each location
+ */
+ for (int j=0; j < locations.length; j++) {
+ loc = locations[j];
+ ul.x = loc[0]-halfWidth;
+ ul.y = loc[1]-halfHeight;
+ ur.x = loc[0]+halfWidth;
+ ur.y = loc[1]-halfHeight;
+ lr.x = loc[0]+halfWidth;
+ lr.y = loc[1]+halfHeight;
+ ll.x = loc[0]-halfWidth;
+ ll.y = loc[1]+halfHeight;
+ PixelCoverage extent = new PixelCoverage(ul, ur, lr, ll);
+ /*
+ PixelCoverage extent = new PixelCoverage(new Coordinate(loc[0]-halfWidth,loc[1]-halfHeight),
+ new Coordinate(loc[0]+halfWidth,loc[1]-halfHeight),
+ new Coordinate(loc[0]+halfWidth,loc[1]+halfHeight),
+ new Coordinate(loc[0]-halfWidth,loc[1]+halfHeight));
+ */
+ try {
+ target.drawRaster(raster, extent, paintProps);
+ }
+ catch (VizException ve) {
+ ve.printStackTrace();
+ }
+ }
+ }
}
diff --git a/rpms/awips2.core/Installer.database/component.spec b/rpms/awips2.core/Installer.database/component.spec
index bc733f9f17..6b2e1b461d 100644
--- a/rpms/awips2.core/Installer.database/component.spec
+++ b/rpms/awips2.core/Installer.database/component.spec
@@ -66,7 +66,7 @@ cp -r %{_baseline_workspace}/${EXPECTED_PATH_TO_CONFIG}/${CONFIG_FILE_TO_INCLUDE
# Copy The SQL Scripts That The Database RPM Will Need To The
# Temporary Directory.
-DIRS_TO_COPY=('damcat' 'hmdb' 'migrated' 'setup' 'SHEF' 'vtec')
+DIRS_TO_COPY=('damcat' 'hmdb' 'migrated' 'setup' 'SHEF' 'vtec' 'ebxml' 'events')
for dir in ${DIRS_TO_COPY[*]};
do
cp -r %{_baseline_workspace}/${PATH_TO_DDL}/${dir}/* \
@@ -166,6 +166,7 @@ IFHS=${AWIPS2_DATA_DIRECTORY}/pgdata_ihfs
MAPS=${AWIPS2_DATA_DIRECTORY}/maps
DAMCAT=${AWIPS2_DATA_DIRECTORY}/damcat
HMDB=${AWIPS2_DATA_DIRECTORY}/hmdb
+EBXML=${AWIPS2_DATA_DIRECTORY}/ebxml
# Add The PostgreSQL Libraries And The PSQL Libraries To LD_LIBRARY_PATH.
export LD_LIBRARY_PATH=${POSTGRESQL_INSTALL}/lib:$LD_LIBRARY_PATH
@@ -271,6 +272,15 @@ function update_createDamcat()
${SQL_SHARE_DIR}/createDamcat.sql
}
+function update_createEbxml()
+{
+ echo ${AWIPS2_DATA_DIRECTORY} | sed 's/\//\\\//g' > .awips2_escape.tmp
+ AWIPS2_DATA_DIRECTORY_ESCAPED=`cat .awips2_escape.tmp`
+ rm -f .awips2_escape.tmp
+ perl -p -i -e "s/%{database_files_home}%/${AWIPS2_DATA_DIRECTORY_ESCAPED}/g" \
+ ${SQL_SHARE_DIR}/createEbxml.sql
+}
+
function update_createHMDB()
{
echo ${AWIPS2_DATA_DIRECTORY} | sed 's/\//\\\//g' > .awips2_escape.tmp
@@ -334,6 +344,10 @@ echo "--------------------------------------------------------------------------
echo "\| Creating a Directory for the hmdb Tablespace..."
echo "--------------------------------------------------------------------------------"
create_sql_element ${HMDB}
+echo "--------------------------------------------------------------------------------"
+echo "\| Creating a Directory for the ebxml Tablespace..."
+echo "--------------------------------------------------------------------------------"
+create_sql_element ${EBXML}
echo ""
echo "--------------------------------------------------------------------------------"
echo "\| Starting PostgreSQL..."
@@ -371,6 +385,9 @@ execute_psql_sql_script ${SQL_SHARE_DIR}/bit_table.sql metadata
execute_psql_sql_script ${SQL_SHARE_DIR}/collective.sql metadata
execute_psql_sql_script ${SQL_SHARE_DIR}/national_category.sql metadata
+# create the events schema
+execute_psql_sql_script ${SQL_SHARE_DIR}/createEventsSchema.sql metadata
+
echo "--------------------------------------------------------------------------------"
echo "\| Creating shef Tables..."
echo "--------------------------------------------------------------------------------"
@@ -387,6 +404,12 @@ execute_psql_sql_script ${SQL_SHARE_DIR}/populateDamcatDatabase.sql dc_ob7oax
update_createHMDB
su ${AWIPS_DEFAULT_USER} -c \
"${SQL_SHARE_DIR}/createHMDB.sh ${PSQL_INSTALL} ${AWIPS_DEFAULT_PORT} ${AWIPS_DEFAULT_USER} ${SQL_SHARE_DIR} ${SQL_LOG}"
+
+update_createEbxml
+echo "--------------------------------------------------------------------------------"
+echo "\| Creating ebxml Tables..."
+echo "--------------------------------------------------------------------------------"
+execute_psql_sql_script ${SQL_SHARE_DIR}/createEbxml.sql postgres
echo "--------------------------------------------------------------------------------"
echo "\| Creating VTEC Tables..."
echo "--------------------------------------------------------------------------------"
diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
old mode 100644
new mode 100755
diff --git a/rpms/awips2.edex/Installer.edex-base/scripts/init.d/edex_camel b/rpms/awips2.edex/Installer.edex-base/scripts/init.d/edex_camel
index 7ac4db2294..6df26fe72d 100644
--- a/rpms/awips2.edex/Installer.edex-base/scripts/init.d/edex_camel
+++ b/rpms/awips2.edex/Installer.edex-base/scripts/init.d/edex_camel
@@ -30,10 +30,10 @@ if [ $TOTAL_MEM -gt 4 ]; then
fi
# Default Services to start
-SERVICES=('ingest' 'ingestGrib' 'request')
+SERVICES=('ingest' 'ingestGrib' 'request' 'datadelivery')
if [ $HIGH_MEM == "on" ]; then
- SERVICES=('ingest' 'ingestGrib' 'ingestDat' 'request')
+ SERVICES=('ingest' 'ingestGrib' 'ingestDat' 'request' 'datadelivery')
fi
# Who to run EDEX server as, usually "awips". (NOT "root")
diff --git a/rpms/awips2.edex/Installer.edex-configuration/component.spec b/rpms/awips2.edex/Installer.edex-configuration/component.spec
index 614a158d47..079fc1e4b6 100644
--- a/rpms/awips2.edex/Installer.edex-configuration/component.spec
+++ b/rpms/awips2.edex/Installer.edex-configuration/component.spec
@@ -126,4 +126,4 @@ rm -rf ${RPM_BUILD_ROOT}
%dir /awips2
%dir /awips2/edex
%dir /awips2/edex/bin
-%config(noreplace) /awips2/edex/bin/setup.env
+%config(noreplace) /awips2/edex/bin/setup.env
\ No newline at end of file
diff --git a/rpms/awips2.edex/Installer.edex-datadelivery/component.spec b/rpms/awips2.edex/Installer.edex-datadelivery/component.spec
new file mode 100644
index 0000000000..d1b47fe04c
--- /dev/null
+++ b/rpms/awips2.edex/Installer.edex-datadelivery/component.spec
@@ -0,0 +1,70 @@
+# Turn off the brp-python-bytecompile script
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+# Turn off the java jar repack
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
+
+%define _component_name awips2-edex-datadelivery
+%define _component_project_dir awips2.edex/Installer.edex-datadelivery
+#
+# AWIPS II Edex Datadelivery Spec File
+#
+Name: %{_component_name}
+Summary: AWIPS II Edex Dat
+Version: %{_component_version}
+Release: %{_component_release}
+Group: AWIPSII
+BuildRoot: /tmp
+Prefix: %{_component_default_prefix}
+URL: N/A
+License: N/A
+Distribution: N/A
+Vendor: Raytheon
+Packager: Bryan Kowal
+
+AutoReq: no
+provides: %{_component_name}
+requires: awips2
+requires: awips2-edex-base
+requires: awips2-python
+requires: awips2-java
+requires: awips2-psql
+
+%description
+AWIPS II Edex Installation - Installs The AWIPS II Edex Datadelivery Plugins.
+
+%prep
+# Verify That The User Has Specified A BuildRoot.
+if [ "${RPM_BUILD_ROOT}" = "/tmp" ]
+then
+ echo "An Actual BuildRoot Must Be Specified. Use The --buildroot Parameter."
+ echo "Unable To Continue ... Terminating"
+ exit 1
+fi
+
+mkdir -p ${RPM_BUILD_ROOT}/awips2/edex
+
+%install
+DEPLOY_SCRIPT="build.edex/deploy-install.xml"
+
+# Deploy Edex To Our Temporary Build Directory.
+/awips2/ant/bin/ant -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
+ -Dinstall.dir=${RPM_BUILD_ROOT}/awips2/edex \
+ -Dinstaller=true -Dlocal.build=false \
+ -Dcomponent.to.deploy=edex-datadelivery
+if [ $? -ne 0 ]; then
+ exit 1
+fi
+
+%pre
+%post
+%preun
+%postun
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%files
+%defattr(644,awips,fxalpha,755)
+%dir /awips2
+%dir /awips2/edex
+/awips2/edex/*
\ No newline at end of file
diff --git a/rpms/awips2.qpid/SOURCES/queueCreator.sh b/rpms/awips2.qpid/SOURCES/queueCreator.sh
index c8ccf29261..7dda8e76a6 100644
--- a/rpms/awips2.qpid/SOURCES/queueCreator.sh
+++ b/rpms/awips2.qpid/SOURCES/queueCreator.sh
@@ -52,4 +52,12 @@ do
qpid-config add queue $queue --durable --file-count 16 --file-size 24
done
+#define 24 Meg persistence queues for HPE ingest
+QUEUES=('Ingest.dhr' 'dhrProcess')
+for queue in ${QUEUES[*]};
+do
+ echo "Creating queue $queue"
+ qpid-config add queue $queue --durable --file-count 16 --file-size 24
+done
+
diff --git a/rpms/common/yum/arch.x86/comps.xml b/rpms/common/yum/arch.x86/comps.xml
index 51501f4677..168bad9fc9 100644
--- a/rpms/common/yum/arch.x86/comps.xml
+++ b/rpms/common/yum/arch.x86/comps.xml
@@ -35,6 +35,7 @@