Jelajahi Sumber

SDK:
- remove unused methods in SceneComposer

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10396 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

nor..67 12 tahun lalu
induk
melakukan
c86413b2f6

+ 7 - 7
jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java

@@ -899,13 +899,13 @@ private void jToggleSelectGeomActionPerformed(java.awt.event.ActionEvent evt) {/
         SceneApplication.getApplication().openScene(request);
     }
 
-    public void addModel(Spatial model) {
-        if (editorController != null) {
-            editorController.addModel(model, toolController.getCursorLocation());
-        } else {
-            displayInfo("No scene opened!");
-        }
-    }
+//    public void addModel(Spatial model) {
+//        if (editorController != null) {
+//            editorController.addModel(model, toolController.getCursorLocation());
+//        } else {
+//            displayInfo("No scene opened!");
+//        }
+//    }
 
     public void addModel(SpatialAssetDataObject model) {
         if (editorController != null) {

+ 47 - 47
jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditorController.java

@@ -644,53 +644,53 @@ public class SceneEditorController implements PropertyChangeListener, NodeListen
         
     }
     
-    public void addModel(final Spatial file) {
-        addModel(file, null);
-    }
-    
-    public void addModel(final Spatial file, final Vector3f location) {
-        if (selectedSpat == null) {
-            return;
-        }
-        final Node selected = selectedSpat.getLookup().lookup(Node.class);
-        if (selected != null) {
-            setNeedsSave(true);
-            SceneApplication.getApplication().enqueue(new Callable<Object>() {
-                
-                public Object call() throws Exception {
-                    doAddModel(file, selected, location);
-                    return null;
-                }
-            });
-        } else {
-            displayInfo("Please select a Node to attach to\nin the SceneExplorer.");
-        }
-    }
-    
-    public void doAddModel(Spatial file, Node selected, Vector3f location) {
-        ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Adding Model..");
-        progressHandle.start();
-        try {
-            if (file != null) {
-                selected.attachChild(file);
-                if (location != null) {
-                    Vector3f localVec = new Vector3f();
-                    selected.worldToLocal(location, localVec);
-                    file.setLocalTranslation(localVec);
-                }
-            }
-            refreshSelected();
-            addSpatialUndo(selected, file, null, jmeRootNode);
-        } catch (Exception ex) {
-            Confirmation msg = new NotifyDescriptor.Confirmation(
-                    "Error importing " + file.getName() + "\n" + ex.toString(),
-                    NotifyDescriptor.OK_CANCEL_OPTION,
-                    NotifyDescriptor.ERROR_MESSAGE);
-            DialogDisplayer.getDefault().notifyLater(msg);
-        }
-        progressHandle.finish();
-        
-    }
+//    public void addModel(final Spatial file) {
+//        addModel(file, null);
+//    }
+//    
+//    public void addModel(final Spatial file, final Vector3f location) {
+//        if (selectedSpat == null) {
+//            return;
+//        }
+//        final Node selected = selectedSpat.getLookup().lookup(Node.class);
+//        if (selected != null) {
+//            setNeedsSave(true);
+//            SceneApplication.getApplication().enqueue(new Callable<Object>() {
+//                
+//                public Object call() throws Exception {
+//                    doAddModel(file, selected, location);
+//                    return null;
+//                }
+//            });
+//        } else {
+//            displayInfo("Please select a Node to attach to\nin the SceneExplorer.");
+//        }
+//    }
+//    
+//    public void doAddModel(Spatial file, Node selected, Vector3f location) {
+//        ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Adding Model..");
+//        progressHandle.start();
+//        try {
+//            if (file != null) {
+//                selected.attachChild(file);
+//                if (location != null) {
+//                    Vector3f localVec = new Vector3f();
+//                    selected.worldToLocal(location, localVec);
+//                    file.setLocalTranslation(localVec);
+//                }
+//            }
+//            refreshSelected();
+//            addSpatialUndo(selected, file, null, jmeRootNode);
+//        } catch (Exception ex) {
+//            Confirmation msg = new NotifyDescriptor.Confirmation(
+//                    "Error importing " + file.getName() + "\n" + ex.toString(),
+//                    NotifyDescriptor.OK_CANCEL_OPTION,
+//                    NotifyDescriptor.ERROR_MESSAGE);
+//            DialogDisplayer.getDefault().notifyLater(msg);
+//        }
+//        progressHandle.finish();
+//        
+//    }
     
     public void setNeedsSave(boolean state) {
         currentFileObject.setModified(state);