From 8cf44e7e3e3f66cc4f9a29747ad42cdf9e12454c Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Sun, 10 Mar 2013 13:20:41 +0000 Subject: [PATCH] SDK : MatDefEditor: fixed compilation warnings git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10483 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- sdk/jme3-materialeditor/build.xml | 16 ++++++++-------- sdk/jme3-materialeditor/manifest.mf | 3 ++- .../materialdefinition/EditableMatDefFile.java | 4 ++-- .../editor/MatDefEditorlElement.java | 2 +- .../navigator/MatDefNavigatorPanel.java | 12 ++++++------ 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sdk/jme3-materialeditor/build.xml b/sdk/jme3-materialeditor/build.xml index c2947deab..dfada4e51 100644 --- a/sdk/jme3-materialeditor/build.xml +++ b/sdk/jme3-materialeditor/build.xml @@ -1,8 +1,8 @@ - - - - - - Builds, tests, and runs the project com.jme3.gde.materials. - - + + + + + + Builds, tests, and runs the project com.jme3.gde.materials. + + diff --git a/sdk/jme3-materialeditor/manifest.mf b/sdk/jme3-materialeditor/manifest.mf index 421b28530..f9ca99de4 100644 --- a/sdk/jme3-materialeditor/manifest.mf +++ b/sdk/jme3-materialeditor/manifest.mf @@ -3,4 +3,5 @@ OpenIDE-Module: com.jme3.gde.materials/1 OpenIDE-Module-Implementation-Version: 0 OpenIDE-Module-Layer: com/jme3/gde/materials/layer.xml OpenIDE-Module-Localizing-Bundle: com/jme3/gde/materials/Bundle.properties - +OpenIDE-Module-Requires: org.openide.windows.WindowManager + diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java index 5c196c8cf..b9f075897 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java @@ -97,7 +97,7 @@ public class EditableMatDefFile { lock = matDefFile.lock(); List sta = BlockLanguageParser.parse(obj.getPrimaryFile().getInputStream()); matDefStructure = new MatDefBlock(sta.get(0)); - AssetKey matDefKey = new AssetKey(assetManager.getRelativeAssetPath(assetManager.getRelativeAssetPath(matDefFile.getPath()))); + AssetKey matDefKey = new AssetKey(assetManager.getRelativeAssetPath(assetManager.getRelativeAssetPath(matDefFile.getPath()))); assetManager.deleteFromCache(matDefKey); materialDef = (MaterialDef) assetManager.loadAsset(assetManager.getRelativeAssetPath(matDefFile.getPath())); lock.releaseLock(); @@ -293,7 +293,7 @@ public class EditableMatDefFile { private void applyChange() { try { - EditorCookie ec = (EditorCookie) lookup.lookup(EditorCookie.class); + EditorCookie ec = lookup.lookup(EditorCookie.class); final StyledDocument doc = ec.getDocument(); final BadLocationException[] exc = new BadLocationException[]{null}; NbDocument.runAtomicAsUser(ec.getDocument(), new Runnable() { diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java index e684ed388..d7d2229ba 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.java @@ -210,7 +210,7 @@ public final class MatDefEditorlElement extends JPanel implements MultiViewEleme final Lookup.Result resMat = obj.getLookup().lookupResult(Material.class); resMat.addLookupListener(new LookupListener() { public void resultChanged(LookupEvent ev) { - Collection col = (Collection) resMat.allInstances(); + Collection col = (Collection) resMat.allInstances(); if (!col.isEmpty()) { Material material = col.iterator().next(); diagram1.refreshPreviews(material); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/MatDefNavigatorPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/MatDefNavigatorPanel.java index 1c0622eec..a13845353 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/MatDefNavigatorPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/navigator/MatDefNavigatorPanel.java @@ -27,12 +27,12 @@ public class MatDefNavigatorPanel extends JPanel implements NavigatorPanel, Expl /** * template for finding data in given context. */ - private static final Lookup.Template MY_DATA = new Lookup.Template(MatDefDataObject.class); + private static final Lookup.Template MY_DATA = new Lookup.Template(MatDefDataObject.class); /** * current context to work on */ - private Lookup.Result curContext; + private Lookup.Result curContext; private Lookup lookup; /** * listener to context changes @@ -68,7 +68,7 @@ public class MatDefNavigatorPanel extends JPanel implements NavigatorPanel, Expl //lookup = context; curContext.addLookupListener(getContextListener()); // get actual data and recompute content - Collection data = curContext.allInstances(); + Collection data = curContext.allInstances(); setNewContent(data); // ExplorerUtils.activateActions(mgr, true); @@ -76,7 +76,7 @@ public class MatDefNavigatorPanel extends JPanel implements NavigatorPanel, Expl } public void panelDeactivated() { - Collection data = curContext.allInstances(); + Collection data = curContext.allInstances(); if (!data.isEmpty()) { MatDefDataObject obj = (MatDefDataObject) data.iterator().next(); obj.getLookupContents().remove(this); @@ -95,7 +95,7 @@ public class MatDefNavigatorPanel extends JPanel implements NavigatorPanel, Expl /** * *********** non - public part *********** */ - private void setNewContent(Collection newData) { + private void setNewContent(Collection newData) { if (!newData.isEmpty()) { MatDefDataObject data = (MatDefDataObject) newData.iterator().next(); data.getLookupContents().add(this); @@ -135,7 +135,7 @@ public class MatDefNavigatorPanel extends JPanel implements NavigatorPanel, Expl private class ContextListener implements LookupListener { public void resultChanged(LookupEvent ev) { - Collection data = ((Lookup.Result) ev.getSource()).allInstances(); + Collection data = (Collection)((Lookup.Result ) ev.getSource()).allInstances(); setNewContent(data); } } // end of ContextListener