From ae096aef723a2eac58a32a9fa8d92e3cc9d00145 Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Wed, 27 Jun 2012 18:38:19 -0500 Subject: [PATCH] Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties Former-commit-id: 4ce58fa303c00d542772e1e2be05390fed3b0795 [formerly 873ee341f53673025432f35cfdb376d41f698cc8] [formerly 4acb1d86932e7d511a14f4ec977195e6557032bc] [formerly 5fe8bd69f8f9497a8976419aa9ef61500cee65af [formerly 4acb1d86932e7d511a14f4ec977195e6557032bc [formerly 403599d216e643dba2fcae0883f32987c7bade3f]]] Former-commit-id: 5fe8bd69f8f9497a8976419aa9ef61500cee65af Former-commit-id: ecd3d8397c46ee4e729e87e7fd64f6413684adff [formerly 7d807fad717d98027c3a53b4a1baea08fb0fed75] Former-commit-id: 3010c15a2adc7194047c7cf26d7a0d820d315a21 --- .../com/raytheon/viz/gfe/rsc/GFEResource.java | 24 ++++++++ cots/org.dom4j/.classpath | 2 - .../feature.xml | 13 ----- .../edex/textdb/dao/StdTextProductDao.java | 56 ------------------- .../edex/textdb/dbapi/impl/TextDB.java | 3 - .../feature.xml | 27 ++++----- .../feature.xml | 7 +++ .../feature.xml | 14 ++--- .../build.properties | 3 +- 9 files changed, 50 insertions(+), 99 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java index 6a216bd740..31033ff542 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java @@ -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 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.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); diff --git a/cots/org.dom4j/.classpath b/cots/org.dom4j/.classpath index 6cd44520a4..55070fe2e8 100644 --- a/cots/org.dom4j/.classpath +++ b/cots/org.dom4j/.classpath @@ -1,9 +1,7 @@ - - diff --git a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml index 7d79f727f1..68274020ca 100644 --- a/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml +++ b/edexOsgi/com.raytheon.edex.feature.uframe/feature.xml @@ -38,19 +38,6 @@ - - version="0.0.0"/> 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 products = new ArrayList(); - try { - session = getSession(); - - Map tmp = new HashMap(); - 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. * diff --git a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java b/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java index 938c1e5b1f..171ec0f70d 100644 --- a/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java +++ b/edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDB.java @@ -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 diff --git a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml index 4858f30adc..8484870e30 100644 --- a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml +++ b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml @@ -32,26 +32,19 @@ unpack="false"/> - - - + - - - + + + diff --git a/edexOsgi/com.raytheon.uf.edex.dat.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.dat.feature/feature.xml index 22a60b7a80..66988d6e49 100644 --- a/edexOsgi/com.raytheon.uf.edex.dat.feature/feature.xml +++ b/edexOsgi/com.raytheon.uf.edex.dat.feature/feature.xml @@ -21,6 +21,13 @@ + + - - + + diff --git a/edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties b/edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties index 34d2e4d2da..5791d48d5f 100644 --- a/edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties +++ b/edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + res/