You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2014/03/19 16:25:30 UTC
svn commit: r1579260 - in /pivot/branches/2.0.x:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
wtk/src/org/apache/pivot/wtk/ApplicationContext.java
Author: smartini
Date: Wed Mar 19 15:25:30 2014
New Revision: 1579260
URL: http://svn.apache.org/r1579260
Log:
fix two eclipse warnings
Modified:
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=1579260&r1=1579259&r2=1579260&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Wed Mar 19 15:25:30 2014
@@ -911,7 +911,7 @@ public class TerraFileBrowserSkin extend
fileTableView.getComponentTooltipListeners().add(new ComponentTooltipListener() {
@Override
- public void tooltipTriggered(Component component, int x, int y) {
+ public void tooltipTriggered(Component comp, int x, int y) {
// Check that we are on the first column.
if (fileTableView.getColumnAt(x) != 0) {
@@ -941,12 +941,12 @@ public class TerraFileBrowserSkin extend
tooltip.setContent(toolTipTextArea);
- Point location = component.getDisplay().getMouseLocation();
+ Point location = comp.getDisplay().getMouseLocation();
x = location.x;
y = location.y;
// Ensure that the tooltip stays on screen
- Display display = component.getDisplay();
+ Display display = comp.getDisplay();
int tooltipHeight = tooltip.getPreferredHeight();
if (y + tooltipHeight > display.getHeight()) {
y -= tooltipHeight;
@@ -957,7 +957,7 @@ public class TerraFileBrowserSkin extend
toolTipTextArea.setMaximumWidth(display.getWidth() - ( x + tooltipXOffset + padding) );
tooltip.setLocation(x + tooltipXOffset, y);
- tooltip.open(component.getWindow());
+ tooltip.open(comp.getWindow());
}
});
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=1579260&r1=1579259&r2=1579260&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Wed Mar 19 15:25:30 2014
@@ -266,13 +266,13 @@ public abstract class ApplicationContext
if (dropLocation != null) {
dropAction = dropTarget.userDropActionChange(dropDescendant, dragManifest,
supportedDropActions, dropLocation.x, dropLocation.y, userDropAction);
- }
- if (dropAction != null) {
- // Perform the drop
- event.acceptDrop(getNativeDropAction(dropAction));
- dropTarget.drop(dropDescendant, dragManifest,
- supportedDropActions, dropLocation.x, dropLocation.y, userDropAction);
+ if (dropAction != null) {
+ // Perform the drop
+ event.acceptDrop(getNativeDropAction(dropAction));
+ dropTarget.drop(dropDescendant, dragManifest,
+ supportedDropActions, dropLocation.x, dropLocation.y, userDropAction);
+ }
}
}