You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2016/04/13 18:34:28 UTC
ambari git commit: AMBARI-15860. Themes: Config placement is not
respected in theme inheritance scenario.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 9741e4aab -> 5a52d1576
AMBARI-15860. Themes: Config placement is not respected in theme inheritance scenario.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5a52d157
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5a52d157
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5a52d157
Branch: refs/heads/trunk
Commit: 5a52d1576fb7e5a818508908d03816c5014d88c1
Parents: 9741e4a
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Wed Apr 13 19:33:44 2016 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Wed Apr 13 19:33:44 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/ambari/server/state/theme/Placement.java | 6 +++---
.../apache/ambari/server/state/theme/ThemeConfiguration.java | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a52d157/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Placement.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Placement.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Placement.java
index e3708d8..850231a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Placement.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/Placement.java
@@ -24,7 +24,7 @@ import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -67,7 +67,7 @@ public class Placement{
}
private List<ConfigPlacement> mergeConfigs(List<ConfigPlacement> parentConfigs, List<ConfigPlacement> childConfigs) {
- Map<String, ConfigPlacement> mergedConfigPlacements = new HashMap<String, ConfigPlacement>();
+ Map<String, ConfigPlacement> mergedConfigPlacements = new LinkedHashMap<String, ConfigPlacement>();
for (ConfigPlacement parentConfigPlacement : parentConfigs) {
mergedConfigPlacements.put(parentConfigPlacement.getConfig(), parentConfigPlacement);
}
@@ -85,4 +85,4 @@ public class Placement{
}
return new ArrayList<ConfigPlacement>(mergedConfigPlacements.values());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5a52d157/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ThemeConfiguration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ThemeConfiguration.java b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ThemeConfiguration.java
index a0d8907..73a8cc9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ThemeConfiguration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/theme/ThemeConfiguration.java
@@ -24,7 +24,7 @@ import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -90,7 +90,7 @@ public class ThemeConfiguration{
}
private List<Layout> mergeLayouts(List<Layout> parentLayouts, List<Layout> childLayouts) {
- Map<String, Layout> mergedLayouts = new HashMap<String, Layout>();
+ Map<String, Layout> mergedLayouts = new LinkedHashMap<String, Layout>();
for (Layout parentLayout : parentLayouts) {
mergedLayouts.put(parentLayout.getName(), parentLayout);
@@ -113,7 +113,7 @@ public class ThemeConfiguration{
}
private List<WidgetEntry> mergeWidgets(List<WidgetEntry> parentWidgets, List<WidgetEntry> childWidgets) {
- Map<String, WidgetEntry> mergedWidgets = new HashMap<String, WidgetEntry>();
+ Map<String, WidgetEntry> mergedWidgets = new LinkedHashMap<String, WidgetEntry>();
for (WidgetEntry widgetEntry : parentWidgets) {
mergedWidgets.put(widgetEntry.getConfig(), widgetEntry);
}
@@ -131,4 +131,4 @@ public class ThemeConfiguration{
return new ArrayList<WidgetEntry>(mergedWidgets.values());
}
-}
\ No newline at end of file
+}