[Pixelle-commit] SF.net SVN: pixelle:[228] trunk/pixelle/src/com/mebigfatguy/pixelle

[<dbr...@us...>]

Revision: 228
          http://pixelle.svn.sourceforge.net/pixelle/?rev=228&view=rev
Author:   dbrosius
Date:     2008-11-25 04:09:42 +0000 (Tue, 25 Nov 2008)

Log Message:
-----------
fix save algorithm

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2008-11-23 05:09:47 UTC (rev 227)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2008-11-25 04:09:42 UTC (rev 228)
@@ -133,8 +133,8 @@
 		
 	}
 	
-	public String[] getUserGroups() {
-		return userAlgorithms.keySet().toArray(new String[userAlgorithms.size()]);
+	public String[] getUserGroups(ImageType imageType) {
+		return userAlgorithms.get(imageType).keySet().toArray(new String[userAlgorithms.size()]);
 	}
 	
 	public void addAlgorithm(ImageType imageType, String groupName, String algorithmName, Map<PixelleComponent, String> algorithm) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2008-11-23 05:09:47 UTC (rev 227)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2008-11-25 04:09:42 UTC (rev 228)
@@ -388,12 +388,12 @@
 		
 		save.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent ae) {
-				SaveAlgorithmDialog dialog = new SaveAlgorithmDialog(frame);
+				ImageType imageType = getImageType();
+				SaveAlgorithmDialog dialog = new SaveAlgorithmDialog(frame, imageType);
 				dialog.setLocationRelativeTo(frame);
 				dialog.setModal(true);
 				dialog.setVisible(true);
 				if (dialog.isOK()) {
-					ImageType imageType = getImageType();
 					String group = dialog.getGroup();
 					String name = dialog.getName();
 					Map<PixelleComponent, String> algorithm = getAlgorithms(imageType);

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2008-11-23 05:09:47 UTC (rev 227)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2008-11-25 04:09:42 UTC (rev 228)
@@ -37,6 +37,7 @@
 import javax.swing.JTextField;
 
 import com.mebigfatguy.pixelle.AlgorithmArchiver;
+import com.mebigfatguy.pixelle.ImageType;
 import com.mebigfatguy.pixelle.PixelleBundle;
 import com.mebigfatguy.pixelle.PixelleFrame;
 import com.mebigfatguy.pixelle.utils.GuiUtils;
@@ -49,14 +50,16 @@
 		new JLabel(PixelleBundle.getString(PixelleBundle.PIXEL_ALGORITHM))
 	};
 	
+	private final ImageType imageType;
 	private JComboBox groupBox;
 	private JTextField nameField;
 	private JButton ok;
 	private JButton cancel;
 	private boolean okClicked = false;
 	
-	public SaveAlgorithmDialog(PixelleFrame owner) {
+	public SaveAlgorithmDialog(PixelleFrame owner, ImageType imageOutputType) {
 		super(owner, PixelleBundle.getString(PixelleBundle.SAVE_ALGORITHM));
+		imageType = imageOutputType;
 		initComponents();
 		initListeners();
 	}
@@ -78,7 +81,7 @@
 		Container cp = getContentPane();
 		cp.setLayout(new BoxLayout(cp, BoxLayout.Y_AXIS));
 		
-		String[] groups = AlgorithmArchiver.getArchiver().getUserGroups();
+		String[] groups = AlgorithmArchiver.getArchiver().getUserGroups(imageType);
 		groupBox = new JComboBox(new DefaultComboBoxModel(groups));
 		groupBox.setEditable(true);
 		nameField = new JTextField(10);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.