Change GraphicsEditor to GraphicConversionEditor

This commit is contained in:
peterdell 2019-08-30 13:34:55 +02:00
parent 34d9cb02c8
commit 174df0479d
12 changed files with 51 additions and 27 deletions

View File

@ -3,6 +3,7 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry exported="true" kind="lib" path="lib/js.jar" sourcepath="lib/js-src.zip"/> <classpathentry exported="true" kind="lib" path="lib/js.jar" sourcepath="lib/js-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/recoil.jar"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

View File

@ -17,4 +17,5 @@ Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin Bundle-Localization: plugin
Export-Package: com.wudsn.ide.gfx.editor Export-Package: com.wudsn.ide.gfx.editor
Bundle-ClassPath: lib/js.jar, Bundle-ClassPath: lib/js.jar,
lib/recoil.jar,
. .

View File

@ -7,5 +7,6 @@ bin.includes = META-INF/,\
schema/,\ schema/,\
icons/,\ icons/,\
lib/js.jar,\ lib/js.jar,\
plugin_de_DE.properties plugin_de_DE.properties,\
lib/recoil.jar

View File

@ -1,11 +1,12 @@
#Properties file for com.wudsn.ide.gfx #Properties file for com.wudsn.ide.gfx
com.wudsn.ide.gfx.converter.GraphicsFile.name=Graphics File com.wudsn.ide.gfx.converter.GraphicsFile.name=Graphics File
com.wudsn.ide.gfx.converter.GraphicsConverterFile.name=Graphics Converter File
com.wudsn.ide.gfx.converter.apple2.AppleIIGraphicsFile.name=Apple II Graphics File com.wudsn.ide.gfx.converter.apple2.AppleIIGraphicsFile.name=Apple II Graphics File
com.wudsn.ide.gfx.converter.atari8.Atari8GraphicsFile.name=Atari 8-bit Graphics File com.wudsn.ide.gfx.converter.atari8.Atari8GraphicsFile.name=Atari 8-bit Graphics File
com.wudsn.ide.gfx.converter.c64.C64GraphicsFile.name=C64 Graphics File com.wudsn.ide.gfx.converter.c64.C64GraphicsFile.name=C64 Graphics File
com.wudsn.ide.gfx.editor.GraphicsEditor.name=Graphics Editor com.wudsn.ide.gfx.editor.GraphicsConversionEditor.name=Graphics Conversion Editor
com.wudsn.ide.gfx.editor.GraphicsEditorOpenCommand.name=Open With Graphics Editor com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand.name=Open With Graphics Conversion Editor
com.wudsn.ide.gfx.editor.GraphicsCategory.name=Graphics com.wudsn.ide.gfx.editor.GraphicsCategory.name=Graphics
com.wudsn.ide.gfx.editor.ImageView.name=Image com.wudsn.ide.gfx.editor.ImageView.name=Image
com.wudsn.ide.gfx.editor.ImageViewShrinkToFit.name=Shrink com.wudsn.ide.gfx.editor.ImageViewShrinkToFit.name=Shrink

View File

@ -5,15 +5,15 @@
<extension <extension
point="org.eclipse.ui.commands"> point="org.eclipse.ui.commands">
<command <command
id="com.wudsn.ide.gfx.editor.GraphicsEditorOpenCommand" id="com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand"
name="%com.wudsn.ide.gfx.editor.GraphicsEditorOpenCommand.name"> name="%com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand.name">
</command> </command>
</extension> </extension>
<extension <extension
point="org.eclipse.ui.handlers"> point="org.eclipse.ui.handlers">
<handler <handler
class="com.wudsn.ide.gfx.editor.GraphicsEditorOpenCommandHandler" class="com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommandHandler"
commandId="com.wudsn.ide.gfx.editor.GraphicsEditorOpenCommand"> commandId="com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand">
</handler> </handler>
</extension> </extension>
<extension <extension
@ -21,8 +21,8 @@
<menuContribution <menuContribution
locationURI="popup:org.eclipse.ui.popup.any?after=com.wudsn.ide.base.editor.hex.HexEditorOpenCommand"> locationURI="popup:org.eclipse.ui.popup.any?after=com.wudsn.ide.base.editor.hex.HexEditorOpenCommand">
<command <command
commandId="com.wudsn.ide.gfx.editor.GraphicsEditorOpenCommand" commandId="com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand"
id="com.wudsn.ide.gfx.editor.GraphicsEditorOpenCommand" id="com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand"
style="push"> style="push">
<visibleWhen <visibleWhen
checkEnabled="false"> checkEnabled="false">
@ -55,7 +55,7 @@
<extension <extension
point="org.eclipse.core.contenttype.contentTypes"> point="org.eclipse.core.contenttype.contentTypes">
<content-type <content-type
file-extensions="bmp, ico, gif, jpg, png, cnv" file-extensions="bmp, ico, gif, jpg, jpeg, png"
id="com.wudsn.ide.gfx.converter.GraphicsFile" id="com.wudsn.ide.gfx.converter.GraphicsFile"
name="%com.wudsn.ide.gfx.converter.GraphicsFile.name" name="%com.wudsn.ide.gfx.converter.GraphicsFile.name"
priority="normal"> priority="normal">
@ -81,20 +81,29 @@
name="%com.wudsn.ide.gfx.converter.apple2.AppleIIGraphicsFile.name" name="%com.wudsn.ide.gfx.converter.apple2.AppleIIGraphicsFile.name"
priority="normal"> priority="normal">
</content-type> </content-type>
<content-type
file-extensions="cnv"
id="com.wudsn.ide.gfx.converter.GraphicsConverterFile"
name="%com.wudsn.ide.gfx.converter.GraphicsConverterFile.name"
priority="normal">
</content-type>
</extension> </extension>
<extension <extension
point="org.eclipse.ui.editors"> point="org.eclipse.ui.editors">
<editor <editor
class="com.wudsn.ide.gfx.editor.GraphicsEditor" class="com.wudsn.ide.gfx.editor.GraphicsConversionEditor"
contributorClass="org.eclipse.ui.part.EditorActionBarContributor" contributorClass="org.eclipse.ui.part.EditorActionBarContributor"
default="true" default="true"
extensions="bmp, ico, gif, jpg, png, cnv" extensions="bmp, ico, gif, jpg, png, cnv"
icon="icons/graphics-editor-16x16.gif" icon="icons/graphics-editor-16x16.gif"
id="com.wudsn.ide.gfx.editor.GraphicsEditor" id="com.wudsn.ide.gfx.editor.GraphicsConversionEditor"
name="%com.wudsn.ide.gfx.editor.GraphicsEditor.name"> name="%com.wudsn.ide.gfx.editor.GraphicsConversionEditor.name">
<contentTypeBinding <contentTypeBinding
contentTypeId="com.wudsn.ide.gfx.converter.GraphicsFile"> contentTypeId="com.wudsn.ide.gfx.converter.GraphicsFile">
</contentTypeBinding> </contentTypeBinding>
<contentTypeBinding
contentTypeId="com.wudsn.ide.gfx.converter.GraphicsConverterFile">
</contentTypeBinding>
</editor> </editor>
</extension> </extension>
<extension <extension
@ -251,6 +260,15 @@
<sourceFile <sourceFile
label="%com.wudsn.ide.gfx.converter.generic.TiledBitMapConverter.COLOR_RAM_FILE"> label="%com.wudsn.ide.gfx.converter.generic.TiledBitMapConverter.COLOR_RAM_FILE">
</sourceFile> </sourceFile>
</converter>
<converter
id="com.wudsn.ide.gfx.converter.generic.RecoilConverter"
name="Recoil"
targetImageDisplayAspect="1x1"
targetImagePaletteSize="0">
<sourceFile
label="Source File">
</sourceFile>
</converter> </converter>
</converterGroup> </converterGroup>
<converterGroup <converterGroup

View File

@ -1,11 +1,12 @@
#Properties file for com.wudsn.ide.gfx #Properties file for com.wudsn.ide.gfx
com.wudsn.ide.gfx.converter.GraphicsFile.name=Grafik-Datei com.wudsn.ide.gfx.converter.GraphicsFile.name=Grafik-Datei
com.wudsn.ide.gfx.converter.GraphicsConverterFile.name=Grafikkonvertierungs-Datei
com.wudsn.ide.gfx.converter.apple2.AppleIIGraphicsFile.name=Apple II Grafik-Datei com.wudsn.ide.gfx.converter.apple2.AppleIIGraphicsFile.name=Apple II Grafik-Datei
com.wudsn.ide.gfx.converter.atari8.Atari8GraphicsFile.name=Atari 8-bit Grafik-Datei com.wudsn.ide.gfx.converter.atari8.Atari8GraphicsFile.name=Atari 8-bit Grafik-Datei
com.wudsn.ide.gfx.converter.c64.C64GraphicsFile.name=C64 Grafik-Datei com.wudsn.ide.gfx.converter.c64.C64GraphicsFile.name=C64 Grafik-Datei
com.wudsn.ide.gfx.editor.GraphicsEditor.name=Grafik Editor com.wudsn.ide.gfx.editor.GraphicsConversionEditor.name=Grafikkonvertierungs Editor
com.wudsn.ide.gfx.editor.GraphicsEditorOpenCommand.name=Öffnen mit Grafik Editor com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand.name=Öffnen mit Grafikkonvertierungs Editor
com.wudsn.ide.gfx.editor.GraphicsCategory.name=Grafik com.wudsn.ide.gfx.editor.GraphicsCategory.name=Grafik
com.wudsn.ide.gfx.editor.ImageView.name=Bild com.wudsn.ide.gfx.editor.ImageView.name=Bild
com.wudsn.ide.gfx.editor.ImageViewShrinkToFit.name=Verkleinern com.wudsn.ide.gfx.editor.ImageViewShrinkToFit.name=Verkleinern

View File

@ -21,7 +21,7 @@ package com.wudsn.ide.gfx;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
import com.wudsn.ide.gfx.editor.GraphicsEditor; import com.wudsn.ide.gfx.editor.GraphicsConversionEditor;
/** /**
* Class which holds the localized text constants. * Class which holds the localized text constants.
@ -96,7 +96,7 @@ public final class Texts extends NLS {
public static String IMAGE_PALETTE_VIEW_COLUMN_COLOR_COUNT_PERCENT_TEXT; public static String IMAGE_PALETTE_VIEW_COLUMN_COLOR_COUNT_PERCENT_TEXT;
/** /**
* Messages for {@link GraphicsEditor}. * Messages for {@link GraphicsConversionEditor}.
*/ */
public static String MESSAGE_S100 = "Source files loaded and converted in {0} ms"; public static String MESSAGE_S100 = "Source files loaded and converted in {0} ms";
public static String MESSAGE_E400; public static String MESSAGE_E400;

View File

@ -30,10 +30,11 @@ import com.wudsn.ide.gfx.model.ConverterMode;
public final class FilesConverterData extends ConverterCommonData { public final class FilesConverterData extends ConverterCommonData {
// Persistent attributes.
private FilesConverterParameters parameters; private FilesConverterParameters parameters;
// Transient attributes.
private List<byte[]> sourceFilesBytes; private List<byte[]> sourceFilesBytes;
private boolean imageDataValid; private boolean imageDataValid;
FilesConverterData(ConverterData converterData) { FilesConverterData(ConverterData converterData) {
@ -123,7 +124,7 @@ public final class FilesConverterData extends ConverterCommonData {
} }
return bytes; return bytes;
} }
public void setImageDataValid(boolean imageDataValid) { public void setImageDataValid(boolean imageDataValid) {
this.imageDataValid = imageDataValid; this.imageDataValid = imageDataValid;
} }

View File

@ -97,7 +97,7 @@ final class FilesConverterDataView {
private IntegerField imageDataWidthField; private IntegerField imageDataWidthField;
private IntegerField imageDataHeightField; private IntegerField imageDataHeightField;
public FilesConverterDataView(final GraphicsEditor editor, Composite parent, FilesConverterData filesConverterData) { public FilesConverterDataView(final GraphicsConversionEditor editor, Composite parent, FilesConverterData filesConverterData) {
if (parent == null) { if (parent == null) {
throw new IllegalArgumentException("Parameter 'parent' must not be null."); throw new IllegalArgumentException("Parameter 'parent' must not be null.");
} }

View File

@ -93,7 +93,7 @@ final class ImageConverterDataView {
private CheckBoxField useDefaultScriptField; private CheckBoxField useDefaultScriptField;
private MultiLineTextField scriptField; private MultiLineTextField scriptField;
public ImageConverterDataView(GraphicsEditor editor, Composite parent, ImageConverterData imageConverterData) { public ImageConverterDataView(GraphicsConversionEditor editor, Composite parent, ImageConverterData imageConverterData) {
if (editor == null) { if (editor == null) {
throw new IllegalArgumentException("Parameter 'editor' must not be null."); throw new IllegalArgumentException("Parameter 'editor' must not be null.");
} }

View File

@ -681,9 +681,9 @@ public final class ImagePaletteView extends ViewPart implements ISelectionListen
if (part == null) { if (part == null) {
setImageProvider(null); setImageProvider(null);
} else { } else {
if (part instanceof GraphicsEditor) { if (part instanceof GraphicsConversionEditor) {
GraphicsEditor graphicsEditor = ((GraphicsEditor) part); GraphicsConversionEditor graphicsConversionEditor = ((GraphicsConversionEditor) part);
setImageProvider(graphicsEditor.getImageProvider()); setImageProvider(graphicsConversionEditor.getImageProvider());
} }
} }
} }

View File

@ -200,9 +200,9 @@ public final class ImageView extends ViewPart implements ISelectionListener {
if (part == null) { if (part == null) {
setImageProvider(null); setImageProvider(null);
} else { } else {
if (part instanceof GraphicsEditor) { if (part instanceof GraphicsConversionEditor) {
GraphicsEditor graphicsEditor = ((GraphicsEditor) part); GraphicsConversionEditor graphicsConversionEditor = ((GraphicsConversionEditor) part);
setImageProvider(graphicsEditor.getImageProvider()); setImageProvider(graphicsConversionEditor.getImageProvider());
System.out.println(this + "" + part + "" + selection); System.out.println(this + "" + part + "" + selection);
} }
} }