소스 검색

Fixed some Deprecation Warnings by moving from `ProgressHandleFactory` to `ProgressHandle`.

MeFisto94 9 년 전
부모
커밋
ea6fd29b50
24개의 변경된 파일26개의 추가작업 그리고 61개의 파일을 삭제
  1. 1 2
      jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/OnlineBrowser.java
  2. 1 2
      jme3-assetpack-support/src/com/jme3/gde/assetpack/project/actions/CleanupProjectAction.java
  3. 1 2
      jme3-assetpack-support/src/com/jme3/gde/assetpack/project/actions/ConvertOgreBinaryMeshesAction.java
  4. 1 2
      jme3-assetpack-support/src/com/jme3/gde/assetpack/project/actions/ImportWorldForgeAction.java
  5. 1 2
      jme3-assetpack-support/src/com/jme3/gde/assetpack/project/actions/PublishAssetPackAction.java
  6. 1 2
      jme3-core/src/com/jme3/gde/core/appstates/NewSceneSaveNode.java
  7. 1 3
      jme3-core/src/com/jme3/gde/core/assets/AssetDataObject.java
  8. 1 2
      jme3-core/src/com/jme3/gde/core/assets/ExternalChangeScanner.java
  9. 1 2
      jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java
  10. 1 4
      jme3-core/src/com/jme3/gde/core/assets/actions/OpenModel.java
  11. 1 3
      jme3-core/src/com/jme3/gde/core/util/ZipExtensionTool.java
  12. 1 2
      jme3-desktop-executables/src/com/jme3/gde/desktop/executables/JreDownloader.java
  13. 1 2
      jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java
  14. 1 2
      jme3-model-importer/src/com/jme3/gde/modelimporter/ImportModel.java
  15. 1 2
      jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshAction.java
  16. 1 3
      jme3-navmesh-gen/src/com/jme3/gde/nmgen/wizard/NewNavMeshWizardAction.java
  17. 1 2
      jme3-ogretools/src/com/jme3/gde/ogretools/convert/AdvOgreXMLConvertAction.java
  18. 1 2
      jme3-scenecomposer/src/com/jme3/gde/scenecomposer/OpenSceneComposer.java
  19. 1 2
      jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java
  20. 3 5
      jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditorController.java
  21. 1 3
      jme3-terrain-editor/src/com/jme3/gde/terraineditor/EditTerrainAction.java
  22. 1 5
      jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java
  23. 1 2
      jme3-terrain-editor/src/com/jme3/gde/terraineditor/tools/GenerateTerrainEntropiesAction.java
  24. 1 3
      jme3-vehicle-creator/src/com/jme3/gde/vehiclecreator/EditVehicleAction.java

+ 1 - 2
jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/OnlineBrowser.java

@@ -22,7 +22,6 @@ import java.util.zip.ZipInputStream;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import javax.swing.event.HyperlinkListener;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor.Confirmation;
 import org.openide.NotifyDescriptor.Confirmation;
@@ -56,7 +55,7 @@ public class OnlineBrowser extends javax.swing.JPanel implements HyperlinkListen
             new Thread(new Runnable() {
             new Thread(new Runnable() {
 
 
                 public void run() {
                 public void run() {
-                    ProgressHandle handle = ProgressHandleFactory.createHandle("Downloading AssetPack..");
+                    ProgressHandle handle = ProgressHandle.createHandle("Downloading AssetPack..");
                     handle.start();
                     handle.start();
                     String name = event.getURL().toString();
                     String name = event.getURL().toString();
                     name = name.substring(name.lastIndexOf("/") + 1, name.length());
                     name = name.substring(name.lastIndexOf("/") + 1, name.length());

+ 1 - 2
jme3-assetpack-support/src/com/jme3/gde/assetpack/project/actions/CleanupProjectAction.java

@@ -13,7 +13,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 import javax.swing.Action;
 import javax.swing.Action;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileObject;
 import org.openide.util.Exceptions;
 import org.openide.util.Exceptions;
 import org.w3c.dom.Element;
 import org.w3c.dom.Element;
@@ -79,7 +78,7 @@ public final class CleanupProjectAction implements Action {
         new Thread(new Runnable() {
         new Thread(new Runnable() {
 
 
             public void run() {
             public void run() {
-                ProgressHandle handle = ProgressHandleFactory.createHandle("Cleanup unused assets..");
+                ProgressHandle handle = ProgressHandle.createHandle("Cleanup unused assets..");
                 handle.start();
                 handle.start();
                 scanFiles(context.getAssetsFolder(), files);
                 scanFiles(context.getAssetsFolder(), files);
                 handle.finish();
                 handle.finish();

+ 1 - 2
jme3-assetpack-support/src/com/jme3/gde/assetpack/project/actions/ConvertOgreBinaryMeshesAction.java

@@ -19,7 +19,6 @@ import java.util.logging.Logger;
 import javax.swing.Action;
 import javax.swing.Action;
 import javax.swing.JComponent;
 import javax.swing.JComponent;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.Project;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.WizardDescriptor;
 import org.openide.WizardDescriptor;
@@ -58,7 +57,7 @@ public final class ConvertOgreBinaryMeshesAction implements Action {
     }
     }
 
 
     public void scanDir(String dir2scan, boolean delete) {
     public void scanDir(String dir2scan, boolean delete) {
-        ProgressHandle handle = ProgressHandleFactory.createHandle("Convert Ogre Binary Files");
+        ProgressHandle handle = ProgressHandle.createHandle("Convert Ogre Binary Files");
         handle.start();
         handle.start();
         try {
         try {
             File zipDir = new File(dir2scan);
             File zipDir = new File(dir2scan);

+ 1 - 2
jme3-assetpack-support/src/com/jme3/gde/assetpack/project/actions/ImportWorldForgeAction.java

@@ -35,7 +35,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 import javax.swing.Action;
 import javax.swing.Action;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor.Message;
 import org.openide.NotifyDescriptor.Message;
@@ -84,7 +83,7 @@ public final class ImportWorldForgeAction implements Action {
         new Thread(new Runnable() {
         new Thread(new Runnable() {
 
 
             public void run() {
             public void run() {
-                ProgressHandle handle = ProgressHandleFactory.createHandle("Import WorldForge Models");
+                ProgressHandle handle = ProgressHandle.createHandle("Import WorldForge Models");
                 handle.start();
                 handle.start();
                 FileObject objects = folder.getFileObject("3d_objects");
                 FileObject objects = folder.getFileObject("3d_objects");
                 if (objects == null) {
                 if (objects == null) {

+ 1 - 2
jme3-assetpack-support/src/com/jme3/gde/assetpack/project/actions/PublishAssetPackAction.java

@@ -25,7 +25,6 @@ import java.util.zip.ZipOutputStream;
 import javax.swing.Action;
 import javax.swing.Action;
 import javax.swing.JComponent;
 import javax.swing.JComponent;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.Project;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.WizardDescriptor;
 import org.openide.WizardDescriptor;
@@ -59,7 +58,7 @@ public final class PublishAssetPackAction implements Action {
             new Thread(new Runnable() {
             new Thread(new Runnable() {
 
 
                 public void run() {
                 public void run() {
-                    ProgressHandle handle = ProgressHandleFactory.createHandle("Publishing AssetPack..");
+                    ProgressHandle handle = ProgressHandle.createHandle("Publishing AssetPack..");
                     handle.start();
                     handle.start();
                     packZip(wizardDescriptor);
                     packZip(wizardDescriptor);
                     copyData(wizardDescriptor);
                     copyData(wizardDescriptor);

+ 1 - 2
jme3-core/src/com/jme3/gde/core/appstates/NewSceneSaveNode.java

@@ -40,7 +40,6 @@ import java.io.IOException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Callable;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.filechooser.FileFilter;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.awt.StatusDisplayer;
 import org.openide.awt.StatusDisplayer;
@@ -107,7 +106,7 @@ public class NewSceneSaveNode extends AbstractNode implements SaveCookie {
                         return null;
                         return null;
                     }
                     }
                 }
                 }
-                ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Saving File..");
+                ProgressHandle progressHandle = ProgressHandle.createHandle("Saving File..");
                 progressHandle.start();
                 progressHandle.start();
                 try {
                 try {
                     BinaryExporter exp = BinaryExporter.getInstance();
                     BinaryExporter exp = BinaryExporter.getInstance();

+ 1 - 3
jme3-core/src/com/jme3/gde/core/assets/AssetDataObject.java

@@ -35,7 +35,6 @@ import com.jme3.asset.AssetEventListener;
 import com.jme3.asset.AssetKey;
 import com.jme3.asset.AssetKey;
 import com.jme3.export.Savable;
 import com.jme3.export.Savable;
 import com.jme3.export.binary.BinaryExporter;
 import com.jme3.export.binary.BinaryExporter;
-import com.jme3.gde.core.scene.ApplicationLogHandler.LogLevel;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.scene.SceneApplication;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStream;
@@ -48,7 +47,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.BeanUtils;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
 import org.netbeans.api.project.ProjectManager;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
@@ -217,7 +215,7 @@ public class AssetDataObject extends MultiDataObject {
             return;
             return;
         }
         }
         final Savable savable = this.savable;
         final Savable savable = this.savable;
-        ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Saving File..");
+        ProgressHandle progressHandle = ProgressHandle.createHandle("Saving File..");
         progressHandle.start();
         progressHandle.start();
         BinaryExporter exp = BinaryExporter.getInstance();
         BinaryExporter exp = BinaryExporter.getInstance();
 //        FileLock lock = null;
 //        FileLock lock = null;

+ 1 - 2
jme3-core/src/com/jme3/gde/core/assets/ExternalChangeScanner.java

@@ -41,7 +41,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.filesystems.FileAttributeEvent;
 import org.openide.filesystems.FileAttributeEvent;
@@ -124,7 +123,7 @@ public class ExternalChangeScanner implements AssetDataPropertyChangeListener, F
     }
     }
 
 
     private void applyExternalData() {
     private void applyExternalData() {
-        ProgressHandle handle = ProgressHandleFactory.createHandle("Updating file data");
+        ProgressHandle handle = ProgressHandle.createHandle("Updating file data");
         handle.start();
         handle.start();
         try {
         try {
             Spatial original = loadOriginalSpatial();
             Spatial original = loadOriginalSpatial();

+ 1 - 2
jme3-core/src/com/jme3/gde/core/assets/actions/ConvertModel.java

@@ -38,7 +38,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionListener;
 import java.util.List;
 import java.util.List;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Exceptions;
 import org.openide.util.Exceptions;
 
 
 public final class ConvertModel implements ActionListener {
 public final class ConvertModel implements ActionListener {
@@ -52,7 +51,7 @@ public final class ConvertModel implements ActionListener {
     public void actionPerformed(ActionEvent ev) {
     public void actionPerformed(ActionEvent ev) {
         Runnable run = new Runnable() {
         Runnable run = new Runnable() {
             public void run() {
             public void run() {
-                ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Converting Model");
+                ProgressHandle progressHandle = ProgressHandle.createHandle("Converting Model");
                 progressHandle.start();
                 progressHandle.start();
                 for (SpatialAssetDataObject spatialAssetDataObject : context) {
                 for (SpatialAssetDataObject spatialAssetDataObject : context) {
                     if (!(spatialAssetDataObject instanceof BinaryModelDataObject)) {
                     if (!(spatialAssetDataObject instanceof BinaryModelDataObject)) {

+ 1 - 4
jme3-core/src/com/jme3/gde/core/assets/actions/OpenModel.java

@@ -37,16 +37,13 @@ import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.scene.SceneRequest;
 import com.jme3.gde.core.scene.SceneRequest;
 import com.jme3.gde.core.sceneexplorer.nodes.JmeNode;
 import com.jme3.gde.core.sceneexplorer.nodes.JmeNode;
 import com.jme3.gde.core.sceneexplorer.nodes.NodeUtility;
 import com.jme3.gde.core.sceneexplorer.nodes.NodeUtility;
-import com.jme3.gde.core.util.notify.NotifyUtil;
 import com.jme3.scene.Node;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionListener;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
-import org.openide.NotifyDescriptor.Confirmation;
 
 
 public final class OpenModel implements ActionListener {
 public final class OpenModel implements ActionListener {
 
 
@@ -64,7 +61,7 @@ public final class OpenModel implements ActionListener {
         Runnable call = new Runnable() {
         Runnable call = new Runnable() {
 
 
             public void run() {
             public void run() {
-                ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Opening Model");
+                ProgressHandle progressHandle = ProgressHandle.createHandle("Opening Model");
                 progressHandle.start();
                 progressHandle.start();
                 try {
                 try {
                     manager.clearCache();
                     manager.clearCache();

+ 1 - 3
jme3-core/src/com/jme3/gde/core/util/ZipExtensionTool.java

@@ -49,10 +49,8 @@ import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipInputStream;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
-import org.openide.modules.InstalledFileLocator;
 import org.openide.modules.Places;
 import org.openide.modules.Places;
 import org.openide.util.Exceptions;
 import org.openide.util.Exceptions;
 import org.openide.util.Utilities;
 import org.openide.util.Utilities;
@@ -101,7 +99,7 @@ public class ZipExtensionTool {
                 }
                 }
             }
             }
         }
         }
-        ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Installing " + extensionName + " data");
+        ProgressHandle progressHandle = ProgressHandle.createHandle("Installing " + extensionName + " data");
         progressHandle.start();
         progressHandle.start();
         if (Utilities.isWindows()) {
         if (Utilities.isWindows()) {
             extractToolsJava(packageFolder + "/" + extensionName + "-" + SUFFIX_WIN + ".zip", settingsFolder + File.separator + extensionName);
             extractToolsJava(packageFolder + "/" + extensionName + "-" + SUFFIX_WIN + ".zip", settingsFolder + File.separator + extensionName);

+ 1 - 2
jme3-desktop-executables/src/com/jme3/gde/desktop/executables/JreDownloader.java

@@ -45,7 +45,6 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.RequestProcessor;
 import org.openide.util.RequestProcessor;
 
 
 /**
 /**
@@ -115,7 +114,7 @@ public class JreDownloader {
 
 
             public Object call() throws Exception {
             public Object call() throws Exception {
                 long length = connection.getContentLengthLong();
                 long length = connection.getContentLengthLong();
-                ProgressHandle progress = ProgressHandleFactory.createHandle("Downloading JRE to " + dest.getName());
+                ProgressHandle progress = ProgressHandle.createHandle("Downloading JRE to " + dest.getName());
                 progress.start((int) length);
                 progress.start((int) length);
                 BufferedInputStream in = null;
                 BufferedInputStream in = null;
                 BufferedOutputStream out = null;
                 BufferedOutputStream out = null;

+ 1 - 2
jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java

@@ -52,7 +52,6 @@ import javax.swing.JToolBar;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.JAXBException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.ParserConfigurationException;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.core.spi.multiview.CloseOperationState;
 import org.netbeans.core.spi.multiview.CloseOperationState;
 import org.netbeans.core.spi.multiview.MultiViewElement;
 import org.netbeans.core.spi.multiview.MultiViewElement;
 import org.netbeans.core.spi.multiview.MultiViewElementCallback;
 import org.netbeans.core.spi.multiview.MultiViewElementCallback;
@@ -336,7 +335,7 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem
     }
     }
 
 
     private void loadGui() {
     private void loadGui() {
-        ProgressHandle handle = ProgressHandleFactory.createHandle("Loading the gui file");
+        ProgressHandle handle = ProgressHandle.createHandle("Loading the gui file");
         try {
         try {
             
             
             InputStream is = this.obj.getPrimaryFile().getInputStream();
             InputStream is = this.obj.getPrimaryFile().getInputStream();

+ 1 - 2
jme3-model-importer/src/com/jme3/gde/modelimporter/ImportModel.java

@@ -34,7 +34,6 @@ import java.util.logging.Logger;
 import java.util.logging.Level;
 import java.util.logging.Level;
 import javax.swing.JComponent;
 import javax.swing.JComponent;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectInformation;
 import org.netbeans.api.project.ProjectInformation;
 import org.netbeans.api.project.ui.OpenProjects;
 import org.netbeans.api.project.ui.OpenProjects;
@@ -97,7 +96,7 @@ public final class ImportModel implements ActionListener {
         if (!cancelled) {
         if (!cancelled) {
             new Thread(new Runnable() {
             new Thread(new Runnable() {
                 public void run() {
                 public void run() {
-                    ProgressHandle handle = ProgressHandleFactory.createHandle("Importing Model..");
+                    ProgressHandle handle = ProgressHandle.createHandle("Importing Model..");
                     handle.start();
                     handle.start();
                     try {
                     try {
                         copyModel(wiz);
                         copyModel(wiz);

+ 1 - 2
jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshAction.java

@@ -10,7 +10,6 @@ import com.jme3.scene.Spatial;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionListener;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor.Confirmation;
 import org.openide.NotifyDescriptor.Confirmation;
@@ -35,7 +34,7 @@ public class NavMeshAction implements ActionListener {
         Runnable call = new Runnable() {
         Runnable call = new Runnable() {
 
 
             public void run() {
             public void run() {
-                ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Opening in Nav Mesh Editor");
+                ProgressHandle progressHandle = ProgressHandle.createHandle("Opening in Nav Mesh Editor");
                 progressHandle.start();
                 progressHandle.start();
 
 
                 
                 

+ 1 - 3
jme3-navmesh-gen/src/com/jme3/gde/nmgen/wizard/NewNavMeshWizardAction.java

@@ -10,7 +10,6 @@ import com.jme3.gde.core.sceneexplorer.nodes.actions.NewSpatialAction;
 import com.jme3.gde.nmgen.NavMeshGenerator;
 import com.jme3.gde.nmgen.NavMeshGenerator;
 import com.jme3.material.Material;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.Node;
 import com.jme3.scene.Node;
@@ -27,7 +26,6 @@ import javax.swing.JComponent;
 import jme3tools.optimize.GeometryBatchFactory;
 import jme3tools.optimize.GeometryBatchFactory;
 import org.critterai.nmgen.IntermediateData;
 import org.critterai.nmgen.IntermediateData;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.WizardDescriptor;
 import org.openide.WizardDescriptor;
 
 
@@ -67,7 +65,7 @@ public final class NewNavMeshWizardAction extends AbstractNewSpatialWizardAction
         if (configuration == null) {
         if (configuration == null) {
             return null;
             return null;
         }
         }
-        ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Generating NavMesh");
+        ProgressHandle progressHandle = ProgressHandle.createHandle("Generating NavMesh");
         progressHandle.start();
         progressHandle.start();
         final Geometry navMesh = new Geometry("NavMesh");
         final Geometry navMesh = new Geometry("NavMesh");
         try {
         try {

+ 1 - 2
jme3-ogretools/src/com/jme3/gde/ogretools/convert/AdvOgreXMLConvertAction.java

@@ -12,7 +12,6 @@ import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor.Confirmation;
 import org.openide.NotifyDescriptor.Confirmation;
@@ -48,7 +47,7 @@ public final class AdvOgreXMLConvertAction implements ActionListener {
         Runnable run = new Runnable() {
         Runnable run = new Runnable() {
 
 
             public void run() {
             public void run() {
-                ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Converting OgreXML");
+                ProgressHandle progressHandle = ProgressHandle.createHandle("Converting OgreXML");
                 progressHandle.start();
                 progressHandle.start();
 
 
                 OgreXMLConvert converter = new OgreXMLConvert();
                 OgreXMLConvert converter = new OgreXMLConvert();

+ 1 - 2
jme3-scenecomposer/src/com/jme3/gde/scenecomposer/OpenSceneComposer.java

@@ -10,7 +10,6 @@ import com.jme3.scene.Spatial;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionEvent;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor.Confirmation;
 import org.openide.NotifyDescriptor.Confirmation;
@@ -31,7 +30,7 @@ public final class OpenSceneComposer implements ActionListener {
         Runnable call = new Runnable() {
         Runnable call = new Runnable() {
 
 
             public void run() {
             public void run() {
-                ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Opening in SceneComposer");
+                ProgressHandle progressHandle = ProgressHandle.createHandle("Opening in SceneComposer");
                 progressHandle.start();
                 progressHandle.start();
                 try {
                 try {
                     manager.clearCache();
                     manager.clearCache();

+ 1 - 2
jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java

@@ -32,7 +32,6 @@ import java.util.logging.Logger;
 import javax.swing.ButtonGroup;
 import javax.swing.ButtonGroup;
 import javax.swing.border.TitledBorder;
 import javax.swing.border.TitledBorder;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Exceptions;
 import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.openide.util.NbBundle;
 import org.openide.windows.TopComponent;
 import org.openide.windows.TopComponent;
@@ -1053,7 +1052,7 @@ private void jToggleSelectGeomActionPerformed(java.awt.event.ActionEvent evt) {/
                     Runnable call = new Runnable() {
                     Runnable call = new Runnable() {
 
 
                         public void run() {
                         public void run() {
-                            ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Reloading Scene..");
+                            ProgressHandle progressHandle = ProgressHandle.createHandle("Reloading Scene..");
                             progressHandle.start();
                             progressHandle.start();
                             try {
                             try {
                                 manager.clearCache();
                                 manager.clearCache();

+ 3 - 5
jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditorController.java

@@ -5,7 +5,6 @@
 package com.jme3.gde.scenecomposer;
 package com.jme3.gde.scenecomposer;
 
 
 import com.jme3.asset.AssetManager;
 import com.jme3.asset.AssetManager;
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.asset.ModelKey;
 import com.jme3.asset.ModelKey;
 import com.jme3.bullet.collision.shapes.CapsuleCollisionShape;
 import com.jme3.bullet.collision.shapes.CapsuleCollisionShape;
 import com.jme3.bullet.control.CharacterControl;
 import com.jme3.bullet.control.CharacterControl;
@@ -38,7 +37,6 @@ import java.util.concurrent.ExecutionException;
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.CannotUndoException;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor.Confirmation;
 import org.openide.NotifyDescriptor.Confirmation;
@@ -567,7 +565,7 @@ public class SceneEditorController implements PropertyChangeListener, NodeListen
     }
     }
     
     
     public void doAddModel(SpatialAssetDataObject file, Node selected, Vector3f location) {
     public void doAddModel(SpatialAssetDataObject file, Node selected, Vector3f location) {
-        ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Adding Model..");
+        ProgressHandle progressHandle = ProgressHandle.createHandle("Adding Model..");
         progressHandle.start();
         progressHandle.start();
         try {
         try {
             Spatial linkNode = file.loadAsset();
             Spatial linkNode = file.loadAsset();
@@ -613,7 +611,7 @@ public class SceneEditorController implements PropertyChangeListener, NodeListen
     }
     }
     
     
     public void doLinkModel(AssetManager manager, String assetName, Node selected, Vector3f location) {
     public void doLinkModel(AssetManager manager, String assetName, Node selected, Vector3f location) {
-        ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Adding Model..");
+        ProgressHandle progressHandle = ProgressHandle.createHandle("Adding Model..");
         progressHandle.start();
         progressHandle.start();
         try {
         try {
             if (selected instanceof AssetLinkNode) {
             if (selected instanceof AssetLinkNode) {
@@ -668,7 +666,7 @@ public class SceneEditorController implements PropertyChangeListener, NodeListen
     }
     }
     
     
     public void doAddModel(Spatial file, Node selected, Vector3f location) {
     public void doAddModel(Spatial file, Node selected, Vector3f location) {
-        ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Adding Model..");
+        ProgressHandle progressHandle = ProgressHandle.createHandle("Adding Model..");
         progressHandle.start();
         progressHandle.start();
         try {
         try {
             if (file != null) {
             if (file != null) {

+ 1 - 3
jme3-terrain-editor/src/com/jme3/gde/terraineditor/EditTerrainAction.java

@@ -31,14 +31,12 @@
  */
  */
 package com.jme3.gde.terraineditor;
 package com.jme3.gde.terraineditor;
 
 
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.gde.core.assets.BinaryModelDataObject;
 import com.jme3.gde.core.assets.BinaryModelDataObject;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionEvent;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor.Confirmation;
 import org.openide.NotifyDescriptor.Confirmation;
@@ -59,7 +57,7 @@ public final class EditTerrainAction implements ActionListener {
         Runnable call = new Runnable() {
         Runnable call = new Runnable() {
 
 
             public void run() {
             public void run() {
-                ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Opening in Terrain Editor");
+                ProgressHandle progressHandle = ProgressHandle.createHandle("Opening in Terrain Editor");
                 progressHandle.start();
                 progressHandle.start();
 
 
                 
                 

+ 1 - 5
jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java

@@ -76,9 +76,7 @@ import javax.swing.filechooser.FileSystemView;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableCellRenderer;
-import jme3tools.converters.ImageToAwt;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.api.settings.ConvertAsProperties;
 import org.netbeans.api.settings.ConvertAsProperties;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
@@ -92,8 +90,6 @@ import org.openide.nodes.NodeMemberEvent;
 import org.openide.nodes.NodeReorderEvent;
 import org.openide.nodes.NodeReorderEvent;
 import org.openide.util.Lookup.Result;
 import org.openide.util.Lookup.Result;
 import org.openide.util.*;
 import org.openide.util.*;
-import org.openide.util.lookup.AbstractLookup;
-import org.openide.util.lookup.InstanceContent;
 import org.openide.windows.TopComponent;
 import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
 import org.openide.windows.WindowManager;
 
 
@@ -163,7 +159,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
         public void setMonitorMax(float f) {
         public void setMonitorMax(float f) {
             max = f;
             max = f;
             if (progressHandle == null) {
             if (progressHandle == null) {
-                progressHandle = ProgressHandleFactory.createHandle("Calculating terrain entropies...");
+                progressHandle = ProgressHandle.createHandle("Calculating terrain entropies...");
                 progressHandle.start((int) max);
                 progressHandle.start((int) max);
             }
             }
         }
         }

+ 1 - 2
jme3-terrain-editor/src/com/jme3/gde/terraineditor/tools/GenerateTerrainEntropiesAction.java

@@ -12,7 +12,6 @@ import com.jme3.scene.Node;
 import com.jme3.terrain.ProgressMonitor;
 import com.jme3.terrain.ProgressMonitor;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 
 
 /**
 /**
  *
  *
@@ -28,7 +27,7 @@ public class GenerateTerrainEntropiesAction extends AbstractToolAction {
     @Override
     @Override
     protected Object doApplyTool(AbstractSceneExplorerNode rootNode) {
     protected Object doApplyTool(AbstractSceneExplorerNode rootNode) {
         Node terrain = rootNode.getLookup().lookup(Node.class);
         Node terrain = rootNode.getLookup().lookup(Node.class);
-        final ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Generating Terrain Entropies");
+        final ProgressHandle progressHandle = ProgressHandle.createHandle("Generating Terrain Entropies");
         progressHandle.start();
         progressHandle.start();
         try {
         try {
             if (terrain instanceof TerrainQuad) { // it should be terrain anyways
             if (terrain instanceof TerrainQuad) { // it should be terrain anyways

+ 1 - 3
jme3-vehicle-creator/src/com/jme3/gde/vehiclecreator/EditVehicleAction.java

@@ -4,7 +4,6 @@
  */
  */
 package com.jme3.gde.vehiclecreator;
 package com.jme3.gde.vehiclecreator;
 
 
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.gde.core.assets.BinaryModelDataObject;
 import com.jme3.gde.core.assets.BinaryModelDataObject;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.gde.core.assets.ProjectAssetManager;
 import com.jme3.scene.Node;
 import com.jme3.scene.Node;
@@ -12,7 +11,6 @@ import com.jme3.scene.Spatial;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionEvent;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor;
 import org.openide.NotifyDescriptor.Confirmation;
 import org.openide.NotifyDescriptor.Confirmation;
@@ -33,7 +31,7 @@ public final class EditVehicleAction implements ActionListener {
         Runnable call = new Runnable() {
         Runnable call = new Runnable() {
 
 
             public void run() {
             public void run() {
-                ProgressHandle progressHandle = ProgressHandleFactory.createHandle("Opening in Vehicle Editor");
+                ProgressHandle progressHandle = ProgressHandle.createHandle("Opening in Vehicle Editor");
                 progressHandle.start();
                 progressHandle.start();