Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [3295] RHQ-1599 Provide the displayName as description if no explicit description is given in the plugin descriptor.
|
From: <hr...@rh...> - 2009-03-05 13:23:23
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [3295] RHQ-1599 Provide the displayName as description if no explicit description is given in the plugin descriptor.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3295</dd> <dt>Author</dt> <dd>hrupp</dd> <dt>Date</dt> <dd>2009-03-05 07:23:20 -0600 (Thu, 05 Mar 2009)</dd> </dl> <h3>Log Message</h3> <pre>RHQ-1599 Provide the displayName as description if no explicit description is given in the plugin descriptor.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulescoreclientapisrcmainjavaorgrhqcoreclientapiagentmetadataMetricsMetadataParserjava">rhq/trunk/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulescoreclientapisrcmainjavaorgrhqcoreclientapiagentmetadataMetricsMetadataParserjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java (3294 => 3295)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java 2009-03-05 10:34:57 UTC (rev 3294) +++ rhq/trunk/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java 2009-03-05 13:23:20 UTC (rev 3295) </span><span class="lines">@@ -111,12 +111,16 @@ </span><span class="cx"> dataType), dataType, NumericType.valueOf(metricDescriptor.getMeasurementType().toUpperCase()), metricDescriptor.isDefaultOn(), collectionInterval, displayType); </span><span class="rem">- definition.setDescription(metricDescriptor.getDescription()); </span><span class="cx"> if (metricDescriptor.getDisplayName() != null) { definition.setDisplayName(metricDescriptor.getDisplayName()); } else { definition.setDisplayName(StringUtils.deCamelCase(definition.getName())); } </span><span class="add">+ if (metricDescriptor.getDescription() != null) { + definition.setDescription(metricDescriptor.getDescription()); + } else { + definition.setDescription(definition.getDisplayName() ); + } </span><span class="cx"> definition.setDestinationType(metricDescriptor.getDestinationType()); </span> </pre> </div> </div> </body> </html> |