You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/09/15 21:07:03 UTC

svn commit: r289289 [102/134] - in /webservices/axis2/trunk/java: ./ etc/ modules/addressing/ modules/addressing/src/META-INF/ modules/addressing/src/org/apache/axis2/handlers/addressing/ modules/addressing/test-resources/ modules/addressing/test/org/a...

Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java Thu Sep 15 11:52:11 2005
@@ -1,74 +1,74 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis2.tool.service.eclipse.ui;
-
-
-import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
-import org.apache.axis2.tool.service.eclipse.util.SettingsConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.wizard.WizardPage;
-
-
-public abstract class AbstractServiceWizardPage extends WizardPage implements SettingsConstants{
-    protected IDialogSettings settings;
-    protected boolean restoredFromPreviousSettings = false;
-    
-    public AbstractServiceWizardPage(String pageName){
-        super(pageName+".name");
-        init(pageName);
-    }
-    
-    protected void init(String pageName){
-        setTitle(ServiceArchiver.getResourceString(pageName+".title"));
-        setDescription(ServiceArchiver.getResourceString(pageName+".desc"));
-        setImageDescriptor(ServiceArchiver.getWizardImageDescriptor());
-        
-        /*
-         * Get the settings for this page. If there is no section in the
-         * Plugin's settings for this OptionsPage, create a new section
-         */
-        IDialogSettings rootSettings = ServiceArchiver.getDefault()
-                .getDialogSettings();
-        IDialogSettings section = rootSettings.getSection(this.getClass()
-                .getName());
-        if (section == null) {
-            settings = rootSettings.addNewSection(this.getClass().getName());
-            restoredFromPreviousSettings = false;
-            initializeDefaultSettings();
-        } else {
-            restoredFromPreviousSettings=true;
-            settings = section;
-        }
-    }
-
-    protected void updateStatus(String message) {
-        setErrorMessage(message);
-        setPageComplete(message == null);
-    }
-
-    protected abstract void initializeDefaultSettings(); 
-    
-    //Default implementation
-    public boolean isSkipNext(){
-        return false;
-    }
-    
-    //public abstract WizardBean getBean();
-    
-    
-    
-    
-}
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis2.tool.service.eclipse.ui;
+
+
+import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
+import org.apache.axis2.tool.service.eclipse.util.SettingsConstants;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.wizard.WizardPage;
+
+
+public abstract class AbstractServiceWizardPage extends WizardPage implements SettingsConstants{
+    protected IDialogSettings settings;
+    protected boolean restoredFromPreviousSettings = false;
+    
+    public AbstractServiceWizardPage(String pageName){
+        super(pageName+".name");
+        init(pageName);
+    }
+    
+    protected void init(String pageName){
+        setTitle(ServiceArchiver.getResourceString(pageName+".title"));
+        setDescription(ServiceArchiver.getResourceString(pageName+".desc"));
+        setImageDescriptor(ServiceArchiver.getWizardImageDescriptor());
+        
+        /*
+         * Get the settings for this page. If there is no section in the
+         * Plugin's settings for this OptionsPage, create a new section
+         */
+        IDialogSettings rootSettings = ServiceArchiver.getDefault()
+                .getDialogSettings();
+        IDialogSettings section = rootSettings.getSection(this.getClass()
+                .getName());
+        if (section == null) {
+            settings = rootSettings.addNewSection(this.getClass().getName());
+            restoredFromPreviousSettings = false;
+            initializeDefaultSettings();
+        } else {
+            restoredFromPreviousSettings=true;
+            settings = section;
+        }
+    }
+
+    protected void updateStatus(String message) {
+        setErrorMessage(message);
+        setPageComplete(message == null);
+    }
+
+    protected abstract void initializeDefaultSettings(); 
+    
+    //Default implementation
+    public boolean isSkipNext(){
+        return false;
+    }
+    
+    //public abstract WizardBean getBean();
+    
+    
+    
+    
+}

Propchange: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java Thu Sep 15 11:52:11 2005
@@ -1,142 +1,142 @@
-/**
- * Copyright 2004,2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.axis2.tool.service.eclipse.ui;
-
-
-import org.apache.axis2.tool.service.bean.ClassFileSelectionBean;
-import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-
-public class ClassFileLocationPage extends AbstractServiceWizardPage{
-
-    private Text classFileLocationText;
-    private Button filterByClassFilesCheckBox;
-    
-   
-    public ClassFileLocationPage(){
-        super("page1");
-    }
-   
-    
-
-    /* (non-Javadoc)
-     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
-     */
-    protected void initializeDefaultSettings() {
-      settings.put(PREF_CLASS_FILE_LOCATION,System.getProperty("user.dir"));
-      settings.put(PREF_FILTER_BY_CLASSES,true);
-
-    }
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-     */
-    public void createControl(Composite parent) {
-        Composite container = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns=3;
-        layout.verticalSpacing = 9;
-        
-        container.setLayout(layout);
-        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		Label lable = new Label(container,SWT.NULL);
-		lable.setText(ServiceArchiver.getResourceString("page1.fileLocationLabel"));
-		
-		classFileLocationText = new Text(container,SWT.BORDER);
-		classFileLocationText.setLayoutData(gd);
-		classFileLocationText.setText(settings.get(PREF_CLASS_FILE_LOCATION));
-		classFileLocationText.addModifyListener(new ModifyListener(){
-		    public void modifyText(ModifyEvent e){
-		        handleModify();
-		    }
-		});
-		
-		Button browseButton = new Button(container,SWT.PUSH);
-		browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
-		browseButton.addMouseListener(new MouseAdapter(){
-		    public void mouseUp(MouseEvent e) {
-		        handleBrowse();
-		    } 
-		});
-		
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		filterByClassFilesCheckBox = new Button(container,SWT.CHECK);
-		filterByClassFilesCheckBox.setLayoutData(gd);
-		filterByClassFilesCheckBox.setText(ServiceArchiver.getResourceString("page1.filter.caption"));
-		filterByClassFilesCheckBox.setSelection(settings.getBoolean(PREF_FILTER_BY_CLASSES));
-		filterByClassFilesCheckBox.addSelectionListener(new SelectionListener(){
-		    public void widgetSelected(SelectionEvent e){
-		        settings.put(PREF_FILTER_BY_CLASSES,filterByClassFilesCheckBox.getSelection());
-		    }
-		    public void widgetDefaultSelected(SelectionEvent e){}
-		});
-		
-		
-		setControl(container);
-		//call the handle modify method if the setttings are restored
-		
-		if (restoredFromPreviousSettings){
-		    handleModify();
-		}
-    }
-    
-    
-    private void handleBrowse(){
-       DirectoryDialog dirDialog = new DirectoryDialog(this.getShell());
-       dirDialog.setMessage(ServiceArchiver.getResourceString("page1.filedialogTitle"));
-       String returnText = dirDialog.open();
-       if (returnText!=null){
-           this.classFileLocationText.setText(returnText);
-       }
-    }
-    
-    private void handleModify(){
-        String classLocationText = this.classFileLocationText.getText().trim();
-        settings.put(PREF_CLASS_FILE_LOCATION,classLocationText);
-        if ("".equals(classLocationText)){
-            updateStatus("page1.error.filemissing");
-        }else{    
-            updateStatus(null);
-        }
-    }
-    
-    public String getClassFileLocation(){
-        return classFileLocationText.getText();
-    }
-    
-    public ClassFileSelectionBean getBean(){
-        ClassFileSelectionBean pageBean = new ClassFileSelectionBean();
-        pageBean.setFileLocation(this.classFileLocationText.getText());
-        if (filterByClassFilesCheckBox.getSelection()){
-            pageBean.setFilter(".class");
-        }
-        return pageBean;
-    }
-}
+/**
+ * Copyright 2004,2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.axis2.tool.service.eclipse.ui;
+
+
+import org.apache.axis2.tool.service.bean.ClassFileSelectionBean;
+import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+
+public class ClassFileLocationPage extends AbstractServiceWizardPage{
+
+    private Text classFileLocationText;
+    private Button filterByClassFilesCheckBox;
+    
+   
+    public ClassFileLocationPage(){
+        super("page1");
+    }
+   
+    
+
+    /* (non-Javadoc)
+     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
+     */
+    protected void initializeDefaultSettings() {
+      settings.put(PREF_CLASS_FILE_LOCATION,System.getProperty("user.dir"));
+      settings.put(PREF_FILTER_BY_CLASSES,true);
+
+    }
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+     */
+    public void createControl(Composite parent) {
+        Composite container = new Composite(parent, SWT.NULL);
+        GridLayout layout = new GridLayout();
+        layout.numColumns=3;
+        layout.verticalSpacing = 9;
+        
+        container.setLayout(layout);
+        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		Label lable = new Label(container,SWT.NULL);
+		lable.setText(ServiceArchiver.getResourceString("page1.fileLocationLabel"));
+		
+		classFileLocationText = new Text(container,SWT.BORDER);
+		classFileLocationText.setLayoutData(gd);
+		classFileLocationText.setText(settings.get(PREF_CLASS_FILE_LOCATION));
+		classFileLocationText.addModifyListener(new ModifyListener(){
+		    public void modifyText(ModifyEvent e){
+		        handleModify();
+		    }
+		});
+		
+		Button browseButton = new Button(container,SWT.PUSH);
+		browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
+		browseButton.addMouseListener(new MouseAdapter(){
+		    public void mouseUp(MouseEvent e) {
+		        handleBrowse();
+		    } 
+		});
+		
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		filterByClassFilesCheckBox = new Button(container,SWT.CHECK);
+		filterByClassFilesCheckBox.setLayoutData(gd);
+		filterByClassFilesCheckBox.setText(ServiceArchiver.getResourceString("page1.filter.caption"));
+		filterByClassFilesCheckBox.setSelection(settings.getBoolean(PREF_FILTER_BY_CLASSES));
+		filterByClassFilesCheckBox.addSelectionListener(new SelectionListener(){
+		    public void widgetSelected(SelectionEvent e){
+		        settings.put(PREF_FILTER_BY_CLASSES,filterByClassFilesCheckBox.getSelection());
+		    }
+		    public void widgetDefaultSelected(SelectionEvent e){}
+		});
+		
+		
+		setControl(container);
+		//call the handle modify method if the setttings are restored
+		
+		if (restoredFromPreviousSettings){
+		    handleModify();
+		}
+    }
+    
+    
+    private void handleBrowse(){
+       DirectoryDialog dirDialog = new DirectoryDialog(this.getShell());
+       dirDialog.setMessage(ServiceArchiver.getResourceString("page1.filedialogTitle"));
+       String returnText = dirDialog.open();
+       if (returnText!=null){
+           this.classFileLocationText.setText(returnText);
+       }
+    }
+    
+    private void handleModify(){
+        String classLocationText = this.classFileLocationText.getText().trim();
+        settings.put(PREF_CLASS_FILE_LOCATION,classLocationText);
+        if ("".equals(classLocationText)){
+            updateStatus("page1.error.filemissing");
+        }else{    
+            updateStatus(null);
+        }
+    }
+    
+    public String getClassFileLocation(){
+        return classFileLocationText.getText();
+    }
+    
+    public ClassFileSelectionBean getBean(){
+        ClassFileSelectionBean pageBean = new ClassFileSelectionBean();
+        pageBean.setFileLocation(this.classFileLocationText.getText());
+        if (filterByClassFilesCheckBox.getSelection()){
+            pageBean.setFilter(".class");
+        }
+        return pageBean;
+    }
+}

Propchange: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java Thu Sep 15 11:52:11 2005
@@ -1,150 +1,150 @@
- /*
-  * Copyright 2004,2005 The Apache Software Foundation.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
- package org.apache.axis2.tool.service.eclipse.ui;
-
- import org.apache.axis2.tool.service.bean.Page3Bean;
-import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
- public class ServiceArchiveOutputLocationPage extends AbstractServiceWizardPage {
-
-     private static final String DEFAULT_JAR_NAME = "my_service.jar";
-     private Text outputFileLocationTextBox;
-     private Button browseButton;
-     private Text outputFileNameTextbox;
-     
-     public ServiceArchiveOutputLocationPage(){
-         super("page4");
-     }
-     
-     
-    /* (non-Javadoc)
-     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
-     */
-    protected void initializeDefaultSettings() {
-        settings.put(PREF_OUTPUT_LOCATION,System.getProperty("user.dir"));
-        settings.put(PREF_OUTPUT_NAME,DEFAULT_JAR_NAME);
-
-    }
-     /* (non-Javadoc)
-      * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-      */
-     public void createControl(Composite parent) {
-         Composite container = new Composite(parent, SWT.NULL);
-         GridLayout layout = new GridLayout();
-         layout.numColumns=3;
-         container.setLayout(layout);
-         
-        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-        gd.grabExcessHorizontalSpace = true;
-         
- 		Label lable = new Label(container,SWT.NULL);
- 		lable.setText(ServiceArchiver.getResourceString("page4.outputlocation.label"));
- 		
- 		outputFileLocationTextBox = new Text(container,SWT.BORDER);
- 		outputFileLocationTextBox.setLayoutData(gd);
- 		outputFileLocationTextBox.setText(settings.get(PREF_OUTPUT_LOCATION));
- 		outputFileLocationTextBox.addModifyListener(new ModifyListener(){
- 		    public void modifyText(ModifyEvent e){
- 		        handleLocationModification();
- 		    }
- 		});
- 		
- 		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
- 				
- 		browseButton = new Button(container,SWT.PUSH);
- 		browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
- 		browseButton.setLayoutData(gd);
- 		browseButton.addMouseListener(new MouseAdapter(){
- 		    public void mouseUp(MouseEvent e) {
- 		        handleBrowse();
- 		    } 
- 		});
- 		
- 		lable = new Label(container,SWT.NULL);
- 		lable.setText(ServiceArchiver.getResourceString("page4.outputname.label"));
- 		
- 		gd = new GridData(GridData.FILL_HORIZONTAL);
- 		
- 		outputFileNameTextbox = new Text(container,SWT.BORDER);
- 		outputFileNameTextbox.setLayoutData(gd);
- 		outputFileNameTextbox.setText(settings.get(PREF_OUTPUT_NAME));
- 		outputFileNameTextbox.addModifyListener(new ModifyListener(){
- 		    public void modifyText(ModifyEvent e){
- 		        handleFileNameModification();
- 		    }
-        });
-
-        if (restoredFromPreviousSettings) {
-            handleFileNameModification();
-            handleLocationModification();
-        } else {
-            //nothing yet
-        }
-
-        setControl(container);
-
-    }
-     
-     private void handleBrowse(){
-         DirectoryDialog dirDialog = new DirectoryDialog(this.getShell());
-         dirDialog.setMessage(ServiceArchiver.getResourceString("page4.dirdialog.caption"));
-         String returnText = dirDialog.open();
-         if (returnText!=null){
-             this.outputFileLocationTextBox.setText(returnText);
-             this.outputFileLocationTextBox.setToolTipText(returnText);
-         }
-      }
-     
-     private void handleLocationModification(){
-         String outputLocationText = outputFileLocationTextBox.getText();
-         settings.put(PREF_OUTPUT_LOCATION,outputLocationText);
-         if (outputLocationText==null ||"".equals(outputLocationText.trim())){
-             this.updateStatus(ServiceArchiver.getResourceString("page4.error.location"));
-         }else{
-             updateStatus(null);
-         }
-     }
-     private void handleFileNameModification(){
-         String outputFilenameText = outputFileNameTextbox.getText();
-         settings.put(PREF_OUTPUT_NAME,outputFilenameText);
-         if (outputFilenameText==null || "".equals(outputFilenameText.trim())){
-             this.updateStatus(ServiceArchiver.getResourceString("page4.error.filename"));
-         }else{
-             updateStatus(null);
-         }
-     }
-     
-     
-     
-     public Page3Bean getBean(){
-         Page3Bean pageBean = new Page3Bean();
-         pageBean.setOutputFolderName(this.outputFileLocationTextBox.getText().trim());
-         pageBean.setOutputFileName(this.outputFileNameTextbox.getText().trim());
-         return pageBean;
-     }
- }
+ /*
+  * Copyright 2004,2005 The Apache Software Foundation.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ package org.apache.axis2.tool.service.eclipse.ui;
+
+ import org.apache.axis2.tool.service.bean.Page3Bean;
+import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+ public class ServiceArchiveOutputLocationPage extends AbstractServiceWizardPage {
+
+     private static final String DEFAULT_JAR_NAME = "my_service.jar";
+     private Text outputFileLocationTextBox;
+     private Button browseButton;
+     private Text outputFileNameTextbox;
+     
+     public ServiceArchiveOutputLocationPage(){
+         super("page4");
+     }
+     
+     
+    /* (non-Javadoc)
+     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
+     */
+    protected void initializeDefaultSettings() {
+        settings.put(PREF_OUTPUT_LOCATION,System.getProperty("user.dir"));
+        settings.put(PREF_OUTPUT_NAME,DEFAULT_JAR_NAME);
+
+    }
+     /* (non-Javadoc)
+      * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+      */
+     public void createControl(Composite parent) {
+         Composite container = new Composite(parent, SWT.NULL);
+         GridLayout layout = new GridLayout();
+         layout.numColumns=3;
+         container.setLayout(layout);
+         
+        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+        gd.grabExcessHorizontalSpace = true;
+         
+ 		Label lable = new Label(container,SWT.NULL);
+ 		lable.setText(ServiceArchiver.getResourceString("page4.outputlocation.label"));
+ 		
+ 		outputFileLocationTextBox = new Text(container,SWT.BORDER);
+ 		outputFileLocationTextBox.setLayoutData(gd);
+ 		outputFileLocationTextBox.setText(settings.get(PREF_OUTPUT_LOCATION));
+ 		outputFileLocationTextBox.addModifyListener(new ModifyListener(){
+ 		    public void modifyText(ModifyEvent e){
+ 		        handleLocationModification();
+ 		    }
+ 		});
+ 		
+ 		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
+ 				
+ 		browseButton = new Button(container,SWT.PUSH);
+ 		browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
+ 		browseButton.setLayoutData(gd);
+ 		browseButton.addMouseListener(new MouseAdapter(){
+ 		    public void mouseUp(MouseEvent e) {
+ 		        handleBrowse();
+ 		    } 
+ 		});
+ 		
+ 		lable = new Label(container,SWT.NULL);
+ 		lable.setText(ServiceArchiver.getResourceString("page4.outputname.label"));
+ 		
+ 		gd = new GridData(GridData.FILL_HORIZONTAL);
+ 		
+ 		outputFileNameTextbox = new Text(container,SWT.BORDER);
+ 		outputFileNameTextbox.setLayoutData(gd);
+ 		outputFileNameTextbox.setText(settings.get(PREF_OUTPUT_NAME));
+ 		outputFileNameTextbox.addModifyListener(new ModifyListener(){
+ 		    public void modifyText(ModifyEvent e){
+ 		        handleFileNameModification();
+ 		    }
+        });
+
+        if (restoredFromPreviousSettings) {
+            handleFileNameModification();
+            handleLocationModification();
+        } else {
+            //nothing yet
+        }
+
+        setControl(container);
+
+    }
+     
+     private void handleBrowse(){
+         DirectoryDialog dirDialog = new DirectoryDialog(this.getShell());
+         dirDialog.setMessage(ServiceArchiver.getResourceString("page4.dirdialog.caption"));
+         String returnText = dirDialog.open();
+         if (returnText!=null){
+             this.outputFileLocationTextBox.setText(returnText);
+             this.outputFileLocationTextBox.setToolTipText(returnText);
+         }
+      }
+     
+     private void handleLocationModification(){
+         String outputLocationText = outputFileLocationTextBox.getText();
+         settings.put(PREF_OUTPUT_LOCATION,outputLocationText);
+         if (outputLocationText==null ||"".equals(outputLocationText.trim())){
+             this.updateStatus(ServiceArchiver.getResourceString("page4.error.location"));
+         }else{
+             updateStatus(null);
+         }
+     }
+     private void handleFileNameModification(){
+         String outputFilenameText = outputFileNameTextbox.getText();
+         settings.put(PREF_OUTPUT_NAME,outputFilenameText);
+         if (outputFilenameText==null || "".equals(outputFilenameText.trim())){
+             this.updateStatus(ServiceArchiver.getResourceString("page4.error.filename"));
+         }else{
+             updateStatus(null);
+         }
+     }
+     
+     
+     
+     public Page3Bean getBean(){
+         Page3Bean pageBean = new Page3Bean();
+         pageBean.setOutputFolderName(this.outputFileLocationTextBox.getText().trim());
+         pageBean.setOutputFileName(this.outputFileNameTextbox.getText().trim());
+         return pageBean;
+     }
+ }

Propchange: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java Thu Sep 15 11:52:11 2005
@@ -1,156 +1,156 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis2.tool.service.eclipse.ui;
-
-
-import org.apache.axis2.tool.service.bean.WizardBean;
-import org.apache.axis2.tool.service.control.Controller;
-import org.apache.axis2.tool.service.control.ProcessException;
-import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-/**
- * @author Ajith
- *         <p/>
- *         TODO To change the template for this generated type comment go to Window -
- *         Preferences - Java - Code Style - Code Templates
- */
-public class ServiceArchiveWizard extends Wizard implements INewWizard {
-
-    private ClassFileLocationPage classFileLocationPage;
-    private WSDLFileSelectionPage wsdlFileSelectionPage;
-    private ServiceXMLFileSelectionPage serviceXMLFileSelectionPage;
-    private ServiceXMLGenerationPage serviceXMLGenerationPage;
-    private ServiceArchiveOutputLocationPage serviceArchiveOutputLocationPage;
-
-    private boolean updateServiceGenerationStatus;
-    private String classFileLocation;
-    private String wsdlFileGenerationStatus;
-    
-    
-    /**
-     * @return Returns the wsdlFileGenerationStatus.
-     */
-    public String getWsdlFileGenerationStatus() {
-        return wsdlFileGenerationStatus;
-    }
-    /**
-     * @param message The wsdlFileGenerationStatus to set.
-     */
-    public void updateWsdlFileGenerationStatus(String message) {
-        this.wsdlFileGenerationStatus = message;
-    }
-    public  String getClassFileLocation(){
-        return classFileLocation;
-    }
-    
-    public  void setClassFileLocation(String location){
-        this.classFileLocation = location;
-    }
-    
-    public void updateServiceGeneration(boolean status){
-        updateServiceGenerationStatus = status;
-    }
-    /**
-     * 
-     */
-    public ServiceArchiveWizard() {
-        super();
-        setWindowTitle(ServiceArchiver.getResourceString("main.title"));
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
-     */
-//    public IWizardPage getNextPage(IWizardPage page) {
-//       
-//        AbstractServiceWizardPage thisPage = (AbstractServiceWizardPage)page.getNextPage();
-//        while (thisPage!=null && thisPage.isSkipNext()) {
-//            if (thisPage.getNextPage()!=null) {
-//                thisPage = (AbstractServiceWizardPage)thisPage.getNextPage();
-//            }else{
-//                break;
-//            }
-//        }
-//        return thisPage;
-//    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.wizard.IWizard#addPages()
-     */
-    public void addPages() {
-        classFileLocationPage = new ClassFileLocationPage();
-        this.addPage(classFileLocationPage);
-        wsdlFileSelectionPage = new WSDLFileSelectionPage();
-        this.addPage(wsdlFileSelectionPage);
-        serviceXMLFileSelectionPage = new ServiceXMLFileSelectionPage();
-        this.addPage(serviceXMLFileSelectionPage);
-//        serviceXMLGenerationPage = new ServiceXMLGenerationPage();
-//        this.addPage(serviceXMLGenerationPage);
-        serviceArchiveOutputLocationPage = new ServiceArchiveOutputLocationPage();
-        this.addPage(serviceArchiveOutputLocationPage);
-    }
-
-    /* (non-Javadobc)
-     * @see org.eclipse.jface.wizard.IWizard#performFinish()
-     */
-    public boolean performFinish() {
-        //create a wizard bean
-        WizardBean wizBean = new WizardBean();
-        wizBean.setPage1bean(classFileLocationPage.getBean());
-        wizBean.setWsdlBean(wsdlFileSelectionPage.getBean());
-        wizBean.setPage2bean(serviceXMLFileSelectionPage.getBean());
-        wizBean.setPage3bean(serviceArchiveOutputLocationPage.getBean());
-        
-        
-        try {
-            new Controller().process(wizBean);
-            showSuccessMessage(" jar file creation successful! ");
-            return true;
-        } catch (ProcessException e) {
-            showErrorMessage(e.getMessage());
-            return false;
-        } catch (Exception e) {
-            showErrorMessage("Unknown Error! " + e.getMessage());
-            return false;
-        }
-
-
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-     */
-    public void init(IWorkbench workbench, IStructuredSelection selection) {
-        // TODO Auto-generated method stub
-
-    }
-
-    private void showErrorMessage(String message) {
-        MessageDialog.openError(this.getShell(), "Error", message);
-    }
-
-    private void showSuccessMessage(String message) {
-        MessageDialog.openInformation(this.getShell(), "Success", message);
-    }
-}
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis2.tool.service.eclipse.ui;
+
+
+import org.apache.axis2.tool.service.bean.WizardBean;
+import org.apache.axis2.tool.service.control.Controller;
+import org.apache.axis2.tool.service.control.ProcessException;
+import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+
+
+/**
+ * @author Ajith
+ *         <p/>
+ *         TODO To change the template for this generated type comment go to Window -
+ *         Preferences - Java - Code Style - Code Templates
+ */
+public class ServiceArchiveWizard extends Wizard implements INewWizard {
+
+    private ClassFileLocationPage classFileLocationPage;
+    private WSDLFileSelectionPage wsdlFileSelectionPage;
+    private ServiceXMLFileSelectionPage serviceXMLFileSelectionPage;
+    private ServiceXMLGenerationPage serviceXMLGenerationPage;
+    private ServiceArchiveOutputLocationPage serviceArchiveOutputLocationPage;
+
+    private boolean updateServiceGenerationStatus;
+    private String classFileLocation;
+    private String wsdlFileGenerationStatus;
+    
+    
+    /**
+     * @return Returns the wsdlFileGenerationStatus.
+     */
+    public String getWsdlFileGenerationStatus() {
+        return wsdlFileGenerationStatus;
+    }
+    /**
+     * @param message The wsdlFileGenerationStatus to set.
+     */
+    public void updateWsdlFileGenerationStatus(String message) {
+        this.wsdlFileGenerationStatus = message;
+    }
+    public  String getClassFileLocation(){
+        return classFileLocation;
+    }
+    
+    public  void setClassFileLocation(String location){
+        this.classFileLocation = location;
+    }
+    
+    public void updateServiceGeneration(boolean status){
+        updateServiceGenerationStatus = status;
+    }
+    /**
+     * 
+     */
+    public ServiceArchiveWizard() {
+        super();
+        setWindowTitle(ServiceArchiver.getResourceString("main.title"));
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
+     */
+//    public IWizardPage getNextPage(IWizardPage page) {
+//       
+//        AbstractServiceWizardPage thisPage = (AbstractServiceWizardPage)page.getNextPage();
+//        while (thisPage!=null && thisPage.isSkipNext()) {
+//            if (thisPage.getNextPage()!=null) {
+//                thisPage = (AbstractServiceWizardPage)thisPage.getNextPage();
+//            }else{
+//                break;
+//            }
+//        }
+//        return thisPage;
+//    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.wizard.IWizard#addPages()
+     */
+    public void addPages() {
+        classFileLocationPage = new ClassFileLocationPage();
+        this.addPage(classFileLocationPage);
+        wsdlFileSelectionPage = new WSDLFileSelectionPage();
+        this.addPage(wsdlFileSelectionPage);
+        serviceXMLFileSelectionPage = new ServiceXMLFileSelectionPage();
+        this.addPage(serviceXMLFileSelectionPage);
+//        serviceXMLGenerationPage = new ServiceXMLGenerationPage();
+//        this.addPage(serviceXMLGenerationPage);
+        serviceArchiveOutputLocationPage = new ServiceArchiveOutputLocationPage();
+        this.addPage(serviceArchiveOutputLocationPage);
+    }
+
+    /* (non-Javadobc)
+     * @see org.eclipse.jface.wizard.IWizard#performFinish()
+     */
+    public boolean performFinish() {
+        //create a wizard bean
+        WizardBean wizBean = new WizardBean();
+        wizBean.setPage1bean(classFileLocationPage.getBean());
+        wizBean.setWsdlBean(wsdlFileSelectionPage.getBean());
+        wizBean.setPage2bean(serviceXMLFileSelectionPage.getBean());
+        wizBean.setPage3bean(serviceArchiveOutputLocationPage.getBean());
+        
+        
+        try {
+            new Controller().process(wizBean);
+            showSuccessMessage(" jar file creation successful! ");
+            return true;
+        } catch (ProcessException e) {
+            showErrorMessage(e.getMessage());
+            return false;
+        } catch (Exception e) {
+            showErrorMessage("Unknown Error! " + e.getMessage());
+            return false;
+        }
+
+
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
+     */
+    public void init(IWorkbench workbench, IStructuredSelection selection) {
+        // TODO Auto-generated method stub
+
+    }
+
+    private void showErrorMessage(String message) {
+        MessageDialog.openError(this.getShell(), "Error", message);
+    }
+
+    private void showSuccessMessage(String message) {
+        MessageDialog.openInformation(this.getShell(), "Success", message);
+    }
+}

Propchange: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java Thu Sep 15 11:52:11 2005
@@ -1,197 +1,197 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.axis2.tool.service.eclipse.ui;
-
-import org.apache.axis2.tool.service.bean.Page2Bean;
-import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class ServiceXMLFileSelectionPage extends AbstractServiceWizardPage {
-   
-    private Text serviceXMLText;
-    private Label manualSelectionLabel;
-    private Label recommendationTextLable;
-    private Button browseButton;
-    private Button selectAutoFileGenerationCheckBox;
-    
-    
-    private boolean skipNextPage=true;
-    private boolean pageComplete;
-    
-    public ServiceXMLFileSelectionPage(){
-        super("page2");
-    }
-    
-    
-    /* (non-Javadoc)
-     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
-     */
-    protected void initializeDefaultSettings() {
-       settings.put(PREF_SERVICE_XML_FILE,"");
-       settings.put(PREF_CHECK_AUTO_GEN_SERVICE_XML,false);
-
-    }
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-     */
-    public void createControl(Composite parent) {
-        Composite container = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns=3;
-        container.setLayout(layout);
-               
-        manualSelectionLabel = new Label(container,SWT.NULL);
-        manualSelectionLabel.setText(ServiceArchiver.getResourceString("page2.selectservicexml.caption"));
-		
-        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		serviceXMLText = new Text(container,SWT.BORDER);
-		serviceXMLText.setLayoutData(gd);
-		serviceXMLText.setText(settings.get(PREF_SERVICE_XML_FILE));
-		serviceXMLText.addModifyListener(new ModifyListener(){
-		    public void modifyText(ModifyEvent e){
-		    handleModify();
-		    }
-		});
-		
-		browseButton = new Button(container,SWT.PUSH);
-		browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
-		browseButton.addMouseListener(new MouseAdapter(){
-		    public void mouseUp(MouseEvent e) {
-		        handleBrowse();
-		    }
-		});
-		
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		selectAutoFileGenerationCheckBox = new Button(container,SWT.CHECK);
-		selectAutoFileGenerationCheckBox.setLayoutData(gd);
-		selectAutoFileGenerationCheckBox.setText(ServiceArchiver.getResourceString("page2.generateauto.caption"));
-		selectAutoFileGenerationCheckBox.setSelection(settings.getBoolean(PREF_CHECK_AUTO_GEN_SERVICE_XML));
-		selectAutoFileGenerationCheckBox.addSelectionListener(new SelectionListener(){
-		    public void widgetSelected(SelectionEvent e){
-		        handleSelection();
-		    }
-		    public void widgetDefaultSelected(SelectionEvent e){}
-		});
-		/////////////////////////////////////////
-		//disable the selection combo for now
-		selectAutoFileGenerationCheckBox.setEnabled(false);
-		selectAutoFileGenerationCheckBox.setToolTipText(ServiceArchiver.getResourceString("page2.autogen.tooltip"));
-		////////////////////////////////////////////
-		
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = 2;
-		gd.verticalSpan  =2;
-		recommendationTextLable = new Label(container,SWT.NULL);
-		recommendationTextLable.setLayoutData(gd);
-		//recommendationTextLable.setForeground()));
-		
-		setControl(container);
-		
-		if (restoredFromPreviousSettings){
-		    handleModify();
-		    handleSelection();
-		}else{
-		    setPageComplete(false);
-		}
-		
-		
-    }
-    
-    private void handleBrowse(){
-        FileDialog fileDialog = new FileDialog(this.getShell());
-        fileDialog.setFilterExtensions(new String[]{"service.xml"});
-        String returnFileName = fileDialog.open() ;
-        if (returnFileName!=null){
-            this.serviceXMLText.setText(returnFileName);
-        }
-    }
-    
-    private void handleSelection(){
-        boolean selection = this.selectAutoFileGenerationCheckBox.getSelection();
-        settings.put(PREF_CHECK_AUTO_GEN_SERVICE_XML,selection);
-        if (selection){
-            changeManualSelectionStatus(false); 
-            this.skipNextPage = false;
-            updateStatus(null);
-            updateGenerationPage(false);
-        }else{
-            changeManualSelectionStatus(true);
-            this.skipNextPage = true;
-            handleModify();
-            updateGenerationPage(true);
-        }
-    }
-    
-    private void updateGenerationPage(boolean status){
-        ServiceArchiveWizard wizard = (ServiceArchiveWizard)this.getWizard();
-        wizard.updateServiceGeneration(status);
-       
-    }
-    
-    private void changeManualSelectionStatus(boolean state){
-        this.serviceXMLText.setEnabled(state);
-        this.browseButton.setEnabled(state);
-        this.manualSelectionLabel.setEnabled(state);
-    }
-    
-    private void handleModify(){
-        String serviceXMLString =serviceXMLText.getText().trim().toLowerCase(); 
-        settings.put(PREF_SERVICE_XML_FILE,serviceXMLString);
-        if (serviceXMLString.equals("")){
-           this.updateStatus(ServiceArchiver.getResourceString("page2.error.servicenameempty")); 
-        }else if(!serviceXMLString.endsWith("service.xml")){
-            this.updateStatus(ServiceArchiver.getResourceString("page2.error.servicenamewrong"));  
-        }else{
-            this.updateStatus(null);
-        }
-    }
-    
- 
-    public void updateRecommendation(String message){
-        if (recommendationTextLable!=null)
-        recommendationTextLable.setText(message);
-    }
-    
-   
-    
-    /* (non-Javadoc)
-     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#isSkipNext()
-     */
-    public boolean isSkipNext() {
-       return this.skipNextPage;
-    }
-    public Page2Bean getBean(){
-        Page2Bean pageBean = new Page2Bean();
-        pageBean.setManual(!this.selectAutoFileGenerationCheckBox.getSelection());
-        pageBean.setManualFileName(this.serviceXMLText.getText());
-        return pageBean;
-    }
-}
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.axis2.tool.service.eclipse.ui;
+
+import org.apache.axis2.tool.service.bean.Page2Bean;
+import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+
+public class ServiceXMLFileSelectionPage extends AbstractServiceWizardPage {
+   
+    private Text serviceXMLText;
+    private Label manualSelectionLabel;
+    private Label recommendationTextLable;
+    private Button browseButton;
+    private Button selectAutoFileGenerationCheckBox;
+    
+    
+    private boolean skipNextPage=true;
+    private boolean pageComplete;
+    
+    public ServiceXMLFileSelectionPage(){
+        super("page2");
+    }
+    
+    
+    /* (non-Javadoc)
+     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
+     */
+    protected void initializeDefaultSettings() {
+       settings.put(PREF_SERVICE_XML_FILE,"");
+       settings.put(PREF_CHECK_AUTO_GEN_SERVICE_XML,false);
+
+    }
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+     */
+    public void createControl(Composite parent) {
+        Composite container = new Composite(parent, SWT.NULL);
+        GridLayout layout = new GridLayout();
+        layout.numColumns=3;
+        container.setLayout(layout);
+               
+        manualSelectionLabel = new Label(container,SWT.NULL);
+        manualSelectionLabel.setText(ServiceArchiver.getResourceString("page2.selectservicexml.caption"));
+		
+        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		serviceXMLText = new Text(container,SWT.BORDER);
+		serviceXMLText.setLayoutData(gd);
+		serviceXMLText.setText(settings.get(PREF_SERVICE_XML_FILE));
+		serviceXMLText.addModifyListener(new ModifyListener(){
+		    public void modifyText(ModifyEvent e){
+		    handleModify();
+		    }
+		});
+		
+		browseButton = new Button(container,SWT.PUSH);
+		browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
+		browseButton.addMouseListener(new MouseAdapter(){
+		    public void mouseUp(MouseEvent e) {
+		        handleBrowse();
+		    }
+		});
+		
+		gd = new GridData();
+		gd.horizontalSpan = 2;
+		selectAutoFileGenerationCheckBox = new Button(container,SWT.CHECK);
+		selectAutoFileGenerationCheckBox.setLayoutData(gd);
+		selectAutoFileGenerationCheckBox.setText(ServiceArchiver.getResourceString("page2.generateauto.caption"));
+		selectAutoFileGenerationCheckBox.setSelection(settings.getBoolean(PREF_CHECK_AUTO_GEN_SERVICE_XML));
+		selectAutoFileGenerationCheckBox.addSelectionListener(new SelectionListener(){
+		    public void widgetSelected(SelectionEvent e){
+		        handleSelection();
+		    }
+		    public void widgetDefaultSelected(SelectionEvent e){}
+		});
+		/////////////////////////////////////////
+		//disable the selection combo for now
+		selectAutoFileGenerationCheckBox.setEnabled(false);
+		selectAutoFileGenerationCheckBox.setToolTipText(ServiceArchiver.getResourceString("page2.autogen.tooltip"));
+		////////////////////////////////////////////
+		
+		gd = new GridData(GridData.FILL_BOTH);
+		gd.horizontalSpan = 2;
+		gd.verticalSpan  =2;
+		recommendationTextLable = new Label(container,SWT.NULL);
+		recommendationTextLable.setLayoutData(gd);
+		//recommendationTextLable.setForeground()));
+		
+		setControl(container);
+		
+		if (restoredFromPreviousSettings){
+		    handleModify();
+		    handleSelection();
+		}else{
+		    setPageComplete(false);
+		}
+		
+		
+    }
+    
+    private void handleBrowse(){
+        FileDialog fileDialog = new FileDialog(this.getShell());
+        fileDialog.setFilterExtensions(new String[]{"service.xml"});
+        String returnFileName = fileDialog.open() ;
+        if (returnFileName!=null){
+            this.serviceXMLText.setText(returnFileName);
+        }
+    }
+    
+    private void handleSelection(){
+        boolean selection = this.selectAutoFileGenerationCheckBox.getSelection();
+        settings.put(PREF_CHECK_AUTO_GEN_SERVICE_XML,selection);
+        if (selection){
+            changeManualSelectionStatus(false); 
+            this.skipNextPage = false;
+            updateStatus(null);
+            updateGenerationPage(false);
+        }else{
+            changeManualSelectionStatus(true);
+            this.skipNextPage = true;
+            handleModify();
+            updateGenerationPage(true);
+        }
+    }
+    
+    private void updateGenerationPage(boolean status){
+        ServiceArchiveWizard wizard = (ServiceArchiveWizard)this.getWizard();
+        wizard.updateServiceGeneration(status);
+       
+    }
+    
+    private void changeManualSelectionStatus(boolean state){
+        this.serviceXMLText.setEnabled(state);
+        this.browseButton.setEnabled(state);
+        this.manualSelectionLabel.setEnabled(state);
+    }
+    
+    private void handleModify(){
+        String serviceXMLString =serviceXMLText.getText().trim().toLowerCase(); 
+        settings.put(PREF_SERVICE_XML_FILE,serviceXMLString);
+        if (serviceXMLString.equals("")){
+           this.updateStatus(ServiceArchiver.getResourceString("page2.error.servicenameempty")); 
+        }else if(!serviceXMLString.endsWith("service.xml")){
+            this.updateStatus(ServiceArchiver.getResourceString("page2.error.servicenamewrong"));  
+        }else{
+            this.updateStatus(null);
+        }
+    }
+    
+ 
+    public void updateRecommendation(String message){
+        if (recommendationTextLable!=null)
+        recommendationTextLable.setText(message);
+    }
+    
+   
+    
+    /* (non-Javadoc)
+     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#isSkipNext()
+     */
+    public boolean isSkipNext() {
+       return this.skipNextPage;
+    }
+    public Page2Bean getBean(){
+        Page2Bean pageBean = new Page2Bean();
+        pageBean.setManual(!this.selectAutoFileGenerationCheckBox.getSelection());
+        pageBean.setManualFileName(this.serviceXMLText.getText());
+        return pageBean;
+    }
+}

Propchange: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java?rev=289289&r1=289288&r2=289289&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java Thu Sep 15 11:52:11 2005
@@ -1,260 +1,260 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.axis2.tool.service.eclipse.ui;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-
-import org.apache.axis2.tool.service.bean.Page2Bean;
-import org.apache.axis2.tool.service.bean.WSDLAutoGenerateOptionBean;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-
-
-public class ServiceXMLGenerationPage extends AbstractServiceWizardPage{
-    
-    private Text classNameTextBox;
-    private Text serviceNameTextBox;
-    private Button searchDeclaredMethodsCheckBox;
-    Button loadButton;
-    private Table table;
-    
-    private boolean dirty = false;
-    
-    public ServiceXMLGenerationPage(){
-        super("page3");
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
-     */
-    protected void initializeDefaultSettings() {
-        // TODO Auto-generated method stub
-
-    }
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-     */
-    public void createControl(Composite parent) {
-        Composite container = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns=3;
-        container.setLayout(layout);
-        
-      
-       
-        
-        Label label = new Label(container,SWT.NULL);
-        label.setText("Service name");
-        
-        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-        gd.horizontalSpan = 2;
-        serviceNameTextBox = new Text(container,SWT.BORDER);
-        serviceNameTextBox.setLayoutData(gd);
-        serviceNameTextBox.addModifyListener(new ModifyListener(){
-            public void modifyText(ModifyEvent e){
-                //updateDirtyStatus(true);
-            }
-        });
-        
-        
-        label = new Label(container,SWT.NULL);
-        label.setText("Class Name");
-        
-        gd = new GridData(GridData.FILL_HORIZONTAL);
-        classNameTextBox = new Text(container,SWT.BORDER);
-        classNameTextBox.setLayoutData(gd);
-        classNameTextBox.addModifyListener(new ModifyListener(){
-            public void modifyText(ModifyEvent e){
-                updateDirtyStatus(true);
-            }
-        });
-        
-        gd = new GridData(GridData.FILL_HORIZONTAL);
-        loadButton = new Button(container,SWT.PUSH);
-        loadButton.setText("Load");
-        loadButton.setLayoutData(gd);
-        loadButton.addSelectionListener(new SelectionListener(){
-            public void widgetSelected(SelectionEvent e){
-                updateTable();
-            }
-            public void widgetDefaultSelected(SelectionEvent e){}
-        });
-        
-        gd = new GridData(GridData.FILL_HORIZONTAL);
-        gd.horizontalSpan = 3;
-        
-        searchDeclaredMethodsCheckBox = new Button(container,SWT.CHECK);
-        searchDeclaredMethodsCheckBox.setLayoutData(gd);
-        searchDeclaredMethodsCheckBox.setText("List Declared Methods Only");
-        searchDeclaredMethodsCheckBox.addSelectionListener(new SelectionListener(){
-            public void widgetSelected(SelectionEvent e){
-                updateDirtyStatus(true);//dirty
-            }
-            public void widgetDefaultSelected(SelectionEvent e){} 
-        });
-        
-        gd = new GridData(GridData.FILL_BOTH);
-        gd.horizontalSpan = 2;
-        gd.verticalSpan = 5;
-        
-        table = new Table(container,SWT.SINGLE|SWT.FULL_SELECTION|SWT.CHECK);
-        table.setLinesVisible(true);
-        table.setHeaderVisible(true); 
-        table.setLayoutData(gd);
-        declareColumn(table,20,"");
-        declareColumn(table,100,"Method Name");
-        declareColumn(table,100,"Return Type");
-        declareColumn(table,100,"Parameter Count");
-        
-        table.setVisible(false);
-		
-		setControl(container);
-
-    }
-     
-    /**
-     * if the user has already filled the data, this page needs to be 
-     * unchangeable
-     *
-     */
-    public void fillDatafromPrevious(WSDLAutoGenerateOptionBean bean) {
-        //set class name
-        String automaticClassName = bean.getClassFileName();
-        this.classNameTextBox.setText(automaticClassName);
-        this.classNameTextBox.setEnabled(false);
-        //set service name
-        String[] classnameParts = automaticClassName.split("\\.");
-        if (classnameParts.length == 0) {
-            this.serviceNameTextBox.setText(automaticClassName);
-        } else {
-            this.serviceNameTextBox
-                    .setText(classnameParts[classnameParts.length - 1]);
-        }
-        //load the classes
-        updateTable();
-        //check the correct ones
-
-        //disbale the table
-        table.setEnabled(false);
-        loadButton.setEnabled(false);
-    }
-    
-    public void clearPreviousData(){
-        this.classNameTextBox.setText("");
-        this.classNameTextBox.setEnabled(true);
-        //set service name
-        this.serviceNameTextBox.setText("");
-        if (table.isVisible()){
-            table.setVisible(false);
-        }
-        loadButton.setEnabled(true);
-    }
-    private void updateDirtyStatus(boolean status){
-        dirty = status;
-        if (table.isVisible()){
-            table.setEnabled(!status);
-        }
-        setPageComplete(!status);
-    }
-    
-    private void declareColumn(Table table, int width,String colName){
-        TableColumn column = new TableColumn(table,SWT.NONE);
-        column.setWidth(width);
-        column.setText(colName);
-    }
-    
-    private void updateTable() {
-        //get a URL from the class file location
-        try {
-            String classFileLocation = getClassFileLocation();
-            URL classFileURL = new File(classFileLocation).toURL();
-            ClassLoader loader = new URLClassLoader(new URL[] { classFileURL });
-
-            Class clazz = loader.loadClass(classNameTextBox.getText());
-            Method[] methods = null;
-            
-            if (searchDeclaredMethodsCheckBox.getSelection()){
-                methods = clazz.getDeclaredMethods();
-            }else{
-                methods = clazz.getMethods();
-            }
-
-            int methodCount = methods.length;
-            if (methodCount > 0) {
-                table.removeAll();
-                TableItem[] items = new TableItem[methodCount]; // An item for each field
-                for (int i = 0 ; i < methodCount; i++){
-                   items[i] = new TableItem(table, SWT.NONE);
-                   items[i].setText(1,methods[i].getName());
-                   items[i].setText(2,methods[i].getReturnType().getName());
-                   items[i].setText(3,methods[i].getParameterTypes().length+"");
-                   items[i].setChecked(true);//check them all by default
-                }
-                table.setVisible(true);
-                
-                //update the dirty variable
-               updateDirtyStatus(false);
-               updateStatus(null);
-            }
-
-        } catch (MalformedURLException e) {
-           updateStatus("Error : invalid location " +e.getMessage());
-        } catch (ClassNotFoundException e) {
-           updateStatus("Error : Class not found " + e.getMessage());
-        }
-    }
-    
-    public boolean isDirty(){
-        return dirty;
-    }
-    private String getClassFileLocation(){
-        ServiceArchiveWizard wizard = (ServiceArchiveWizard)getWizard();
-        return wizard.getClassFileLocation();
-    }
-    
-    public Page2Bean getBean(Page2Bean previousBean){
-        //previousBean.setAutomatic(true);
-        previousBean.setAutomaticClassName(classNameTextBox.getText());
-        ArrayList list = new ArrayList();
-        TableItem[] items = table.getItems();
-        int itemLength = items.length;
-        for(int i=0;i<itemLength;i++){
-           if(items[i].getChecked()){
-               list.add(items[i].getText(1));//get the selected method name only
-           }
-        }
-        previousBean.setSelectedMethodNames(list);
-        previousBean.setServiceName(this.serviceNameTextBox.getText());
-        return previousBean;
-    }
-}
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis2.tool.service.eclipse.ui;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+
+import org.apache.axis2.tool.service.bean.Page2Bean;
+import org.apache.axis2.tool.service.bean.WSDLAutoGenerateOptionBean;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
+
+
+public class ServiceXMLGenerationPage extends AbstractServiceWizardPage{
+    
+    private Text classNameTextBox;
+    private Text serviceNameTextBox;
+    private Button searchDeclaredMethodsCheckBox;
+    Button loadButton;
+    private Table table;
+    
+    private boolean dirty = false;
+    
+    public ServiceXMLGenerationPage(){
+        super("page3");
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
+     */
+    protected void initializeDefaultSettings() {
+        // TODO Auto-generated method stub
+
+    }
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+     */
+    public void createControl(Composite parent) {
+        Composite container = new Composite(parent, SWT.NULL);
+        GridLayout layout = new GridLayout();
+        layout.numColumns=3;
+        container.setLayout(layout);
+        
+      
+       
+        
+        Label label = new Label(container,SWT.NULL);
+        label.setText("Service name");
+        
+        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+        gd.horizontalSpan = 2;
+        serviceNameTextBox = new Text(container,SWT.BORDER);
+        serviceNameTextBox.setLayoutData(gd);
+        serviceNameTextBox.addModifyListener(new ModifyListener(){
+            public void modifyText(ModifyEvent e){
+                //updateDirtyStatus(true);
+            }
+        });
+        
+        
+        label = new Label(container,SWT.NULL);
+        label.setText("Class Name");
+        
+        gd = new GridData(GridData.FILL_HORIZONTAL);
+        classNameTextBox = new Text(container,SWT.BORDER);
+        classNameTextBox.setLayoutData(gd);
+        classNameTextBox.addModifyListener(new ModifyListener(){
+            public void modifyText(ModifyEvent e){
+                updateDirtyStatus(true);
+            }
+        });
+        
+        gd = new GridData(GridData.FILL_HORIZONTAL);
+        loadButton = new Button(container,SWT.PUSH);
+        loadButton.setText("Load");
+        loadButton.setLayoutData(gd);
+        loadButton.addSelectionListener(new SelectionListener(){
+            public void widgetSelected(SelectionEvent e){
+                updateTable();
+            }
+            public void widgetDefaultSelected(SelectionEvent e){}
+        });
+        
+        gd = new GridData(GridData.FILL_HORIZONTAL);
+        gd.horizontalSpan = 3;
+        
+        searchDeclaredMethodsCheckBox = new Button(container,SWT.CHECK);
+        searchDeclaredMethodsCheckBox.setLayoutData(gd);
+        searchDeclaredMethodsCheckBox.setText("List Declared Methods Only");
+        searchDeclaredMethodsCheckBox.addSelectionListener(new SelectionListener(){
+            public void widgetSelected(SelectionEvent e){
+                updateDirtyStatus(true);//dirty
+            }
+            public void widgetDefaultSelected(SelectionEvent e){} 
+        });
+        
+        gd = new GridData(GridData.FILL_BOTH);
+        gd.horizontalSpan = 2;
+        gd.verticalSpan = 5;
+        
+        table = new Table(container,SWT.SINGLE|SWT.FULL_SELECTION|SWT.CHECK);
+        table.setLinesVisible(true);
+        table.setHeaderVisible(true); 
+        table.setLayoutData(gd);
+        declareColumn(table,20,"");
+        declareColumn(table,100,"Method Name");
+        declareColumn(table,100,"Return Type");
+        declareColumn(table,100,"Parameter Count");
+        
+        table.setVisible(false);
+		
+		setControl(container);
+
+    }
+     
+    /**
+     * if the user has already filled the data, this page needs to be 
+     * unchangeable
+     *
+     */
+    public void fillDatafromPrevious(WSDLAutoGenerateOptionBean bean) {
+        //set class name
+        String automaticClassName = bean.getClassFileName();
+        this.classNameTextBox.setText(automaticClassName);
+        this.classNameTextBox.setEnabled(false);
+        //set service name
+        String[] classnameParts = automaticClassName.split("\\.");
+        if (classnameParts.length == 0) {
+            this.serviceNameTextBox.setText(automaticClassName);
+        } else {
+            this.serviceNameTextBox
+                    .setText(classnameParts[classnameParts.length - 1]);
+        }
+        //load the classes
+        updateTable();
+        //check the correct ones
+
+        //disbale the table
+        table.setEnabled(false);
+        loadButton.setEnabled(false);
+    }
+    
+    public void clearPreviousData(){
+        this.classNameTextBox.setText("");
+        this.classNameTextBox.setEnabled(true);
+        //set service name
+        this.serviceNameTextBox.setText("");
+        if (table.isVisible()){
+            table.setVisible(false);
+        }
+        loadButton.setEnabled(true);
+    }
+    private void updateDirtyStatus(boolean status){
+        dirty = status;
+        if (table.isVisible()){
+            table.setEnabled(!status);
+        }
+        setPageComplete(!status);
+    }
+    
+    private void declareColumn(Table table, int width,String colName){
+        TableColumn column = new TableColumn(table,SWT.NONE);
+        column.setWidth(width);
+        column.setText(colName);
+    }
+    
+    private void updateTable() {
+        //get a URL from the class file location
+        try {
+            String classFileLocation = getClassFileLocation();
+            URL classFileURL = new File(classFileLocation).toURL();
+            ClassLoader loader = new URLClassLoader(new URL[] { classFileURL });
+
+            Class clazz = loader.loadClass(classNameTextBox.getText());
+            Method[] methods = null;
+            
+            if (searchDeclaredMethodsCheckBox.getSelection()){
+                methods = clazz.getDeclaredMethods();
+            }else{
+                methods = clazz.getMethods();
+            }
+
+            int methodCount = methods.length;
+            if (methodCount > 0) {
+                table.removeAll();
+                TableItem[] items = new TableItem[methodCount]; // An item for each field
+                for (int i = 0 ; i < methodCount; i++){
+                   items[i] = new TableItem(table, SWT.NONE);
+                   items[i].setText(1,methods[i].getName());
+                   items[i].setText(2,methods[i].getReturnType().getName());
+                   items[i].setText(3,methods[i].getParameterTypes().length+"");
+                   items[i].setChecked(true);//check them all by default
+                }
+                table.setVisible(true);
+                
+                //update the dirty variable
+               updateDirtyStatus(false);
+               updateStatus(null);
+            }
+
+        } catch (MalformedURLException e) {
+           updateStatus("Error : invalid location " +e.getMessage());
+        } catch (ClassNotFoundException e) {
+           updateStatus("Error : Class not found " + e.getMessage());
+        }
+    }
+    
+    public boolean isDirty(){
+        return dirty;
+    }
+    private String getClassFileLocation(){
+        ServiceArchiveWizard wizard = (ServiceArchiveWizard)getWizard();
+        return wizard.getClassFileLocation();
+    }
+    
+    public Page2Bean getBean(Page2Bean previousBean){
+        //previousBean.setAutomatic(true);
+        previousBean.setAutomaticClassName(classNameTextBox.getText());
+        ArrayList list = new ArrayList();
+        TableItem[] items = table.getItems();
+        int itemLength = items.length;
+        for(int i=0;i<itemLength;i++){
+           if(items[i].getChecked()){
+               list.add(items[i].getText(1));//get the selected method name only
+           }
+        }
+        previousBean.setSelectedMethodNames(list);
+        previousBean.setServiceName(this.serviceNameTextBox.getText());
+        return previousBean;
+    }
+}

Propchange: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java
------------------------------------------------------------------------------
    svn:eol-style = native