mantisconnect-cvs Mailing List for MantisConnect (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 159
          http://mantisconnect.svn.sourceforge.net/mantisconnect/?rev=159&view=rev
Author:   planser
Date:     2008-01-31 07:29:19 -0800 (Thu, 31 Jan 2008)

Log Message:
-----------
Some refactorings regarding handling of attachments.

Modified Paths:
--------------
    mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/DefaultSubmitter.java
    mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/swing/AttachmentsPart.java
    mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/swing/IssueSubmitPanel.java

Modified: mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/DefaultSubmitter.java
===================================================================

--- mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/DefaultSubmitter.java	2008-01-22 11:22:04 UTC (rev 158)
+++ mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/DefaultSubmitter.java	2008-01-31 15:29:19 UTC (rev 159)
@@ -14,6 +14,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -28,6 +29,15 @@
  * @author Peter Lanser, pl...@us...
  */
 public class DefaultSubmitter implements ISubmitter {
+	
+	// Compressed file types. Array must be sorted!
+	public final static String[] COMPRESSED_FILES = new String[] {
+		"bz2", "gif", "gz", "jpg", "png", "rar", "zip"
+	};
+	
+	static {
+		Arrays.sort(COMPRESSED_FILES);
+	}
 
 	private boolean compressAttachments;
 
@@ -38,7 +48,7 @@
 	public DefaultSubmitter(boolean compressAttachments) {
 		this.compressAttachments = compressAttachments;
 	}
-
+	
 	public long submitAttachment(IMCSession session, long issueId, File file) throws MCException {
 		try {
 			byte[] data = Utilities.readFile(file);
@@ -49,13 +59,22 @@
 			} else {
 				filename = file.getName();
 			}
-			return session.addIssueAttachment(issueId, filename, Utilities.getMimeType(filename),
-					data);
+			return addAttachment(session, issueId, data, filename);
 		} catch (IOException e) {
 			throw new MCException(e);
-		}
+		}		
 	}
 
+	public long submitAttachment(IMCSession session, long issueId, IIssueAttachment attachment) throws MCException {
+		return submitAttachment(session, issueId, new File(attachment.getFilename()));
+	}
+
+	protected long addAttachment(IMCSession session, long issueId, byte[] data,
+			String filename) throws MCException {
+		return session.addIssueAttachment(issueId, filename, Utilities
+				.getMimeType(filename), data);
+	}
+
 	protected byte[] compress(byte[] data, String filename) throws IOException {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		ZipOutputStream zos = new ZipOutputStream(baos);
@@ -80,7 +99,8 @@
 		String filename = file.getName();
 		int lastSeparator = filename.lastIndexOf('.');
 		if (lastSeparator > 0 && lastSeparator < filename.length()) {
-			return filename.substring(lastSeparator).equalsIgnoreCase(".zip");
+			String type = filename.substring(lastSeparator + 1).toLowerCase();
+			return Arrays.binarySearch(COMPRESSED_FILES, type) >= 0;
 		} else {
 			return false;
 		}
@@ -94,7 +114,7 @@
 		long issueId = session.addIssue(issue);
 		if (attachments != null) {
 			for (int i = 0; i < attachments.length; i++) {
-				submitAttachment(session, issueId, new File(attachments[i].getFilename()));
+				submitAttachment(session, issueId, attachments[i]);
 			}
 		}
 		if (notes != null) {

Modified: mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/swing/AttachmentsPart.java
===================================================================
--- mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/swing/AttachmentsPart.java	2008-01-22 11:22:04 UTC (rev 158)
+++ mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/swing/AttachmentsPart.java	2008-01-31 15:29:19 UTC (rev 159)
@@ -91,10 +91,8 @@
 		List array = new ArrayList();
 		DefaultListModel model = (DefaultListModel) attachments.getModel();
 		for (int i = 0; i < model.getSize(); i++) {
-			File file = (File) model.getElementAt(i);
-			IssueAttachment attachmentData = new IssueAttachment();
-			attachmentData.setFilename(file.toString());
-			array.add(attachmentData);
+			IIssueAttachment attachment = (IIssueAttachment) model.getElementAt(i);
+			array.add(attachment);
 		}
 		issue
 				.setAttachments((IIssueAttachment[]) array.toArray(new IIssueAttachment[array
@@ -110,8 +108,7 @@
 		IIssueAttachment[] issueAttachments = issue.getAttachments();
 		if (issueAttachments != null) {
 			for (int i = 0; i < issueAttachments.length; i++) {
-				((DefaultListModel) attachments.getModel()).addElement(new File(issueAttachments[i]
-						.getFilename()));
+				((DefaultListModel) attachments.getModel()).addElement(issueAttachments[i]);
 			}
 		}
 	}
@@ -140,9 +137,10 @@
 			JFileChooser chooser = getFileChooser();
 			if (chooser.showOpenDialog(getOwner()) == JFileChooser.APPROVE_OPTION) {
 				DefaultListModel model = (DefaultListModel) attachments.getModel();
-				if (!model.contains(chooser.getSelectedFile())) {
-					((DefaultListModel) attachments.getModel()).addElement(chooser
-							.getSelectedFile());
+				IssueAttachment attachment = new IssueAttachment();
+				attachment.setFilename(chooser.getSelectedFile().toString());
+				if (!model.contains(attachment)) {
+					((DefaultListModel) attachments.getModel()).addElement(attachment);
 				}
 			}
 		}
@@ -182,14 +180,17 @@
 				setBackground(list.getBackground());
 				setForeground(list.getForeground());
 			}
-			File file = (File) value;
+			IIssueAttachment attachment = (IIssueAttachment) value;
+			File file = new File(attachment.getFilename());
 			StringBuffer text = new StringBuffer(file.toString());
 			if (submitter.doCompress(file)) {
 				text
 						.append(" ").append(Messages.getString("AttachmentsPart.Message.WillBeCompressed")); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			setText(text.toString());
-			setIcon(getFileChooser().getIcon(file));
+			if (file.exists()) {
+				setIcon(getFileChooser().getIcon(file));
+			}
 			return this;
 		}
 

Modified: mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/swing/IssueSubmitPanel.java
===================================================================
--- mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/swing/IssueSubmitPanel.java	2008-01-22 11:22:04 UTC (rev 158)
+++ mantisconnect/trunk/clients/java/client-api/src/main/org/mantisbt/connect/ui/swing/IssueSubmitPanel.java	2008-01-31 15:29:19 UTC (rev 159)
@@ -19,6 +19,7 @@
 import java.util.Vector;
 
 import javax.swing.JPanel;
+import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
 
 import org.mantisbt.connect.Enumeration;
@@ -98,7 +99,9 @@
 		if (additional != null) {
 			gc.gridy = 1;
 			gc.weighty = 0;
-			add(createAdditionalControls(), gc);
+			add(additional, gc);
+			gc.gridy = 2;
+			add(new JSeparator(), gc);
 		}
 	}
 


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




2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (20)	Oct (16)	Nov (1)	Dec
2005	Jan	Feb (7)	Mar (7)	Apr	May (19)	Jun (22)	Jul (1)	Aug (2)	Sep (63)	Oct (1)	Nov	Dec (4)
2006	Jan	Feb (11)	Mar (26)	Apr (22)	May (13)	Jun	Jul	Aug (34)	Sep (15)	Oct (28)	Nov (7)	Dec
2007	Jan (14)	Feb	Mar (23)	Apr (3)	May (3)	Jun	Jul (3)	Aug	Sep	Oct (3)	Nov (1)	Dec (4)
2008	Jan (11)	Feb (34)	Mar	Apr	May (1)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec
2009	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (4)	Nov	Dec
2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (7)
2011	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

mantisconnect-cvs Mailing List for MantisConnect (Page 3)

mantisconnect-cvs — Mailing list for cvs commits