diff options
| author | Ansgar Radermacher | 2014-05-15 13:17:57 +0000 |
|---|---|---|
| committer | Ansgar Radermacher | 2014-05-15 13:18:26 +0000 |
| commit | 00f57319e8bc382a82604780d8f1c52246b00267 (patch) | |
| tree | 9fe0a818c90fa2a00e7847a78b5679b36445362a /plugins/views | |
| parent | 0ed54ab7103a015936c85fff8b62c551202de67a (diff) | |
| download | org.eclipse.papyrus-00f57319e8bc382a82604780d8f1c52246b00267.tar.gz org.eclipse.papyrus-00f57319e8bc382a82604780d8f1c52246b00267.tar.xz org.eclipse.papyrus-00f57319e8bc382a82604780d8f1c52246b00267.zip | |
Bug 434953 - [Model Validation] Columns are invisible
Diffstat (limited to 'plugins/views')
2 files changed, 17 insertions, 9 deletions
diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/src/org/eclipse/papyrus/views/validation/internal/ModelValidationPage.java b/plugins/views/validation/org.eclipse.papyrus.views.validation/src/org/eclipse/papyrus/views/validation/internal/ModelValidationPage.java index fe4c777e15f..34ae10b77d4 100644 --- a/plugins/views/validation/org.eclipse.papyrus.views.validation/src/org/eclipse/papyrus/views/validation/internal/ModelValidationPage.java +++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/src/org/eclipse/papyrus/views/validation/internal/ModelValidationPage.java @@ -22,7 +22,6 @@ import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnPixelData; import org.eclipse.jface.viewers.ColumnViewerToolTipSupport; -import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelectionProvider; @@ -66,6 +65,12 @@ import org.eclipse.ui.part.Page; public class ModelValidationPage extends Page { + protected static final int COLUMN_WITH_MIN = 1; + + protected static final int COLUMN_WITH_MAX = 2000; + + protected static final int COLUMN_WITH_DEFAULT = 300; + private final ViewSettings settings; private ValidationMarkersService markers; @@ -173,15 +178,18 @@ public class ModelValidationPage final int columnIndex = table.getTable().indexOf(result.getColumn()); int width = settings.getColumnWidth(columnIndex); - ColumnLayoutData layoutData; - if (width < 0) { - // it's a relative weight - layoutData = new ColumnWeightData(-width, true); - } else { - layoutData = new ColumnPixelData(width, true); + // sanity check, supply default values if outside authorized values, see bug 434953 + if (width < COLUMN_WITH_MIN) { + width = COLUMN_WITH_DEFAULT; + } + else if (width > COLUMN_WITH_MAX) { + width = COLUMN_WITH_MAX; } - layout.setColumnData(result.getColumn(), layoutData); + ColumnLayoutData layoutData; + layoutData = new ColumnPixelData(width, true); + layout.setColumnData(result.getColumn(), layoutData); + result.getColumn().addListener(SWT.Resize, new Listener() { public void handleEvent(Event event) { diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/src/org/eclipse/papyrus/views/validation/internal/ModelValidationView.java b/plugins/views/validation/org.eclipse.papyrus.views.validation/src/org/eclipse/papyrus/views/validation/internal/ModelValidationView.java index f1e255045e0..6b6febc9826 100644 --- a/plugins/views/validation/org.eclipse.papyrus.views.validation/src/org/eclipse/papyrus/views/validation/internal/ModelValidationView.java +++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/src/org/eclipse/papyrus/views/validation/internal/ModelValidationView.java @@ -35,7 +35,7 @@ import org.eclipse.ui.part.PageBookView; public class ModelValidationView extends PageBookView { - public static final String VIEW_ID = "org.eclipse.papyrus.views.validation.ModelValidationView"; + public static final String VIEW_ID = "org.eclipse.papyrus.views.validation.ModelValidationView"; //$NON-NLS-1$ private ViewSettings settings; |