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

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

Revision: 108
          http://pixelle.svn.sourceforge.net/pixelle/?rev=108&view=rev
Author:   dbrosius
Date:     2008-06-28 15:46:49 -0700 (Sat, 28 Jun 2008)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2008-06-28 22:30:06 UTC (rev 107)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2008-06-28 22:46:49 UTC (rev 108)
@@ -79,38 +79,30 @@
 	JCheckBoxMenuItem fitToWindowItem;
 	
 	JMenu transformMenu;
-	JMenuItem optionsItem;
 	JCheckBoxMenuItem transformNewWindowItem;
+	JMenuItem optionsItem;
 	JMenuItem transformItem;
 	
-	ResourceBundle rb = ResourceBundle.getBundle("com.mebigfatguy.pixelle.pixelle");
 	JScrollPane scroll;
-	ImagePanel panel = new ImagePanel();
+	ImagePanel panel;
 	PixelleImage image;
 	boolean doNewWindow;
 	
 	public PixelleFrame() {
-		image = new PixelleImage();
-		doNewWindow = false;
-		initComponents();
-		initListeners();
-		
-		setTitle(rb.getString("pixelle.title"));
+		this(new PixelleImage(), false);
 	}
 	
 	public PixelleFrame(PixelleImage srcImage) {
+		this(srcImage, true);
+	}
+	
+	private PixelleFrame(PixelleImage srcImage, boolean transformInNewWindow) {
 		image = srcImage;
-		doNewWindow = true;
+		doNewWindow = transformInNewWindow;
 		initComponents();
 		initListeners();
 		
-		setTitle(rb.getString("pixelle.title"));
-		Container cp = getContentPane();
-		cp.removeAll();
-		setZoom(ZoomLevel.FitToWindow);
-		scroll = new JScrollPane(panel);
-		cp.add(scroll, BorderLayout.CENTER);
-		setBounds(GuiUtils.getScreenBounds());
+		setTitle(PixelleBundle.getString(PixelleBundle.TITLE));
 		FrameMgr.getInstance().add(this);
 	}
 	
@@ -141,7 +133,7 @@
 		
 		mb.add(fileMenu);
 		
-		viewMenu = new JMenu(rb.getString(PixelleBundle.VIEW_MENU));
+		viewMenu = new JMenu(PixelleBundle.getString(PixelleBundle.VIEW_MENU));
 		oneEighthItem = new JCheckBoxMenuItem(new ZoomAction(this, ZoomLevel.OneEighth));
 		viewMenu.add(oneEighthItem);
 		oneFourthItem = new JCheckBoxMenuItem(new ZoomAction(this, ZoomLevel.OneFourth));
@@ -174,12 +166,12 @@
 		
 		mb.add(viewMenu);
 		
-		transformMenu = new JMenu(rb.getString(PixelleBundle.TRANSFORM_MENU));
-		optionsItem = new JMenuItem(new OptionsAction(this));
-		transformMenu.add(optionsItem);
+		transformMenu = new JMenu(PixelleBundle.getString(PixelleBundle.TRANSFORM_MENU));
 		transformNewWindowItem = new JCheckBoxMenuItem(new TransformNewWindowAction(this));
 		transformNewWindowItem.setSelected(doNewWindow);
 		transformMenu.add(transformNewWindowItem);
+		optionsItem = new JMenuItem(new OptionsAction(this));
+		transformMenu.add(optionsItem);
 		transformMenu.addSeparator();
 		transformItem = new JMenuItem(new TransformAction(this));
 		transformMenu.add(transformItem);
@@ -192,6 +184,13 @@
 		
 		Container cp = getContentPane();
 		cp.setLayout(new BorderLayout());
+
+		panel = new ImagePanel();
+		scroll = new JScrollPane(panel);
+		cp.add(scroll, BorderLayout.CENTER);
+		setBounds(GuiUtils.getScreenBounds());
+		
+		setZoom(ZoomLevel.FitToWindow);
 	}
 	
 	public boolean createNewWindow() {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java	2008-06-28 22:30:06 UTC (rev 107)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java	2008-06-28 22:46:49 UTC (rev 108)
@@ -39,6 +39,9 @@
 	
 	public PixelleImage() {
 		this(new BufferedImage(400, 400, BufferedImage.TYPE_3BYTE_BGR));
+		Graphics g = image.getGraphics();
+		g.setColor(Color.RED);
+		g.fillRect(0, 0, 400, 400);
 	}
 	
 	public PixelleImage(BufferedImage img) {


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