Explorar o código

terrain editor : removed warnings

Dokthar %!s(int64=9) %!d(string=hai) anos
pai
achega
bb60a848d9

+ 15 - 8
jme3-terrain-editor/src/com/jme3/gde/terraineditor/AddTerrainAction.java

@@ -116,8 +116,8 @@ public class AddTerrainAction extends AbstractNewSpatialWizardAction {
         com.jme3.material.Material mat = new com.jme3.material.Material(manager, "Common/MatDefs/Terrain/TerrainLighting.j3md");
 
         String assetFolder = "";
-        if (manager != null && manager instanceof ProjectAssetManager)
-            assetFolder = ((ProjectAssetManager)manager).getAssetFolderName();
+        if (manager != null)
+            assetFolder = manager.getAssetFolderName();
 
         // write out 3 alpha blend images
         for (int i=0; i<TerrainEditorController.NUM_ALPHA_TEXTURES; i++) {
@@ -138,12 +138,19 @@ public class AddTerrainAction extends AbstractNewSpatialWizardAction {
             File alphaImageFile = new File(assetFolder+alphaBlendFileName);
             ImageIO.write(alphaBlend, "png", alphaImageFile);
             Texture tex = manager.loadAsset(new TextureKey(alphaBlendFileName, false));
-            if (i == 0)
-                mat.setTexture("AlphaMap", tex);
-            else if (i == 1)
-                mat.setTexture("AlphaMap_1", tex);
-            else if (i == 2)
-                mat.setTexture("AlphaMap_2", tex);
+            switch (i) {
+                case 0:
+                    mat.setTexture("AlphaMap", tex);
+                    break;
+                case 1:
+                    mat.setTexture("AlphaMap_1", tex);
+                    break;
+                case 2:
+                    mat.setTexture("AlphaMap_2", tex);
+                    break;
+                default:
+                    break;
+            }
         }
         
         Texture defaultTexture = manager.loadTexture(TerrainEditorController.DEFAULT_TERRAIN_TEXTURE);

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

@@ -69,7 +69,7 @@ public final class EditTerrainAction implements ActionListener {
                     java.awt.EventQueue.invokeLater(new Runnable() {
 
                         public void run() {
-                            manager.getManager().clearCache();
+                            manager.clearCache();
                             TerrainEditorTopComponent composer = TerrainEditorTopComponent.findInstance();
                             composer.openScene(asset, context, manager);
                         }

+ 2 - 2
jme3-terrain-editor/src/com/jme3/gde/terraineditor/RenameTerrainWizardPanel1.java

@@ -56,14 +56,14 @@ public class RenameTerrainWizardPanel1 implements WizardDescriptor.Panel<WizardD
 
     @Override
     public void readSettings(WizardDescriptor wiz) {
-        RenameTerrainVisualPanel1 comp = (RenameTerrainVisualPanel1) getComponent();
+        RenameTerrainVisualPanel1 comp = getComponent();
         String name = wiz.getProperty("oldName").toString();
         comp.setOriginalName(name);
     }
 
     @Override
     public void storeSettings(WizardDescriptor wiz) {
-        RenameTerrainVisualPanel1 comp = (RenameTerrainVisualPanel1) getComponent();
+        RenameTerrainVisualPanel1 comp = getComponent();
         String name = comp.getRenamed();
         wiz.putProperty("newName", name );
     }

+ 2 - 2
jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorController.java

@@ -1089,12 +1089,12 @@ public class TerrainEditorController implements NodeListener {
 
             if (enabled) {
                 for (int i=0; i<getNumUsedTextures(); i++) {
-                    float scale = 1f/(float)(size/getTextureScale(i));
+                    float scale = 1f/(size/getTextureScale(i));
                     setTextureScale(i, scale);
                 }
             } else {
                 for (int i=0; i<getNumUsedTextures(); i++) {
-                    float scale = (float)(size*getTextureScale(i));
+                    float scale = (size*getTextureScale(i));
                     setTextureScale(i, scale);
                 }
             }

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

@@ -1332,7 +1332,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
                 toolController.cleanup();
             }
 
-            toolController = new TerrainToolController(currentRequest.getToolNode(), currentRequest.getManager().getManager(), request.getJmeNode());
+            toolController = new TerrainToolController(currentRequest.getToolNode(), currentRequest.getManager(), request.getJmeNode());
             camController = new TerrainCameraController(SceneApplication.getApplication().getCamera());
             camController.setMaster(this);
             camController.enable();

+ 1 - 1
jme3-terrain-editor/src/com/jme3/gde/terraineditor/sky/SkyboxVisualPanel2.java

@@ -45,7 +45,7 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import jme3tools.converters.ImageToAwt;
 import org.openide.util.ImageUtilities;
-
+@SuppressWarnings({"unchecked", "rawtypes"})
 public final class SkyboxVisualPanel2 extends JPanel {
 
     private TexturePreview texPreview;

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

@@ -45,12 +45,12 @@ import org.openide.loaders.DataObject;
 public class RoughTerrainTool extends TerrainTool {
     
     private RoughExtraToolParams params;
-    
+
     @Override
     public void actionPrimary(Vector3f point, int textureIndex, AbstractSceneExplorerNode rootNode, DataObject dataObject) {
         if (radius == 0 || weight == 0)
             return;
-        RoughTerrainToolAction action = new RoughTerrainToolAction(point, radius, weight, (RoughExtraToolParams)params);
+        RoughTerrainToolAction action = new RoughTerrainToolAction(point, radius, weight, params);
         action.doActionPerformed(rootNode, dataObject);
     }