From c8d66f224c6a7031af4b729bd211a11a146b86c9 Mon Sep 17 00:00:00 2001 From: Normen Hansen Date: Thu, 22 Jan 2015 16:43:12 +0100 Subject: [PATCH] - Move Wavefront OBJ Support layer registration to Annotations --- sdk/jme3-wavefront/manifest.mf | 1 - .../nbproject/genfiles.properties | 8 +- .../WaveFrontMaterialDataObject.java | 11 +- .../wavefront/WaveFrontMaterialResolver.xml | 13 -- .../gde/wavefront/WaveFrontOBJDataObject.java | 36 +++- .../gde/wavefront/WaveFrontOBJResolver.xml | 13 -- .../src/com/jme3/gde/wavefront/layer.xml | 171 ------------------ 7 files changed, 45 insertions(+), 208 deletions(-) delete mode 100644 sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontMaterialResolver.xml delete mode 100644 sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontOBJResolver.xml delete mode 100644 sdk/jme3-wavefront/src/com/jme3/gde/wavefront/layer.xml diff --git a/sdk/jme3-wavefront/manifest.mf b/sdk/jme3-wavefront/manifest.mf index 93b4672be..10522fe9f 100644 --- a/sdk/jme3-wavefront/manifest.mf +++ b/sdk/jme3-wavefront/manifest.mf @@ -1,6 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: com.jme3.gde.wavefront/1 OpenIDE-Module-Implementation-Version: 0 -OpenIDE-Module-Layer: com/jme3/gde/wavefront/layer.xml OpenIDE-Module-Localizing-Bundle: com/jme3/gde/wavefront/Bundle.properties diff --git a/sdk/jme3-wavefront/nbproject/genfiles.properties b/sdk/jme3-wavefront/nbproject/genfiles.properties index eb0bf5082..5cd88a40d 100644 --- a/sdk/jme3-wavefront/nbproject/genfiles.properties +++ b/sdk/jme3-wavefront/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=0406ce7c +build.xml.data.CRC32=f45ac22f build.xml.script.CRC32=fa305471 -build.xml.stylesheet.CRC32=a56c6a5b@2.66.1 +build.xml.stylesheet.CRC32=a56c6a5b@2.67.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=0406ce7c +nbproject/build-impl.xml.data.CRC32=f45ac22f nbproject/build-impl.xml.script.CRC32=8239585b -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.66.1 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1 diff --git a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontMaterialDataObject.java b/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontMaterialDataObject.java index 91f9c118e..1245044f8 100644 --- a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontMaterialDataObject.java +++ b/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontMaterialDataObject.java @@ -7,12 +7,17 @@ package com.jme3.gde.wavefront; import com.jme3.gde.core.assets.AssetDataObject; import java.io.IOException; import org.openide.filesystems.FileObject; +import org.openide.filesystems.MIMEResolver; +import org.openide.loaders.DataObject; import org.openide.loaders.DataObjectExistsException; import org.openide.loaders.MultiFileLoader; -import org.openide.nodes.CookieSet; -import org.openide.nodes.Node; -import org.openide.text.DataEditorSupport; +@MIMEResolver.ExtensionRegistration( + displayName = "Wavefront OBJ Material", + mimeType = "text/x-wavefrontmtl", + extension = {"mtl", "MTL"} +) +@DataObject.Registration(displayName = "Wavefront OBJ Material", mimeType = "text/x-wavefrontmtl", iconBase="com/jme3/gde/wavefront/Computer_File_083.gif") public class WaveFrontMaterialDataObject extends AssetDataObject { public WaveFrontMaterialDataObject(FileObject pf, MultiFileLoader loader) throws DataObjectExistsException, IOException { diff --git a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontMaterialResolver.xml b/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontMaterialResolver.xml deleted file mode 100644 index bbeabb9ab..000000000 --- a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontMaterialResolver.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontOBJDataObject.java b/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontOBJDataObject.java index dd5dcd4a0..7e92b88ca 100644 --- a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontOBJDataObject.java +++ b/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontOBJDataObject.java @@ -6,13 +6,43 @@ package com.jme3.gde.wavefront; import com.jme3.gde.core.assets.SpatialAssetDataObject; import java.io.IOException; +import org.openide.awt.ActionID; +import org.openide.awt.ActionReference; +import org.openide.awt.ActionReferences; import org.openide.filesystems.FileObject; +import org.openide.filesystems.MIMEResolver; +import org.openide.loaders.DataObject; import org.openide.loaders.DataObjectExistsException; import org.openide.loaders.MultiFileLoader; -import org.openide.nodes.CookieSet; -import org.openide.nodes.Node; -import org.openide.text.DataEditorSupport; +@MIMEResolver.ExtensionRegistration( + displayName = "Wavefront OBJ", + mimeType = "text/x-wavefrontobj", + extension = {"obj", "OBJ"} +) +@DataObject.Registration(displayName = "Wavefront OBJ", mimeType = "text/x-wavefrontobj", iconBase ="com/jme3/gde/wavefront/People_039.gif") +@ActionReferences(value = { + @ActionReference(id = + @ActionID(category = "jMonkeyPlatform", id = "com.jme3.gde.core.assets.actions.ConvertModel"), path = "Loaders/text/x-wavefrontobj/Actions", position = 10), + @ActionReference(id = + @ActionID(category = "jMonkeyPlatform", id = "com.jme3.gde.core.assets.actions.OpenModel"), path = "Loaders/text/x-wavefrontobj/Actions", position = 20), + @ActionReference(id = + @ActionID(category = "Edit", id = "org.openide.actions.CutAction"), path = "Loaders/text/x-wavefrontobj/Actions", position = 200, separatorBefore = 100), + @ActionReference(id = + @ActionID(category = "Edit", id = "org.openide.actions.CopyAction"), path = "Loaders/text/x-wavefrontobj/Actions", position = 300, separatorAfter = 400), + @ActionReference(id = + @ActionID(category = "Edit", id = "org.openide.actions.DeleteAction"), path = "Loaders/text/x-wavefrontobj/Actions", position = 500), + @ActionReference(id = + @ActionID(category = "System", id = "org.openide.actions.RenameAction"), path = "Loaders/text/x-wavefrontobj/Actions", position = 600, separatorAfter = 700), + @ActionReference(id = + @ActionID(category = "System", id = "org.openide.actions.SaveAsTemplateAction"), path = "Loaders/text/x-wavefrontobj/Actions", position = 800, separatorAfter = 900), + @ActionReference(id = + @ActionID(category = "System", id = "org.openide.actions.FileSystemAction"), path = "Loaders/text/x-wavefrontobj/Actions", position = 1000, separatorAfter = 1100), + @ActionReference(id = + @ActionID(category = "System", id = "org.openide.actions.ToolsAction"), path = "Loaders/text/x-wavefrontobj/Actions", position = 1200), + @ActionReference(id = + @ActionID(category = "System", id = "org.openide.actions.PropertiesAction"), path = "Loaders/text/x-wavefrontobj/Actions", position = 1300) +}) public class WaveFrontOBJDataObject extends SpatialAssetDataObject { public WaveFrontOBJDataObject(FileObject pf, MultiFileLoader loader) throws DataObjectExistsException, IOException { diff --git a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontOBJResolver.xml b/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontOBJResolver.xml deleted file mode 100644 index f11299e35..000000000 --- a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/WaveFrontOBJResolver.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/layer.xml b/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/layer.xml deleted file mode 100644 index 10554773a..000000000 --- a/sdk/jme3-wavefront/src/com/jme3/gde/wavefront/layer.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -