Peter Centgraf pushed to branch feature/CMS-11027 at cms-community / hippo-cms
Commits:
f1a9baa4 by Peter Centgraf at 2018-02-08T13:01:48+01:00
CMS-11027 Relax static types for HCM to avoid annoying wildcards in API
- - - - -
1 changed file:
-
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
Changes:
=====================================
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
=====================================
---
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
+++
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/PropertiesEditor.java
@@ -150,7 +150,7 @@ public class PropertiesEditor extends DataView<Property> {
final ConfigurationItemCategory propCat =
getCategoryForProperty(propertyPath, cfgModel);
final JcrPath propertyJcrPath = JcrPaths.getPath(propertyPath);
- final ConfigurationProperty<?,?> cfgProperty =
cfgModel.resolveProperty(propertyJcrPath);
+ final ConfigurationProperty cfgProperty =
cfgModel.resolveProperty(propertyJcrPath);
String origin = "";
if ((propCat.equals(ConfigurationItemCategory.CONFIG) ||
propCat.equals(ConfigurationItemCategory.SYSTEM))
&& cfgProperty != null) {
@@ -181,7 +181,7 @@ public class PropertiesEditor extends DataView<Property> {
String nodeOrigin = "";
final JcrPath jcrPath = JcrPaths.getPath(nodePath);
if (nodeCat.equals(ConfigurationItemCategory.CONFIG)) {
- final ConfigurationNode<?,?,?> cfgNode =
cfgModel.resolveNode(jcrPath);
+ final ConfigurationNode cfgNode = cfgModel.resolveNode(jcrPath);
nodeOrigin = (cfgNode==null)
? "<config>"
:
cfgNode.getDefinitions().stream().map(ModelItem::getOrigin).collect(joining("\n"));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/f1a9baa402e11b4ef23168ebab25f6c1b3f82573
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/f1a9baa402e11b4ef23168ebab25f6c1b3f82573
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
