From d87e69d97facc688c73e749b1173bb58b3c96df7 Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Fri, 12 Aug 2011 08:52:51 +0000 Subject: [PATCH] SDK : Texture Editor: fixed save feature. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8004 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- sdk/jme3-texture-editor/build.xml | 16 +- .../nbproject/build-impl.xml | 90 ++++----- .../nbproject/genfiles.properties | 16 +- sdk/jme3-texture-editor/nbproject/project.xml | 182 +++++++++--------- .../textureeditor/ImageEditorComponent.java | 20 +- .../ImageEditorTopComponent.form | 5 +- .../ImageEditorTopComponent.java | 4 + 7 files changed, 181 insertions(+), 152 deletions(-) diff --git a/sdk/jme3-texture-editor/build.xml b/sdk/jme3-texture-editor/build.xml index 532a00862..01a1a7a10 100644 --- a/sdk/jme3-texture-editor/build.xml +++ b/sdk/jme3-texture-editor/build.xml @@ -1,8 +1,8 @@ - - - - - - Builds, tests, and runs the project com.jme3.gde.textureeditor. - - + + + + + + Builds, tests, and runs the project com.jme3.gde.textureeditor. + + diff --git a/sdk/jme3-texture-editor/nbproject/build-impl.xml b/sdk/jme3-texture-editor/nbproject/build-impl.xml index da1fee342..1b15288ee 100644 --- a/sdk/jme3-texture-editor/nbproject/build-impl.xml +++ b/sdk/jme3-texture-editor/nbproject/build-impl.xml @@ -1,45 +1,45 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + You must set 'suite.dir' to point to your containing module suite + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdk/jme3-texture-editor/nbproject/genfiles.properties b/sdk/jme3-texture-editor/nbproject/genfiles.properties index a4bf06c76..0ebe665ca 100644 --- a/sdk/jme3-texture-editor/nbproject/genfiles.properties +++ b/sdk/jme3-texture-editor/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=3b9326db -build.xml.script.CRC32=8ff5ca92 -build.xml.stylesheet.CRC32=a56c6a5b@1.42.2 -# 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=3b9326db -nbproject/build-impl.xml.script.CRC32=512d1004 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2 +build.xml.data.CRC32=4da634b7 +build.xml.script.CRC32=8ff5ca92 +build.xml.stylesheet.CRC32=a56c6a5b@2.45 +# 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=4da634b7 +nbproject/build-impl.xml.script.CRC32=512d1004 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.45 diff --git a/sdk/jme3-texture-editor/nbproject/project.xml b/sdk/jme3-texture-editor/nbproject/project.xml index d04700165..93161d5f0 100644 --- a/sdk/jme3-texture-editor/nbproject/project.xml +++ b/sdk/jme3-texture-editor/nbproject/project.xml @@ -1,87 +1,95 @@ - - - org.netbeans.modules.apisupport.project - - - com.jme3.gde.textureeditor - - - - org.netbeans.modules.settings - - - - 1 - 1.22.1.1 - - - - org.openide.awt - - - - 7.19.1.1 - - - - org.openide.dialogs - - - - 7.13.1 - - - - org.openide.filesystems - - - - 7.32.1.1.1 - - - - org.openide.loaders - - - - 7.10.1 - - - - org.openide.nodes - - - - 7.12.1.1 - - - - org.openide.util - - - - 7.31.2.1 - - - - org.openide.windows - - - - 6.30.1 - - - - - com.jme3.gde.textureeditor - com.jme3.gde.textureeditor.filters - com.jme3.gde.textureeditor.tools - tgaimageplugin - - - ext/TGAImagePlugin.jar - release/modules/ext/TGAImagePlugin.jar - - - - + + + org.netbeans.modules.apisupport.project + + + com.jme3.gde.textureeditor + + + + org.netbeans.modules.settings + + + + 1 + 1.22.1.1 + + + + org.openide.awt + + + + 7.19.1.1 + + + + org.openide.dialogs + + + + 7.13.1 + + + + org.openide.filesystems + + + + 7.32.1.1.1 + + + + org.openide.loaders + + + + 7.10.1 + + + + org.openide.nodes + + + + 7.12.1.1 + + + + org.openide.util + + + + 7.31.2.1 + + + + org.openide.util.lookup + + + + 8.10 + + + + org.openide.windows + + + + 6.30.1 + + + + + com.jme3.gde.textureeditor + com.jme3.gde.textureeditor.filters + com.jme3.gde.textureeditor.tools + tgaimageplugin + + + ext/TGAImagePlugin.jar + release/modules/ext/TGAImagePlugin.jar + + + + diff --git a/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorComponent.java b/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorComponent.java index 13449a4b9..a124f74e4 100644 --- a/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorComponent.java +++ b/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorComponent.java @@ -47,14 +47,17 @@ import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; import org.openide.NotifyDescriptor.Confirmation; import org.openide.NotifyDescriptor.Message; +import org.openide.awt.UndoRedo; import org.openide.cookies.SaveCookie; import org.openide.filesystems.FileChooserBuilder; import org.openide.filesystems.FileObject; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.Node; +import org.openide.util.lookup.InstanceContent; public class ImageEditorComponent implements EditorToolTarget { + private static ImageIcon Icon(String name) { return new ImageIcon(ImageEditorComponent.class.getResource("/com/jme3/gde/textureeditor/resources/" + name)); @@ -84,6 +87,7 @@ public class ImageEditorComponent implements EditorToolTarget { private EditorTool currentTool; private SaveNode saveNode = new SaveNode(); private boolean newFile = false; + private final InstanceContent content; private void doPaint(Graphics2D g) { if (editedImage != null) { @@ -92,6 +96,7 @@ public class ImageEditorComponent implements EditorToolTarget { if (currentTool != null) { currentTool.drawTrack(g, imageScreen.getWidth(), imageScreen.getHeight(), scaleX, scaleY); } + } public ImageEditorComponent() { @@ -108,6 +113,13 @@ public class ImageEditorComponent implements EditorToolTarget { COMPONENT.add(scroller); COMPONENT.add(topContainer, BorderLayout.NORTH); COMPONENT.add(bottomBar, BorderLayout.SOUTH); + //Create a new instance of our dynamic object: + content = new InstanceContent(); + + } + + public InstanceContent getContent() { + return content; } public void setCurrentTool(EditorTool t) { @@ -229,6 +241,7 @@ public class ImageEditorComponent implements EditorToolTarget { } else if (source == imageCrop) { setCurrentTool(CropTool.create()); } + } }; for (AbstractButton b : Arrays.asList(zoomIn, zoomOut, resize, /*save, saveAs,*/ @@ -253,6 +266,7 @@ public class ImageEditorComponent implements EditorToolTarget { Exceptions.printStackTrace(ex); } } + } private void requestFileAndSave() { @@ -303,6 +317,7 @@ public class ImageEditorComponent implements EditorToolTarget { Exceptions.printStackTrace(ex); } } + } private void querySizeAndResize() { @@ -372,6 +387,7 @@ public class ImageEditorComponent implements EditorToolTarget { } else if (source == spheremap) { spawnEditor(SphereMappedFilter.create().filter(editedImage)); } + } }; @@ -435,9 +451,9 @@ public class ImageEditorComponent implements EditorToolTarget { public void fire(boolean modified) { if (modified) { - getCookieSet().assign(SaveCookie.class, impl); + content.add(impl); } else { - getCookieSet().assign(SaveCookie.class); + content.remove(impl); } } diff --git a/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.form b/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.form index 225962ab2..7711b4027 100644 --- a/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.form +++ b/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.form @@ -1,6 +1,6 @@ - + -
+ @@ -11,6 +11,7 @@ + diff --git a/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.java b/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.java index 255e366a2..8c46be1eb 100644 --- a/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.java +++ b/sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.java @@ -15,6 +15,7 @@ import org.openide.windows.WindowManager; import org.openide.util.ImageUtilities; import org.netbeans.api.settings.ConvertAsProperties; import org.openide.filesystems.FileObject; +import org.openide.util.lookup.AbstractLookup; /** * Top component which displays something. @@ -35,6 +36,9 @@ public final class ImageEditorTopComponent extends TopComponent { setToolTipText(NbBundle.getMessage(ImageEditorTopComponent.class, "HINT_ImageEditorTopComponent")); setIcon(ImageUtilities.loadImage(ICON_PATH, true)); add(EDITOR.getComponent()); + + //Add the dynamic object to the TopComponent Lookup: + associateLookup(new AbstractLookup(EDITOR.getContent())); } /** This method is called from within the constructor to