diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java index 076f9c242..f25294d8c 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java @@ -18,6 +18,9 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.io.FileReader; import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import java.util.logging.Logger; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; @@ -50,7 +53,9 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio return; } String[] leaves = assetManager.getMaterials(); - TreeUtil.createTree(jTree1, leaves); + List leavesList = Arrays.asList(leaves); + Collections.sort(leavesList); + TreeUtil.createTree(jTree1, leavesList.toArray(new String[0])); TreeUtil.expandTree(jTree1, (TreeNode) jTree1.getModel().getRoot(), 1); jTree1.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); jTree1.addTreeSelectionListener(this); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java index e85107c64..154a6dfa2 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java @@ -21,6 +21,8 @@ import java.awt.Component; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -523,14 +525,16 @@ public final class MaterialEditorTopComponent extends CloneableTopComponent impl } } - public void setMatDefList(final String[] strings, String selected) { + public void setMatDefList(final String[] matDefs, String selected) { EditableMaterialFile prop = materialFile; materialFile = null; jComboBox1.removeAllItems(); jComboBox1.addItem(""); - - for (int i = 0; i < strings.length; i++) { - String string = strings[i]; + List matDefList = Arrays.asList(matDefs); + Collections.sort(matDefList); + String[] sortedMatDefs = matDefList.toArray(new String[0]); + for (int i = 0; i < sortedMatDefs.length; i++) { + String string = sortedMatDefs[i]; jComboBox1.addItem(string); }