More fixes of static analysis warnings for UML2SD

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / views / uml2sd / dialogs / SDPrintDialogUI.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialogUI.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialogUI.java
index 055f884a0c7427c074e83f2e3b35c27661bd02a0..366ba69160a848e88160594c66863676732e3574 100755 (executable)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialogUI.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialogUI.java
@@ -18,7 +18,6 @@ import java.util.Arrays;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.GridUtil;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.DiagramToolTip;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.NGC;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget;
@@ -382,8 +381,6 @@ public class SDPrintDialogUI {
             if (!isEnabled()) {
                 Image toDel = d;
                 d = new Image(super.getShell().getDisplay(), drawRegionSelected(d, new Rectangle(0, 0, lw, lh), new RGB(221, 208, 200)));
-                // d, new Rectangle(0,0,((int)(stepX*overviewCanvas.zoomValue)),((int)(
-                // stepY*overviewCanvas.zoomValue))),new RGB(221,208,200)));
                 toDel.dispose();
             }
 
@@ -630,6 +627,22 @@ public class SDPrintDialogUI {
 
     }
 
+    /**
+     * A traverse listener implementation.
+     */
+    protected static class LocalTraverseListener implements TraverseListener {
+        /*
+         * (non-Javadoc)
+         * @see org.eclipse.swt.events.TraverseListener#keyTraversed(org.eclipse.swt.events.TraverseEvent)
+         */
+        @Override
+        public void keyTraversed(TraverseEvent e) {
+            if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)) {
+                e.doit = true;
+            }
+        }
+    }
+
     // ------------------------------------------------------------------------
     // Constructors
     // ------------------------------------------------------------------------
@@ -688,7 +701,7 @@ public class SDPrintDialogUI {
                         fCurrentPage.setSelection(false);
                         fAllPages.setSelection(true);
                     }
-                    if (fVertPagesNum.getText() == "") { //$NON-NLS-1$
+                    if ("".equals(fVertPagesNum.getText())) { //$NON-NLS-1$
                         fVertPagesNum.setText("1"); //$NON-NLS-1$
                     }
                 }
@@ -830,10 +843,7 @@ public class SDPrintDialogUI {
         data2.verticalSpan = 1;
 
         fOverviewCanvas = new LocalSD(g2, SWT.NO_BACKGROUND);
-        GridData seqDiagLayoutData = new GridData(GridData.HORIZONTAL_ALIGN_FILL// |GridData.GRAB_HORIZONTAL|
-                /* GridData.GRAB_VERTICAL| */| GridData.VERTICAL_ALIGN_FILL);
-        // seqDiagLayoutData.widthHint=400;
-        // seqDiagLayoutData.horizontalAlignment=GridData.HORIZONTAL_ALIGN_FILL;
+        GridData seqDiagLayoutData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
         fOverviewCanvas.setLayoutData(seqDiagLayoutData);
         // overviewCanvas.resizeContents(100,100);
         if (fSdView.getContentsWidth() < fSdView.getVisibleWidth() && fSdView.getContentsHeight() < fSdView.getVisibleHeight()) {
@@ -950,18 +960,7 @@ public class SDPrintDialogUI {
 
         });
 
-        fOverviewCanvas.addTraverseListener(new TraverseListener() {
-            /*
-             * (non-Javadoc)
-             * @see org.eclipse.swt.events.TraverseListener#keyTraversed(org.eclipse.swt.events.TraverseEvent)
-             */
-            @Override
-            public void keyTraversed(TraverseEvent e) {
-                if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)) {
-                    e.doit = true;
-                }
-            }
-        });
+        fOverviewCanvas.addTraverseListener(new LocalTraverseListener());
 
         fOverviewCanvas.addFocusListener(new FocusListener() {
             /*
@@ -985,7 +984,7 @@ public class SDPrintDialogUI {
 
         if (fShowPrintButton) {
             Composite printerDlg = new Composite(parent, SWT.NONE);
-            data = GridUtil.createHorizontalFill();
+            data = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
             data.horizontalSpan = 6;
             parentLayout = new GridLayout();
             parentLayout.numColumns = 2;
@@ -993,7 +992,7 @@ public class SDPrintDialogUI {
             printerDlg.setLayoutData(data);
 
             Label label = new Label(printerDlg, SWT.NONE);
-            label.setLayoutData(GridUtil.createHorizontalFill());
+            label.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
             fPrinterDialog = new Button(printerDlg, SWT.PUSH);
             fPrinterDialog.setText(SDMessages._115);
 
@@ -1005,7 +1004,6 @@ public class SDPrintDialogUI {
                  */
                 @Override
                 public void widgetSelected(SelectionEvent e) {
-
                     printButtonSelected();
                 }
 
@@ -1165,7 +1163,7 @@ public class SDPrintDialogUI {
         if ((fSdView.getVisibleWidth() > fSdView.getContentsWidth()) && (fSetVPagesNumber.getSelection() || fSetHPagesNumber.getSelection())) {
             rat = (float) fSdView.getVisibleWidth() / (float) fSdView.getContentsWidth();
         }
-        fZoomFactor = (fOverviewCanvas.getContentsWidth() / cw) / fOverviewCanvas.getZoomFactor() * rat;// /view.getZoomFactor();
+        fZoomFactor = (fOverviewCanvas.getContentsWidth() / cw) / fOverviewCanvas.getZoomFactor() * rat;
     }
 
     /**