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

Issue #2298: Fix DataURIUtil calling setPluginName

Browse source 
Change-Id: Ic0ee254bcd61bad9a76179486b11ff15bff2d271

Former-commit-id: d03a94ddef [formerly dcab61ba26] [formerly d03a94ddef [formerly dcab61ba26] [formerly 6657880572 [formerly 2e7494fad8b1ae47c93b7d37a84f38f674d46aa9]]]
Former-commit-id: 6657880572
Former-commit-id: 47d9647144 [formerly 8599940dee]
Former-commit-id: bc4627a22d
This commit is contained in:
Richard Peter 2013-09-11 16:54:54 -05:00
parent 00364668a4
commit fc0f67f5b0
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
View file

@ -54,7 +54,7 @@ import com.raytheon.uf.common.util.ConvertUtil;
* from PluginDataObject
* May 15, 2013 1869 bsteffen Move uri map creation from RecordFactory.
* May 16, 2013 1869 bsteffen Rewrite dataURI property mappings.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract and removed setPluginName.
*
* </pre>
*
@ -67,6 +67,9 @@ public class DataURIUtil {
private static final String FIELD_SEPARATOR = ".";
private static final Pattern FIELD_SEPARATOR_PATTERN = Pattern.compile("["
+ FIELD_SEPARATOR + "]");
private static final Pattern SEPARATOR_PATTERN = Pattern
.compile(DataURI.SEPARATOR);
@ -300,14 +303,19 @@ public class DataURIUtil {
accessMap.put(access.getFieldName(), access);
}
for (String dataKey : dataMap.keySet()) {
Object data = dataMap.get(dataKey);
DataURIFieldAccess access = accessMap.get(dataKey);
if (access == null) {
access = new DataURIFieldAccess(Arrays.asList(dataKey.split("["
+ FIELD_SEPARATOR + "]")),
object != null ? object.getClass() : null);
if (!PLUGIN_NAME_KEY.equals(dataKey)) {
Object data = dataMap.get(dataKey);
DataURIFieldAccess access = accessMap.get(dataKey);
if (access == null) {
access = new DataURIFieldAccess(
Arrays.asList(FIELD_SEPARATOR_PATTERN
.split(dataKey)),
object != null ? object.getClass() : null);
}
access.setFieldValue(object, data);
}
access.setFieldValue(object, data);
}
}