Changeset 5631

Timestamp:

09/26/08 17:05:48 (8 weeks ago)

Author:

will

Message:

Paste button for pasting from word into TextImport dialog

Location:

branches/ProtocolEditor/src

Files:

• ui/components/TextImporter.java (modified) (2 diffs)
• util/VersionControlMethods.java (modified) (1 diff)
• xmlMVC/XMLModel.java (modified) (1 diff)

branches/ProtocolEditor/src/ui/components/TextImporter.java

@@ -27 +27 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Toolkit;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -206 +210 @@
                 clearButton.setBackground(null);
                 toolbarBox.add(clearButton);
+                
+                // Paste button 
+                JButton pasteButton = new JButton("Paste Text");
+                pasteButton.setBorder(tb);
+                pasteButton.setBackground(null);
+                pasteButton.addActionListener(new ActionListener() {
+                        public void actionPerformed(ActionEvent e) {
+                                Transferable t = Toolkit.getDefaultToolkit().
+                                getSystemClipboard().getContents(null);
+                        try {
+                            if (t != null && t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+                                String text = (String)t.getTransferData(DataFlavor.stringFlavor);
+                                int offset = textArea.getCaretPosition();
+                                textArea.getDocument().insertString(offset, text, null);
+                            }
+                        } catch (UnsupportedFlavorException ex) {
+                        } catch (IOException ex) {
+                        } catch (BadLocationException ex) {
+                                        // TODO Auto-generated catch block
+                                        ex.printStackTrace();
+                                }    
+                        }
+                });
+                toolbarBox.add(pasteButton);
                 
                 toolbarBox.add(new JPanel());   // so to align buttons to left.

branches/ProtocolEditor/src/util/VersionControlMethods.java

@@ -68 +68 @@
                 while (fileTokenizer.hasMoreTokens()) {
                         
-                        if (! softwareTokenizer.hasMoreTokens())
+                        if (! softwareTokenizer.hasMoreTokens()) {
                                 return true;
+                        }
+                        try {
+                                
+                                int softwareNo = Integer.parseInt(softwareTokenizer.nextToken());
+                                int fileNo = Integer.parseInt(fileTokenizer.nextToken());
                         
-                        int softwareNo = Integer.parseInt(softwareTokenizer.nextToken());
-                        int fileNo = Integer.parseInt(fileTokenizer.nextToken());
-                        
-                        if (fileNo > softwareNo)
-                                return true;
+                                if (fileNo > softwareNo) {
+                                        return true;
+                                } else if (fileNo < softwareNo) {
+                                        return false;
+                                }
+                                
+                        } catch (NumberFormatException ex) {
+                                return false;
+                        }
                 }
                 

branches/ProtocolEditor/src/xmlMVC/XMLModel.java

@@ -436 +436 @@
                          */
                         String fileVersionNumber = getCurrentTree().getVersionNumber();
-                        if (! VersionControlMethods.isFileVersionFromFuture(fileVersionNumber))
+                        if (! VersionControlMethods.isFileVersionFromFuture(fileVersionNumber)) {
                                 getCurrentTree().setVersionNumber(ConfigConstants.EDITOR_VERSION_NUMBER);
+                        }
                         
                         getRootNode().getDataField().setAttribute(DataFieldConstants.PROTOCOL_FILE_NAME, outputFile.getName(), false);