Fix pasting links in macosx.

Check whether source setup exists when building deltas, prevent failing wix build if some build history is missing.
cusax-fix
Damian Minkov 15 years ago
parent 88e178c3ad
commit 26afb8bcc5

@ -776,11 +776,16 @@
<basename property="old.wix.build" file="${build-location}"/>
<!-- we must skip building deltas for current build -->
<!-- we must skip building deltas for current build
and if the source setup file is missing
-->
<condition property="process.delta">
<not>
<equals arg1="${old.wix.build}" arg2="${build.label}"/>
</not>
<and>
<not>
<equals arg1="${old.wix.build}" arg2="${build.label}"/>
</not>
<available file="${build-location}\${windows.arch}\setup.msi"/>
</and>
</condition>
<antcall target="-make-wix-delta-msi"/>

@ -152,11 +152,13 @@ public boolean importData(JComponent comp, Transferable t)
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 @@ else if (t.isDataFlavorSupported(uriListFlavor))
File file = new File(
URLDecoder.decode(url.getFile(), "UTF-8"));
chatPanel.sendFile(file);
dataProcessed = true;
}
return dataProcessed;
}
catch (UnsupportedFlavorException e)
{
@ -179,7 +184,8 @@ else if (t.isDataFlavorSupported(uriListFlavor))
logger.debug("Failed to drop files.", e);
}
}
else if (t.isDataFlavorSupported(uiContactDataFlavor))
if (t.isDataFlavorSupported(uiContactDataFlavor))
{
Object o = null;
@ -238,7 +244,8 @@ else if (t.isDataFlavorSupported(uiContactDataFlavor))
.showDialog();
}
}
else if (t.isDataFlavorSupported(DataFlavor.stringFlavor))
if (t.isDataFlavorSupported(DataFlavor.stringFlavor))
{
InputContext inputContext = comp.getInputContext();
if (inputContext != null)
@ -250,7 +257,7 @@ else if (t.isDataFlavorSupported(DataFlavor.stringFlavor))
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 @@ else if (t.isDataFlavorSupported(DataFlavor.stringFlavor))
logger.debug("Failed to drop string.", ioe);
}
}
return false;
}
}

Loading…
Cancel
Save