Author: DartPeng Date: 2008-10-09 01:53:15 -0400 (Thu, 09 Oct 2008) New Revision: 10759 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java Log: JBIDE-2841 1.Remove the load button 2.Change the file browse button location 3.Add title and description for the wizard page Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-10-09 04:58:44 UTC (rev 10758) +++ trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-10-09 05:53:15 UTC (rev 10759) @@ -58,6 +58,11 @@ } public Object getReturnValue() { + try { + returnObject = this.loadedTheObject(fileText.getText()); + } catch (Exception e) { + e.printStackTrace(); + } return returnObject; } @@ -106,7 +111,6 @@ // registe the listener for controls hookBrowseButtonSelectionAdapter(); hookFileTextModifyListener(); - hookRadioButtonSelectionAdapter(); this.setControl(mainComposite); } @@ -176,6 +180,43 @@ xsdLayout.marginWidth = 0; xsdComposite.setLayout(xsdLayout); + Label nfileLanel = new Label(xsdComposite, SWT.NONE); + nfileLanel.setText("XML File Path :"); + fileTextComposite = new Composite(xsdComposite, SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + fileTextComposite.setLayoutData(gd); + GridLayout xsdtgl = new GridLayout(); + xsdtgl.marginWidth = 0; + xsdtgl.marginHeight = 0; + xsdtgl.numColumns = 1; + fileTextComposite.setLayout(xsdtgl); + + fileText = new Text(fileTextComposite, SWT.BORDER); + gd = new GridData(GridData.FILL_HORIZONTAL); + fileText.setLayoutData(gd); + gd.grabExcessHorizontalSpace = true; + +// final Button loadXSDButton = new Button(fileTextComposite, SWT.NONE); +// loadXSDButton.setText("Load"); +// loadXSDButton.addSelectionListener(new SelectionAdapter() { +// +// @Override +// public void widgetSelected(SelectionEvent e) { +// super.widgetSelected(e); +// reasourceLoaded = false; +// try { +// returnObject = loadedTheObject(fileText.getText()); +// reasourceLoaded = true; +// } catch (Throwable e2) { +// // ignore +// e2.printStackTrace(); +// } +// changeWizardPageStatus(); +// } +// +// }); + Composite browseButtonComposite = new Composite(xsdComposite, SWT.NONE); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; @@ -202,75 +243,29 @@ gd.horizontalAlignment = GridData.END; fileSystemBrowseButton.setLayoutData(gd); - Label nfileLanel = new Label(xsdComposite, SWT.NONE); - nfileLanel.setText("XSD File Path :"); - fileTextComposite = new Composite(xsdComposite, SWT.NONE); - gd = new GridData(GridData.FILL_HORIZONTAL); - gd.grabExcessHorizontalSpace = true; - fileTextComposite.setLayoutData(gd); - GridLayout xsdtgl = new GridLayout(); - xsdtgl.marginWidth = 0; - xsdtgl.marginHeight = 0; - xsdtgl.numColumns = 2; - fileTextComposite.setLayout(xsdtgl); - - fileText = new Text(fileTextComposite, SWT.BORDER); - gd = new GridData(GridData.FILL_HORIZONTAL); - fileText.setLayoutData(gd); - gd.grabExcessHorizontalSpace = true; - - final Button loadXSDButton = new Button(fileTextComposite, SWT.NONE); - loadXSDButton.setText("Load"); - loadXSDButton.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - super.widgetSelected(e); - reasourceLoaded = false; - try { - returnObject = loadedTheObject(fileText.getText()); - reasourceLoaded = true; - } catch (Throwable e2) { - // ignore - e2.printStackTrace(); - } - changeWizardPageStatus(); - } - - }); - - // tableViewer = CheckboxTableViewer.newCheckList(xsdComposite, - // SWT.FULL_SELECTION | SWT.BORDER); - // gd = new GridData(GridData.FILL_BOTH); - // gd.heightHint = 200; - // gd.horizontalSpan = 2; - // tableViewer.getControl().setLayoutData(gd); - // - // initTableViewer(); - return xsdComposite; } abstract protected Object loadedTheObject(String path) throws Exception; protected void initTableViewer() { - tableViewer.addCheckStateListener(new ICheckStateListener() { - boolean flag = true; - - public void checkStateChanged(CheckStateChangedEvent event) { - if (flag) { - Object checkObject = event.getElement(); - boolean check = event.getChecked(); - flag = false; - tableViewer.setAllChecked(false); - tableViewer.setChecked(checkObject, check); - flag = true; - changeWizardPageStatus(); - } - } - }); - tableViewer.setContentProvider(new XSDStructuredModelContentProvider()); - tableViewer.setLabelProvider(new XSDStructuredModelLabelProvider()); +// tableViewer.addCheckStateListener(new ICheckStateListener() { +// boolean flag = true; +// +// public void checkStateChanged(CheckStateChangedEvent event) { +// if (flag) { +// Object checkObject = event.getElement(); +// boolean check = event.getChecked(); +// flag = false; +// tableViewer.setAllChecked(false); +// tableViewer.setChecked(checkObject, check); +// flag = true; +// changeWizardPageStatus(); +// } +// } +// }); +// tableViewer.setContentProvider(new XSDStructuredModelContentProvider()); +// tableViewer.setLabelProvider(new XSDStructuredModelLabelProvider()); } protected void setCompositeChildrenEnabled(Composite composite, @@ -305,9 +300,9 @@ String error = null; if (text == null || "".equals(text)) error = "Please Select a file"; - if (!reasourceLoaded) { - error = "Resource must be loaded"; - } +// if (!reasourceLoaded) { +// error = "Resource must be loaded"; +// } this.setErrorMessage(error); this.setPageComplete(error == null); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2008-10-09 04:58:44 UTC (rev 10758) +++ trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2008-10-09 05:53:15 UTC (rev 10759) @@ -17,14 +17,20 @@ public XMLStructuredDataWizardPage(String pageName, String title, ImageDescriptor titleImage) { super(pageName, title, titleImage); - // TODO Auto-generated constructor stub + setPageText(); } public XMLStructuredDataWizardPage(String pageName) { super(pageName); - // TODO Auto-generated constructor stub + setPageText(); } + private void setPageText() { + this.setTitle("Select xml file"); + this.setDescription("Select a .xml file to be the source/target data"); + + } + /* * (non-Javadoc) *