差分情報 12
ファイル入出力機能の追加

差分情報適用後の実行イメージ

差分情報

パッチファイル （Unified diffs）

--- CanvasPanel.java	Mon Jun 01 05:12:13 2009
+++ CanvasPanel.java	Wed Jun 17 04:12:42 2009
@@ -97,4 +97,60 @@
 			((Graphics2D) g).drawImage(img, 0, 0, this);
 		}
 	}
+	
+	//aaaaaaaaaaaaaaaaaaaaaaaaaaadd
+
+	void r(String gazo)
+	{
+		//naniyomikakidekiruka
+		System.out.println("rrrrrrrr");
+	    for(int i = 0; i < javax.imageio.ImageIO.getReaderFormatNames().length; i++) {
+	    System.out.println(javax.imageio.ImageIO.getReaderFormatNames()[i]);
+	    }
+	    
+	    try {
+		       img = javax.imageio.ImageIO.read(new java.io.File(gazo));
+		       repaint();		    }catch (Exception e) {}
+	    /*Graphics2D g2 = (Graphics2D)g;
+
+	    BufferedImage readImage = null;
+	    try {
+	      readImage = ImageIO.read(new File("sample.png"));
+	    } catch (Exception e) {
+	      e.printStackTrace();
+	      readImage = null;
+	    }file:///C:/Documents%20and%20Settings/yuichiro-y/%E3%83%87%E3%82%B9%E3%82%AF%E3%83%88%E3%83%83%E3%83%97/IMG_0154/IMG_0150.jpg
+
+	    if (readImage != null){
+	      g2.drawImage(readImage, 0, 0, this);
+	    }
+
+	    */
+	    
+	    //if (!javax.imageio.ImageIO.write(img, "PNG", f)) {
+		//}
+
+	}
+	
+	void w(String gazo)
+	{
+		for(int i = 0; i < javax.imageio.ImageIO.getWriterFormatNames().length; i++) {
+	    System.out.println(javax.imageio.ImageIO.getWriterFormatNames()[i]);
+	    }
+
+		/*System.out.println("wwwww");
+	    for(int i = 0; i < javax.imageio.ImageIO.getWriterFormatNames().length; i++) {
+	    System.out.println(javax.imageio.ImageIO.getWriterFormatNames()[i]);
+	    }
+	    try {
+	       img = javax.imageio.ImageIO.read(new java.io.File(gazo));
+	       repaint();
+	    }catch (Exception e) {}*/
+		try {
+			javax.imageio.ImageIO.write(img, "png", new java.io.File(gazo)); //ping de iiyone
+
+		    }catch (Exception e) {}
+	}
+	
+	//aaaaaaaaaaaaaaaaddend
 }
--- ReviewPaintMain.java	Mon Jun 01 05:12:12 2009
+++ ReviewPaintMain.java	Wed Jun 17 04:11:56 2009
@@ -252,9 +252,41 @@
 			jLabelCursorPosition.setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED)); // 枠（掘り込みベベル）
 			jPanelToolLayout.add(jLabelCursorPosition);
 			jPanelToolLayout.add(getJPanelToolOption());
+			
+			
+			//aaaaaaaadd
+			rrrr.setPreferredSize(new Dimension(40,40));
+			
+			jPanelToolLayout.add(rrrr);
+			
+			JButton r = new JButton("r");
+			
+			r.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent e) {
+					jPanelCanvasPaper.r(rrrr.getText());
+				}
+			});
+			jPanelToolLayout.add(r);
+			
+			JButton w = new JButton("www");
+			w.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent e) {
+					jPanelCanvasPaper.w(rrrr.getText());
+				}
+			});
+			jPanelToolLayout.add(w);
+			
+			
+			//aaaaaaaaaaaaaaaaaaaddend
+			
+			
+			
 		}
 		return jPanelToolLayout;
 	}
+//	aaaaaaaadd
+	javax.swing.JTextField rrrr = new javax.swing.JTextField();
+//	aaaaaaaaddend
 
 	// --------------------------------------------------
 	// ペイントツールの切り替え（各種ペイントツールのボタン押下時に呼び出されるメソッド）

変更後のファイル

変更の種類		変更後のファイル		変更前後の比較
	修正		/rrrrrrrwwww/CanvasPanel.java	Side-by-side diffs
	修正		/rrrrrrrwwww/ReviewPaintMain.java	Side-by-side diffs

リンク先は

リポジトリ上のURLです