diff --git a/com.wudsn.ide.gfx/.classpath b/com.wudsn.ide.gfx/.classpath
index 688cd937..fe7fc536 100644
--- a/com.wudsn.ide.gfx/.classpath
+++ b/com.wudsn.ide.gfx/.classpath
@@ -3,6 +3,7 @@
+
diff --git a/com.wudsn.ide.gfx/META-INF/MANIFEST.MF b/com.wudsn.ide.gfx/META-INF/MANIFEST.MF
index 8f5a93a3..558516dd 100644
--- a/com.wudsn.ide.gfx/META-INF/MANIFEST.MF
+++ b/com.wudsn.ide.gfx/META-INF/MANIFEST.MF
@@ -17,4 +17,5 @@ Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: com.wudsn.ide.gfx.editor
Bundle-ClassPath: lib/js.jar,
+ lib/recoil.jar,
.
diff --git a/com.wudsn.ide.gfx/build.properties b/com.wudsn.ide.gfx/build.properties
index 797b9943..f7046346 100644
--- a/com.wudsn.ide.gfx/build.properties
+++ b/com.wudsn.ide.gfx/build.properties
@@ -7,5 +7,6 @@ bin.includes = META-INF/,\
schema/,\
icons/,\
lib/js.jar,\
- plugin_de_DE.properties
+ plugin_de_DE.properties,\
+ lib/recoil.jar
diff --git a/com.wudsn.ide.gfx/plugin.properties b/com.wudsn.ide.gfx/plugin.properties
index f8677508..3eb27853 100644
--- a/com.wudsn.ide.gfx/plugin.properties
+++ b/com.wudsn.ide.gfx/plugin.properties
@@ -1,11 +1,12 @@
#Properties file for com.wudsn.ide.gfx
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.atari8.Atari8GraphicsFile.name=Atari 8-bit 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.GraphicsEditorOpenCommand.name=Open With Graphics Editor
+com.wudsn.ide.gfx.editor.GraphicsConversionEditor.name=Graphics Conversion 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.ImageView.name=Image
com.wudsn.ide.gfx.editor.ImageViewShrinkToFit.name=Shrink
diff --git a/com.wudsn.ide.gfx/plugin.xml b/com.wudsn.ide.gfx/plugin.xml
index 0b2bf510..81ba3818 100644
--- a/com.wudsn.ide.gfx/plugin.xml
+++ b/com.wudsn.ide.gfx/plugin.xml
@@ -5,15 +5,15 @@
+ id="com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand"
+ name="%com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand.name">
+ class="com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommandHandler"
+ commandId="com.wudsn.ide.gfx.editor.GraphicsConversionEditorOpenCommand">
@@ -55,7 +55,7 @@
@@ -81,20 +81,29 @@
name="%com.wudsn.ide.gfx.converter.apple2.AppleIIGraphicsFile.name"
priority="normal">
+
+
+ id="com.wudsn.ide.gfx.editor.GraphicsConversionEditor"
+ name="%com.wudsn.ide.gfx.editor.GraphicsConversionEditor.name">
+
+
+
+
+
+
sourceFilesBytes;
-
private boolean imageDataValid;
FilesConverterData(ConverterData converterData) {
@@ -123,7 +124,7 @@ public final class FilesConverterData extends ConverterCommonData {
}
return bytes;
}
-
+
public void setImageDataValid(boolean imageDataValid) {
this.imageDataValid = imageDataValid;
}
diff --git a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/FilesConverterDataView.java b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/FilesConverterDataView.java
index a556317a..19d7109a 100644
--- a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/FilesConverterDataView.java
+++ b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/FilesConverterDataView.java
@@ -97,7 +97,7 @@ final class FilesConverterDataView {
private IntegerField imageDataWidthField;
private IntegerField imageDataHeightField;
- public FilesConverterDataView(final GraphicsEditor editor, Composite parent, FilesConverterData filesConverterData) {
+ public FilesConverterDataView(final GraphicsConversionEditor editor, Composite parent, FilesConverterData filesConverterData) {
if (parent == null) {
throw new IllegalArgumentException("Parameter 'parent' must not be null.");
}
diff --git a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImageConverterDataView.java b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImageConverterDataView.java
index 216a1154..20bfa541 100644
--- a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImageConverterDataView.java
+++ b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImageConverterDataView.java
@@ -93,7 +93,7 @@ final class ImageConverterDataView {
private CheckBoxField useDefaultScriptField;
private MultiLineTextField scriptField;
- public ImageConverterDataView(GraphicsEditor editor, Composite parent, ImageConverterData imageConverterData) {
+ public ImageConverterDataView(GraphicsConversionEditor editor, Composite parent, ImageConverterData imageConverterData) {
if (editor == null) {
throw new IllegalArgumentException("Parameter 'editor' must not be null.");
}
diff --git a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImagePaletteView.java b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImagePaletteView.java
index 0402a695..1ece40f2 100644
--- a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImagePaletteView.java
+++ b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImagePaletteView.java
@@ -681,9 +681,9 @@ public final class ImagePaletteView extends ViewPart implements ISelectionListen
if (part == null) {
setImageProvider(null);
} else {
- if (part instanceof GraphicsEditor) {
- GraphicsEditor graphicsEditor = ((GraphicsEditor) part);
- setImageProvider(graphicsEditor.getImageProvider());
+ if (part instanceof GraphicsConversionEditor) {
+ GraphicsConversionEditor graphicsConversionEditor = ((GraphicsConversionEditor) part);
+ setImageProvider(graphicsConversionEditor.getImageProvider());
}
}
}
diff --git a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImageView.java b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImageView.java
index 47f126c1..caf3306c 100644
--- a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImageView.java
+++ b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/ImageView.java
@@ -200,9 +200,9 @@ public final class ImageView extends ViewPart implements ISelectionListener {
if (part == null) {
setImageProvider(null);
} else {
- if (part instanceof GraphicsEditor) {
- GraphicsEditor graphicsEditor = ((GraphicsEditor) part);
- setImageProvider(graphicsEditor.getImageProvider());
+ if (part instanceof GraphicsConversionEditor) {
+ GraphicsConversionEditor graphicsConversionEditor = ((GraphicsConversionEditor) part);
+ setImageProvider(graphicsConversionEditor.getImageProvider());
System.out.println(this + "" + part + "" + selection);
}
}