diff options
author | njames <nkskjames@gmail.com> | 2015-10-24 16:44:59 -0500 |
---|---|---|
committer | njames <nkskjames@gmail.com> | 2015-10-24 16:44:59 -0500 |
commit | 2595b33cb7da037622b2f873bc80f56309319912 (patch) | |
tree | 847dec51fa033f7553b7767d0dbbd872313a34d0 /src/com/ibm | |
parent | 25a98575966b4e5ec2b8b85151ecabb73a676796 (diff) | |
download | serverwiz-2595b33cb7da037622b2f873bc80f56309319912.tar.gz serverwiz-2595b33cb7da037622b2f873bc80f56309319912.zip |
Changed HashMaps to TreeMaps so saved XML will be sorted by key
therefore making diffs and merges easier
Diffstat (limited to 'src/com/ibm')
-rw-r--r-- | src/com/ibm/ServerWizard2/MainDialog.java | 3 | ||||
-rw-r--r-- | src/com/ibm/ServerWizard2/SystemModel.java | 18 | ||||
-rw-r--r-- | src/com/ibm/ServerWizard2/TargetWizardController.java | 3 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/com/ibm/ServerWizard2/MainDialog.java b/src/com/ibm/ServerWizard2/MainDialog.java index bc78c6a..a68ccf1 100644 --- a/src/com/ibm/ServerWizard2/MainDialog.java +++ b/src/com/ibm/ServerWizard2/MainDialog.java @@ -2,6 +2,7 @@ package com.ibm.ServerWizard2; import java.util.HashMap; import java.util.Map; +import java.util.TreeMap; import java.util.Vector; import org.eclipse.jface.dialogs.Dialog; @@ -752,7 +753,7 @@ public class MainDialog extends Dialog { if (attribute.isGlobal()) { if (ep !=null) { String path="/"+ep.getName(); - HashMap<String,Field> settings = controller.getGlobalSettings(path); + TreeMap<String,Field> settings = controller.getGlobalSettings(path); if (settings == null) { controller.setGlobalSetting(path, attribute.name, ""); controller.setGlobalSetting(path, "INSTANCE_ID", ep.getTargetName()); diff --git a/src/com/ibm/ServerWizard2/SystemModel.java b/src/com/ibm/ServerWizard2/SystemModel.java index 1b5d020..f6bf50a 100644 --- a/src/com/ibm/ServerWizard2/SystemModel.java +++ b/src/com/ibm/ServerWizard2/SystemModel.java @@ -38,7 +38,7 @@ public class SystemModel { public HashMap<String, Vector<Target>> childTargetTypes = new HashMap<String, Vector<Target>>(); // From attribute types - public HashMap<String, Enumerator> enumerations = new HashMap<String, Enumerator>(); + public TreeMap<String, Enumerator> enumerations = new TreeMap<String, Enumerator>(); public HashMap<String, Attribute> attributes = new HashMap<String, Attribute>(); // List of targets in current system @@ -48,7 +48,7 @@ public class SystemModel { private Vector<Target> busTypes = new Vector<Target>(); private PropertyChangeSupport changes = new PropertyChangeSupport(this); - private HashMap<String, HashMap<String, Field>> globalSettings = new HashMap<String, HashMap<String, Field>>(); + private TreeMap<String, TreeMap<String, Field>> globalSettings = new TreeMap<String, TreeMap<String, Field>>(); public String logData; @@ -358,9 +358,9 @@ public class SystemModel { } public Field setGlobalSetting(String path, String attribute, String value) { - HashMap<String, Field> s = globalSettings.get(path); + TreeMap<String, Field> s = globalSettings.get(path); if (s == null) { - s = new HashMap<String, Field>(); + s = new TreeMap<String, Field>(); globalSettings.put(path, s); } Field f = s.get(attribute); @@ -374,7 +374,7 @@ public class SystemModel { } public Boolean isGlobalSetting(String path, String attribute) { - HashMap<String, Field> s = globalSettings.get(path); + TreeMap<String, Field> s = globalSettings.get(path); if (s == null) { return false; } @@ -386,7 +386,7 @@ public class SystemModel { } public Field getGlobalSetting(String path, String attribute) { - HashMap<String, Field> s = globalSettings.get(path); + TreeMap<String, Field> s = globalSettings.get(path); if (s == null) { Field f=this.setGlobalSetting(path, attribute, ""); return f; @@ -398,13 +398,13 @@ public class SystemModel { return f; } - public HashMap<String, Field> getGlobalSettings(String path) { - HashMap<String, Field> s = globalSettings.get(path); + public TreeMap<String, Field> getGlobalSettings(String path) { + TreeMap<String, Field> s = globalSettings.get(path); return s; } public void writeGlobalSettings(Writer out) throws Exception { - for (Map.Entry<String, HashMap<String, Field>> entry : this.globalSettings.entrySet()) { + for (Map.Entry<String, TreeMap<String, Field>> entry : this.globalSettings.entrySet()) { out.write("<globalSetting>\n"); out.write("\t<id>" + entry.getKey() + "</id>\n"); for (Map.Entry<String, Field> setting : entry.getValue().entrySet()) { diff --git a/src/com/ibm/ServerWizard2/TargetWizardController.java b/src/com/ibm/ServerWizard2/TargetWizardController.java index fd19069..e55e9ba 100644 --- a/src/com/ibm/ServerWizard2/TargetWizardController.java +++ b/src/com/ibm/ServerWizard2/TargetWizardController.java @@ -9,6 +9,7 @@ import java.io.StringWriter; import java.nio.file.Files; import java.nio.file.StandardCopyOption; import java.util.HashMap; +import java.util.TreeMap; import java.util.Vector; import javax.xml.parsers.DocumentBuilder; @@ -214,7 +215,7 @@ public class TargetWizardController implements PropertyChangeListener { public Field getGlobalSetting(String path,String attribute) { return model.getGlobalSetting(path, attribute); } - public HashMap<String,Field> getGlobalSettings(String path) { + public TreeMap<String,Field> getGlobalSettings(String path) { return model.getGlobalSettings(path); } public Vector<Target> getChildTargets(Target target) { |