r935 - in xwiki/trunk/src/main/java/com/xpn/xwiki/plugin: . image

[Xavier MOGHRABI]

Author: moghrabix
Date: 2006-02-16 09:56:48 +0100 (Thu, 16 Feb 2006)
New Revision: 935

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginInterface.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/image/ImagePlugin.java
Log:
Renaming image to attachment


Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java	2006-02-15 20:15:32 UTC (rev 934)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java	2006-02-16 08:56:48 UTC (rev 935)
@@ -91,7 +91,7 @@
     public void endRendering(XWikiContext context) {
     }
     
-    public XWikiAttachment downloadAttachment(XWikiAttachment image, XWikiContext context) {
-    	return image;
+    public XWikiAttachment downloadAttachment(XWikiAttachment attachment, XWikiContext context) {
+    	return attachment;
     }
 }

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginInterface.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginInterface.java	2006-02-15 20:15:32 UTC (rev 934)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginInterface.java	2006-02-16 08:56:48 UTC (rev 935)
@@ -54,6 +54,6 @@
     String insidePREHandler(String line, XWikiContext context);
     String endRenderingHandler(String line, XWikiContext context);
     Api getPluginApi(XWikiPluginInterface plugin, XWikiContext context);
-    XWikiAttachment downloadAttachment(XWikiAttachment image, XWikiContext context);
+    XWikiAttachment downloadAttachment(XWikiAttachment attachment, XWikiContext context);
 
 }

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java	2006-02-15 20:15:32 UTC (rev 934)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java	2006-02-16 08:56:48 UTC (rev 935)
@@ -178,14 +178,13 @@
         }
     }
 
-    public XWikiAttachment downloadAttachment(XWikiAttachment image, XWikiContext context) {
+    public XWikiAttachment downloadAttachment(XWikiAttachment attachment, XWikiContext context) {
 	for (int i=0;i<plugins.size();i++) {
 	    try {
-		image = ((XWikiPluginInterface)plugins_classes.get(plugins.get(i))).downloadAttachment(image, context);
 	    } catch (Exception e)
 	    {}
 	}
-	return image;
+	return attachment;
     }
 
-}
\ No newline at end of file
+}

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/image/ImagePlugin.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/image/ImagePlugin.java	2006-02-15 20:15:32 UTC (rev 934)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/image/ImagePlugin.java	2006-02-16 08:56:48 UTC (rev 935)
@@ -89,47 +89,47 @@
 			imageCache.flushAll();
 	}
 
-	public XWikiAttachment downloadAttachment(XWikiAttachment image, XWikiContext context) {
+	public XWikiAttachment downloadAttachment(XWikiAttachment attachment, XWikiContext context) {
 
 		int height = 0;
-		XWikiAttachment imageclone = null;
+		XWikiAttachment attachmentClone = null;
 		try {
 			
 			height = Integer.parseInt(context.getRequest().getParameter("height"));
 			
-			imageclone = (XWikiAttachment) image.clone();
-			String key = imageclone.getId() + "-" + TYPE_PNG + "-" + height;
+			attachmentClone = (XWikiAttachment) attachment.clone();
+			String key = attachmentClone.getId() + "-" + TYPE_PNG + "-" + height;
 			
 			if (imageCache != null) {
 				try {
-					imageclone.setContent((byte []) imageCache.getFromCache(key));
+					attachmentClone.setContent((byte []) imageCache.getFromCache(key));
 				} catch (XWikiCacheNeedsRefreshException e) {
 					try {
-						imageclone = this.getImageByHeight(imageclone, height, context);
-						imageCache.putInCache(key, imageclone.getContent(context));
+						attachmentClone = this.getImageByHeight(attachmentClone, height, context);
+						imageCache.putInCache(key, attachmentClone.getContent(context));
 					} catch (Exception e2) {
 						imageCache.cancelUpdate(key);
 						throw e2;
 					}
 				}
 			} else {
-				imageclone = this.getImageByHeight(imageclone, height, context);
+				attachmentClone = this.getImageByHeight(attachmentClone, height, context);
 			}
 		} catch (Exception e) {
-			imageclone = image;
+			attachmentClone = attachment;
 		} finally {
-			return imageclone;
+			return attachmentClone;
 		}
 	}
 
-	public XWikiAttachment getImageByHeight(XWikiAttachment image, int thumbnailHeight, XWikiContext context) throws Exception {
+	public XWikiAttachment getImageByHeight(XWikiAttachment attachment, int thumbnailHeight, XWikiContext context) throws Exception {
 		
-		if (getType(image.getMimeType(context)) == 0)
+		if (getType(attachment.getMimeType(context)) == 0)
 			throw new PluginException(name,  PluginException.ERROR_XWIKI_NOT_IMPLEMENTED,
 					"Only JPG, PNG or BMP images are supported.");
 
 		Toolkit tk = Toolkit.getDefaultToolkit();
-		Image imgOri = tk.createImage(image.getContent(context));
+		Image imgOri = tk.createImage(attachment.getContent(context));
 
 		MediaTracker mediaTracker = new MediaTracker(new Container());
 		mediaTracker.addImage(imgOri, 0);
@@ -157,9 +157,9 @@
 		ImageIO.write(imgTN, "PNG", bout);
 
 		
-		image.setContent(bout.toByteArray());
+		attachment.setContent(bout.toByteArray());
 		
-		return image;
+		return attachment;
 	}
 
 	public static int getType(String mimeType) {