Fix bugs in widget ordering

ctrueden · ctrueden · commit db47e50ff5aa · 2017-09-25T22:14:10.000+02:00
They were erroneously alphabetical!
diff --git a/src/main/java/org/scijava/nwidget/swing/NSwingWidgetPanelFactory.java b/src/main/java/org/scijava/nwidget/swing/NSwingWidgetPanelFactory.java
@@ -57,7 +57,7 @@ public JPanel getComponent() {
 					new MigLayout("fillx,wrap 2", "[right]10[fill,grow]");
 			panel.setLayout(layout);
 
-			widgets.stream().forEach(widget -> {
+			for (final NSwingWidget widget : widgets) {
 				// add widget to panel
 				final String label = NWidgets.label(widget);
 				if (label != null) {
@@ -72,7 +72,7 @@ public JPanel getComponent() {
 					// widget occupies entire row
 					getComponent().add(widget.getComponent(), "span");
 				}
-			});
+			}
 
 			return panel;
 		}
diff --git a/src/main/java/org/scijava/struct/DefaultStructInstance.java b/src/main/java/org/scijava/struct/DefaultStructInstance.java
@@ -1,21 +1,21 @@
 
 package org.scijava.struct;
 
+import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 public class DefaultStructInstance<O> implements StructInstance<O> {
 
 	private final Struct struct;
 	private final O object;
 
-	private final TreeMap<String, MemberInstance<?>> memberMap;
+	private final LinkedHashMap<String, MemberInstance<?>> memberMap;
 
 	public DefaultStructInstance(final Struct struct, final O object) {
 		this.struct = struct;
 		this.object = object;
-		memberMap = new TreeMap<>();
+		memberMap = new LinkedHashMap<>();
 		for (final Member<?> member : struct.members()) {
 			memberMap.put(member.getKey(), member.createInstance(object));
 		}
