Issue #1302 Merge branch '5-Data_Delivery' into development

Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
This commit is contained in:
Dustin Johnson 2012-11-01 11:27:02 -05:00
parent 6efd4a8ef1
commit 7d0e4a6e75
286 changed files with 12866 additions and 2567 deletions

View file

@ -88,6 +88,7 @@
</copy>
<copy todir="${buildDirectory}/plugins">
<fileset dir="${buildDirectory}/../../" includes="com.raytheon.uf.common.util*/**"/>
<fileset dir="${buildDirectory}/../../" includes="com.raytheon.uf.common.status*/**"/>
</copy>
<copy todir="${buildDirectory}/features">
<fileset dir="${buildDirectory}/../../" includes="com.raytheon.rcm.feature*/**"/>

View file

@ -42,6 +42,13 @@
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.status"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.util"

View file

@ -108,6 +108,11 @@
<copy todir="${buildDirectory}/plugins">
<fileset dir="${buildDirectory}/../../../" includes="gov.*/**"/>
</copy>
<echo message="ogc.*/**"/>
<copy todir="${buildDirectory}/plugins">
<fileset dir="${buildDirectory}/../../../" includes="ogc.*/**"/>
</copy>
<antcall target="getBaseComponents" />
</target>

View file

@ -112,6 +112,11 @@
<copy todir="${buildDirectory}/plugins">
<fileset dir="${buildDirectory}/../../../" includes="edu.*/**"/>
</copy>
<echo message="ogc.*/**"/>
<copy todir="${buildDirectory}/plugins">
<fileset dir="${buildDirectory}/../../../" includes="ogc.*/**"/>
</copy>
<echo message="de.*/**"/>
<copy todir="${buildDirectory}/plugins">
<fileset dir="${buildDirectory}/../../../" includes="de.*/**"/>

View file

@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.viz.core;visibility:=reexport,
com.raytheon.uf.common.status,
org.jep;bundle-version="1.0.0",
com.raytheon.uf.common.status,
com.raytheon.uf.common.message;bundle-version="1.11.11",
com.raytheon.uf.common.alertviz,
javax.jms;bundle-version="1.0.0",

View file

@ -63,6 +63,8 @@ Export-Package: com.raytheon.uf.viz.core,
com.raytheon.uf.viz.core.notification.jobs,
com.raytheon.uf.viz.core.notification.observers,
com.raytheon.uf.viz.core.preferences,
com.raytheon.uf.viz.core.presenter,
com.raytheon.uf.viz.core.presenter.components,
com.raytheon.uf.viz.core.procedures,
com.raytheon.uf.viz.core.requests,
com.raytheon.uf.viz.core.rsc,

View file

@ -34,4 +34,5 @@
</bean> -->
<bean class="com.raytheon.uf.common.geospatial.LogRedirector" factory-method="getInstance"/>
</beans>

View file

@ -731,6 +731,8 @@ public interface IGraphicsTarget extends IImagingExtension {
*/
public IView getView();
/**
/**
* Use drawStrings(DrawableString parameters)
*/

View file

@ -48,13 +48,20 @@ import com.raytheon.uf.viz.core.localization.LocalizationManager;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/1/06 chammack Initial Creation.
* Sep 12, 2012 1167 djohnson Add datadelivery servers.
*
* </pre>
*
* @author chammack
*
*/
public class VizApp {
public final class VizApp {
/**
* Disabled constructor.
*/
private VizApp() {
}
private static final String USER_FLAG = "-u";
@ -66,6 +73,12 @@ public class VizApp {
private static String pypiesServer;
private static String dataDeliveryServer;
private static String dataDeliveryLcmServer;
private static String dataDeliveryQueryServer;
private static String serverDataDir;
static {
@ -244,6 +257,50 @@ public class VizApp {
VizApp.pypiesServer = pypiesServer;
}
/**
* @return the dataDeliveryServer
*/
public static String getDataDeliveryServer() {
return dataDeliveryServer;
}
/**
* @param dataDeliveryServer
* the dataDeliveryServer to set
*/
public static void setDataDeliveryServer(String dataDeliveryServer) {
VizApp.dataDeliveryServer = dataDeliveryServer;
}
/**
* @return the dataDeliveryLcmServer
*/
public static String getDataDeliveryLcmServer() {
return dataDeliveryLcmServer;
}
/**
* @param dataDeliveryLcmServer
* the dataDeliveryLcmServer to set
*/
public static void setDataDeliveryLcmServer(String dataDeliveryLcmServer) {
VizApp.dataDeliveryLcmServer = dataDeliveryLcmServer;
}
/**
* @return the dataDeliveryQueryServer
*/
public static String getDataDeliveryQueryServer() {
return dataDeliveryQueryServer;
}
/**
* @param dataDeliveryQueryServer
* the dataDeliveryQueryServer to set
*/
public static void setDataDeliveryQueryServer(String dataDeliveryQueryServer) {
VizApp.dataDeliveryQueryServer = dataDeliveryQueryServer;
}
public static String getServerDataDir() {
return VizApp.serverDataDir;
}

View file

@ -47,6 +47,7 @@ import com.raytheon.uf.viz.core.requests.ThriftClient;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 5, 2009 mschenke Initial creation
* Sep 12, 2012 1167 djohnson Add datadelivery servers.
*
* </pre>
*
@ -115,6 +116,8 @@ public class LocalizationInitializer {
VizApp.setJmsServer(resp.getJmsServer());
VizApp.setPypiesServer(resp.getPypiesServer());
VizApp.setServerDataDir(resp.getServerDataDir());
VizApp.setDataDeliveryServer(resp.getDataDeliveryServer());
VizApp.setDataDeliveryLcmServer(resp.getDataDeliveryLcmServer());
VizApp.setDataDeliveryQueryServer(resp.getDataDeliveryQueryServer());
}
}

View file

@ -90,7 +90,8 @@ import com.raytheon.uf.viz.core.requests.ThriftClient;
* Jul 30, 2007 njensen Refactored.
* Feb 12, 2008 chammack Removed base configuration
* Mar 26, 2008 njensen Added rename() and getFileContents().
* May 19, 2007 #1127 randerso Implemented error handling
* May 19, 2007 #1127 randerso Implemented error handling
* Sep 12, 2012 1167 djohnson Add datadelivery servers.
*
* </pre>
*
@ -225,6 +226,10 @@ public class LocalizationManager implements IPropertyChangeListener {
VizApp.setHttpServer(resp.getHttpServer());
VizApp.setJmsServer(resp.getJmsServer());
VizApp.setPypiesServer(resp.getPypiesServer());
VizApp.setDataDeliveryServer(resp.getDataDeliveryServer());
VizApp.setDataDeliveryLcmServer(resp.getDataDeliveryLcmServer());
VizApp.setDataDeliveryQueryServer(resp
.getDataDeliveryQueryServer());
VizApp.setServerDataDir(resp.getServerDataDir());
} catch (VizException e) {
statusHandler.handle(UFStatus.Priority.SIGNIFICANT,

View file

@ -0,0 +1,78 @@
/**
* 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;
/**
* A view interface that defines methods all views should provide an
* implementation for.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 21, 2012 0743 djohnson Initial creation
*
* </pre>
*
* @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);
}

View file

@ -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.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 24, 2012 223 mpduff Initial creation.
*
* </pre>
*
* @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);
}
}

View file

@ -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.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 15, 2012 0743 djohnson Initial creation.
* Aug 29, 2012 0223 mpduff Extend WidgetConf.
*
* </pre>
*
* @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);
}
}

View file

@ -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.
*
* <pre>
*
* 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.
*
* </pre>
*
* @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);
}
}

View file

@ -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.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 18, 2012 223 mpduff Initial creation
*
* </pre>
*
* @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);
}
}

View file

@ -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.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 12, 2012 223 mpduff Initial creation
*
* </pre>
*
* @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);
}
}

View file

@ -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.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 26, 2012 223 mpduff Initial creation
*
* </pre>
*
* @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);
}
}

View file

@ -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;

View file

@ -360,4 +360,18 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.cxf"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="net.jcip"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

View file

@ -153,6 +153,13 @@
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="net.jcip"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.viz.product.alertviz"

View file

@ -155,6 +155,7 @@ public class LocalizationPerspectiveManager extends
Priority.PROBLEM,
"Error setting up python interpreter: "
+ t.getLocalizedMessage(), t);
t.printStackTrace();
}
}

View file

@ -106,7 +106,7 @@ public class IncludeMenuItem extends CommonIncludeMenuItem implements
*/
@Override
public String getId() {
return "IncludeSubMenuContributionId_" + subMenuName;
return "IncludeSubMenuContributionId_"+subMenuName;
}
};
return new IContributionItem[] { submenuCont };

View file

@ -147,11 +147,15 @@
version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.collaboration.feature"
id="com.raytheon.uf.viz.datadelivery.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.kml.export.feature"
id="com.raytheon.uf.viz.useradmin.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.collaboration.feature"
version="0.0.0"/>
<requires>

View file

@ -56,7 +56,8 @@ public class CheckPermissions {
public static boolean getAuthorization() {
boolean authorized = false;
IUser user = UserController.getUserObject();
CheckPermissionsRequest request = new CheckPermissionsRequest(user);
CheckPermissionsRequest request = new CheckPermissionsRequest();
request.setUser(user);
try {
ServerResponse<String> obj = (ServerResponse<String>) ThriftClient
.sendRequest(request);
@ -66,7 +67,7 @@ public class CheckPermissions {
authorized = false;
}
} catch (VizException e) {
statusHandler.error("Error checking permissions for: " + user);
statusHandler.error("Error checking permissions for: " + user, e);
authorized = false;
}
return authorized;

View file

@ -243,38 +243,45 @@ public class SiteActivationDlg extends CaveJFACEDialog implements
private void doValidate() {
String siteID = this.siteId.getText();
ValidateConfigRequest request = new ValidateConfigRequest(siteID, "gfe");
try {
String result = (String) ThriftClient.sendRequest(request);
appendToLog(result);
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM,
"Error processing site activation request", e);
if (!siteID.isEmpty()) {
ValidateConfigRequest request = new ValidateConfigRequest(siteID,
"gfe");
try {
String result = (String) ThriftClient.sendRequest(request);
appendToLog(result);
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM,
"Error processing site activation request", e);
}
}
}
private void doActivate() {
String siteID = this.siteId.getText();
ActivateSiteRequest request = new ActivateSiteRequest(siteID, "gfe");
try {
ThriftClient.sendRequest(request);
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM,
"Error processing site activation request", e);
if (!siteID.isEmpty()) {
ActivateSiteRequest request = new ActivateSiteRequest(siteID, "gfe");
try {
ThriftClient.sendRequest(request);
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM,
"Error processing site activation request", e);
}
}
}
private void doDeactivate() {
String siteID = this.siteId.getText();
DeactivateSiteRequest request = new DeactivateSiteRequest(siteID, "gfe");
try {
ThriftClient.sendRequest(request);
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM,
"Error processing site deactivation request", e);
if (!siteID.isEmpty()) {
DeactivateSiteRequest request = new DeactivateSiteRequest(siteID,
"gfe");
try {
ThriftClient.sendRequest(request);
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM,
"Error processing site deactivation request", e);
}
}
}

View file

@ -88,7 +88,7 @@ import com.vividsolutions.jts.geom.GeometryFactory;
* Jun 30, 2009 2524 snaples Initial creation
* Feb 29 2010 9909 lbousaidi changed the for loop for getting
* the HRAP grid bin
* Apr 17, 2012 9602 mgamazaychikm Changed the HRAP grid j index for loop
* Apr 17, 2012 9602 mgamazaychikm Changed the HRAP grid j index for loop
* </pre>
*
* @author snaples
@ -441,6 +441,8 @@ public class PlotGriddedTempResource extends
@Override
protected void paintInternal(IGraphicsTarget target,
PaintProperties paintProps) throws VizException {
target.setUseBuiltinColorbar(false);
if (buf == null || DailyQcUtils.grids_flag != 1
|| displayMgr.isMaxmin() != true) {
return;

View file

@ -31,7 +31,8 @@ Export-Package: com.raytheon.viz.ui,
com.raytheon.viz.ui.statusline,
com.raytheon.viz.ui.tools,
com.raytheon.viz.ui.views,
com.raytheon.viz.ui.widgets
com.raytheon.viz.ui.widgets,
com.raytheon.viz.ui.widgets.duallist
Bundle-Vendor: Raytheon
Import-Package: com.raytheon.uf.common.colormap,
com.raytheon.uf.common.message.response

View file

@ -413,7 +413,7 @@ public abstract class CaveSWTDialogBase extends Dialog {
* Returns if the dialog is disposed, a null dialog will not mean it is
* disposed as it may not have been opened yet.
*
* @return
* @return boolean
*/
public final boolean isDisposed() {
return (shell != null && shell.isDisposed());

View file

@ -0,0 +1,397 @@
/**
* 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 org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
/**
* Images for the Add All, Add, Remove, Remove All, Move Up, and Move Down
* buttons. Reused from Data Delivery
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 31, 2012 mpduff Initial creation
*
* </pre>
*
* @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()];
}
}

View file

@ -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.
*
* <pre>
*
* 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.
*
* </pre>
*
* @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<String> fullList) {
config.setFullList(fullList);
populateLists();
}
/**
* Populate the available and selected list controls.
*/
private void populateLists() {
availableList.removeAll();
selectedList.removeAll();
if (config.getFullList().size() == 0) {
return;
}
if (config.getFullList() != null) {
for (String s : config.getFullList()) {
if (s == null) {
continue;
}
if (config.getSelectedList().contains(s) == false) {
availableList.add(s);
}
}
}
if (config.getSelectedList() != null) {
for (String s : config.getSelectedList()) {
selectedList.add(s);
}
}
if (availableList.getItemCount() > 0) {
moveAllRightBtn.setEnabled(true);
}
if (selectedList.getItemCount() > 0) {
moveAllLeftBtn.setEnabled(true);
}
entriesUpdated();
}
/**
* Move down event handler
*/
private void handleMoveDown() {
if (selectedList.getSelectionCount() == 1
&& selectedList.getItemCount() > 1) {
int selectedIdx = selectedList.getSelectionIndex();
String item = selectedList.getItem(selectedIdx);
if (selectedIdx < selectedList.getItemCount() - 2) {
selectedList.remove(selectedIdx);
selectedList.add(item, selectedIdx + 1);
selectedList.select(selectedIdx + 1);
} else if (selectedIdx < selectedList.getItemCount() - 1) {
selectedList.remove(selectedIdx);
selectedList.add(item);
selectedList.select(selectedList.getItemCount() - 1);
}
enableDisableUpDownButtons();
}
}
/**
* Move left event handler
*/
private void handleMoveLeft() {
int[] selectionIndices = selectedList.getSelectionIndices();
moveLeft = true;
if (selectionIndices.length == 0) {
return;
}
int firstIndex = selectionIndices[0];
HashSet<String> list = config.getIncludeList();
if (list.contains(selectedList.getItem(firstIndex))) {
return;
}
reloadAvailableList();
selectedList.remove(selectionIndices);
if (selectedList.getItemCount() > 0) {
if (firstIndex < selectedList.getItemCount()) {
selectedList.setSelection(firstIndex);
} else {
selectedList.setSelection(selectedList.getItemCount() - 1);
}
} else {
moveLeftBtn.setEnabled(false);
}
moveAllRightBtn.setEnabled(true);
entriesUpdated();
enableDisableUpDownButtons();
}
/**
* Move all left event handler
*/
private void handleMoveAllLeft(boolean callEntriesUpdated) {
HashSet<String> list = config.getIncludeList();
moveAllLeft = true;
for (String sl : selectedList.getItems()) {
if (!list.contains(sl)) {
selectedList.remove(sl);
}
}
reloadAvailableList();
moveLeftBtn.setEnabled(false);
moveAllLeftBtn.setEnabled(false);
moveAllRightBtn.setEnabled(true);
if (callEntriesUpdated == true) {
entriesUpdated();
}
enableDisableUpDownButtons();
}
/**
* Move up event handler
*/
private void handleMoveUp() {
if (selectedList.getSelectionCount() == 1) {
int selectedIdx = selectedList.getSelectionIndex();
String col = selectedList.getItem(selectedIdx);
if (selectedIdx > 0) {
selectedList.remove(selectedIdx);
selectedList.add(col, selectedIdx - 1);
selectedList.select(selectedIdx - 1);
}
enableDisableUpDownButtons();
}
}
/**
* Move all right event handler
*/
private void handleMoveAllRight() {
String[] items = availableList.getItems();
if (items.length == 0) {
return;
}
for (String item : items) {
selectedList.add(item);
}
availableList.removeAll();
moveRightBtn.setEnabled(false);
moveAllRightBtn.setEnabled(false);
moveAllLeftBtn.setEnabled(true);
entriesUpdated();
enableDisableUpDownButtons();
}
/**
* Move right event handler
*/
private void handleMoveRight() {
String[] items = availableList.getSelection();
if (items.length == 0) {
return;
}
int firstIdxSelected = availableList.indexOf(items[0]);
for (String item : items) {
selectedList.add(item);
}
availableList.remove(availableList.getSelectionIndices());
if (availableList.getItemCount() == 0) {
moveRightBtn.setEnabled(false);
} else {
if (firstIdxSelected > availableList.getItemCount() - 1) {
availableList.select(availableList.getItemCount() - 1);
} else {
availableList.select(firstIdxSelected);
}
}
moveAllLeftBtn.setEnabled(true);
entriesUpdated();
enableDisableUpDownButtons();
}
/**
* Convenience method to handle the enabling/disabling of the up and down
* buttons. This depends on how many items are in the list, how many items
* are selected, where the selected it is in the list.
*/
private void enableDisableUpDownButtons() {
// Return if the buttons are now even visible.
if (config.isShowUpDownBtns() == false) {
return;
}
if (selectedList.getSelectionCount() > 1
|| selectedList.getSelectionCount() == 0) {
moveUpBtn.setEnabled(false);
moveDownBtn.setEnabled(false);
} else {
if (selectedList.getSelectionIndex() == 0
|| selectedList.getItemCount() == 0) {
moveUpBtn.setEnabled(false);
} else {
moveUpBtn.setEnabled(true);
}
if (selectedList.getSelectionIndex() == selectedList.getItemCount() - 1
|| selectedList.getItemCount() == 0) {
moveDownBtn.setEnabled(false);
} else {
moveDownBtn.setEnabled(true);
}
}
}
/**
* Reload the availableList data preserving the original order of the list.
*/
private void reloadAvailableList() {
String[] selectedStrings = availableList.getSelection();
ArrayList<String> availableListNew = new ArrayList<String>();
String search = config.getSearchField();
String[] selectedItemArray = selectedList.getItems();
ArrayList<String> selectedItemList = new ArrayList<String>();
for (String selectedItem : selectedItemArray) {
selectedItemList.add(selectedItem);
}
// Check if search field text present
if (config.getSearchField() == null) {
// If no search field text
if (moveAllLeft) {
availableList.removeAll();
for (String s : config.getFullList()) {
if (!selectedItemList.contains(s)) {
availableList.add(s);
}
}
} else if (moveLeft) {
// Add selected item matching search field text to available
// list
for (String s : selectedList.getSelection()) {
availableList.add(s);
}
// Sort the list();
availableListNew = sortAvailable(availableList);
availableList.removeAll();
for (String b : availableListNew) {
availableList.add(b);
}
}
} else {
if (moveAllLeft) {
availableList.removeAll();
// Add all matching search field text to available list
for (String s : config.getFullList()) {
if (s.contains(search)) {
availableList.add(s);
}
}
} else if (moveLeft) {
// Add selected item matching search field text to available
// list
for (String s : selectedList.getSelection()) {
availableList.add(s);
}
// Sort the list
availableListNew = sortAvailable(availableList);
availableList.removeAll();
for (String b : availableListNew) {
availableList.add(b);
}
}
}
moveAllLeft = false;
moveLeft = false;
availableList.setSelection(selectedStrings);
}
private void showAvailableListMenu() {
IMenuData menuData = config.getMenuData();
if (menuData.isShowMenu() && availableList.getSelectionCount() > 0) {
menuData.setListSelection(availableList.getSelection()[0]);
menuData.showListMenu(getShell(), config.getMenuData()
.getMenuText());
}
}
private void showSelectedListMenu() {
IMenuData menuData = config.getMenuData();
if (menuData.isShowMenu() && selectedList.getSelectionCount() > 0) {
menuData.setListSelection(selectedList.getSelection()[0]);
menuData.showListMenu(getShell(), config.getMenuData()
.getMenuText());
}
}
private ArrayList<String> sortAvailable(List oldAvailableList) {
ArrayList<String> availableListsorted = new ArrayList<String>();
String[] arr = oldAvailableList.getItems();
// Put available list in order
if (config.isNumericData()) {
// If data are numeric then must sort on the numeric value
try {
Map<Integer, String> map = new TreeMap<Integer, String>();
for (String a : arr) {
map.put(Integer.parseInt(a), a);
}
for (Integer i : map.keySet()) {
availableListsorted.add(map.get(i));
}
} catch (NumberFormatException e) {
// numeric data not all numeric, string sorting
availableListsorted = (ArrayList<String>) Arrays.asList(arr);
Collections.sort(availableListsorted);
}
} else {
for (String a : arr) {
availableListsorted.add(a);
}
Collections.sort(availableListsorted);
}
return availableListsorted;
}
/**
* Calls the callback method to notify something has changed.
*/
private void entriesUpdated() {
if (updateCallback != null) {
if (selectedList.getItemCount() == 0) {
updateCallback.hasEntries(false);
} else {
updateCallback.hasEntries(true);
}
}
}
/**
* Clear all users.
*/
public void clearSelection() {
handleMoveAllLeft(false);
}
/**
* Clear Available Users list.
*
* @param clearSelectionList
*/
public void clearAvailableList(boolean clearSelectionList) {
this.availableList.removeAll();
if (clearSelectionList == true) {
clearSelection();
}
}
/**
* Set the Available List items.
*
* @param items
* the list items.
*/
public void setAvailableItems(java.util.List<String> items) {
this.availableList.setItems(items.toArray(new String[items.size()]));
}
/**
* Get the number of items in the list.
*
* @return the number of items.
*/
public int getItemCount() {
return selectedList.getItemCount();
}
/**
* Get the Selected List items.
*
* @return the items in the selected list.
*/
public String[] getSelectedListItems() {
return selectedList.getItems();
}
/**
* Get the selection.
*
* @return the selections.
*/
public String[] getSelectedSelection() {
return selectedList.getSelection();
}
/**
* Get the configuration.
*
* @return items in available list.
*/
public String[] getAvailableListItems() {
return availableList.getItems();
}
/**
* Set the Selected List items.
*
* @param items
* the list items.
*/
public void setSelectedItems(String[] items) {
selectedList.setItems(items);
reloadAvailableList();
}
/**
* Selected User items.
*
* @param selection
* selected user items
*/
public void selectItems(String[] selection) {
availableList.deselectAll();
int[] selectedIndices = new int[selection.length];
for (int i = 0; i < selection.length; i++) {
selectedIndices[i] = availableList.indexOf(selection[i]);
}
availableList.select(selectedIndices);
handleMoveRight();
}
/**
* Get the configuration.
*
* @return the configuration.
*/
public DualListConfig getConfig() {
return config;
}
/**
* Set the configuration.
*
* @param config
* the configuration.
*/
public void setConfig(DualListConfig config) {
this.config = config;
}
}

View file

@ -0,0 +1,297 @@
/**
* 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.HashSet;
import java.util.List;
/**
* Config file for DualList class. Reused from Data Delivery.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 31, 2012 mpduff Initial creation.
* Aug 10, 2012 1002 mpduff Added numeric flag for sorting.
*
* </pre>
*
* @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<String> selectedList = new ArrayList<String>();
/**
* Full list of available items.
*/
private List<String> fullList = new ArrayList<String>();
/**
* The list to include.
*/
private HashSet<String> includeList = new HashSet<String>();
/**
* The search field.
*/
private String searchField = null;
private IMenuData menuData;
/** Flag for numeric data */
private boolean numericData = false;
/**
* Constructor.
*/
public DualListConfig() {
}
/**
* Get the include list.
*
* @return the include list.
*/
public HashSet<String> getIncludeList() {
return includeList;
}
/**
* Set the include list.
*
* @param includeList
* List to always include.
*/
public void setIncludeList(HashSet<String> includeList) {
this.includeList = includeList;
}
/**
* Get the available list header text.
*
* @return Available list header text.
*/
public String getAvailableListText() {
return availableListText;
}
/**
* Set the available list header text.
*
* @param availableListLabel
* Available list header text.
*/
public void setAvailableListLabel(String availableListLabel) {
this.availableListText = availableListLabel;
}
/**
* Get the selected list header text.
*
* @return Selected list header text.
*/
public String getSelectedListText() {
return selectedListText;
}
/**
* Set the selected list header text.
*
* @param selectedListLabel
* Selected list header text.
*/
public void setSelectedListLabel(String selectedListLabel) {
this.selectedListText = selectedListLabel;
}
/**
* Get the list control width.
*
* @return The list width.
*/
public int getListWidth() {
return listWidth;
}
/**
* Set the width of the list control.
*
* @param listWidth
* Width of the list control.
*/
public void setListWidth(int listWidth) {
this.listWidth = listWidth;
}
/**
* Get the height of the list control.
*
* @return The height of the list control.
*/
public int getListHeight() {
return listHeight;
}
/**
* Set the height of the list control.
*
* @param listHeight
* The height of the list control.
*/
public void setListHeight(int listHeight) {
this.listHeight = listHeight;
}
/**
* Check if the up/down buttons should be shown.
*
* @return True if the buttons are shown, false if hidden.
*/
public boolean isShowUpDownBtns() {
return showUpDownBtns;
}
/**
* Set the show up/down button flag.
*
* @param showUpDownBtns
* True to show the buttons, false to not show the buttons.
*/
public void setShowUpDownBtns(boolean showUpDownBtns) {
this.showUpDownBtns = showUpDownBtns;
}
/**
* Get an array of selected items.
*
* @return An array of selected items.
*/
public List<String> getSelectedList() {
return selectedList;
}
/**
* Set the array of selected items.
*
* @param selectedList
* Array of selected items.
*/
public void setSelectedList(List<String> selectedList) {
this.selectedList = selectedList;
}
/**
* Get an array of all of the available items.
*
* @return The array of all available items.
*/
public List<String> getFullList() {
return fullList;
}
/**
* Set the array of all of the available items.
*
* @param fullList
* The array of all available items.
*/
public void setFullList(List<String> fullList) {
this.fullList = fullList;
}
/**
* Get the search field text.
*
* @return the String
* the search field text.
*/
public String getSearchField() {
return searchField;
}
/**
* Set the search field text.
*
* @param searchField
* the search field text.
*/
public void setSearchField(String searchField) {
this.searchField = searchField;
}
public IMenuData getMenuData() {
return menuData;
}
public void setMenuData(IMenuData menuData) {
this.menuData = menuData;
}
/**
* @param numericData the numericData to set
*/
public void setNumericData(boolean numericData) {
this.numericData = numericData;
}
/**
* @return the numericData
*/
public boolean isNumericData() {
return numericData;
}
}

View file

@ -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.viz.ui.widgets.duallist;
import org.eclipse.swt.widgets.Shell;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jun 1, 2012 mpduff Initial creation
*
* </pre>
*
* @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);
}

View file

@ -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
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 31, 2012 mpduff Initial creation.
* Aug 08, 2012 863 jpiatt Added selectedChange method for clean & dirty checks.
*
* </pre>
*
* @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();
}

View file

@ -7,7 +7,6 @@
<classpathentry exported="true" kind="lib" path="externaljars/fldat.jar"/>
<classpathentry exported="true" kind="lib" path="externaljars/ihfsdb.jar"/>
<classpathentry exported="true" kind="lib" path="externaljars/jcchart.jar"/>
<classpathentry exported="true" kind="lib" path="externaljars/jdom.jar"/>
<classpathentry exported="true" kind="lib" path="externaljars/junit.jar"/>
<classpathentry exported="true" kind="lib" path="externaljars/netcdfUI-2.2.22.jar"/>
<classpathentry exported="true" kind="lib" path="externaljars/postgresql-8.3-603.jdbc3.jar"/>

View file

@ -120,13 +120,6 @@ Export-Package: ChartDirector,
org.apache.bsf.util.event.generator,
org.apache.bsf.util.type,
org.apache.taglibs.bsf,
org.jdom,
org.jdom.adapters,
org.jdom.filter,
org.jdom.input,
org.jdom.output,
org.jdom.transform,
org.jdom.xpath,
org.postgresql,
org.postgresql.core,
org.postgresql.core.types,
@ -243,7 +236,6 @@ Bundle-ClassPath: externaljars/bsf.jar,
externaljars/fldat.jar,
externaljars/ihfsdb.jar,
externaljars/jcchart.jar,
externaljars/jdom.jar,
externaljars/junit.jar,
externaljars/netcdfUI-2.2.22.jar,
externaljars/nlog4j-1.2.21.jar,

View file

@ -33,6 +33,7 @@ import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
@ -539,14 +540,13 @@ public class SacXMLDecoder
public String toString()
{
StringWriter stringWriter = new StringWriter();
XMLOutputter outputter = new XMLOutputter();
Format format = Format.getPrettyFormat();
format = format.setIndent(" ");
XMLOutputter outputter = new XMLOutputter(format);
String returnValue = null;
try
{
outputter.setTextTrim( true );
outputter.setIndent( " " );
outputter.setNewlines( true );
outputter.output( _doc, stringWriter );
returnValue = stringWriter.toString();
}

View file

@ -30,6 +30,7 @@ import ohd.hseb.util.StringParser;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
public class SacXMLEncoder
@ -552,7 +553,9 @@ public class SacXMLEncoder
private void writeXmlToFile(Document outputXmlDoc, String xmlFileName)
{
XMLOutputter _xmlOutputter = new XMLOutputter(" ", true);
Format format = Format.getRawFormat();
format.setIndent(" ");
XMLOutputter _xmlOutputter = new XMLOutputter(format);
try
{

View file

@ -33,8 +33,9 @@ import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom.output.Format.TextMode;
import org.jdom.output.XMLOutputter;
import org.jdom.output.Format;
public class SacXMLTester
{
@ -473,14 +474,13 @@ public class SacXMLTester
public String toString()
{
StringWriter stringWriter = new StringWriter();
XMLOutputter outputter = new XMLOutputter();
Format format = Format.getPrettyFormat();
format = format.setIndent(" ");
XMLOutputter outputter = new XMLOutputter(format);
String returnValue = null;
try
{
outputter.setTextTrim( true );
outputter.setIndent( " " );
outputter.setNewlines( true );
outputter.output( _inputXMLDoc, stringWriter );
returnValue = stringWriter.toString();
}
@ -494,7 +494,9 @@ public class SacXMLTester
private void writeXmlToFile(Document outputXmlDoc, String xmlFileName)
{
XMLOutputter _xmlOutputter = new XMLOutputter(" ", true);
Format format = Format.getRawFormat();
format.setIndent(" ");
XMLOutputter _xmlOutputter = new XMLOutputter(format);
try
{

View file

@ -20,6 +20,7 @@ import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
/**
@ -37,7 +38,7 @@ public class SshpDataTransferMgr
private Document _controlDoc = null;
private SAXBuilder _builder = new SAXBuilder();
private XMLOutputter _xmlOutputter = new XMLOutputter(" ", true);
private XMLOutputter _xmlOutputter = null;
private FileLogger _logger = null;
private String _logFilePath = null;
@ -59,6 +60,10 @@ public class SshpDataTransferMgr
_logger = new FileLogger(_logFilePath);
Format format = Format.getRawFormat();
format.setIndent(" ");
this._xmlOutputter = new XMLOutputter(format);
loadControlFile();
return;

View file

@ -1,5 +1,11 @@
<<<<<<< HEAD
#Wed Feb 15 11:40:52 CST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
=======
#Thu Mar 26 11:28:33 CDT 2009
eclipse.preferences.version=1
>>>>>>> development
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

7
cots/net.jcip/.classpath Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="jcip-annotations.jar" sourcepath="jcip-annotations-src.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>

28
cots/net.jcip/.project Normal file
View file

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>net.jcip</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

View file

@ -0,0 +1,8 @@
#Wed Jul 25 12:18:05 CDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6

View file

@ -0,0 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jcip Plugin
Bundle-SymbolicName: net.jcip
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: jcip-annotations.jar,
.
Export-Package: net.jcip.annotations

View file

@ -0,0 +1,4 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
jcip-annotations.jar

Binary file not shown.

Binary file not shown.

View file

@ -2,7 +2,6 @@
<classpath>
<classpathentry exported="true" kind="lib" path="gt-postgis-2.6.4.jar" sourcepath="gt-postgis-2.6.4-sources.zip"/>
<classpathentry exported="true" kind="lib" path="common-2.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="jdom-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="commons-beanutils-1.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="commons-codec-1.2.jar"/>
<classpathentry exported="true" kind="lib" path="commons-collections-3.1.jar"/>
@ -10,23 +9,51 @@
<classpathentry exported="true" kind="lib" path="commons-jxpath-1.2.jar"/>
<classpathentry exported="true" kind="lib" path="commons-lang-2.3.jar"/>
<classpathentry exported="true" kind="lib" path="commons-pool-1.5.3.jar"/>
<classpathentry exported="true" kind="lib" path="jts-1.10.jar" sourcepath="jts-1.10.zip"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="ecore-2.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="geoapi-2.3-M1.jar"/>
<classpathentry exported="true" kind="lib" path="geoapi-pending-2.3-M1.jar"/>
<classpathentry exported="true" kind="lib" path="gt-api-2.6.4.jar" sourcepath="gt-api-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-coverage-2.6.4.jar" sourcepath="gt-coverage-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-epsg-wkt-2.6.4.jar" sourcepath="gt-epsg-wkt-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-geotiff-2.6.4.jar" sourcepath="gt-geotiff-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-graph-2.6.4.jar" sourcepath="gt-graph-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-gtopo30-2.6.4.jar" sourcepath="gt-gtopo30-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-image-2.6.4.jar" sourcepath="gt-image-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-main-2.6.4.jar" sourcepath="gt-main-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-metadata-2.6.4.jar" sourcepath="gt-metadata-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-referencing-2.6.4.jar" sourcepath="gt-referencing-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-referencing3D-2.6.4.jar" sourcepath="gt-referencing3D-2.6.4-sources-.jar"/>
<classpathentry exported="true" kind="lib" path="gt-shapefile-2.6.4.jar" sourcepath="gt-shapefile-2.6.4-sources.zip"/>
<classpathentry exported="true" kind="lib" path="gt-api-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-api-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-coverage-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-coverage-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-cql-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-epsg-wkt-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-epsg-wkt-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-geotiff-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-geotiff-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-graph-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-graph-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-gtopo30-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-gtopo30-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-image-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-image-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-main-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-main-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-metadata-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-metadata-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-referencing-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-referencing-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-referencing3D-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-referencing3D-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-render-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-shapefile-2.6.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="gt-shapefile-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-xml-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-xsd-core-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-xsd-filter-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-xsd-gml2-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-xsd-gml3-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-xsd-kml-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="gt-xsd-sld-2.6.4.jar"/>
<classpathentry exported="true" kind="lib" path="jdom-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="jts-1.10.jar"/>
<classpathentry exported="true" kind="lib" path="picocontainer-1.2.jar"/>
<classpathentry exported="true" kind="lib" path="xercesImpl-2.7.1.jar"/>
<classpathentry exported="true" kind="lib" path="xml-apis-1.0.b2.jar"/>
<classpathentry exported="true" kind="lib" path="xml-apis-xerces-2.7.1.jar"/>
<classpathentry exported="true" kind="lib" path="xsd-2.2.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
<referencedentry exported="true" kind="lib" path="gt-jdbc-2.6.4.jar" sourcepath="gt-jdbc-2.6.4-sources.zip"/>
</classpath>

View file

@ -1,7 +1,8 @@
#Thu Mar 26 11:29:04 CDT 2009
#Fri Jun 08 11:49:31 CDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.source=1.6

View file

@ -3,36 +3,61 @@ Bundle-ManifestVersion: 2
Bundle-Name: Geotools Plug-in
Bundle-SymbolicName: org.geotools
Bundle-Version: 2.6.4
Bundle-Vendor: Raytheon-bundled OSS
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BuddyPolicy: registered, ext, global
Bundle-ClassPath: geoapi-2.3-M1.jar,
geoapi-pending-2.3-M1.jar,
gt-api-2.6.4.jar,
gt-coverage-2.6.4.jar,
gt-epsg-wkt-2.6.4.jar,
gt-geotiff-2.6.4.jar,
gt-graph-2.6.4.jar,
gt-gtopo30-2.6.4.jar,
gt-image-2.6.4.jar,
gt-main-2.6.4.jar,
gt-metadata-2.6.4.jar,
gt-referencing-2.6.4.jar,
gt-referencing3D-2.6.4.jar,
gt-shapefile-2.6.4.jar,
gt-postgis-2.6.4.jar,
jts-1.10.jar,
Bundle-ClassPath: common-2.2.1.jar,
commons-beanutils-1.7.0.jar,
commons-codec-1.2.jar,
commons-collections-3.1.jar,
commons-dbcp-1.2.2.jar,
commons-jxpath-1.2.jar,
commons-lang-2.3.jar,
commons-logging-1.1.1.jar,
commons-pool-1.5.3.jar,
common-2.2.1.jar,
jdom-1.0.jar
Export-Package: com.vividsolutions.jts,
ecore-2.2.2.jar,
geoapi-2.3-M1.jar,
geoapi-pending-2.3-M1.jar,
gt-api-2.6.4-sources.jar,
gt-api-2.6.4.jar,
gt-coverage-2.6.4-sources.jar,
gt-coverage-2.6.4.jar,
gt-cql-2.6.4.jar,
gt-epsg-wkt-2.6.4-sources.jar,
gt-epsg-wkt-2.6.4.jar,
gt-geotiff-2.6.4-sources.jar,
gt-geotiff-2.6.4.jar,
gt-graph-2.6.4-sources.jar,
gt-graph-2.6.4.jar,
gt-gtopo30-2.6.4-sources.jar,
gt-gtopo30-2.6.4.jar,
gt-image-2.6.4-sources.jar,
gt-image-2.6.4.jar,
gt-main-2.6.4-sources.jar,
gt-main-2.6.4.jar,
gt-metadata-2.6.4-sources.jar,
gt-metadata-2.6.4.jar,
gt-referencing-2.6.4-sources.jar,
gt-referencing-2.6.4.jar,
gt-referencing3D-2.6.4-sources.jar,
gt-referencing3D-2.6.4.jar,
gt-render-2.6.4.jar,
gt-shapefile-2.6.4-sources.jar,
gt-shapefile-2.6.4.jar,
gt-xml-2.6.4.jar,
gt-xsd-core-2.6.4.jar,
gt-xsd-filter-2.6.4.jar,
gt-xsd-gml2-2.6.4.jar,
gt-xsd-gml3-2.6.4.jar,
gt-xsd-kml-2.6.4.jar,
gt-xsd-sld-2.6.4.jar,
jdom-1.0.jar,
gt-postgis-2.6.4.jar,
jts-1.10.jar,
picocontainer-1.2.jar,
xercesImpl-2.7.1.jar,
xml-apis-1.0.b2.jar,
xml-apis-xerces-2.7.1.jar,
xsd-2.2.2.jar
Bundle-Vendor: Raytheon-bundled OSS
Export-Package: .,
com.vividsolutions.jts,
com.vividsolutions.jts.algorithm,
com.vividsolutions.jts.algorithm.locate,
com.vividsolutions.jts.geom,
@ -70,6 +95,17 @@ Export-Package: com.vividsolutions.jts,
com.vividsolutions.jts.precision,
com.vividsolutions.jts.simplify,
com.vividsolutions.jts.util,
org.eclipse.emf.common,
org.eclipse.emf.common.archive,
org.eclipse.emf.common.command,
org.eclipse.emf.common.notify,
org.eclipse.emf.common.notify.impl,
org.eclipse.emf.common.util,
org.eclipse.xsd,
org.eclipse.xsd.ecore,
org.eclipse.xsd.impl,
org.eclipse.xsd.impl.type,
org.eclipse.xsd.util,
org.geotools.console,
org.geotools.coverage,
org.geotools.coverage.grid,
@ -80,54 +116,228 @@ Export-Package: com.vividsolutions.jts,
org.geotools.coverage.processing,
org.geotools.coverage.processing.operation,
org.geotools.data,
org.geotools.data.collection,
org.geotools.data.crs,
org.geotools.data.memory,
org.geotools.data.ows,
org.geotools.data.postgis,
org.geotools.data.shapefile,
org.geotools.data.shapefile.dbf,
org.geotools.data.shapefile.indexed,
org.geotools.data.shapefile.indexed.attribute,
org.geotools.data.shapefile.prj,
org.geotools.data.shapefile.shp,
org.geotools.data.shapefile.shp.xml,
org.geotools.data.store,
org.geotools.data.view,
org.geotools.factory,
org.geotools.feature,
org.geotools.feature.collection,
org.geotools.feature.simple,
org.geotools.feature.type,
org.geotools.feature.visitor,
org.geotools.filter,
org.geotools.filter.capability,
org.geotools.filter.expression,
org.geotools.filter.function,
org.geotools.filter.function.math,
org.geotools.filter.function.string,
org.geotools.filter.identity,
org.geotools.filter.spatial,
org.geotools.filter.v1_0,
org.geotools.filter.v1_0.capabilities,
org.geotools.filter.v1_1,
org.geotools.filter.v1_1.capabilities,
org.geotools.filter.visitor,
org.geotools.gce.geotiff,
org.geotools.gce.geotiff.adapters,
org.geotools.gce.geotiff.codes,
org.geotools.gce.gtopo30,
org.geotools.gce.image,
org.geotools.geometry,
org.geotools.geometry.coordinatesequence,
org.geotools.geometry.jts,
org.geotools.geometry.jts.coordinatesequence,
org.geotools.geometry.text,
org.geotools.gml,
org.geotools.gml.producer,
org.geotools.gml2,
org.geotools.gml2.bindings,
org.geotools.gml3,
org.geotools.gml3.bindings,
org.geotools.gml3.bindings.smil,
org.geotools.gml3.smil,
org.geotools.gml3.v3_2,
org.geotools.gml3.v3_2.gco,
org.geotools.gml3.v3_2.gmd,
org.geotools.gml3.v3_2.gmx,
org.geotools.gml3.v3_2.gsr,
org.geotools.gml3.v3_2.gss,
org.geotools.gml3.v3_2.gts,
org.geotools.graph.build,
org.geotools.graph.build.basic,
org.geotools.graph.build.feature,
org.geotools.graph.build.line,
org.geotools.graph.build.opt,
org.geotools.graph.build.polygon,
org.geotools.graph.io,
org.geotools.graph.io.standard,
org.geotools.graph.path,
org.geotools.graph.structure,
org.geotools.graph.structure.basic,
org.geotools.graph.structure.line,
org.geotools.graph.structure.opt,
org.geotools.graph.traverse,
org.geotools.graph.traverse.basic,
org.geotools.graph.traverse.standard,
org.geotools.graph.util,
org.geotools.graph.util.delaunay,
org.geotools.graph.util.geom,
org.geotools.graph.util.graph,
org.geotools.image,
org.geotools.image.io,
org.geotools.image.jai,
org.geotools.image.palette,
org.geotools.index,
org.geotools.index.quadtree,
org.geotools.index.quadtree.fs,
org.geotools.io,
org.geotools.kml,
org.geotools.kml.bindings,
org.geotools.legend,
org.geotools.map,
org.geotools.map.event,
org.geotools.math,
org.geotools.measure,
org.geotools.metadata,
org.geotools.metadata.iso,
org.geotools.metadata.iso.citation,
org.geotools.metadata.iso.constraint,
org.geotools.metadata.iso.content,
org.geotools.metadata.iso.distribution,
org.geotools.metadata.iso.extent,
org.geotools.metadata.iso.identification,
org.geotools.metadata.iso.lineage,
org.geotools.metadata.iso.maintenance,
org.geotools.metadata.iso.quality,
org.geotools.metadata.iso.spatial,
org.geotools.metadata.sql,
org.geotools.nature,
org.geotools.ows,
org.geotools.parameter,
org.geotools.referencing,
org.geotools.referencing.crs,
org.geotools.referencing.cs,
org.geotools.referencing.datum,
org.geotools.referencing.factory,
org.geotools.referencing.factory.epsg,
org.geotools.referencing.factory.wms,
org.geotools.referencing.operation,
org.geotools.referencing.operation.builder,
org.geotools.referencing.operation.matrix,
org.geotools.referencing.operation.projection,
org.geotools.referencing.operation.transform,
org.geotools.referencing.piecewise,
org.geotools.referencing.wkt,
org.geotools.renderer,
org.geotools.renderer.crs,
org.geotools.renderer.i18n,
org.geotools.renderer.label,
org.geotools.renderer.lite,
org.geotools.renderer.lite.gridcoverage2d,
org.geotools.renderer.style,
org.geotools.renderer.style.shape,
org.geotools.resources,
org.geotools.resources.coverage,
org.geotools.resources.geometry,
org.geotools.resources.i18n,
org.geotools.resources.image,
org.geotools.sld,
org.geotools.sld.bindings,
org.geotools.styling,
org.geotools.styling.visitor,
org.geotools.util,
org.geotools.util.logging,
org.geotools.xlink,
org.geotools.xml,
org.geotools.xml.filter,
org.geotools.xml.gml,
org.geotools.xml.handlers,
org.geotools.xml.handlers.xsi,
org.geotools.xml.impl,
org.geotools.xml.impl.jxpath,
org.geotools.xml.schema,
org.geotools.xml.schema.impl,
org.geotools.xml.styling,
org.geotools.xml.test,
org.geotools.xml.transform,
org.geotools.xml.xLink,
org.geotools.xml.xsi,
org.geotools.xs,
org.geotools.xs.bindings,
org.geotools.xs.facets,
org.jdom,
org.jdom.adapters,
org.jdom.filter,
org.jdom.input,
org.jdom.output,
org.jdom.transform,
org.jdom.xpath,
org.opengis.annotation,
org.opengis.coverage,
org.opengis.coverage.grid,
org.opengis.coverage.grid.quadrilateral,
org.opengis.coverage.processing,
org.opengis.display.canvas,
org.opengis.display.container,
org.opengis.display.primitive,
org.opengis.feature,
org.opengis.feature.simple,
org.opengis.feature.type,
org.opengis.filter,
org.opengis.filter.capability,
org.opengis.filter.expression,
org.opengis.filter.identity,
org.opengis.filter.sort,
org.opengis.filter.spatial,
org.opengis.geometry,
org.opengis.geometry.aggregate,
org.opengis.geometry.complex,
org.opengis.geometry.coordinate,
org.opengis.geometry.primitive,
org.opengis.metadata,
org.opengis.metadata.citation,
org.opengis.metadata.constraint,
org.opengis.metadata.content,
org.opengis.metadata.distribution,
org.opengis.metadata.extent,
org.opengis.metadata.identification,
org.opengis.metadata.lineage,
org.opengis.metadata.maintenance,
org.opengis.metadata.quality,
org.opengis.metadata.spatial,
org.opengis.observation,
org.opengis.observation.coverage,
org.opengis.observation.sampling,
org.opengis.parameter,
org.opengis.referencing,
org.opengis.referencing.crs,
org.opengis.referencing.cs,
org.opengis.referencing.datum,
org.opengis.referencing.operation,
org.opengis.util
Bundle-ActivationPolicy: lazy
org.opengis.sld,
org.opengis.style,
org.opengis.style.portrayal,
org.opengis.temporal,
org.opengis.util,
org.opengis.webservice,
org.opengis.webservice.capability,
org.opengis.webservice.feature
Require-Bundle: javax.vecmath;bundle-version="1.3.1",
javax.measure;bundle-version="1.0.0",
org.apache.commons.logging,
org.apache.log4j,
org.postgres;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BuddyPolicy: registered, ext, global
Bundle-ActivationPolicy: lazy

View file

@ -1,19 +1,50 @@
bin.includes = META-INF/,\
.,\
common-2.2.1.jar,\
commons-beanutils-1.7.0.jar,\
commons-codec-1.2.jar,\
commons-collections-3.1.jar,\
commons-dbcp-1.2.2.jar,\
commons-jxpath-1.2.jar,\
commons-lang-2.3.jar,\
commons-pool-1.5.3.jar,\
ecore-2.2.2.jar,\
geoapi-2.3-M1.jar,\
geoapi-pending-2.3-M1.jar,\
gt-api-2.6.4-sources.jar,\
gt-api-2.6.4.jar,\
gt-coverage-2.6.4-sources.jar,\
gt-coverage-2.6.4.jar,\
gt-cql-2.6.4.jar,\
gt-epsg-wkt-2.6.4-sources.jar,\
gt-epsg-wkt-2.6.4.jar,\
gt-geotiff-2.6.4-sources.jar,\
gt-geotiff-2.6.4.jar,\
gt-graph-2.6.4-sources.jar,\
gt-graph-2.6.4.jar,\
gt-gtopo30-2.6.4-sources.jar,\
gt-gtopo30-2.6.4.jar,\
gt-image-2.6.4-sources.jar,\
gt-image-2.6.4.jar,\
gt-main-2.6.4-sources.jar,\
gt-main-2.6.4.jar,\
gt-metadata-2.6.4-sources.jar,\
gt-metadata-2.6.4.jar,\
gt-referencing-2.6.4-sources.jar,\
gt-referencing-2.6.4.jar,\
gt-referencing3D-2.6.4-sources.jar,\
gt-referencing3D-2.6.4.jar,\
gt-render-2.6.4.jar,\
gt-shapefile-2.6.4-sources.jar,\
gt-shapefile-2.6.4.jar,\
gt-xml-2.6.4.jar,\
gt-xsd-core-2.6.4.jar,\
gt-xsd-filter-2.6.4.jar,\
gt-xsd-gml2-2.6.4.jar,\
gt-xsd-gml3-2.6.4.jar,\
gt-xsd-kml-2.6.4.jar,\
gt-xsd-sld-2.6.4.jar,\
jdom-1.0.jar,\
jts-1.10.jar,\
commons-beanutils-1.7.0.jar,\
commons-codec-1.2.jar,\
@ -26,4 +57,9 @@ bin.includes = META-INF/,\
jdom-1.0.jar,\
gt-postgis-2.6.4.jar,\
gt-jdbc-2.6.4.jar,\
gt-jdbc-postgis-2.6.4.jar
gt-jdbc-postgis-2.6.4.jar,\
picocontainer-1.2.jar,\
xercesImpl-2.7.1.jar,\
xml-apis-1.0.b2.jar,\
xml-apis-xerces-2.7.1.jar,\
xsd-2.2.2.jar

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="hibernate-spatial-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="hibernate-spatial-postgis-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="hibernate3.5.0-Final.jar"/>
<classpathentry exported="true" kind="lib" path="javassist-3.9.0.GA.jar"/>
<classpathentry exported="true" kind="lib" path="jta-1.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View file

@ -0,0 +1,8 @@
#Fri Jun 08 11:53:01 CDT 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6

View file

@ -3,10 +3,13 @@ Bundle-ManifestVersion: 2
Bundle-Name: Hibernate Plug-in
Bundle-SymbolicName: org.hibernate
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: hibernate-spatial-1.0.jar,
hibernate-spatial-postgis-1.0.jar,
hibernate3.5.0-Final.jar,
javassist-3.9.0.GA.jar,
jta-1.1.jar
Bundle-Vendor: Hibernate
Require-Bundle: org.slf4j
Export-Package:
org.hibernate,
Export-Package: org.hibernate,
org.hibernate.action,
org.hibernate.annotations,
org.hibernate.annotations.common,
@ -171,7 +174,14 @@ Export-Package:
org.hibernate.tuple.entity,
org.hibernate.type,
org.hibernate.usertype,
org.hibernate.util
Bundle-ClassPath: hibernate3.5.0-Final.jar,
javassist-3.9.0.GA.jar,
jta-1.1.jar
org.hibernate.util,
org.hibernatespatial,
org.hibernatespatial.cfg,
org.hibernatespatial.criterion,
org.hibernatespatial.helper,
org.hibernatespatial.mgeom,
org.hibernatespatial.pojo,
org.hibernatespatial.postgis,
org.hibernatespatial.readers,
org.hibernatespatial.spi
Require-Bundle: org.slf4j

View file

@ -1,4 +1,6 @@
bin.includes = META-INF/,\
hibernate-spatial-1.0.jar,\
hibernate-spatial-postgis-1.0.jar,\
hibernate3.5.0-Final.jar,\
javassist-3.9.0.GA.jar,\
jta-1.1.jar

Binary file not shown.

Binary file not shown.

View file

@ -2,11 +2,14 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="junit-4.3.1.jar" sourcepath="org.junitsrc.zip"/>
<classpathentry exported="true" kind="lib" path="hamcrest-api-1.0.jar" sourcepath="org.junitsrc.zip"/>
<classpathentry exported="true" kind="lib" path="hamcrest-library-1.0.jar" sourcepath="org.junitsrc.zip"/>
<classpathentry exported="true" kind="lib" path="jmock-2.0.0.jar" sourcepath="org.junitsrc.zip"/>
<classpathentry exported="true" kind="lib" path="jmock-junit3-2.0.0.jar" sourcepath="org.junitsrc.zip"/>
<classpathentry exported="true" kind="lib" path="jmock-junit4-2.0.0.jar" sourcepath="org.junitsrc.zip"/>
<classpathentry exported="true" kind="lib" path="cglib-nodep-2.2.jar"/>
<classpathentry exported="true" kind="lib" path="javassist-3.16.1-GA.jar"/>
<classpathentry exported="true" kind="lib" path="mockito-all-1.9.0.jar"/>
<classpathentry exported="true" kind="lib" path="objenesis-1.2.jar"/>
<classpathentry exported="true" kind="lib" path="powermock-mockito-1.4.12-full.jar"/>
<classpathentry exported="true" kind="lib" path="junit-4.10.jar" sourcepath="junit-4.10-src.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View file

@ -3,25 +3,48 @@ Bundle-ManifestVersion: 2
Bundle-Name: Junit Plug-in
Bundle-SymbolicName: org.junit
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: junit-4.3.1.jar,
hamcrest-api-1.0.jar,
hamcrest-library-1.0.jar,
jmock-2.0.0.jar,
Bundle-ClassPath: jmock-2.0.0.jar,
jmock-junit3-2.0.0.jar,
jmock-junit4-2.0.0.jar
Export-Package: junit.extensions,
jmock-junit4-2.0.0.jar,
cglib-nodep-2.2.jar,
javassist-3.16.1-GA.jar,
mockito-all-1.9.0.jar,
objenesis-1.2.jar,
powermock-mockito-1.4.12-full.jar,
junit-4.10.jar
Export-Package: javassist,
javassist.bytecode,
javassist.bytecode.analysis,
javassist.bytecode.annotation,
javassist.bytecode.stackmap,
javassist.compiler,
javassist.compiler.ast,
javassist.convert,
javassist.expr,
javassist.runtime,
javassist.scopedpool,
javassist.tools,
javassist.tools.reflect,
javassist.tools.rmi,
javassist.tools.web,
javassist.util,
javassist.util.proxy,
junit.extensions,
junit.framework,
junit.runner,
junit.textui,
net.sf.cglib.asm,
net.sf.cglib.asm.signature,
net.sf.cglib.beans,
net.sf.cglib.core,
net.sf.cglib.proxy,
net.sf.cglib.reflect,
net.sf.cglib.transform,
net.sf.cglib.transform.impl,
net.sf.cglib.util,
org.hamcrest,
org.hamcrest.beans,
org.hamcrest.collection,
org.hamcrest.core,
org.hamcrest.internal,
org.hamcrest.number,
org.hamcrest.object,
org.hamcrest.text,
org.hamcrest.xml,
org.jmock,
org.jmock.api,
org.jmock.example.qcon,
@ -35,11 +58,147 @@ Export-Package: junit.extensions,
org.jmock.lib.action,
org.jmock.syntax,
org.junit,
org.junit.experimental,
org.junit.experimental.categories,
org.junit.experimental.max,
org.junit.experimental.results,
org.junit.experimental.runners,
org.junit.experimental.theories,
org.junit.experimental.theories.internal,
org.junit.experimental.theories.suppliers,
org.junit.internal,
org.junit.internal.builders,
org.junit.internal.matchers,
org.junit.internal.requests,
org.junit.internal.runners,
org.junit.internal.runners.model,
org.junit.internal.runners.rules,
org.junit.internal.runners.statements,
org.junit.matchers,
org.junit.rules,
org.junit.runner,
org.junit.runner.manipulation,
org.junit.runner.notification,
org.junit.runners
org.junit.runners,
org.junit.runners.model,
org.mockito,
org.mockito.asm,
org.mockito.asm.signature,
org.mockito.asm.tree,
org.mockito.asm.tree.analysis,
org.mockito.asm.util,
org.mockito.cglib.beans,
org.mockito.cglib.core,
org.mockito.cglib.proxy,
org.mockito.cglib.reflect,
org.mockito.cglib.transform,
org.mockito.cglib.transform.impl,
org.mockito.cglib.util,
org.mockito.configuration,
org.mockito.exceptions,
org.mockito.exceptions.base,
org.mockito.exceptions.misusing,
org.mockito.exceptions.verification,
org.mockito.exceptions.verification.junit,
org.mockito.internal,
org.mockito.internal.configuration,
org.mockito.internal.configuration.injection,
org.mockito.internal.configuration.injection.filter,
org.mockito.internal.creation,
org.mockito.internal.creation.cglib,
org.mockito.internal.creation.jmock,
org.mockito.internal.debugging,
org.mockito.internal.exceptions,
org.mockito.internal.exceptions.base,
org.mockito.internal.exceptions.util,
org.mockito.internal.invocation,
org.mockito.internal.invocation.finder,
org.mockito.internal.invocation.realmethod,
org.mockito.internal.listeners,
org.mockito.internal.matchers,
org.mockito.internal.matchers.apachecommons,
org.mockito.internal.progress,
org.mockito.internal.reporting,
org.mockito.internal.runners,
org.mockito.internal.runners.util,
org.mockito.internal.stubbing,
org.mockito.internal.stubbing.answers,
org.mockito.internal.stubbing.defaultanswers,
org.mockito.internal.util,
org.mockito.internal.util.junit,
org.mockito.internal.util.reflection,
org.mockito.internal.verification,
org.mockito.internal.verification.api,
org.mockito.internal.verification.argumentmatching,
org.mockito.internal.verification.checkers,
org.mockito.invocation,
org.mockito.listeners,
org.mockito.runners,
org.mockito.stubbing,
org.mockito.stubbing.answers,
org.mockito.verification,
org.objenesis,
org.objenesis.instantiator,
org.objenesis.instantiator.basic,
org.objenesis.instantiator.gcj,
org.objenesis.instantiator.jrockit,
org.objenesis.instantiator.perc,
org.objenesis.instantiator.sun,
org.objenesis.strategy,
org.powermock.api.extension.listener,
org.powermock.api.extension.proxyframework,
org.powermock.api.mockito,
org.powermock.api.mockito.expectation,
org.powermock.api.mockito.internal,
org.powermock.api.mockito.internal.configuration,
org.powermock.api.mockito.internal.expectation,
org.powermock.api.mockito.internal.invocationcontrol,
org.powermock.api.mockito.internal.mockcreation,
org.powermock.api.mockito.internal.verification,
org.powermock.api.mockito.mockpolicies,
org.powermock.api.mockito.powermocklistener,
org.powermock.api.mockito.verification,
org.powermock.api.support,
org.powermock.api.support.membermodification,
org.powermock.api.support.membermodification.strategy,
org.powermock.api.support.membermodification.strategy.impl,
org.powermock.classloading,
org.powermock.classloading.spi,
org.powermock.core,
org.powermock.core.classloader,
org.powermock.core.classloader.annotations,
org.powermock.core.spi,
org.powermock.core.spi.listener,
org.powermock.core.spi.support,
org.powermock.core.spi.testresult,
org.powermock.core.spi.testresult.impl,
org.powermock.core.testlisteners,
org.powermock.core.transformers,
org.powermock.core.transformers.impl,
org.powermock.mockpolicies,
org.powermock.mockpolicies.impl,
org.powermock.mockpolicies.support,
org.powermock.modules.junit3,
org.powermock.modules.junit3.internal,
org.powermock.modules.junit3.internal.impl,
org.powermock.modules.junit4,
org.powermock.modules.junit4.common.internal,
org.powermock.modules.junit4.common.internal.impl,
org.powermock.modules.junit4.internal.impl,
org.powermock.modules.junit4.internal.impl.testcaseworkaround,
org.powermock.modules.junit4.legacy,
org.powermock.modules.junit4.legacy.internal.impl,
org.powermock.modules.junit4.legacy.internal.impl.testcaseworkaround,
org.powermock.modules.testng,
org.powermock.modules.testng.internal,
org.powermock.reflect,
org.powermock.reflect.exceptions,
org.powermock.reflect.internal,
org.powermock.reflect.internal.matcherstrategies,
org.powermock.reflect.internal.primitivesupport,
org.powermock.reflect.matching,
org.powermock.reflect.proxyframework,
org.powermock.reflect.spi,
org.powermock.tests.utils,
org.powermock.tests.utils.impl
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

View file

@ -1,7 +1,11 @@
bin.includes = META-INF/,\
junit-4.3.1.jar,\
hamcrest-api-1.0.jar,\
hamcrest-library-1.0.jar,\
jmock-2.0.0.jar,\
jmock-junit3-2.0.0.jar,\
jmock-junit4-2.0.0.jar
jmock-junit4-2.0.0.jar,\
cglib-nodep-2.2.jar,\
javassist-3.16.1-GA.jar,\
junit-4.8.2.jar,\
mockito-all-1.9.0.jar,\
objenesis-1.2.jar,\
powermock-mockito-1.4.12-full.jar,\
junit-4.10.jar

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -34,9 +34,10 @@
<echo message="this is a base for other ant files, do not call directly" />
</target>
<target name="deploy" depends="util.deploy" >
<echo message="Basedir: ${basedir}"/>
<echo message="bin dir: ${BIN.DIR}"/>
<target name="deploy" depends="util.deploy,resources.deploy">
<echo message="Basedir: ${basedir}"/>
<echo message="bin dir: ${BIN.DIR}"/>
<!-- The build files that inherite from this base are designed to be
called from a master build file located in the build.edex directory.
To override and use locally, set the 'dest.dir' property on the command
@ -104,8 +105,7 @@
<antcall target="component-substitute.utility-substitute"></antcall>
</target>
<!-- this target deploys the component's Utility Service Configurations if applicable -->
<target name="util.deploy" if="util.deploy.ready" >
<target name="util.deploy" if="util.deploy.ready" description="Deploys the component's Utility Service Configurations">
<echo message="deploying utility files to ${util.dest.dir}" />
<copy todir="${util.dest.dir}" overwrite="true" >
<fileset dir="${basedir}/${UTIL.DIR}"/>
@ -113,6 +113,19 @@
<antcall target="utility-substitute"></antcall>
</target>
<target name="resources.deploy" description="Deploy the component's resource files">
<if>
<available file="${basedir}/resources" type="dir" />
<then>
<echo message="deploying resource files to ${resources.dest.dir}" />
<mkdir dir="${resources.dest.dir}" />
<copy todir="${resources.dest.dir}" overwrite="true">
<fileset dir="${basedir}/resources" />
</copy>
</then>
</if>
</target>
&substitute-targets;
</project>

View file

@ -74,10 +74,14 @@
<param name="feature"
value="com.raytheon.uf.edex.ost.feature" />
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.event.feature" />
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.npp.feature" />
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.event.feature" />
</antcall>
<antcall target="build">
<param name="feature"
value="com.raytheon.uf.edex.npp.feature" />

View file

@ -7,5 +7,6 @@
overwrite="${esb.overwrite}">
<fileset file="${esb.directory}/bin/setup.env" />
</copy>
</target>
</project>

View file

@ -1,7 +1,7 @@
<project name="deploy.esb" default="main">
<import file="${basedir}/deploy-common/deploy-web.xml" />
<project name="deploy.esb" default="main">
<import file="deploy-web.xml" />
<target name="main">
<target name="main">
<!-- on a developer machine, the following directories should
already exist. -->
<mkdir dir="${edex.root.directory}/lib" />
@ -124,6 +124,9 @@
<deploy.war
web.project.dir="gov.noaa.nws.ncep.edex.purgeutil"
war.name="purgeWeb" />
<deploy.war
web.project.dir="com.raytheon.uf.edex.registry.ebxml"
war.name="registryEbxml" />
</target>
<taskdef resource="net/sf/antcontrib/antlib.xml"

View file

@ -34,4 +34,4 @@
</then>
</if>
</target>
</project>
</project>

View file

@ -115,35 +115,21 @@
</then>
</if>
</then>
<else>
<var name="plugin.utility"
value="${plugin.base}/utility" />
<else>
<jarPlugin
plugin.directory323="${plugin.base}"
jar.file323="${jar.destfile}" />
<!-- copy the utility (localization) files. -->
<if>
<available file="${plugin.utility}"
type="dir" />
<then>
<copy todir="${edex.root.directory}/data/utility"
overwrite="true">
<fileset dir="${plugin.utility}"
includes="*/**" />
</copy>
</then>
</if>
</else>
</if>
<ant antfile="${basedir}/deploy-common/external-rules.xml"
inheritAll="false">
<property name="plugin._directory"
value="${plugin.base}" />
<property name="deployment._root"
value="${edex.root.directory}" />
</ant>
<ant antfile="${basedir}/deploy-common/external-rules.xml"
inheritAll="false">
<property name="plugin._directory"
value="${plugin.base}" />
<property name="deployment._root"
value="${edex.root.directory}" />
</ant>
</sequential>
</macrodef>
@ -301,4 +287,4 @@
</for>
</sequential>
</macrodef>
</project>
</project>

View file

@ -20,15 +20,15 @@
<!-- The generated pattern is that plugins/features are gathered into the -->
<!-- folder ${target.folder}/${projectName} -->
<!-- ===================================================================== -->
<target name="gather.bin.parts">
<ant antfile="${builder}/../deploy-common/external-rules.xml"
inheritAll="false">
<property name="plugin._directory"
value="${projectLocation}" />
<property name="deployment._root"
value="${target.folder}/.." />
</ant>
</target>
<target name="gather.bin.parts">
<ant antfile="${builder}/../deploy-common/external-rules.xml"
inheritAll="false">
<property name="plugin._directory"
value="${projectLocation}" />
<property name="deployment._root"
value="${target.folder}/.." />
</ant>
</target>
<!-- ===================================================================== -->
<!-- Called after invoking the gather.bin.parts targets for all plugins -->

View file

@ -149,13 +149,13 @@
</fileset>
</copy>
<mkdir dir="${builder}/postBuild/${edex.root.directory}/conf" />
<copy todir="${builder}/postBuild/${edex.root.directory}/conf">
<fileset dir="${build.output.directory}/conf">
<include name="resources/**" />
</fileset>
</copy>
<mkdir dir="${builder}/postBuild/${edex.root.directory}/conf" />
<copy todir="${builder}/postBuild/${edex.root.directory}/conf">
<fileset dir="${build.output.directory}/conf">
<include name="resources/**" />
</fileset>
</copy>
<!-- special rule for cots -->
<if>
<not>

View file

@ -21,6 +21,7 @@
# Wrapper Properties
#********************************************************************
wrapper.java.classpath.6=%EDEX_HOME%/conf/resources/
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=%EDEX_HOME%/bin/linux-x86-32/
wrapper.java.library.path.4=%EDEX_HOME%/lib/dependencies/org.jep.linux32/

View file

@ -22,12 +22,20 @@ export BROKER_ADDR=localhost
# setup hdf5 connection if pypies is enabled
export PYPIES_SERVER=http://localhost:9582
# data delivery specific variables, used below in the localization section
export DATADELIVERY_HOST=localhost
export DATADELIVERY_PORT=9588
export DATADELIVERY_SOAP_PORT=10144
# moved here from environment.xml
# these values are returned to clients that contact the localization service
export HTTP_PORT=9581
export HTTP_SERVER=http://localhost:${HTTP_PORT}/services
export JMS_SERVER=tcp://localhost:5672
export RADAR_SERVER=tcp://localhost:8813
export DATADELIVERY_SERVER=http://${DATADELIVERY_HOST}:${DATADELIVERY_PORT}/services/thrift
export DATADELIVERY_LCM_SERVER=http://${DATADELIVERY_HOST}:${DATADELIVERY_SOAP_PORT}/lcm?WSDL
export DATADELIVERY_QUERY_SERVER=http://${DATADELIVERY_HOST}:${DATADELIVERY_SOAP_PORT}/query?WSDL
# set the AWIPS II shared directory
export SHARE_DIR=/awips2/edex/data/share
@ -42,4 +50,4 @@ export SITE_IDENTIFIER=${AW_SITE_IDENTIFIER}
# set Fax environment variables pointing to ldad@ls1
export LDAD_EXTERNAL_HOME=/ldad
export LDAD_EXTERNAL_PUBLIC=/data/ldad/public
export LDAD_EXTERNAL_PUBLIC=/data/ldad/public

View file

@ -46,6 +46,7 @@ wrapper.java.classpath.2=%EDEX_HOME%/lib/plugins/com.raytheon.uf.edex.esb.camel.
wrapper.java.classpath.3=%EDEX_HOME%/conf/
wrapper.java.classpath.4=%EDEX_HOME%/conf/cache/
wrapper.java.classpath.5=%EDEX_HOME%/conf/spring/
wrapper.java.classpath.6=%EDEX_HOME%/conf/resources/
# set the umask for file/directory creation by the Java process
wrapper.java.umask=0002
@ -114,16 +115,20 @@ wrapper.java.additional.36=-Dlog4j.configuration=%LOG4J_CONF%
# moved these from environment.xml to setup.env
wrapper.java.additional.37=-Dhttp.server=%HTTP_SERVER%
wrapper.java.additional.38=-Djms.server=%JMS_SERVER%
wrapper.java.additional.39=-Ddatadelivery.server=%DATADELIVERY_SERVER%
wrapper.java.additional.40=-Ddatadelivery.lcm.server=%DATADELIVERY_LCM_SERVER%
wrapper.java.additional.41=-Ddatadelivery.query.server=%DATADELIVERY_QUERY_SERVER%
wrapper.java.additional.39=-DHighMem=%HIGH_MEM_FLAG%
wrapper.java.additional.40=-Dmanagement.port=%MGMT_PORT%
wrapper.java.additional.42=-DHighMem=%HIGH_MEM_FLAG%
wrapper.java.additional.43=-Dmanagement.port=%MGMT_PORT%
wrapper.java.additional.41=-Dqpid.dest_syntax=BURL
wrapper.java.additional.42=-Dweb.port=8080
wrapper.java.additional.43=-Dconfidential.port=8443
wrapper.java.additional.44=-Dhttp.port=%HTTP_PORT%
wrapper.java.additional.45=-Dedex.arch=%EDEX_ARCH%
wrapper.java.additional.46=-Dedex.tmp=%TEMP_DIR%
wrapper.java.additional.44=-Dqpid.dest_syntax=BURL
wrapper.java.additional.45=-Dweb.port=8080
wrapper.java.additional.46=-Dconfidential.port=8443
wrapper.java.additional.47=-Dhttp.port=%HTTP_PORT%
wrapper.java.additional.48=-Dedex.arch=%EDEX_ARCH%
wrapper.java.additional.49=-Dedex.tmp=%TEMP_DIR%
wrapper.java.additional.50=-Dawips.registrymanager.debug=%AWIPS_REGISTRYMANAGER_DEBUG%
# Initial Java Heap Size (in MB)
wrapper.java.initmemory=%INIT_MEM%

View file

@ -0,0 +1,37 @@
<ehcache>
<diskStore path="java.io.tmpdir"/>
<defaultCache
maxElementsInMemory="1000"
maxElementsOnDisk="1"
eternal="false"
overflowToDisk="false"
timeToIdleSeconds="120"
timeToLiveSeconds="120"
diskPersistent="false"
memoryStoreEvictionPolicy="LRU"
/>
<cache
name="org.hibernate.cache.UpdateTimestampsCache"
maxElementsInMemory="1000"
maxElementsOnDisk="1"
eternal="false"
overflowToDisk="false"
timeToIdleSeconds="180"
timeToLiveSeconds="180"
diskPersistent="false"
memoryStoreEvictionPolicy="LRU"
/>
<cache
name="org.hibernate.cache.StandardQueryCache"
maxElementsInMemory="1000"
maxElementsOnDisk="1"
eternal="false"
overflowToDisk="false"
timeToIdleSeconds="120"
timeToLiveSeconds="120"
diskPersistent="false"
memoryStoreEvictionPolicy="LRU"
/>
</ehcache>

View file

@ -0,0 +1,79 @@
<?xml version='1.0' encoding='utf-8'?>
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<!--
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.
-->
<hibernate-configuration>
<session-factory>
<!-- JDBC Properties -->
<property name="connection.driver_class">
org.postgresql.Driver
</property>
<property name="dialect">
org.hibernate.dialect.PostgreSQLDialect
</property>
<property name="connection.url">
jdbc:postgresql://${db.addr}:${db.port}/ebxml
</property>
<property name="connection.username">awips</property>
<property name="connection.password">awips</property>
<property name="connection.release_mode">
after_transaction
</property>
<property name="jdbc.batch_size">100</property>
<!-- Optional Hibernate Configuration Properties -->
<!-- Write all SQL statements to console -->
<property name="hibernate.show_sql">false</property>
<!-- Pretty print the SQL in the log and console -->
<property name="hibenate.format_sql">false</property>
<!-- If turned on, Hibernate will generate comments inside the SQL, for easier debugging, defaults to false -->
<property name="hibernate.use_sql_comments">false</property>
<!-- Use c3p0 connection pooling -->
<property name="hibernate.connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</property>
<!-- c3p0 Connection Pool Properties -->
<!-- Additional properties may be added to c3p0.properties -->
<property name="hibernate.c3p0.idle_test_period">60</property>
<property name="hibernate.c3p0.timeout">1800</property>
<property name="hibernate.c3p0.max_statements">10</property>
<property name="hibernate.c3p0.acquire_increment">5</property>
<property name="hibernate.c3p0.min_size">${db.metadata.pool.min}</property>
<property name="hibernate.c3p0.max_size">${db.metadata.pool.max}</property>
<property name="hibernate.generate_statistics">true</property>
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>
<property name="hibernate.current_session_context_class">thread</property>
<!-- <property name="hibernate.cache.region.jbc2.cfg.shared">/awips2/edex/data/utility/edex_static/base/ebxml/cache/RegRepCacheConfig.xml</property> -->
<property name="hibernate.cache.provider_class">net.sf.ehcache.hibernate.EhCacheProvider</property>
<property name="hibernate.cache.use_second_level_cache">true</property>
<property name="hibernate.cache.use_query_cache">true</property>
<property name="hibernate.cache.jbc.query.localonly">true</property>
</session-factory>
</hibernate-configuration>

Some files were not shown because too many files have changed in this diff Show more