Author: DartPeng
Date: 2009-05-15 00:13:49 -0400 (Fri, 15 May 2009)
New Revision: 15262
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksVersionSelectionPage.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksConfigurationFileNewWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksFileContainerSelectionPage.java
Log:
JBIDE-4281
1. Move smooks version selection to a new wizardpage.
2. Give "xml" as smooks file extension name.
3. Give "smooks-config.xml" as default file name.
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksConfigurationFileNewWizard.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksConfigurationFileNewWizard.java 2009-05-15
03:56:39 UTC (rev 15261)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksConfigurationFileNewWizard.java 2009-05-15
04:13:49 UTC (rev 15262)
@@ -39,6 +39,7 @@
*/
public class SmooksConfigurationFileNewWizard extends Wizard implements INewWizard {
private SmooksFileContainerSelectionPage containerSelectionPage;
+ private SmooksVersionSelectionPage versionSelectionPage;
private ISelection selection;
/**
@@ -58,6 +59,9 @@
containerSelectionPage = new SmooksFileContainerSelectionPage("Smooks
Configuration File",
(IStructuredSelection) selection);
addPage(containerSelectionPage);
+
+ versionSelectionPage = new SmooksVersionSelectionPage("Smooks Version
Selection");
+ addPage(versionSelectionPage);
}
/**
@@ -67,7 +71,7 @@
public boolean performFinish() {
final IPath containerPath = containerSelectionPage.getContainerFullPath();
final String fileName = containerSelectionPage.getFileName();
- final String version = containerSelectionPage.getVersion();
+ final String version = versionSelectionPage.getVersion();
IRunnableWithProgress op = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException {
try {
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksFileContainerSelectionPage.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksFileContainerSelectionPage.java 2009-05-15
03:56:39 UTC (rev 15261)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksFileContainerSelectionPage.java 2009-05-15
04:13:49 UTC (rev 15262)
@@ -1,16 +1,8 @@
package org.jboss.tools.smooks.configuration.wizards;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.jboss.tools.smooks.configuration.SmooksConstants;
/**
*
@@ -18,68 +10,17 @@
*/
public class SmooksFileContainerSelectionPage extends WizardNewFileCreationPage {
- String version = SmooksConstants.VERSION_1_1;
-
public SmooksFileContainerSelectionPage(String pageName, IStructuredSelection selection)
{
super(pageName, selection);
setTitle("Smooks Configuration File Wizard Page");
setDescription("Create a new Smooks configuration file.");
+ setFileExtension("xml");
+ setFileName("smooks-config.xml");
}
@Override
public void createControl(Composite parent) {
super.createControl(parent);
- Composite buttonComposite = new Composite((Composite) getControl(), SWT.NONE);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- buttonComposite.setLayoutData(gd);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- buttonComposite.setLayout(layout);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- Label speator = new Label(buttonComposite, SWT.SEPARATOR|SWT.HORIZONTAL);
- gd.widthHint = 10;
- speator.setLayoutData(gd);
-
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- Label label = new Label(buttonComposite, SWT.NONE);
- label.setText("Please select Smooks configuration file version");
-
-
- final CCombo combo = new CCombo(buttonComposite,SWT.BORDER);
- combo.setEditable(false);
-
- for(int i = 0 ; i < SmooksConstants.SMOOKS_VERSIONS.length ; i++){
- combo.add(SmooksConstants.SMOOKS_VERSIONS[i]);
- }
-
- int defaultIndex = 0 ;
- for(int i = 0 ; i < SmooksConstants.SMOOKS_VERSIONS.length ; i++){
- if(SmooksConstants.SMOOKS_VERSIONS[i].equals(version)){
- defaultIndex = i;
- break;
- }
- }
- combo.select(defaultIndex);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- combo.setLayoutData(gd);
-
- combo.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- version = combo.getText();
- }
-
- });
+ validatePage();
}
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
}
\ No newline at end of file
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksVersionSelectionPage.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksVersionSelectionPage.java
(rev 0)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksVersionSelectionPage.java 2009-05-15
04:13:49 UTC (rev 15262)
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.wizards;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.jboss.tools.smooks.configuration.SmooksConstants;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class SmooksVersionSelectionPage extends WizardPage {
+
+ protected String version = SmooksConstants.VERSION_1_1;
+
+ /* (non-Javadoc)
+ * @see
org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+ */
+ public void createControl(Composite parent) {
+
+ Composite buttonComposite = new Composite((Composite)parent, SWT.NONE);
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ buttonComposite.setLayoutData(gd);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ buttonComposite.setLayout(layout);
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+ Label label = new Label(buttonComposite, SWT.NONE);
+ label.setText("Smooks Version");
+
+
+
+ final Combo combo = new Combo(buttonComposite,SWT.BORDER | SWT.READ_ONLY);
+
+ for(int i = 0 ; i < SmooksConstants.SMOOKS_VERSIONS.length ; i++){
+ combo.add(SmooksConstants.SMOOKS_VERSIONS[i]);
+ }
+
+ int defaultIndex = 0 ;
+ for(int i = 0 ; i < SmooksConstants.SMOOKS_VERSIONS.length ; i++){
+ if(SmooksConstants.SMOOKS_VERSIONS[i].equals(version)){
+ defaultIndex = i;
+ break;
+ }
+ }
+ combo.select(defaultIndex);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+ combo.setLayoutData(gd);
+
+ combo.addModifyListener(new ModifyListener(){
+
+ public void modifyText(ModifyEvent e) {
+ version = combo.getText();
+ }
+
+ });
+
+ setControl(buttonComposite);
+ }
+
+ public SmooksVersionSelectionPage(String pageName, String title, ImageDescriptor
titleImage) {
+ super(pageName, title, titleImage);
+ this.setTitle("Smooks version selection");
+ this.setDescription("Please select Smooks configuration file version");
+ }
+
+ public SmooksVersionSelectionPage(String pageName) {
+ super(pageName);
+ this.setTitle("Smooks version selection");
+ this.setDescription("Please select Smooks configuration file version");
+ }
+
+ /**
+ * @return the version
+ */
+ public String getVersion() {
+ return version;
+ }
+
+ /**
+ * @param version the version to set
+ */
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+}
Property changes on:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksVersionSelectionPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain