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

Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties

Browse source 
Former-commit-id: 4ce58fa303 [formerly 873ee341f5] [formerly 4acb1d8693] [formerly 5fe8bd69f8 [formerly 4acb1d8693 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]]
Former-commit-id: 5fe8bd69f8
Former-commit-id: ecd3d8397c46ee4e729e87e7fd64f6413684adff [formerly 7d807fad71]
Former-commit-id: 3010c15a2a
This commit is contained in:
Bryan Kowal 2012-06-27 18:38:19 -05:00
parent dfd75b4c72
commit ae096aef72
9 changed files with 50 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
View file

@ -63,6 +63,7 @@ import com.raytheon.uf.common.dataplugin.gfe.grid.IGrid2D;
import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData.CoordinateType;
import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
import com.raytheon.uf.common.dataplugin.gfe.server.notify.UserMessageNotification;
import com.raytheon.uf.common.dataplugin.gfe.slice.DiscreteGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.slice.ScalarGridSlice;
@ -123,6 +124,7 @@ import com.raytheon.viz.gfe.core.IReferenceSetManager.RefSetMode;
import com.raytheon.viz.gfe.core.griddata.DiscreteGridData;
import com.raytheon.viz.gfe.core.griddata.IGridData;
import com.raytheon.viz.gfe.core.griddata.WeatherGridData;
import com.raytheon.viz.gfe.core.internal.NotificationRouter.AbstractGFENotificationObserver;
import com.raytheon.viz.gfe.core.internal.OffscreenSpatialDisplayManager;
import com.raytheon.viz.gfe.core.msgs.IGridDataChangedListener;
import com.raytheon.viz.gfe.core.msgs.IParmIDChangedListener;
@ -274,6 +276,8 @@ public class GFEResource extends
}
};
private AbstractGFENotificationObserver<UserMessageNotification> notificationObserver;
/**
* Construct a resource that is capable of displaying a particular parm
@ -311,6 +315,24 @@ public class GFEResource extends
updateRightClickMenu();
// TODO: this probably should be done in parmManager or maybe not at all
// there should be some kind of parm inv update when new ISC data comes
// in that should be listened for in if ISC mode is on
notificationObserver = new AbstractGFENotificationObserver<UserMessageNotification>(
UserMessageNotification.class) {
@Override
public void notify(UserMessageNotification notificationMessage) {
if (notificationMessage.getCategory().equals("ISC")) {
for (Parm p : GFEResource.this.dataManager.getParmManager()
.getSelectedParms()) {
p.getListeners().fireGridChangedListener(p.getParmID(),
p.getInventorySpan());
}
reset();
}
}
};
}
public void reset() {
@ -375,6 +397,8 @@ public class GFEResource extends
shadedShapes.clear();
}
dataManager.getNotificationRouter()
.removeObserver(notificationObserver);
parm.getListeners().removeGridChangedListener(gridChanged);
parm.getListeners().removeParmInventoryChangedListener(
parmInventoryChanged);

2
cots/org.dom4j/.classpath
View file

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="jaxen-1.1.4.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="jaxen-1.1.4.jar"/>
<classpathentry exported="true" kind="lib" path="dom4j-1.6.1.jar" sourcepath="org.dom4jsrc.zip"/>
<classpathentry kind="output" path="bin"/>
</classpath>

13
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
View file

@ -38,19 +38,6 @@
<includes
id="com.raytheon.uf.edex.cots.feature"
<plugin
id="com.raytheon.uf.edex.tafqueue"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.tafqueue"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>
<includes

56
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dao/StdTextProductDao.java
View file

@ -361,62 +361,6 @@ public class StdTextProductDao extends CoreDao {
return products;
}
/**
* Use the reference/creation time to restrict the results when obtaining a
* product.
*
* @param ccc
* @param nnn
* @param xxx
* @param refTime
* @return products
*/
public List<StdTextProduct> cccnnnxxxByRefTime(String ccc, String nnn,
String xxx, Long refTime) {
ccc = StringUtils.rightPad(ccc, MAX_FIELD_LENGTH);
nnn = StringUtils.rightPad(nnn, MAX_FIELD_LENGTH);
xxx = StringUtils.rightPad(xxx, MAX_FIELD_LENGTH);
Session session = null;
List<StdTextProduct> products = new ArrayList<StdTextProduct>();
try {
session = getSession();
Map<String, Object> tmp = new HashMap<String, Object>();
tmp.put(ProdCCC_ID, ccc);
tmp.put(ProdNNN_ID, nnn);
tmp.put(ProdXXX_ID, xxx);
tmp.put(CREATETIME, refTime);
Criteria criteria = session
.createCriteria(getStdTextProductInstance().getClass());
criteria.add(Restrictions.allEq(tmp));
criteria.addOrder(Order.asc(ProdCCC_ID));
criteria.addOrder(Order.asc(ProdNNN_ID));
criteria.addOrder(Order.asc(ProdXXX_ID));
criteria.addOrder(Order.desc(CREATETIME));
criteria.addOrder(Order.desc(ProdHDRTIME));
Iterator<?> iter = criteria.list().iterator();
while (iter.hasNext()) {
StdTextProduct prod = (StdTextProduct) iter.next();
if (prod != null && prod.getProduct() != null
&& prod.getProduct().length() > 0) {
products.add(prod);
}
}
} catch (Exception e) {
logger.error("Error occurred reading products", e);
} finally {
closeSession(session);
}
return products;
}
/**
* This function reads a specific version of the specified product.
*

3
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java
View file

@ -772,9 +772,6 @@ public class TextDB {
if (parser.isStateQuery()) {
products = stateNNNRead(parser.getState(), parser.getNnn(),
operationalMode);
} else if (refTimeMode) {
products = (new StdTextProductDao(operationalMode))
.cccnnnxxxByRefTime(ccc, nnn, xxx, refTime);
} else {
int versionNo = 0; // default version number; read the latest
// version

27
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
View file

@ -32,26 +32,19 @@
unpack="false"/>
<plugin
id="com.raytheon.uf.common.climo"
id="com.raytheon.uf.common.cache"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.cache"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.edex.site"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.edex.uengine"
download-size="0"
@ -276,13 +269,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.hlstopo"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.jms"
download-size="0"
@ -310,7 +296,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.edex.decodertools"
download-size="0"
@ -325,4 +311,11 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.tafqueue"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

7
edexOsgi/com.raytheon.uf.edex.dat.feature/feature.xml
View file

@ -21,6 +21,13 @@
<import feature="com.raytheon.uf.edex.radar.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.uf.edex.hydro.feature" version="1.0.0.qualifier"/>
</requires>
<plugin
id="com.raytheon.uf.edex.plugin.loctables"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.monitor.cpg"

14
edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
View file

@ -276,13 +276,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.edex.plugin.loctables"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.edex.plugin.lsr"
download-size="0"
@ -360,4 +353,11 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.edex.tafqueue"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

3
edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
View file

@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
.,\
res/