# HG changeset patch # User Frank Benoit # Date 1240136567 -7200 # Node ID 2755ef2c8ef89b043035231a6fdae06a2588d1a1 # Parent 6086085e153dd1b533df5046a5d63716aeac8f3d Fix compile for base type changes diff -r 6086085e153d -r 2755ef2c8ef8 org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/Locator.d --- a/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/Locator.d Sun Apr 19 11:33:55 2009 +0200 +++ b/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/Locator.d Sun Apr 19 12:22:47 2009 +0200 @@ -67,8 +67,8 @@ public int getMiddle(int segmentHeight, bool text) { if (heights !is null && heights.size() > rowCounter) { Integer [] rdata = arrayFromObject!(Integer)(heights.get(rowCounter)); - int rheight = rdata[0].value; - int rleading = rdata[1].value; + int rheight = rdata[0].intValue(); + int rleading = rdata[1].intValue(); if (text) return y + rheight/2 - segmentHeight/2 - rleading; return y + rheight/2 - segmentHeight/2; @@ -78,8 +78,8 @@ public int getBaseline(int segmentHeight, bool text) { if (heights !is null && heights.size()>rowCounter) { Integer [] rdata = arrayFromObject!(Integer)(heights.get(rowCounter)); - int rheight = rdata[0].value; - int rleading = rdata[1].value; + int rheight = rdata[0].intValue(); + int rleading = rdata[1].intValue(); if (text) return y + rheight - segmentHeight - rleading; return y + rheight - segmentHeight; diff -r 6086085e153d -r 2755ef2c8ef8 org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/SelectionData.d --- a/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/SelectionData.d Sun Apr 19 11:33:55 2009 +0200 +++ b/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/SelectionData.d Sun Apr 19 12:22:47 2009 +0200 @@ -93,7 +93,7 @@ return isInverted(rowHeight) ? start.x:stop.x; } private bool isInverted(Locator locator) { - int rowHeight = arrayFromObject!(Integer)(locator.heights.get(locator.rowCounter))[0].value; + int rowHeight = arrayFromObject!(Integer)(locator.heights.get(locator.rowCounter))[0].intValue(); return isInverted(rowHeight); } private bool isInverted(int rowHeight) { @@ -112,7 +112,7 @@ public bool isSelectedRow(Locator locator) { if (!isEnclosed()) return false; - int rowHeight = arrayFromObject!(Integer)(locator.heights.get(locator.rowCounter))[0].value; + int rowHeight = arrayFromObject!(Integer)(locator.heights.get(locator.rowCounter))[0].intValue(); return isSelectedRow(locator.y, rowHeight); } public bool isSelectedRow(int y, int rowHeight) { @@ -124,7 +124,7 @@ public bool isFirstSelectionRow(Locator locator) { if (!isEnclosed()) return false; - int rowHeight = arrayFromObject!(Integer)(locator.heights.get(locator.rowCounter))[0].value; + int rowHeight = arrayFromObject!(Integer)(locator.heights.get(locator.rowCounter))[0].intValue(); return (locator.y + rowHeight >= getTopOffset() && locator.y <= getTopOffset()); } @@ -137,7 +137,7 @@ public bool isLastSelectionRow(Locator locator) { if (!isEnclosed()) return false; - int rowHeight = arrayFromObject!(Integer)(locator.heights.get(locator.rowCounter))[0].value; + int rowHeight = arrayFromObject!(Integer)(locator.heights.get(locator.rowCounter))[0].intValue(); return (locator.y + rowHeight >=getBottomOffset() && locator.y <= getBottomOffset()); }