copy from subversion repository r.68

[ginkgo/master.git] / org.ginkgo.gcov / src / org / ginkgo / gcov / navigator / Navigator.java

diff --git a/org.ginkgo.gcov/src/org/ginkgo/gcov/navigator/Navigator.java b/org.ginkgo.gcov/src/org/ginkgo/gcov/navigator/Navigator.java
index 5ebaf22..7fded80 100644 (file)
--- a/org.ginkgo.gcov/src/org/ginkgo/gcov/navigator/Navigator.java
+++ b/org.ginkgo.gcov/src/org/ginkgo/gcov/navigator/Navigator.java
@@ -5,7 +5,9 @@ import org.eclipse.cdt.internal.ui.cview.CView;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.jface.layout.TreeColumnLayout;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.OwnerDrawLabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
@@ -31,25 +33,47 @@ public class Navigator extends CommonNavigator {
        public void createPartControl(Composite parent) {
                super.createPartControl(parent);
                CommonViewer aViewer = getCommonViewer();
-               createColumn(aViewer);
+               TreeColumnLayout ad = new TreeColumnLayout();
+               parent.setLayout(ad);
+               createColumn(aViewer,ad);
+//             createColumn(aViewer);
        }
-       private CommonViewer createColumn(CommonViewer aViewer) {
+//     private CommonViewer createColumn(CommonViewer aViewer) {
+//             TreeColumn column =new TreeColumn(aViewer.getTree(),SWT.NONE);
+//             TreeColumn b = column;
+//             b.setWidth(200);
+//             b.setText("Column 1");
+//             
+//             final TreeViewerColumn column2 = new TreeViewerColumn(aViewer,SWT.NONE);
+//             column2.getColumn().setWidth(200);
+//             column2.getColumn().setText("Column 2");
+//             
+//             column2.setLabelProvider(new CoverageLabelProvider(column2,aViewer));
+//             
+//             aViewer.getTree().setHeaderVisible(true);
+//             OwnerDrawLabelProvider.setUpOwnerDraw(getCommonViewer());
+//             return aViewer;
+//     }
+       /*copy from coverage history SampleView*/
+       private TreeViewer createColumn(TreeViewer aViewer, TreeColumnLayout ad) {
+
                TreeColumn column =new TreeColumn(aViewer.getTree(),SWT.NONE);
-               TreeColumn b = column;
-               b.setWidth(200);
-               b.setText("Column 1");
+               column.setWidth(200);
+               column.setText("Column 1");
+               ad.setColumnData(column, new ColumnWeightData(50, 100));
                
-               final TreeViewerColumn column2 = new TreeViewerColumn(aViewer,SWT.NONE);
-               column2.getColumn().setWidth(200);
-               column2.getColumn().setText("Column 2");
+               TreeViewerColumn viewerColumn2 = new TreeViewerColumn(aViewer,SWT.NONE);
+               viewerColumn2.setLabelProvider(new CoverageLabelProvider(viewerColumn2,aViewer));
                
-               column2.setLabelProvider(new CoverageLabelProvider(column2,getCommonViewer()));
+               TreeColumn column2 = viewerColumn2.getColumn();
+               column2.setWidth(200);
+               column2.setText("Column 2");
+               ad.setColumnData(column2,new ColumnWeightData(50, 100));
                
                aViewer.getTree().setHeaderVisible(true);
-               OwnerDrawLabelProvider.setUpOwnerDraw(getCommonViewer());
+               OwnerDrawLabelProvider.setUpOwnerDraw(aViewer);
                return aViewer;
        }
-
        public Navigator() {
                // TODO \8e©\93®\90¶\90¬\82³\82ê\82½\83R\83\93\83X\83g\83\89\83N\83^\81[\81E\83X\83^\83u
        }