Issue #2667 fixed bin lightning menus

the column name for the source of the lightning data was changed


Former-commit-id: 62e8a279840672f1ee2bb9f3ecf982c80a04d83c
This commit is contained in:
Brian Clements 2014-03-03 13:17:05 -06:00
parent 99fd81f105
commit 91936beadf
10 changed files with 31 additions and 31 deletions

View file

@ -36,8 +36,8 @@
<mapping key="pluginName"> <mapping key="pluginName">
<constraint constraintValue="binlightning" constraintType="EQUALS" /> <constraint constraintValue="binlightning" constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>

View file

@ -38,8 +38,8 @@
<constraint constraintValue="binlightning" <constraint constraintValue="binlightning"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>
@ -58,8 +58,8 @@
<constraint constraintValue="binlightning" <constraint constraintValue="binlightning"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>

View file

@ -36,8 +36,8 @@
<mapping key="pluginName"> <mapping key="pluginName">
<constraint constraintValue="binlightning" constraintType="EQUALS" /> <constraint constraintValue="binlightning" constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>

View file

@ -36,8 +36,8 @@
<mapping key="pluginName"> <mapping key="pluginName">
<constraint constraintValue="binlightning" constraintType="EQUALS" /> <constraint constraintValue="binlightning" constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>

View file

@ -43,8 +43,8 @@
<constraint constraintValue="binlightning" <constraint constraintValue="binlightning"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>
@ -69,8 +69,8 @@
<constraint constraintValue="binlightning" <constraint constraintValue="binlightning"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>
@ -95,8 +95,8 @@
<constraint constraintValue="binlightning" <constraint constraintValue="binlightning"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>
@ -121,8 +121,8 @@
<constraint constraintValue="binlightning" <constraint constraintValue="binlightning"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>
@ -147,8 +147,8 @@
<constraint constraintValue="binlightning" <constraint constraintValue="binlightning"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>
@ -173,8 +173,8 @@
<constraint constraintValue="binlightning" <constraint constraintValue="binlightning"
constraintType="EQUALS" /> constraintType="EQUALS" />
</mapping> </mapping>
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="EQUALS" /> <constraint constraintValue="${source}" constraintType="EQUALS" />
</mapping> </mapping>
</metadataMap> </metadataMap>
</resourceData> </resourceData>

View file

@ -21,12 +21,12 @@
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="subMenu" menuText="NLDN" id="NLDNSubMenu"> <contribute xsi:type="subMenu" menuText="NLDN" id="NLDNSubMenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/nldnLightningBundleItems.xml"> <contribute xsi:type="subinclude" fileName="menus/lightning/nldnLightningBundleItems.xml">
<substitute key="lightSource" value="NLDN"/> <substitute key="source" value="NLDN"/>
</contribute> </contribute>
</contribute> </contribute>
<contribute xsi:type="subMenu" menuText="GLD" id="GLDSubMenu"> <contribute xsi:type="subMenu" menuText="GLD" id="GLDSubMenu">
<contribute xsi:type="subinclude" fileName="menus/lightning/gldLightningBundleItems.xml"> <contribute xsi:type="subinclude" fileName="menus/lightning/gldLightningBundleItems.xml">
<substitute key="lightSource" value="GLD"/> <substitute key="source" value="GLD"/>
</contribute> </contribute>
</contribute> </contribute>
</menuTemplate> </menuTemplate>

View file

@ -4,7 +4,7 @@
<resourceCategory>MISC</resourceCategory> <resourceCategory>MISC</resourceCategory>
<resourceParameters> <resourceParameters>
pluginName=binlightning pluginName=binlightning
lightSource=NLDN,GLN source=NLDN,GLN
colorByIntensity=false colorByIntensity=false
legendColor=RGB {200, 200, 200} legendColor=RGB {200, 200, 200}
</resourceParameters> </resourceParameters>

View file

@ -4,7 +4,7 @@
<resourceCategory>MISC</resourceCategory> <resourceCategory>MISC</resourceCategory>
<resourceParameters> <resourceParameters>
pluginName=binlightning pluginName=binlightning
lightSource=NLDN,GLN source=NLDN,GLN
colorByIntensity=true colorByIntensity=true
legendColor=RGB {200, 200, 200} legendColor=RGB {200, 200, 200}
</resourceParameters> </resourceParameters>

View file

@ -26,9 +26,9 @@
<mapping key="pluginName"> <mapping key="pluginName">
<constraint constraintValue="${pluginName}" constraintType="EQUALS" /> <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
</mapping> </mapping>
<!-- Uncomment this when the baseline is updated for lightSource <!-- Uncomment this when the baseline is updated for source
<mapping key="lightSource"> <mapping key="source">
<constraint constraintValue="${lightSource}" constraintType="IN" /> <constraint constraintValue="${source}" constraintType="IN" />
</mapping> </mapping>
--> -->
</metadataMap> </metadataMap>

View file

@ -72,11 +72,11 @@
</nc-resourceParameter> </nc-resourceParameter>
<!-- Change this to a REQUEST_CONSTRAINT when our baseline is updated to get <!-- Change this to a REQUEST_CONSTRAINT when our baseline is updated to get
the latest binlightning decoder implementing the lightSource column --> the latest binlightning decoder implementing the source column -->
<nc-resourceParameter <nc-resourceParameter
ncResourceName="Lightning" ncResourceName="Lightning"
paramClass="String" paramClass="String"
paramName="lightSource" paramName="source"
defaultValue="NLDN" defaultValue="NLDN"
paramType="IMPLEMENTATION_PARAM"> paramType="IMPLEMENTATION_PARAM">
</nc-resourceParameter> </nc-resourceParameter>