You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by aj...@apache.org on 2005/05/25 04:42:14 UTC
svn commit: r178349 - in /webservices/axis/trunk/java/modules/tool:
resources/codegen/ resources/codegen/icons/
src/org/apache/axis/tool/codegen/eclipse/
src/org/apache/axis/tool/codegen/eclipse/pages/
src/org/apache/axis/tool/codegen/resources/
src/org/apache/axis/tool/control/ src/org/apache/axis/tool/core/
src/org/apache/axis/tool/service/
Author: ajith
Date: Tue May 24 19:42:12 2005
New Revision: 178349
URL: http://svn.apache.org/viewcvs?rev=178349&view=rev
Log:
Modified the codegen wizard tool. Added an Icon to the wizard page
Added:
webservices/axis/trunk/java/modules/tool/resources/codegen/icons/asf-feather.gif (with props)
webservices/axis/trunk/java/modules/tool/resources/codegen/icons/icon.gif (with props)
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/service/
Removed:
webservices/axis/trunk/java/modules/tool/resources/codegen/icons/sample.gif
Modified:
webservices/axis/trunk/java/modules/tool/resources/codegen/plugin.xml
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodeGenWizard.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodegenWizardPlugin.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OptionsPage.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OutputPage.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/WSDLFileSelectionPage.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/resources/Codegen.properties
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/control/Controller.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ClassFileHandler.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ServiceFileCreator.java
Added: webservices/axis/trunk/java/modules/tool/resources/codegen/icons/asf-feather.gif
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/resources/codegen/icons/asf-feather.gif?rev=178349&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/axis/trunk/java/modules/tool/resources/codegen/icons/asf-feather.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: webservices/axis/trunk/java/modules/tool/resources/codegen/icons/icon.gif
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/resources/codegen/icons/icon.gif?rev=178349&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/axis/trunk/java/modules/tool/resources/codegen/icons/icon.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/axis/trunk/java/modules/tool/resources/codegen/plugin.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/resources/codegen/plugin.xml?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/resources/codegen/plugin.xml (original)
+++ webservices/axis/trunk/java/modules/tool/resources/codegen/plugin.xml Tue May 24 19:42:12 2005
@@ -36,12 +36,12 @@
point="org.eclipse.ui.newWizards">
<category
name="Axis2 Wizards"
- id="Axis2_Codegen_Wizards">
+ id="Axis2_Wizards">
</category>
<wizard
name="Axis2 Code Generator"
- icon="icons/sample.gif"
- category="Axis2_Codegen_Wizards"
+ icon="icons/icon.gif"
+ category="Axis2_Wizards"
class="org.apache.axis.tool.codegen.eclipse.CodeGenWizard"
id="org.apache.axis.tool.codegen.eclipse.CodeGenWizard">
</wizard>
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodeGenWizard.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodeGenWizard.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodeGenWizard.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodeGenWizard.java Tue May 24 19:42:12 2005
@@ -26,10 +26,9 @@
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWizard;
-//import org.eclipse.ui.ide.IDE;
/**
- *
+ * The main wizard for the codegen wizard
*/
public class CodeGenWizard extends Wizard implements INewWizard {
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodegenWizardPlugin.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodegenWizardPlugin.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodegenWizardPlugin.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/CodegenWizardPlugin.java Tue May 24 19:42:12 2005
@@ -1,5 +1,6 @@
package org.apache.axis.tool.codegen.eclipse;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.*;
import org.osgi.framework.BundleContext;
import java.util.*;
@@ -12,6 +13,7 @@
private static CodegenWizardPlugin plugin;
//Resource bundle.
private ResourceBundle resourceBundle;
+ private static ImageDescriptor wizardImageDescriptor;
/**
* The constructor.
@@ -66,4 +68,12 @@
public ResourceBundle getResourceBundle() {
return resourceBundle;
}
+
+ public static ImageDescriptor getWizardImageDescriptor(){
+ if (wizardImageDescriptor==null){
+ wizardImageDescriptor =CodegenWizardPlugin.imageDescriptorFromPlugin("Axis2_Codegen_Wizard","icons/asf-feather.gif");
+ }
+ return wizardImageDescriptor;
+ }
+
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OptionsPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OptionsPage.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OptionsPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OptionsPage.java Tue May 24 19:42:12 2005
@@ -33,6 +33,8 @@
private Button syncOnlyRadioButton;
private Button asyncOnlyRadioButton;
private Text packageText;
+ private Button serverSideCheckBoxButton;
+
/**
* @param pageName
*/
@@ -40,6 +42,7 @@
super(CodegenWizardPlugin.getResourceString("page2.name"));
setTitle(CodegenWizardPlugin.getResourceString("page2.title"));
setDescription(CodegenWizardPlugin.getResourceString("page2.desc"));
+ setImageDescriptor(CodegenWizardPlugin.getWizardImageDescriptor());
}
@@ -63,6 +66,7 @@
languageSelectionComboBox = new Combo(container, SWT.DROP_DOWN |SWT.BORDER |SWT.READ_ONLY);
//fill the combo
this.fillLanguageCombo();
+
languageSelectionComboBox.setLayoutData(gd);
syncOnlyRadioButton = new Button(container,SWT.RADIO);
syncOnlyRadioButton.setText(CodegenWizardPlugin.getResourceString("page2.sync.caption"));
@@ -73,16 +77,24 @@
label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin.getResourceString("page2.package.caption"));
+
packageText = new Text(container,SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL);
packageText.setLayoutData(gd);
- packageText.setText("default");
+ packageText.setText("default");//get this text from the URLProcessor
+
+ serverSideCheckBoxButton = new Button(container,SWT.CHECK);
+ serverSideCheckBoxButton.setText(CodegenWizardPlugin.getResourceString("page2.serverside.caption"));
setControl(container);
setPageComplete(true);
}
+ /**
+ * Fill the combo with proper language names
+ *
+ */
private void fillLanguageCombo(){
languageSelectionComboBox.add(JAVA);
@@ -93,22 +105,42 @@
}
/**
- *
+ * Get the selected language
* @return
*/
public String getSelectedLanguage(){
return languageSelectionComboBox.getItem(languageSelectionComboBox.getSelectionIndex());
}
+ /**
+ * the async only status
+ * @return
+ */
public boolean isAsyncOnlyOn(){
return asyncOnlyRadioButton.getSelection();
}
+ /**
+ * the sync only status
+ * @return
+ */
public boolean isSyncOnlyOn(){
return syncOnlyRadioButton.getSelection();
}
+ /**
+ * return the package name
+ * @return
+ */
public String getPackageName(){
return this.packageText.getText();
+ }
+
+ /**
+ * The serverside status
+ * @return
+ */
+ public boolean isServerside(){
+ return this.serverSideCheckBoxButton.getSelection();
}
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OutputPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OutputPage.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OutputPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/OutputPage.java Tue May 24 19:42:12 2005
@@ -35,9 +35,7 @@
public class OutputPage extends WizardPage {
private Text outputLocation;
-
private Button browseButton;
-
private Button locationSelectCheckBox;
/**
@@ -47,12 +45,12 @@
super(CodegenWizardPlugin.getResourceString("page3.name"));
setTitle(CodegenWizardPlugin.getResourceString("page3.title"));
setDescription(CodegenWizardPlugin.getResourceString("page3.desc"));
+ setImageDescriptor(CodegenWizardPlugin.getWizardImageDescriptor());
}
/*
* (non-Javadoc)
- *
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
public void createControl(Composite parent) {
@@ -91,11 +89,20 @@
this.setPageComplete(true);
}
-
+
+ /**
+ * get the output location
+ * @return
+ */
public String getOutputLocation() {
return outputLocation.getText();
}
+ /**
+ * Worker method for handling modifications to the
+ * textbox
+ *
+ */
private void handleModifyEvent() {
String text = this.outputLocation.getText();
if ((text == null) || (text.trim().equals(""))) {
@@ -107,8 +114,7 @@
}
/**
- * Updates the wizard page messages
- *
+ * Updates the wizard page error messages
* @param message
*/
private void updateStatus(String message) {
@@ -116,6 +122,10 @@
setPageComplete(message == null);
}
+ /**
+ * Handle the browse button events
+ *
+ */
private void handleBrowse() {
boolean location = false;//locationSelectCheckBox.getSelection();
if (!location) {
@@ -130,7 +140,7 @@
getShell(),
ResourcesPlugin.getWorkspace().getRoot(),
false,
- "Select new file container");
+ CodegenWizardPlugin.getResourceString("page3.containerbox.title"));
if (dialog.open() == ContainerSelectionDialog.OK) {
Object[] result = dialog.getResult();
if (result.length == 1) {
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/WSDLFileSelectionPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/WSDLFileSelectionPage.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/WSDLFileSelectionPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/eclipse/pages/WSDLFileSelectionPage.java Tue May 24 19:42:12 2005
@@ -1,12 +1,21 @@
package org.apache.axis.tool.codegen.eclipse.pages;
import org.apache.axis.tool.codegen.eclipse.CodegenWizardPlugin;
+import org.eclipse.jface.dialogs.IDialogPage;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.layout.*;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.jface.viewers.*;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+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;
/**
* The first page of the code generator wizrad.
@@ -27,6 +36,7 @@
setTitle(CodegenWizardPlugin.getResourceString("page1.title"));
setDescription(CodegenWizardPlugin.getResourceString("page1.desc"));
this.selection = selection;
+ setImageDescriptor(CodegenWizardPlugin.getWizardImageDescriptor());
}
/**
@@ -110,6 +120,10 @@
setPageComplete(message == null);
}
+ /**
+ * Get the file name
+ * @return
+ */
public String getFileName() {
return fileText.getText();
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/resources/Codegen.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/resources/Codegen.properties?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/resources/Codegen.properties (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/codegen/resources/Codegen.properties Tue May 24 19:42:12 2005
@@ -5,24 +5,21 @@
#General
general.Error=Error
genearal.name=Axis2 Codegen Wizard
-#WSDL selection page
+############################################################################
+#WSDL selection page - Page1
#WSDL selection page name
page1.name=Axis2 Code generation wizard
-#WSDL selection page title
page1.title=WSDL selection page
-#WSDL selection page Description
page1.desc=Welcome to the Axis2 code generator wizard. Select the WSDL file
-#WSDL file selection label caption
+#labels
page1.fileselection.label=&WSDL file:
-#WSDL browse button caption
page1.fileselection.browse=Browse...
#Errors
page1.error.filemissingerror=File name should be specified
page1.error.wrongextension=File extension must be wsdl
#
###################################################################
-#Options page
-#Options selection page
+#Options - Page2
page2.name=Axis2 Code generation wizard
page2.title=Options
page2.desc=Set the options for the code generator
@@ -31,18 +28,20 @@
page2.sync.caption=Generate sync style only
page2.async.caption=Generate async style only
page2.package.caption=Set the package name
+page2.serverside.caption=Generate serverside code
#######################################################################
-#Output Page3
+#Output location selection - Page3
page3.name=Axis2 Code generation wizard
page3.title=Output
page3.desc=Set the output project for the generated code
#lables
page3.output.caption=Output path
page3.outselection.browse=Browse...
+page3.containerbox.title="Select new file container"
#errors
page3.error.nolocation=output location needs to be specified
#
##########################################################################
-# Wizard
+#Wizard
#Success message
wizard.success=Code generation successful!
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/control/Controller.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/control/Controller.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/control/Controller.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/control/Controller.java Tue May 24 19:42:12 2005
@@ -1,5 +1,9 @@
package org.apache.axis.tool.control;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
import org.apache.axis.tool.bean.Page1Bean;
import org.apache.axis.tool.bean.Page2Bean;
import org.apache.axis.tool.bean.Page3Bean;
@@ -8,10 +12,6 @@
import org.apache.axis.tool.core.FileCopier;
import org.apache.axis.tool.core.JarFileWriter;
import org.apache.axis.tool.core.ServiceFileCreator;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ClassFileHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ClassFileHandler.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ClassFileHandler.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ClassFileHandler.java Tue May 24 19:42:12 2005
@@ -1,7 +1,5 @@
package org.apache.axis.tool.core;
-import sun.misc.URLClassPath;
-
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
@@ -9,6 +7,8 @@
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Enumeration;
+
+import sun.misc.URLClassPath;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java Tue May 24 19:42:12 2005
@@ -1,10 +1,10 @@
package org.apache.axis.tool.core;
+import java.io.File;
+
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Copy;
import org.apache.tools.ant.types.FileSet;
-
-import java.io.File;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java Tue May 24 19:42:12 2005
@@ -1,10 +1,10 @@
package org.apache.axis.tool.core;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Jar;
-
import java.io.File;
import java.io.IOException;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Jar;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ServiceFileCreator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ServiceFileCreator.java?rev=178349&r1=178348&r2=178349&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ServiceFileCreator.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/ServiceFileCreator.java Tue May 24 19:42:12 2005
@@ -1,10 +1,10 @@
package org.apache.axis.tool.core;
-import org.apache.axis.tool.control.ProcessException;
-
import java.io.File;
import java.io.FileWriter;
import java.util.ArrayList;
+
+import org.apache.axis.tool.control.ProcessException;
/*
* Copyright 2004,2005 The Apache Software Foundation.