Author: bfitzpat Date: 2009-12-22 12:58:18 -0500 (Tue, 22 Dec 2009) New Revision: 19542 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java Log: OPEN - issue JBIDE-5423: Smooks editor takes up too much room on screen https://jira.jboss.org/jira/browse/JBIDE-5423 - fixes for scroll panels Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2009-12-22 17:57:31 UTC (rev 19541) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksReaderFormPage.java 2009-12-22 17:58:18 UTC (rev 19542) @@ -169,6 +169,7 @@ protected boolean lockCheck = false; private Button removeInputDataButton; private Button addInputDataButton; + private ScrolledPageBook scrolledPageBook; public SmooksReaderFormPage(FormEditor editor, String id, String title) { super(editor, id, title); @@ -381,12 +382,12 @@ FillLayout flayout = new FillLayout(); section.setLayout(flayout); - ScrolledPageBook pageBook = new ScrolledPageBook(section); - pageBook.setBackground(toolkit.getColors().getBackground()); - section.setClient(pageBook); + scrolledPageBook = new ScrolledPageBook(section); + scrolledPageBook.setBackground(toolkit.getColors().getBackground()); + section.setClient(scrolledPageBook); - readerConfigComposite = pageBook.createPage(pageBook); - pageBook.showPage(pageBook); + readerConfigComposite = scrolledPageBook.createPage(scrolledPageBook); + scrolledPageBook.showPage(scrolledPageBook); GridLayout gl = new GridLayout(); gl.numColumns = 2; @@ -716,6 +717,7 @@ } if (readerConfigComposite != null) { disposeCompositeControls(readerConfigComposite, null); + scrolledPageBook.reflow(true); } if (reader instanceof EObject) { Object obj = ((EObject) reader); @@ -762,7 +764,12 @@ IItemPropertySource.class); modelPanelCreator.createModelPanel(reader, getManagedForm().getToolkit(), readerConfigComposite, ps, (ISmooksModelProvider) getEditor(), getEditor()); - readerConfigComposite.getParent().layout(); + Composite parentPage = readerConfigComposite.getParent(); + if(parentPage != null){ + parentPage.layout(); + } + scrolledPageBook.reflow(true); + } catch (Exception e) { e.printStackTrace(); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-12-22 17:57:31 UTC (rev 19541) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-12-22 17:58:18 UTC (rev 19542) @@ -966,7 +966,7 @@ if (page != null && page instanceof IEditorPart) { try { parent.setLayout(new FillLayout()); - + ITaskNodeProvider nodeProvider = (ITaskNodeProvider) ((IEditorPart) page) .getAdapter(ITaskNodeProvider.class); if (nodeProvider != null) {