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

Fixed the Issue where removing a Control didn't set the dirty flag (made the Model Savable)

Browse Source
experimental
MeFisto94 9 years ago
parent f4098ce89c
commit 2297520cf7
8 changed files with 86 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAnimControl.java
  2. 13
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeCharacterControl.java
  3. 12
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java
  4. 11
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGhostControl.java
  5. 11
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeRigidBodyControl.java
  6. 10
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSkeletonControl.java
  7. 10
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainLodControl.java
  8. 10
      sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleControl.java

10
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAnimControl.java
Unescape View File

@ -129,6 +129,15 @@ public class JmeAnimControl extends AbstractSceneExplorerNode {
};
}
@Override
protected void fireSave(boolean modified) {
Node parent = getParentNode();
if (parent instanceof AbstractSceneExplorerNode) {
AbstractSceneExplorerNode par=(AbstractSceneExplorerNode)parent;
par.fireSave(modified);
}
}
@Override
public boolean canDestroy() {
return !readOnly;
@ -139,6 +148,7 @@ public class JmeAnimControl extends AbstractSceneExplorerNode {
super.destroy();
final Spatial spat = getParentNode().getLookup().lookup(Spatial.class);
try {
fireSave(true);
SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception {

13
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeCharacterControl.java
Unescape View File

@ -42,12 +42,11 @@ import java.io.IOException;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import javax.swing.Action;
import javax.swing.ImageIcon;
import org.openide.actions.DeleteAction;
import org.openide.loaders.DataObject;
import org.openide.nodes.Node;
import org.openide.nodes.Sheet;
import org.openide.util.Exceptions;
import org.openide.util.ImageUtilities;
import org.openide.util.actions.SystemAction;
/**
@ -92,6 +91,15 @@ public class JmeCharacterControl extends AbstractSceneExplorerNode {
};
}
@Override
protected void fireSave(boolean modified) {
Node parent = getParentNode();
if (parent instanceof AbstractSceneExplorerNode) {
AbstractSceneExplorerNode par=(AbstractSceneExplorerNode)parent;
par.fireSave(modified);
}
}
@Override
public boolean canDestroy() {
return !readOnly;
@ -102,6 +110,7 @@ public class JmeCharacterControl extends AbstractSceneExplorerNode {
super.destroy();
final Spatial spat=getParentNode().getLookup().lookup(Spatial.class);
try {
fireSave(true);
SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception {

12
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java
Unescape View File

@ -32,7 +32,6 @@
package com.jme3.gde.core.sceneexplorer.nodes;
import com.jme3.gde.core.icons.IconList;
import com.jme3.gde.core.properties.ScenePropertyChangeListener;
import com.jme3.gde.core.scene.SceneApplication;
import com.jme3.scene.Spatial;
import com.jme3.scene.control.Control;
@ -43,6 +42,7 @@ import java.util.concurrent.ExecutionException;
import javax.swing.Action;
import org.openide.actions.DeleteAction;
import org.openide.loaders.DataObject;
import org.openide.nodes.Node;
import org.openide.nodes.Sheet;
import org.openide.util.Exceptions;
import org.openide.util.actions.SystemAction;
@ -121,6 +121,15 @@ public class JmeGenericControl extends AbstractSceneExplorerNode {
};
}
@Override
protected void fireSave(boolean modified) {
Node parent = getParentNode();
if (parent instanceof AbstractSceneExplorerNode) {
AbstractSceneExplorerNode par=(AbstractSceneExplorerNode)parent;
par.fireSave(modified);
}
}
@Override
public boolean canDestroy() {
return true;
@ -131,6 +140,7 @@ public class JmeGenericControl extends AbstractSceneExplorerNode {
super.destroy();
final Spatial spat = getParentNode().getLookup().lookup(Spatial.class);
try {
fireSave(true);
SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception {
spat.removeControl(control);

11
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGhostControl.java
Unescape View File

@ -45,6 +45,7 @@ import java.util.concurrent.ExecutionException;
import javax.swing.Action;
import org.openide.actions.DeleteAction;
import org.openide.loaders.DataObject;
import org.openide.nodes.Node;
import org.openide.nodes.Sheet;
import org.openide.util.Exceptions;
import org.openide.util.actions.SystemAction;
@ -91,6 +92,15 @@ public class JmeGhostControl extends AbstractSceneExplorerNode {
};
}
@Override
protected void fireSave(boolean modified) {
Node parent = getParentNode();
if (parent instanceof AbstractSceneExplorerNode) {
AbstractSceneExplorerNode par=(AbstractSceneExplorerNode)parent;
par.fireSave(modified);
}
}
@Override
public boolean canDestroy() {
return !readOnly;
@ -101,6 +111,7 @@ public class JmeGhostControl extends AbstractSceneExplorerNode {
super.destroy();
final Spatial spat=getParentNode().getLookup().lookup(Spatial.class);
try {
fireSave(true);
SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception {

11
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeRigidBodyControl.java
Unescape View File

@ -45,6 +45,7 @@ import java.util.concurrent.ExecutionException;
import javax.swing.Action;
import org.openide.actions.DeleteAction;
import org.openide.loaders.DataObject;
import org.openide.nodes.Node;
import org.openide.nodes.Sheet;
import org.openide.util.Exceptions;
import org.openide.util.actions.SystemAction;
@ -91,6 +92,15 @@ public class JmeRigidBodyControl extends AbstractSceneExplorerNode {
};
}
@Override
protected void fireSave(boolean modified) {
Node parent = getParentNode();
if (parent instanceof AbstractSceneExplorerNode) {
AbstractSceneExplorerNode par=(AbstractSceneExplorerNode)parent;
par.fireSave(modified);
}
}
@Override
public boolean canDestroy() {
return !readOnly;
@ -101,6 +111,7 @@ public class JmeRigidBodyControl extends AbstractSceneExplorerNode {
super.destroy();
final Spatial spat=getParentNode().getLookup().lookup(Spatial.class);
try {
fireSave(true);
SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception {

10
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeSkeletonControl.java
Unescape View File

@ -108,6 +108,15 @@ public class JmeSkeletonControl extends AbstractSceneExplorerNode {
};
}
@Override
protected void fireSave(boolean modified) {
Node parent = getParentNode();
if (parent instanceof AbstractSceneExplorerNode) {
AbstractSceneExplorerNode par=(AbstractSceneExplorerNode)parent;
par.fireSave(modified);
}
}
@Override
public boolean canDestroy() {
return !readOnly;
@ -118,6 +127,7 @@ public class JmeSkeletonControl extends AbstractSceneExplorerNode {
super.destroy();
final Spatial spat = getParentNode().getLookup().lookup(Spatial.class);
try {
fireSave(true);
SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception {

10
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeTerrainLodControl.java
Unescape View File

@ -94,6 +94,15 @@ public class JmeTerrainLodControl extends AbstractSceneExplorerNode {
};
}
@Override
protected void fireSave(boolean modified) {
Node parent = getParentNode();
if (parent instanceof AbstractSceneExplorerNode) {
AbstractSceneExplorerNode par=(AbstractSceneExplorerNode)parent;
par.fireSave(modified);
}
}
@Override
public boolean canDestroy() {
return !readOnly;
@ -104,6 +113,7 @@ public class JmeTerrainLodControl extends AbstractSceneExplorerNode {
super.destroy();
final Spatial spat = getParentNode().getLookup().lookup(Spatial.class);
try {
fireSave(true);
SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception {

10
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeVehicleControl.java
Unescape View File

@ -96,6 +96,15 @@ public class JmeVehicleControl extends AbstractSceneExplorerNode {
};
}
@Override
protected void fireSave(boolean modified) {
Node parent = getParentNode();
if (parent instanceof AbstractSceneExplorerNode) {
AbstractSceneExplorerNode par=(AbstractSceneExplorerNode)parent;
par.fireSave(modified);
}
}
@Override
public boolean canDestroy() {
return !readOnly;
@ -106,6 +115,7 @@ public class JmeVehicleControl extends AbstractSceneExplorerNode {
super.destroy();
final Spatial spat = getParentNode().getLookup().lookup(Spatial.class);
try {
fireSave(true);
SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception {

Write Preview
Loading…
Cancel
Save