aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2011-05-18 09:49:27 +0000
committerDamian Minkov <damencho@jitsi.org>2011-05-18 09:49:27 +0000
commit26afb8bcc55501c96ba03c5e7fe898cdf26b2508 (patch)
tree9bcebfafbd7bc58de232418658abb27fdf3b34b9 /src/net/java
parent88e178c3ad2393ffeba57219b583b999eb4ea1b6 (diff)
downloadjitsi-26afb8bcc55501c96ba03c5e7fe898cdf26b2508.zip
jitsi-26afb8bcc55501c96ba03c5e7fe898cdf26b2508.tar.gz
jitsi-26afb8bcc55501c96ba03c5e7fe898cdf26b2508.tar.bz2
Fix pasting links in macosx.
Check whether source setup exists when building deltas, prevent failing wix build if some build history is missing.
Diffstat (limited to 'src/net/java')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/chat/ChatTransferHandler.java16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransferHandler.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransferHandler.java
index 9caf1a8..9fb0914 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransferHandler.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransferHandler.java
@@ -152,11 +152,13 @@ public class ChatTransferHandler
logger.debug("Failed to drop files.", e);
}
}
- else if (t.isDataFlavorSupported(uriListFlavor))
+
+ if (t.isDataFlavorSupported(uriListFlavor))
{
try
{
Object o = t.getTransferData(uriListFlavor);
+ boolean dataProcessed = false;
StringTokenizer tokens = new StringTokenizer((String)o);
while (tokens.hasMoreTokens())
@@ -166,7 +168,10 @@ public class ChatTransferHandler
File file = new File(
URLDecoder.decode(url.getFile(), "UTF-8"));
chatPanel.sendFile(file);
+ dataProcessed = true;
}
+
+ return dataProcessed;
}
catch (UnsupportedFlavorException e)
{
@@ -179,7 +184,8 @@ public class ChatTransferHandler
logger.debug("Failed to drop files.", e);
}
}
- else if (t.isDataFlavorSupported(uiContactDataFlavor))
+
+ if (t.isDataFlavorSupported(uiContactDataFlavor))
{
Object o = null;
@@ -238,7 +244,8 @@ public class ChatTransferHandler
.showDialog();
}
}
- else if (t.isDataFlavorSupported(DataFlavor.stringFlavor))
+
+ if (t.isDataFlavorSupported(DataFlavor.stringFlavor))
{
InputContext inputContext = comp.getInputContext();
if (inputContext != null)
@@ -250,7 +257,7 @@ public class ChatTransferHandler
BufferedReader reader = new BufferedReader(
DataFlavor.stringFlavor.getReaderForText(t));
- StringBuffer buffToPaste = new StringBuffer();
+ StringBuilder buffToPaste = new StringBuilder();
String line = reader.readLine();
while(line != null)
@@ -278,6 +285,7 @@ public class ChatTransferHandler
logger.debug("Failed to drop string.", ioe);
}
}
+
return false;
}
}