sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

material browser sorts alphabetically. Material editor sorts mat-def list alphabetically

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10466 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
bre..om 2013-03-05 18:08:27 +00:00
parent a1e7e024ea
commit 48a6c4745d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java
View File

@ -18,6 +18,9 @@ import java.awt.event.WindowEvent;
import java.awt.event.WindowListener; import java.awt.event.WindowListener;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener; import javax.swing.event.TreeSelectionListener;
@ -50,7 +53,9 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio
return; return;
} }
String[] leaves = assetManager.getMaterials(); String[] leaves = assetManager.getMaterials();
TreeUtil.createTree(jTree1, leaves); List<String> leavesList = Arrays.asList(leaves);
Collections.sort(leavesList);
TreeUtil.createTree(jTree1, leavesList.toArray(new String[0]));
TreeUtil.expandTree(jTree1, (TreeNode) jTree1.getModel().getRoot(), 1); TreeUtil.expandTree(jTree1, (TreeNode) jTree1.getModel().getRoot(), 1);
jTree1.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); jTree1.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
jTree1.addTreeSelectionListener(this); jTree1.addTreeSelectionListener(this);

12
sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java
View File

@ -21,6 +21,8 @@ import java.awt.Component;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; 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; EditableMaterialFile prop = materialFile;
materialFile = null; materialFile = null;
jComboBox1.removeAllItems(); jComboBox1.removeAllItems();
jComboBox1.addItem(""); jComboBox1.addItem("");
List<String> matDefList = Arrays.asList(matDefs);
for (int i = 0; i < strings.length; i++) { Collections.sort(matDefList);
String string = strings[i]; String[] sortedMatDefs = matDefList.toArray(new String[0]);
for (int i = 0; i < sortedMatDefs.length; i++) {
String string = sortedMatDefs[i];
jComboBox1.addItem(string); jComboBox1.addItem(string);
} }