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

MaterialBrowser will remember browse path. Removed commented out code from TextureBrowser

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

1
sdk/jme3-core/src/com/jme3/gde/core/properties/TextureBrowser.java
View File

@ -69,7 +69,6 @@ public class TextureBrowser extends javax.swing.JDialog implements TreeSelection
private ProjectAssetManager assetManager; private ProjectAssetManager assetManager;
private TexturePropertyEditor editor; private TexturePropertyEditor editor;
private DDSPreview ddsPreview; private DDSPreview ddsPreview;
//private static TreePath lastSelectedTexture;
private Preferences prefs; private Preferences prefs;
private static final String PREF_LAST_SELECTED = "lastSelectedTexture"; private static final String PREF_LAST_SELECTED = "lastSelectedTexture";

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

@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.prefs.Preferences;
import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener; import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
@ -37,11 +38,14 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio
private ProjectAssetManager assetManager; private ProjectAssetManager assetManager;
private MaterialPropertyEditor editor; private MaterialPropertyEditor editor;
private Preferences prefs;
private static final String PREF_LAST_SELECTED = "lastSelectedMaterial";
/** Creates new form MaterialBrowser */ /** Creates new form MaterialBrowser */
public MaterialBrowser(java.awt.Frame parent, boolean modal, ProjectAssetManager assetManager, MaterialPropertyEditor editor) { public MaterialBrowser(java.awt.Frame parent, boolean modal, ProjectAssetManager assetManager, MaterialPropertyEditor editor) {
this.assetManager = assetManager; this.assetManager = assetManager;
this.editor = editor; this.editor = editor;
prefs = Preferences.userNodeForPackage(this.getClass());
initComponents(); initComponents();
loadAvailableMaterials(); loadAvailableMaterials();
setSelectedMaterial((Material) editor.getValue()); setSelectedMaterial((Material) editor.getValue());
@ -85,6 +89,13 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio
jTree1.expandPath(TreeUtil.buildTreePath(jTree1, parent, path, 0, true)); jTree1.expandPath(TreeUtil.buildTreePath(jTree1, parent, path, 0, true));
jTree1.getSelectionModel().setSelectionPath(TreeUtil.buildTreePath(jTree1, parent, path, 0, false)); jTree1.getSelectionModel().setSelectionPath(TreeUtil.buildTreePath(jTree1, parent, path, 0, false));
} else {
String lastSelected = prefs.get(PREF_LAST_SELECTED, null);
if (lastSelected != null) {
TreePath parent = new TreePath((TreeNode) jTree1.getModel().getRoot());
TreePath selectedTreePath = TreeUtil.buildTreePath(jTree1, parent, ("/"+lastSelected).split("/"), 0, true);
jTree1.expandPath(selectedTreePath);
}
} }
} }
@ -109,6 +120,7 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio
fr.read(b); fr.read(b);
materialTextPreview.setText(new String(b).trim()); materialTextPreview.setText(new String(b).trim());
} }
prefs.put(PREF_LAST_SELECTED, selected);
} catch (IOException ex) { } catch (IOException ex) {
Exceptions.printStackTrace(ex); Exceptions.printStackTrace(ex);
} }