sigonasr2
/
jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK : Texture Editor: fixed save feature.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8004 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
rem..om 13 years ago
parent 91477b73f5
commit d87e69d97f
7 changed files with 181 additions and 152 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      sdk/jme3-texture-editor/build.xml
  2. 90
      sdk/jme3-texture-editor/nbproject/build-impl.xml
  3. 16
      sdk/jme3-texture-editor/nbproject/genfiles.properties
  4. 182
      sdk/jme3-texture-editor/nbproject/project.xml
  5. 20
      sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorComponent.java
  6. 5
      sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.form
  7. 4
      sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.java

16
sdk/jme3-texture-editor/build.xml
Unescape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="com.jme3.gde.textureeditor" default="netbeans" basedir=".">
<description>Builds, tests, and runs the project com.jme3.gde.textureeditor.</description>
<import file="nbproject/build-impl.xml"/>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="com.jme3.gde.textureeditor" default="netbeans" basedir=".">
<description>Builds, tests, and runs the project com.jme3.gde.textureeditor.</description>
<import file="nbproject/build-impl.xml"/>
</project>

90
sdk/jme3-texture-editor/nbproject/build-impl.xml
Unescape View File

@ -1,45 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
*** GENERATED FROM project.xml - DO NOT EDIT ***
*** EDIT ../build.xml INSTEAD ***
-->
<project name="com.jme3.gde.textureeditor-impl" basedir="..">
<fail message="Please build using Ant 1.7.1 or higher.">
<condition>
<not>
<antversion atleast="1.7.1"/>
</not>
</condition>
</fail>
<property file="nbproject/private/suite-private.properties"/>
<property file="nbproject/suite.properties"/>
<fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
<property file="${suite.dir}/nbproject/private/platform-private.properties"/>
<property file="${suite.dir}/nbproject/platform.properties"/>
<macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
<attribute name="name"/>
<attribute name="value"/>
<sequential>
<property name="@{name}" value="${@{value}}"/>
</sequential>
</macrodef>
<macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
<attribute name="property"/>
<attribute name="value"/>
<sequential>
<property name="@{property}" value="@{value}"/>
</sequential>
</macrodef>
<property file="${user.properties.file}"/>
<nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
<nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
<nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
<fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
<condition>
<not>
<contains string="${cluster.path.evaluated}" substring="platform"/>
</not>
</condition>
</fail>
<import file="${harness.dir}/build.xml"/>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<!--
*** GENERATED FROM project.xml - DO NOT EDIT ***
*** EDIT ../build.xml INSTEAD ***
-->
<project name="com.jme3.gde.textureeditor-impl" basedir="..">
<fail message="Please build using Ant 1.7.1 or higher.">
<condition>
<not>
<antversion atleast="1.7.1"/>
</not>
</condition>
</fail>
<property file="nbproject/private/suite-private.properties"/>
<property file="nbproject/suite.properties"/>
<fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
<property file="${suite.dir}/nbproject/private/platform-private.properties"/>
<property file="${suite.dir}/nbproject/platform.properties"/>
<macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
<attribute name="name"/>
<attribute name="value"/>
<sequential>
<property name="@{name}" value="${@{value}}"/>
</sequential>
</macrodef>
<macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
<attribute name="property"/>
<attribute name="value"/>
<sequential>
<property name="@{property}" value="@{value}"/>
</sequential>
</macrodef>
<property file="${user.properties.file}"/>
<nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
<nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
<nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
<fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
<condition>
<not>
<contains string="${cluster.path.evaluated}" substring="platform"/>
</not>
</condition>
</fail>
<import file="${harness.dir}/build.xml"/>
</project>

16
sdk/jme3-texture-editor/nbproject/genfiles.properties
Unescape View File

@ -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

182
sdk/jme3-texture-editor/nbproject/project.xml
Unescape View File

@ -1,87 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
<code-name-base>com.jme3.gde.textureeditor</code-name-base>
<suite-component/>
<module-dependencies>
<dependency>
<code-name-base>org.netbeans.modules.settings</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.22.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.awt</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.19.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.dialogs</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.13.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.filesystems</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.32.1.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.loaders</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.10.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.nodes</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.12.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.31.2.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.windows</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>6.30.1</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
<public-packages>
<package>com.jme3.gde.textureeditor</package>
<package>com.jme3.gde.textureeditor.filters</package>
<package>com.jme3.gde.textureeditor.tools</package>
<package>tgaimageplugin</package>
</public-packages>
<class-path-extension>
<runtime-relative-path>ext/TGAImagePlugin.jar</runtime-relative-path>
<binary-origin>release/modules/ext/TGAImagePlugin.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
<code-name-base>com.jme3.gde.textureeditor</code-name-base>
<suite-component/>
<module-dependencies>
<dependency>
<code-name-base>org.netbeans.modules.settings</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.22.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.awt</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.19.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.dialogs</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.13.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.filesystems</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.32.1.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.loaders</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.10.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.nodes</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.12.1.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.31.2.1</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.util.lookup</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>8.10</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.windows</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>6.30.1</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
<public-packages>
<package>com.jme3.gde.textureeditor</package>
<package>com.jme3.gde.textureeditor.filters</package>
<package>com.jme3.gde.textureeditor.tools</package>
<package>tgaimageplugin</package>
</public-packages>
<class-path-extension>
<runtime-relative-path>ext/TGAImagePlugin.jar</runtime-relative-path>
<binary-origin>release/modules/ext/TGAImagePlugin.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
</project>

20
sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorComponent.java
Unescape View File

@ -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);
}
}

5
sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.form
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Form version="1.4" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@ -11,6 +11,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>

4
sdk/jme3-texture-editor/src/com/jme3/gde/textureeditor/ImageEditorTopComponent.java
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save