1) Moved net.sourceforge.phpeclipse.ui\src\net\sourceforge\phpdt back to net.sourcefo...

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / preferences / MarkOccurrencesConfigurationBlock.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java
index cd88ab4..cda6161 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java
@@ -17,11 +17,13 @@ import java.util.Iterator;
 import java.util.Map;
 
 import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
-import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
+//import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.text.Assert;
+//incastrix
+//import org.eclipse.jface.text.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -30,7 +32,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
+//import org.eclipse.swt.widgets.Label;
 
 /**
  * Configures Java Editor hover preferences.
@@ -127,6 +129,9 @@ class MarkOccurrencesConfigurationBlock implements
                layout.numColumns = 1;
                composite.setLayout(layout);
 
+               GridData gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL);
+               composite.setLayoutData(gd);
+
                String label;
 
                label = PreferencesMessages
@@ -193,7 +198,7 @@ class MarkOccurrencesConfigurationBlock implements
                // createDependency(master,
                // PreferenceConstants.EDITOR_MARK_IMPLEMENTORS, slave);
 
-               addFiller(composite);
+               //addFiller(composite);
 
                label = PreferencesMessages
                                .getString("JavaEditorPreferencePage.stickyOccurrences");
@@ -205,15 +210,15 @@ class MarkOccurrencesConfigurationBlock implements
                return composite;
        }
 
-       private void addFiller(Composite composite) {
-               PixelConverter pixelConverter = new PixelConverter(composite);
-
-               Label filler = new Label(composite, SWT.LEFT);
-               GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-               gd.horizontalSpan = 2;
-               gd.heightHint = pixelConverter.convertHeightInCharsToPixels(1) / 2;
-               filler.setLayoutData(gd);
-       }
+//     private void addFiller(Composite composite) {
+//             PixelConverter pixelConverter = new PixelConverter(composite);
+//
+//             Label filler = new Label(composite, SWT.LEFT);
+//             GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
+//             gd.horizontalSpan = 2;
+//             gd.heightHint = pixelConverter.convertHeightInCharsToPixels(1) / 2;
+//             filler.setLayoutData(gd);
+//     }
 
        private Button addCheckBox(Composite parent, String label, String key,
                        int indentation) {