diff options
7 files changed, 37 insertions, 37 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/Clipboard.java index 111f9bf7a8..a67c6616d5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/Clipboard.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/Clipboard.java @@ -23,8 +23,8 @@ import org.eclipse.swt.internal.carbon.OS; */ public class Clipboard { - private Display display; - private int scrap = 0; + Display display; + int scrap = 0; /** * Constructs a new instance of this class. Creating an instance of a Clipboard @@ -550,7 +550,7 @@ public String[] getAvailableTypeNames() { return names; } -private int[] _getAvailableTypes() { +int[] _getAvailableTypes() { int[] types = new int[0]; int[] scrap = new int[1]; if (OS.GetCurrentScrap(scrap) != OS.noErr) return types; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/FileTransfer.java index 6e50a3030f..ef3c8fabf1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/FileTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/FileTransfer.java @@ -35,13 +35,13 @@ import org.eclipse.swt.internal.carbon.*; */ public class FileTransfer extends ByteArrayTransfer { - private static FileTransfer _instance = new FileTransfer(); - private static final String HFS = "hfs "; - private static final String FURL = "furl"; - private static final int HFSID = registerType(HFS); - private static final int FURLID = registerType(FURL); + static FileTransfer _instance = new FileTransfer(); + static final String HFS = "hfs "; //$NON-NLS-1$ + static final String FURL = "furl"; //$NON-NLS-1$ + static final int HFSID = registerType(HFS); + static final int FURLID = registerType(FURL); -private FileTransfer() {} +FileTransfer() {} /** * Returns the singleton instance of the FileTransfer class. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/HTMLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/HTMLTransfer.java index e9251ccffd..c664d0486c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/HTMLTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/HTMLTransfer.java @@ -27,11 +27,11 @@ import org.eclipse.swt.internal.carbon.OS; */ public class HTMLTransfer extends ByteArrayTransfer { - private static HTMLTransfer _instance = new HTMLTransfer(); - private static final String HTML = "HTML"; //$NON-NLS-1$ - private static final int HTMLID = registerType(HTML); + static HTMLTransfer _instance = new HTMLTransfer(); + static final String HTML = "HTML"; //$NON-NLS-1$ + static final int HTMLID = registerType(HTML); -private HTMLTransfer() {} +HTMLTransfer() {} /** * Returns the singleton instance of the HTMLTransfer class. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/RTFTransfer.java index 8a898aa59f..c4aeac8499 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/RTFTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/RTFTransfer.java @@ -28,11 +28,11 @@ import org.eclipse.swt.internal.carbon.CFRange; */ public class RTFTransfer extends ByteArrayTransfer { - private static RTFTransfer _instance = new RTFTransfer(); - private static final String RTF = "RTF "; - private static final int RTFID = registerType(RTF); + static RTFTransfer _instance = new RTFTransfer(); + static final String RTF = "RTF "; //$NON-NLS-1$ + static final int RTFID = registerType(RTF); -private RTFTransfer() {} +RTFTransfer() {} /** * Returns the singleton instance of the RTFTransfer class. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TableDragUnderEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TableDragUnderEffect.java index 934f08a053..b8751dbfb2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TableDragUnderEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TableDragUnderEffect.java @@ -15,10 +15,10 @@ import org.eclipse.swt.graphics.*; import org.eclipse.swt.widgets.*; class TableDragUnderEffect extends DragUnderEffect { - private Table table; - private TableItem currentItem; - private TableItem[] selection = new TableItem[0]; - private int currentEffect = DND.FEEDBACK_NONE; + Table table; + TableItem currentItem; + TableItem[] selection = new TableItem[0]; + int currentEffect = DND.FEEDBACK_NONE; TableDragUnderEffect(Table table) { this.table = table; @@ -38,13 +38,13 @@ void show(int effect, int x, int y) { selection = new TableItem[0]; } } -private TableItem findItem(int x, int y){ +TableItem findItem(int x, int y){ if (table == null) return null; Point coordinates = new Point(x, y); coordinates = table.toControl(coordinates); return table.getItem(coordinates); } -private void setDragUnderEffect(int effect, TableItem item) { +void setDragUnderEffect(int effect, TableItem item) { if (currentItem != item) { if (item == null) { table.setSelection(new TableItem[0]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TextTransfer.java index 84eed74d1f..4c6594d647 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TextTransfer.java @@ -29,13 +29,13 @@ import org.eclipse.swt.internal.carbon.OS; */ public class TextTransfer extends ByteArrayTransfer { - private static TextTransfer _instance = new TextTransfer(); - private static final String TEXT = "TEXT"; - private static final String UTEXT = "utxt"; - private static final int TEXTID = OS.kScrapFlavorTypeText; - private static final int UTEXTID = OS.kScrapFlavorTypeUnicode; + static TextTransfer _instance = new TextTransfer(); + static final String TEXT = "TEXT"; //$NON-NLS-1$ + static final String UTEXT = "utxt"; //$NON-NLS-1$ + static final int TEXTID = OS.kScrapFlavorTypeText; + static final int UTEXTID = OS.kScrapFlavorTypeUnicode; -private TextTransfer() {} +TextTransfer() {} /** * Returns the singleton instance of the TextTransfer class. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TreeDragUnderEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TreeDragUnderEffect.java index 35ae0c4d6e..15254814d8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TreeDragUnderEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/carbon/org/eclipse/swt/dnd/TreeDragUnderEffect.java @@ -16,10 +16,10 @@ import org.eclipse.swt.widgets.*; class TreeDragUnderEffect extends DragUnderEffect { - private Tree tree; - private TreeItem currentItem = null; - private int currentEffect = DND.FEEDBACK_NONE; - private TreeItem[] selection = new TreeItem[0]; + Tree tree; + TreeItem currentItem = null; + int currentEffect = DND.FEEDBACK_NONE; + TreeItem[] selection = new TreeItem[0]; TreeDragUnderEffect(Tree tree) { this.tree = tree; @@ -39,12 +39,12 @@ void show(int effect, int x, int y) { selection = new TreeItem[0]; } } -private TreeItem findItem(int x , int y){ +TreeItem findItem(int x , int y){ Point coordinates = new Point(x, y); coordinates = tree.toControl(coordinates); return tree.getItem(coordinates); } -private void setDragUnderEffect(int effect, TreeItem item) { +void setDragUnderEffect(int effect, TreeItem item) { switch (effect) { case DND.FEEDBACK_SELECT: if (currentEffect == DND.FEEDBACK_INSERT_AFTER || @@ -85,14 +85,14 @@ private void setDragUnderEffect(int effect, TreeItem item) { break; } } -private void setDropSelection (TreeItem item) { +void setDropSelection (TreeItem item) { if (item == null) { tree.setSelection(new TreeItem[0]); } else { tree.setSelection(new TreeItem[]{item}); } } -private void setInsertMark (TreeItem item, boolean after) { +void setInsertMark (TreeItem item, boolean after) { // not currently implemented } } |