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

- fix some more warnings

Browse Source 
- fix undo for cloneable values

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7745 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-06-26 13:04:49 +00:00
parent fc04902c30
commit e8118b5485
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/properties/SceneExplorerProperty.java
View File

@ -136,9 +136,9 @@ public class SceneExplorerProperty<T> extends PropertySupport.Reflection<T> {
if (undo) { if (undo) {
try { try {
Object oldValue = getSuperValue(); Object oldValue = getSuperValue();
if (oldValue.getClass().getMethod("clone", null) != null) { if (oldValue.getClass().getMethod("clone") != null) {
addUndo(oldValue.getClass().getMethod("clone", null).invoke(oldValue, null), val); addUndo(oldValue.getClass().getMethod("clone").invoke(oldValue), val);
Logger.getLogger(SceneExplorerProperty.class.getName()).log(Level.INFO, "Add cloned undo {0}", oldValue.getClass().getMethod("clone", null).invoke(oldValue, null)); Logger.getLogger(SceneExplorerProperty.class.getName()).log(Level.INFO, "Add cloned undo {0}", oldValue.getClass().getMethod("clone").invoke(oldValue));
} }
} catch (Exception e) { } catch (Exception e) {
addUndo(getSuperValue(), val); addUndo(getSuperValue(), val);

3
sdk/jme3-gui/src/com/jme3/gde/gui/multiview/NiftyPreviewPanel.java
View File

@ -205,9 +205,8 @@ public class NiftyPreviewPanel extends PanelView {
Logger.getLogger(NiftyPreviewPanel.class.getName()).log(Level.WARNING, "No Project AssetManager found!"); Logger.getLogger(NiftyPreviewPanel.class.getName()).log(Level.WARNING, "No Project AssetManager found!");
return null; return null;
} }
AssetManager assetManager = pm.getManager();
AudioRenderer audioRenderer = SceneApplication.getApplication().getAudioRenderer(); AudioRenderer audioRenderer = SceneApplication.getApplication().getAudioRenderer();
niftyDisplay = new NiftyJmeDisplay(assetManager, niftyDisplay = new NiftyJmeDisplay(pm,
inputHandler, inputHandler,
audioRenderer, audioRenderer,
guiViewPort); guiViewPort);