More code cleanup:

Refactored Entity Proxy Subscription to handle generics better
Rewrote RemoteMap to use TreeMap instead of the internal array for
order. It now sorts its keys by number if they parse, else as strings.
Removed a no-longer-in-progress outcome form class

1 files changed, 9 insertions, 1 deletions

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java
index b0bb079..716a073 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ImageEditField.java
@@ -31,15 +31,17 @@ public class ImageEditField extends StringEditField {
 	static JFileChooser chooser = new JFileChooser();

 	static {

 		chooser.addChoosableFileFilter(new javax.swing.filechooser.FileFilter() {

+					@Override

 					public String getDescription() {

 						return "Image Files";

 					}

 

+					@Override

 					public boolean accept(File f) {

 						return (f.isDirectory() || (f.isFile() && (f.getName()

 								.endsWith(".gif")

 								|| f.getName().endsWith(".jpg")

-								|| f.getName().endsWith(".jpeg") 

+								|| f.getName().endsWith(".jpeg")

 								|| f.getName().endsWith(".png"))));

 					}

 				});

@@ -51,6 +53,7 @@ public class ImageEditField extends StringEditField {
 		imagePanel = Box.createVerticalBox();

 		browseButton = new JButton("Browse");

 		browseButton.addActionListener(new ActionListener() {

+			@Override

 			public void actionPerformed(ActionEvent e) {

 				int returnVal = chooser.showOpenDialog(null);

 				if (returnVal == JFileChooser.APPROVE_OPTION) {

@@ -77,18 +80,22 @@ public class ImageEditField extends StringEditField {
 		imagePanel.add(browseButton);

 	}

 

+	@Override

 	public String getDefaultValue() {

 		return "";

 	}

 

+	@Override

 	public Component getControl() {

 		return imagePanel;

 	}

 

+	@Override

 	public String getText() {

 		return encodedImage == null ? "" : encodedImage;

 	}

 

+	@Override

 	public void setText(String text) {

 		encodedImage = text;

 		if (text != null && text.length() > 0) {

@@ -98,6 +105,7 @@ public class ImageEditField extends StringEditField {
 		}

 	}

 

+	@Override

 	public void setEditable(boolean editable) {

 		browseButton.setVisible(false);

 	}