diff --git a/sdk/jme3-assetpack-support/manifest.mf b/sdk/jme3-assetpack-support/manifest.mf index 55152c16b..e32441049 100644 --- a/sdk/jme3-assetpack-support/manifest.mf +++ b/sdk/jme3-assetpack-support/manifest.mf @@ -2,7 +2,6 @@ Manifest-Version: 1.0 OpenIDE-Module: com.jme3.gde.assetpack OpenIDE-Module-Implementation-Version: 0 OpenIDE-Module-Install: com/jme3/gde/assetpack/Installer.class -OpenIDE-Module-Layer: com/jme3/gde/assetpack/layer.xml OpenIDE-Module-Localizing-Bundle: com/jme3/gde/assetpack/Bundle.properties OpenIDE-Module-Requires: org.openide.windows.WindowManager diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackBrowserTopComponentSettings.xml b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackBrowserTopComponentSettings.xml deleted file mode 100644 index 63a4cea95..000000000 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackBrowserTopComponentSettings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackBrowserTopComponentWstcref.xml b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackBrowserTopComponentWstcref.xml deleted file mode 100644 index 0a8c88263..000000000 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackBrowserTopComponentWstcref.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java index eab3900e4..1d95dc45e 100644 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java +++ b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/AssetPackLoader.java @@ -96,7 +96,7 @@ public class AssetPackLoader { if (model != null && node != null) { node.attachChild(model); } else { - Logger.getLogger(AssetPackLoader.class.getName()).log(Level.WARNING, "Error loading model"); + Logger.getLogger(AssetPackLoader.class.getName()).log(Level.INFO, "Error loading model"); } } if (node != null) { diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddAssetAction.java b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddAssetAction.java index 7499b55c1..929f54c51 100644 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddAssetAction.java +++ b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddAssetAction.java @@ -53,7 +53,7 @@ public final class AddAssetAction implements Action { SceneComposerTopComponent.findInstance().addModel(model); AssetPackLoader.addModelFiles(pm, scenePm, conf); } else { - Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "Error loading model"); + Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Error loading model"); } } else { AssetConfiguration conf = new AssetConfiguration(assetElement); diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddToProjectAction.java b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddToProjectAction.java index 06b81e35d..fbe3cdb0a 100644 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddToProjectAction.java +++ b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddToProjectAction.java @@ -71,7 +71,7 @@ public final class AddToProjectAction implements Action { DialogDisplayer.getDefault().notifyLater(msg); } } else { - Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "Error loading model"); + Logger.getLogger(this.getClass().getName()).log(Level.INFO, "Error loading model"); } } else { AssetConfiguration conf = new AssetConfiguration(assetElement); diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackBrowserTopComponent.form b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackBrowserTopComponent.form index 70e2658d7..90f9450b3 100644 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackBrowserTopComponent.form +++ b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackBrowserTopComponent.form @@ -1,4 +1,4 @@ - +
diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackBrowserTopComponent.java b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackBrowserTopComponent.java index fb2540d6e..3547e2330 100644 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackBrowserTopComponent.java +++ b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/browser/AssetPackBrowserTopComponent.java @@ -14,6 +14,8 @@ import org.openide.windows.WindowManager; //import org.openide.util.ImageUtilities; import org.netbeans.api.settings.ConvertAsProperties; import org.openide.actions.CopyAction; +import org.openide.awt.ActionID; +import org.openide.awt.ActionReference; import org.openide.explorer.ExplorerManager; import org.openide.explorer.ExplorerUtils; import org.openide.explorer.view.BeanTreeView; @@ -25,6 +27,16 @@ import org.openide.util.actions.SystemAction; */ @ConvertAsProperties(dtd = "-//com.jme3.gde.assetpack.browser//AssetPackBrowser//EN", autostore = false) +@TopComponent.Description( + preferredID = "AssetPackBrowserTopComponent", + iconBase="com/jme3/gde/assetpack/icons/assetpack.png", +persistenceType = TopComponent.PERSISTENCE_ALWAYS) +@TopComponent.Registration(mode = "explorer", openAtStartup = true, position = 500) +@ActionID(category = "Window", id = "com.jme3.gde.assetpack.browser.AssetPackBrowserTopComponent") +@ActionReference(path = "Menu/Window" /*, position = 333 */) +@TopComponent.OpenActionRegistration( + displayName = "AssetPackBrowser", +preferredID = "AssetPackBrowserTopComponent") @SuppressWarnings({"unchecked", "rawtypes"}) public final class AssetPackBrowserTopComponent extends TopComponent implements ExplorerManager.Provider { diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/layer.xml b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/layer.xml deleted file mode 100644 index 586c50b9f..000000000 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/layer.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/CreateProjectWizardIterator.java b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/CreateProjectWizardIterator.java index e48407f80..b6d31ad2d 100644 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/CreateProjectWizardIterator.java +++ b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/project/wizards/CreateProjectWizardIterator.java @@ -18,6 +18,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import javax.swing.JComponent; import javax.swing.event.ChangeListener; +import org.netbeans.api.templates.TemplateRegistration; import org.netbeans.spi.project.ui.support.ProjectChooser; import org.netbeans.spi.project.ui.templates.support.Templates; import org.openide.WizardDescriptor; @@ -28,8 +29,12 @@ import org.openide.xml.XMLUtil; import org.w3c.dom.Document; import org.xml.sax.InputSource; -// An example action demonstrating how the wizard could be called from within -// your code. You can copy-paste the code below wherever you need. +@TemplateRegistration(folder = "Project/Asset Pack", + content = "/com/jme3/gde/assetpack/AssetPackProject.zip", + iconBase = "com/jme3/gde/assetpack/icons/assetpack.png", + displayName = "com.jme3.gde.assetpack.Bundle#Templates/Project/AssetPack/AssetPackProject.zip", + description = "/com/jme3/gde/assetpack/project/AssetPackProjectDescription.html" +) @SuppressWarnings({"unchecked", "rawtypes"}) public final class CreateProjectWizardIterator implements WizardDescriptor.InstantiatingIterator {