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

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

Revision: 316
          http://pixelle.svn.sourceforge.net/pixelle/?rev=316&view=rev
Author:   dbrosius
Date:     2010-06-12 05:43:20 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
warnings

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/CloseFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/InspectorAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/PrintAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/QuitAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAsAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformNewWindowAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/ZoomAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/CloseFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/CloseFileAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/CloseFileAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.FrameMgr;
@@ -34,7 +35,7 @@
 	
 	public CloseFileAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.CLOSE_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/InspectorAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/InspectorAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/InspectorAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -33,7 +34,7 @@
 	
 	public InspectorAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.INSPECTOR_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('I', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('I', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
@@ -37,7 +38,7 @@
 	
 	public NewFileAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.NEW_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('N', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('N', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -24,6 +24,7 @@
 
 import javax.imageio.ImageIO;
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
@@ -43,7 +44,7 @@
 	
 	public OpenFileAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.OPEN_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -36,7 +37,7 @@
 	
 	public OptionsAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.OPTIONS_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', ActionEvent.SHIFT_MASK | ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', ActionEvent.SHIFT_MASK | ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/PrintAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/PrintAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/PrintAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -32,7 +33,7 @@
 
 	public PrintAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.PRINT_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('P', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('P', ActionEvent.CTRL_MASK));
 	}
 	
 	public void actionPerformed(ActionEvent e) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/QuitAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/QuitAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/QuitAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -22,6 +22,7 @@
 import java.util.Set;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JFrame;
 import javax.swing.KeyStroke;
 
@@ -34,7 +35,7 @@
 
 	public QuitAction() {
 		super(PixelleBundle.getString(PixelleBundle.QUIT_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Q', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Q', ActionEvent.CTRL_MASK));
 	}
 	
 	public void actionPerformed(ActionEvent e) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -24,6 +24,7 @@
 
 import javax.imageio.ImageIO;
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
@@ -34,12 +35,12 @@
 	
 	private static final long serialVersionUID = -8339987202623985741L;
 	
-	private PixelleFrame frame;
-	private SaveFileAsAction saveAsAction;
+	private final PixelleFrame frame;
+	private final SaveFileAsAction saveAsAction;
 
 	public SaveFileAction(PixelleFrame pf, SaveFileAsAction action) {
 		super(PixelleBundle.getString(PixelleBundle.SAVE_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('S', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('S', ActionEvent.CTRL_MASK));
 		frame = pf;
 		saveAsAction = action;
 	}

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAsAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAsAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAsAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -26,6 +26,7 @@
 
 import javax.imageio.ImageIO;
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
@@ -38,11 +39,11 @@
 	
 	private static final long serialVersionUID = 548030636198842553L;
 	 
-	private PixelleFrame frame;
+	private final PixelleFrame frame;
 
 	public SaveFileAsAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.SAVEAS_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('A', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('A', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -22,6 +22,7 @@
 import java.text.MessageFormat;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
@@ -40,7 +41,7 @@
 	
 	public TransformAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.TRANSFORM_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('T', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('T', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformNewWindowAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformNewWindowAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformNewWindowAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -33,7 +34,7 @@
 	
 	public TransformNewWindowAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.TRANSFORM_NEW_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', ActionEvent.SHIFT_MASK | ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', ActionEvent.SHIFT_MASK | ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/ZoomAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/ZoomAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/ZoomAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -35,7 +36,7 @@
 	
 	public ZoomAction(PixelleFrame pf, ZoomLevel level) {
 		super(PixelleBundle.getString(level.getKey()));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Z', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Z', ActionEvent.CTRL_MASK));
 		frame = pf;
 		zoom = level;
 	}

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -39,6 +39,7 @@
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
+import javax.swing.WindowConstants;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
 import com.mebigfatguy.pixelle.PixelleComponent;
@@ -113,7 +114,7 @@
 	}
 
 	private void initListeners() {
-		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
 		ok.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent ae) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -53,6 +53,7 @@
 import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
@@ -77,7 +78,7 @@
 		for (PixelleComponent comp : PixelleComponent.rgbValues()) {
 			rgbLHS.put(comp, new JLabel(PixelleBundle.getString("formula." + comp.name().toLowerCase()) + " = "));
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JTextField> rgbEditor = new EnumMap<PixelleComponent, JTextField>(PixelleComponent.class);
 	{
@@ -86,21 +87,21 @@
 			tf.setFont(EditorFontFactory.getEditorFont());
 			rgbEditor.put(comp, tf);
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JLabel> rgbLabels = new EnumMap<PixelleComponent, JLabel>(PixelleComponent.class);
 	{
 		for (PixelleComponent comp : PixelleComponent.rgbValues()) {
 			rgbLabels.put(comp, new JLabel(PixelleBundle.getString("label." + comp.name().toLowerCase())));
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JLabel> gsLHS = new EnumMap<PixelleComponent, JLabel>(PixelleComponent.class);
 	{
 		for (PixelleComponent comp : PixelleComponent.gsValues()) {
 			gsLHS.put(comp, new JLabel(PixelleBundle.getString("formula." + comp.name().toLowerCase()) + " = "));
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JTextField> gsEditor = new EnumMap<PixelleComponent, JTextField>(PixelleComponent.class);
 	{
@@ -109,16 +110,15 @@
 			tf.setFont(EditorFontFactory.getEditorFont());
 			gsEditor.put(comp, tf);
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JLabel> gsLabels = new EnumMap<PixelleComponent, JLabel>(PixelleComponent.class);
 	{
 		for (PixelleComponent comp : PixelleComponent.gsValues()) {
 			gsLabels.put(comp, new JLabel(PixelleBundle.getString("label." + comp.name().toLowerCase())));
 		}
-	};
+	}
 
-
 	PixelleFrame frame;
 	JButton ok;
 	JButton cancel;
@@ -474,7 +474,7 @@
 				}
 			}
 		});
-		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 	}
 
 	static class FocusExpansionListener extends FocusAdapter
@@ -577,10 +577,10 @@
 			addButton.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent ae) {
 					Set<JFrame> frames = FrameMgr.getInstance().getFrames();
-					PixelleFrame frame = (PixelleFrame)JOptionPane.showInputDialog(SourcePanel.this, PixelleBundle.getString(PixelleBundle.PICK_SOURCE_LABEL), PixelleBundle.getString(PixelleBundle.TITLE), JOptionPane.QUESTION_MESSAGE, null, frames.toArray(new JFrame[frames.size()]), null);
-					if (frame != null) {
+					PixelleFrame pixFrame = (PixelleFrame)JOptionPane.showInputDialog(SourcePanel.this, PixelleBundle.getString(PixelleBundle.PICK_SOURCE_LABEL), PixelleBundle.getString(PixelleBundle.TITLE), JOptionPane.QUESTION_MESSAGE, null, frames.toArray(new JFrame[frames.size()]), null);
+					if (pixFrame != null) {
 						int id = sourceTable.getRowCount();
-						sourceModel.addRow(new Object[] { Integer.valueOf(id), frame });
+						sourceModel.addRow(new Object[] { Integer.valueOf(id), pixFrame });
 					}
 				}
 			});

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -35,6 +35,7 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import javax.swing.WindowConstants;
 
 import com.mebigfatguy.pixelle.AlgorithmArchiver;
 import com.mebigfatguy.pixelle.ImageType;
@@ -121,7 +122,7 @@
 	}
 	
 	private void initListeners() {
-		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		
 		addWindowListener(new WindowAdapter() {
 			@Override

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -27,7 +27,7 @@
 import javax.swing.JComponent;
 
 public class GuiUtils {
-	public enum Sizing {Width, Height, Both};
+	public enum Sizing {Width, Height, Both}
 	
 	private GuiUtils() {}
 	


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