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 sa...@apache.org on 2007/03/28 12:25:24 UTC
svn commit: r523263 - in
/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools:
bean/ idea/ java2wsdl/
Author: sandakith
Date: Wed Mar 28 03:25:11 2007
New Revision: 523263
URL: http://svn.apache.org/viewvc?view=rev&rev=523263
Log:
revieved and commit the Axis2 - 2416
Thanks Shivantha
Modified:
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/BottomPanel.java
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/Java2WSDLFrame.java
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java
webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java?view=diff&rev=523263&r1=523262&r2=523263
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java Wed Mar 28 03:25:11 2007
@@ -47,7 +47,7 @@
public class CodegenBean {
- private String WSDLFileName = null;
+ private String WSDLFileName =null ;
private String output = ".";
private String packageName = URLProcessor.DEFAULT_PACKAGE;
private String language = "java";
@@ -63,16 +63,22 @@
private String portName;
private String databindingName;
- public void setNamespace2packageList(String namespace2packageList) {
- this.namespace2packageList = namespace2packageList;
- }
-
private String namespace2packageList;
+ private Definition wsdlDefinition = null;
+
private boolean defaultClient = true;
Project project;
+ private boolean isServerSideInterface = true;
+
+ public void setNamespace2packageList(String namespace2packageList) {
+ this.namespace2packageList = namespace2packageList;
+ }
+
+
+
public boolean isServerSideInterface() {
return isServerSideInterface;
}
@@ -81,7 +87,7 @@
isServerSideInterface = serverSideInterface;
}
- private boolean isServerSideInterface = true;
+
public boolean isDefaultClient() {
@@ -216,16 +222,16 @@
CommandLineOptionConstants.WSDL2JavaConstants.SERVICE_NAME_OPTION, getStringArray(serviceName)));
}
//server side interface mapping
- if (isServerSideInterface){
- optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION, new CommandLineOption(
- CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION, new String[0]));
- }
+ if (isServerSideInterface){
+ optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION, new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION, new String[0]));
+ }
//ns2pkg mapping
- if (namespace2packageList!= null){
- optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION, new CommandLineOption(
- CommandLineOptionConstants.WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION, getStringArray(namespace2packageList)));
- }
+ if (namespace2packageList!= null){
+ optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION, new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION, getStringArray(namespace2packageList)));
+ }
return optionMap;
}
@@ -278,6 +284,7 @@
new WSDL11ToAxisServiceBuilder(url.openConnection().getInputStream());
builder.setBaseUri(getBaseUri(wsdlURI));
+ builder.setCodegen(true);
return builder.populateService();
}
@@ -367,6 +374,7 @@
}
CodeGenConfiguration codegenConfig = new CodeGenConfiguration(fillOptionMap());
codegenConfig.addAxisService(getAxisService(WSDLFileName));
+ codegenConfig.setWsdlDefinition(wsdlDefinition);
//set the baseURI
codegenConfig.setBaseURI(getBaseUri(WSDLFileName));
new CodeGenerationEngine(codegenConfig).generate();
@@ -374,6 +382,7 @@
try {
CodeGenConfiguration codegenConfig = new CodeGenConfiguration(fillOptionMap());
codegenConfig.addAxisService(getAxisService(WSDLFileName));
+ codegenConfig.setWsdlDefinition(wsdlDefinition);
//set the baseURI
codegenConfig.setBaseURI(getBaseUri(WSDLFileName));
new CodeGenerationEngine(codegenConfig).generate();
@@ -388,14 +397,13 @@
}
}
- private Definition wsdlDefinition = null;
+
public void readWSDL() throws WSDLException {
+ WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
+ wsdlDefinition = reader.readWSDL(WSDLFileName) ;
- WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
- wsdlDefinition = reader.readWSDL(WSDLFileName);
-
}
//get the default package derived by the targetNamespace
@@ -455,14 +463,13 @@
public void setProject(Project project) {
this.project = project;
- System.out.println();
}
public File getTemp() {
String time = Calendar.getInstance().getTime().toString().replace(':', '-');
- File temp = new File(getActiveProject().getProjectFile().getParent().getPath() + File.separator + "temp-" + time);
+ File temp = new File( getActiveProject().getProjectFilePath() + File.separator + "temp-" + time);
return temp;
}
@@ -490,24 +497,16 @@
return null;
}
- /**
+ /*
* Returns the namespace map from definition
* @return
*/
- public Collection getDefinitionNamespaceMap(){
+ public Collection getDefinitionNamespaceMap(){
Map namespaces = wsdlDefinition.getNamespaces();
- ArrayList list = new ArrayList();
- String target = wsdlDefinition.getTargetNamespace();
- Iterator iterator = namespaces.values().iterator();
- while (iterator.hasNext())
- {
- String namespace = (String)iterator.next();
- if (!(namespace.equalsIgnoreCase(target)))
- list.add(namespace);
- }
- return list;
- }
+ return namespaces.values() ;
+
+ }
}
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java?view=diff&rev=523263&r1=523262&r2=523263
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java Wed Mar 28 03:25:11 2007
@@ -143,7 +143,7 @@
} catch (Exception e1) {
throw e1;
}
-
+
}
public void copyDirectory(File srcDir, File destDir) throws IOException {
@@ -193,7 +193,7 @@
compiler.compileSource(temp.getAbsolutePath());
String wsdl = codegenBean.getWSDLFileName();
final String name = wsdl.substring(wsdl.lastIndexOf(File.separatorChar) + 1, wsdl.lastIndexOf(".")) + "-stub";
- final File lib = new File(codegenBean.getActiveProject().getProjectFile().getParent().getPath() + File.separator + "lib");
+ final File lib = new File(codegenBean.getActiveProject().getProjectFilePath() + File.separator + "lib");
if (!lib.isDirectory()) {
lib.mkdir();
}
@@ -224,7 +224,7 @@
}
});
} catch (Exception e1) {
- throw e1;
+ throw e1;
}
finally {
@@ -242,7 +242,7 @@
} catch (WSDLException e) {
JOptionPane.showMessageDialog(this, "An error occured while parsing the " +
"specified WSDL. Please make sure that the selected file is a valid WSDL.",
- "Error!", JOptionPane.ERROR_MESSAGE);
+ "Error!", JOptionPane.ERROR_MESSAGE);
panleID--;
break;
}
@@ -251,7 +251,7 @@
this.secondPanel.setVisible(false);
this.plMiddle.setVisible(false);
if (this.optionPane.codegenBean == null)
- this.optionPane.setCodeGenBean(codegenBean);
+ this.optionPane.setCodeGenBean(codegenBean);
this.optionPane.setVisible(true);
this.outputpane.setVisible(false);
BottomPanel.setEnable(true,true, false, true);
@@ -263,7 +263,7 @@
this.secondPanel.setVisible(true);
if(this.secondPanel.codegenBean == null)
- this.secondPanel.setCodeGenBean(codegenBean);
+ this.secondPanel.setCodeGenBean(codegenBean);
this.secondPanel.setStatus();
this.plMiddle.setVisible(false);
this.optionPane.setVisible(false);
@@ -276,7 +276,7 @@
if (this.optionPane.radCustom.isSelected() && (result = validatePackageNames()) != null)
{
JOptionPane.showMessageDialog(this, "The package name " + result + " is not a valid package name",
- "Error!!!", JOptionPane.INFORMATION_MESSAGE);
+ "Error!!!", JOptionPane.INFORMATION_MESSAGE);
panleID--;
break;
}
@@ -297,29 +297,29 @@
public String validatePackageNames(){
if (!validatePackageName(this.secondPanel.txtPacakgeName.getText()))
- return this.secondPanel.txtPacakgeName.getText();
+ return this.secondPanel.txtPacakgeName.getText();
for(int count=0;count<this.secondPanel.table.getRowCount();count++){
if(!validatePackageName((String)this.secondPanel.table.getValueAt(count,1)))
- return (String)this.secondPanel.table.getValueAt(count,1);
+ return (String)this.secondPanel.table.getValueAt(count,1);
}
return null;
}
- public boolean validatePackageName(String name){
+ public boolean validatePackageName(String name){
- if(name.matches("[a-z]([a-z0-9_]+\\.?)+[a-z0-9_]"))
- return true;
+ if(name.matches("[a-z]([a-z0-9_]+\\.?)+[a-z0-9_]"))
+ return true;
- return false;
- }
+ return false;
+ }
public void backButtonImpl(){
panleID--;
switch (panleID) {
case 0: {
panel_3.setCaptions(" WSDL selection page"
- , " Welcome to the Axis2 code generation wizard. Select the WSDL file");
+ , " Welcome to the Axis2 code generation wizard. Select the WSDL file");
this.secondPanel.setVisible(false);
this.plMiddle.setVisible(true);
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java?view=diff&rev=523263&r1=523262&r2=523263
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java Wed Mar 28 03:25:11 2007
@@ -133,26 +133,26 @@
{
flag = false;
- if (count == 0) {
- radCurrentProject.setEnabled(false);
- cmbCurrentProject.setEnabled(false);
- cmbModuleSrc.setEnabled(false);
- lblCurrentProject.setEnabled(false);
- lblModuleSrc.setEnabled(false);
- radCustomLocation.setSelected(true);
- txtoutput.setEnabled(true);
- btwBrowse.setEnabled(true);
- }
- else{
- radCurrentProject.setEnabled(true);
- cmbCurrentProject.setEnabled(true);
- cmbModuleSrc.setEnabled(true);
- lblCurrentProject.setEnabled(true);
- lblModuleSrc.setEnabled(true);
- radCurrentProject.setSelected(true);
- txtoutput.setEnabled(false);
- btwBrowse.setEnabled(false);
- }
+ if (count == 0) {
+ radCurrentProject.setEnabled(false);
+ cmbCurrentProject.setEnabled(false);
+ cmbModuleSrc.setEnabled(false);
+ lblCurrentProject.setEnabled(false);
+ lblModuleSrc.setEnabled(false);
+ radCustomLocation.setSelected(true);
+ txtoutput.setEnabled(true);
+ btwBrowse.setEnabled(true);
+ }
+ else{
+ radCurrentProject.setEnabled(true);
+ cmbCurrentProject.setEnabled(true);
+ cmbModuleSrc.setEnabled(true);
+ lblCurrentProject.setEnabled(true);
+ lblModuleSrc.setEnabled(true);
+ radCurrentProject.setSelected(true);
+ txtoutput.setEnabled(false);
+ btwBrowse.setEnabled(false);
+ }
}
}
@@ -187,72 +187,72 @@
}
else if (obj == cmbCurrentProject) {
loadcmbModuleSrcProject();
+ }
}
-}
-class OutPutPaneLayout implements LayoutManager {
+ class OutPutPaneLayout implements LayoutManager {
- public OutPutPaneLayout() {
- }
+ public OutPutPaneLayout() {
+ }
- public void addLayoutComponent(String name, Component comp) {
- }
+ public void addLayoutComponent(String name, Component comp) {
+ }
- public void removeLayoutComponent(Component comp) {
- }
+ public void removeLayoutComponent(Component comp) {
+ }
- public Dimension preferredLayoutSize(Container parent) {
- Dimension dim = new Dimension(0, 0);
+ public Dimension preferredLayoutSize(Container parent) {
+ Dimension dim = new Dimension(0, 0);
- Insets insets = parent.getInsets();
- dim.width = 611 + insets.left + insets.right;
- dim.height = 600 + insets.top + insets.bottom;
+ Insets insets = parent.getInsets();
+ dim.width = 611 + insets.left + insets.right;
+ dim.height = 600 + insets.top + insets.bottom;
- return dim;
- }
+ return dim;
+ }
- public Dimension minimumLayoutSize(Container parent) {
- return new Dimension(0, 0);
- }
+ public Dimension minimumLayoutSize(Container parent) {
+ return new Dimension(0, 0);
+ }
- public void layoutContainer(Container parent) {
- Insets insets = parent.getInsets();
+ public void layoutContainer(Container parent) {
+ Insets insets = parent.getInsets();
- Component c;
- c = parent.getComponent(2);
- if (c.isVisible()) {
- c.setBounds(insets.left + 8, insets.top + 8, 350, 24);
- }
- c = parent.getComponent(3);
- if (c.isVisible()) {
- c.setBounds(insets.left + 30, insets.top + 40, 150, 24);
- }
- c = parent.getComponent(5);
- if (c.isVisible()) {
- c.setBounds(insets.left + 200, insets.top + 40, 330, 24);
- }
- c = parent.getComponent(6);
- if (c.isVisible()) {
- c.setBounds(insets.left + 30, insets.top + 70, 150, 24);
- }
- c = parent.getComponent(7);
- if (c.isVisible()) {
- c.setBounds(insets.left + 200, insets.top + 70, 330, 24);
- }
- c = parent.getComponent(4);
- if (c.isVisible()) {
- c.setBounds(insets.left + 8, insets.top + 100, 350, 24);
- }
- c = parent.getComponent(0);
- if (c.isVisible()) {
- c.setBounds(insets.left + 30, insets.top + 130, 150, 24);
- }
- c = parent.getComponent(1);
- if (c.isVisible()) {
- c.setBounds(insets.left + 200, insets.top + 130, 150, 24);
+ Component c;
+ c = parent.getComponent(2);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 8, insets.top + 8, 350, 24);
+ }
+ c = parent.getComponent(3);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 30, insets.top + 40, 150, 24);
+ }
+ c = parent.getComponent(5);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 200, insets.top + 40, 330, 24);
+ }
+ c = parent.getComponent(6);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 30, insets.top + 70, 150, 24);
+ }
+ c = parent.getComponent(7);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 200, insets.top + 70, 330, 24);
+ }
+ c = parent.getComponent(4);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 8, insets.top + 100, 350, 24);
+ }
+ c = parent.getComponent(0);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 30, insets.top + 130, 150, 24);
+ }
+ c = parent.getComponent(1);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 200, insets.top + 130, 150, 24);
+ }
}
}
-}
}
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java?view=diff&rev=523263&r1=523262&r2=523263
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java Wed Mar 28 03:25:11 2007
@@ -85,7 +85,7 @@
setFont(new Font("Helvetica", Font.PLAIN, 12));
setLayout(customLayout);
-
+
lblLangauge = new JLabel("Select the output language");
add(lblLangauge);
@@ -215,19 +215,20 @@
}
/**
- * Loads the namespaces
- * @param namespaceMap
- */
- private void loadNamespaces(Collection namespaceMap){
- Iterator namespaces = namespaceMap.iterator();
+ * Loads the namespaces
+ * @param namespaceMap
+ */
+ private void loadNamespaces(Collection namespaceMap){
+
+ Iterator namespaces = namespaceMap.iterator();
Object tableData [][] = new Object[namespaceMap.size()][2];
int i = 0;
while(namespaces.hasNext()){
- String namespace = (String)namespaces.next();
- tableData[i][0] = namespace;
- tableData[i][1] = getPackageFromNamespace(namespace);
- i++;
+ String namespace = (String)namespaces.next();
+ tableData[i][0] = namespace;
+ tableData[i][1] = getPackageFromNamespace(namespace);
+ i++;
}
model.setTableData(tableData);
@@ -236,11 +237,11 @@
}
/**
- * get the package derived by Namespace
- */
- public String getPackageFromNamespace(String namespace){
- return URLProcessor.makePackageName(namespace);
- }
+ * get the package derived by Namespace
+ */
+ public String getPackageFromNamespace(String namespace){
+ return URLProcessor.makePackageName(namespace);
+ }
public void fillBean() {
int index = cmbLan.getSelectedIndex();
@@ -273,12 +274,12 @@
if (clientSide.isSelected()){
- if (rdasync.isSelected()) {
- codegenBean.setAsyncOnly(true);
- }
- else if (rdsyn.isSelected()) {
- codegenBean.setSyncOnly(true);
- }
+ if (rdasync.isSelected()) {
+ codegenBean.setAsyncOnly(true);
+ }
+ else if (rdsyn.isSelected()) {
+ codegenBean.setSyncOnly(true);
+ }
}
else if (serverSide.isSelected()) {
@@ -289,21 +290,21 @@
if (serverSideInterface.isSelected())
codegenBean.setServerSideInterface(true);
else
- codegenBean.setServerSideInterface(false);
+ codegenBean.setServerSideInterface(false);
}
else {
- codegenBean.setGenerateAll(true);
+ codegenBean.setGenerateAll(true);
-}
+ }
if (chkTestCase.isSelected()) {
codegenBean.setTestCase(true);
}
else
- codegenBean.setTestCase(false);
+ codegenBean.setTestCase(false);
codegenBean.setPackageName(txtPacakgeName.getText());
codegenBean.setServiceName(cmbServiceName.getSelectedItem().toString());
- codegenBean.setServiceName(cmbPortName.getSelectedItem().toString());
+ codegenBean.setPortName(cmbPortName.getSelectedItem().toString());
codegenBean.setNamespace2packageList(getNs2PkgMapping());
}
@@ -311,19 +312,19 @@
* get the package to namespace mappings
* @return
*/
- public String getNs2PkgMapping(){
- String returnList="";
- String packageValue;
- for (int i=0;i<table.getRowCount();i++){
- packageValue = (String)table.getValueAt(i,1);
- returnList = returnList +
- ("".equals(returnList)?"":",") +
- (String)table.getValueAt(i,0)+ "=" + packageValue;
+ public String getNs2PkgMapping(){
+ String returnList="";
+ String packageValue;
+ for (int i=0;i<table.getRowCount();i++){
+ packageValue = (String)table.getValueAt(i,1);
+ returnList = returnList +
+ ("".equals(returnList)?"":",") +
+ (String)table.getValueAt(i,0)+ "=" + packageValue;
- }
- return "".equals(returnList)?null:returnList;
- }
+ }
+ return "".equals(returnList)?null:returnList;
+ }
public void actionPerformed(ActionEvent e) {
Object obj = e.getSource();
@@ -331,12 +332,12 @@
int selindex = cmbServiceName.getSelectedIndex();
if (selindex>=0)
{
- java.util.List ports = codegenBean.getPortNameList((QName) serviceNameList.get(selindex));
- cmbPortName.removeAllItems();
- for (int i = 0; i < ports.size(); i++) {
- String portName = (String) ports.get(i);
- cmbPortName.addItem(portName);
- }
+ java.util.List ports = codegenBean.getPortNameList((QName) serviceNameList.get(selindex));
+ cmbPortName.removeAllItems();
+ for (int i = 0; i < ports.size(); i++) {
+ String portName = (String) ports.get(i);
+ cmbPortName.addItem(portName);
+ }
}
}
else if (obj == serverSide){
@@ -350,7 +351,7 @@
}
else
{
- rdasync.setEnabled(false);
+ rdasync.setEnabled(false);
rdBoth.setEnabled(false);
rdsyn.setEnabled(false);
chkTestCase.setEnabled(false);
@@ -377,7 +378,7 @@
serverSideInterface.setEnabled(false);
}
}
- else if (obj == all){
+ else if (obj == all){
if(all.isSelected()){
rdasync.setEnabled(false);
rdBoth.setEnabled(false);
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/BottomPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/BottomPanel.java?view=diff&rev=523263&r1=523262&r2=523263
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/BottomPanel.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/BottomPanel.java Wed Mar 28 03:25:11 2007
@@ -62,14 +62,13 @@
if (java2WSDLFrame.plMiddle .isVisible() ) {
if(java2WSDLFrame.plMiddle.testLoading()){
- java2WSDLFrame.increasePanelID();
+
java2WSDLFrame.setPanel();
}else
setEnable(false,false,false,true);
}else if(java2WSDLFrame.opPanel.isVisible()){
- java2WSDLFrame.increasePanelID();
java2WSDLFrame.setPanel();
}
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/Java2WSDLFrame.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/Java2WSDLFrame.java?view=diff&rev=523263&r1=523262&r2=523263
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/Java2WSDLFrame.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/Java2WSDLFrame.java Wed Mar 28 03:25:11 2007
@@ -17,7 +17,7 @@
OutputPanel outPanel;
- private int panleID = 0;
+ private int panleID = 1;
private ClassLoader classLoader;
Project project;
@@ -82,9 +82,6 @@
public void setClassLoader(ClassLoader classLoader) {
this.classLoader = classLoader;
}
- public void increasePanelID() {
- panleID++;
- }
public void generatecode() throws Exception {
@@ -99,7 +96,7 @@
switch (panleID) {
case 1:{
this.imgPanel .setCaptions(" Java source/classpath selection" ,
- " Welcome to the Axis2 Java source code generation wizard.");
+ " Select the classes and the libraries.");
this.plMiddle .setVisible(true);
@@ -112,23 +109,21 @@
break;
}
case 2: {
- this.imgPanel .setCaptions(" Options"
- , " Select from custom or default");
-
+ this.imgPanel .setCaptions(" Java to WSDL Options " ,
+ " Set the Options for the generator.");
this.plMiddle .setVisible(false);
this.opPanel.setVisible(true);
this.outPanel .setVisible(false);
- plBottom.setEnable(true,true, false, true);
+ plBottom.setEnable(true,true, true, true);
break;
}
case 3: {
- this.imgPanel .setCaptions(" Options"
- , " Select from custom or default");
-
+ this.imgPanel .setCaptions(" WSDL file Output location " ,
+ " Select the location for the generated WSDL.");
this.plMiddle .setVisible(false);
this.opPanel.setVisible(false);
@@ -148,33 +143,48 @@
case 1: {
this.imgPanel .setCaptions(" Java source/classpath selection" ,
- " Welcome to the Axis2 Java source code generation wizard.");
+ " Select the classes and the libraries.");
+
this.opPanel.setVisible(false);
+
this.plMiddle.setVisible(true);
+
this.outPanel.setVisible(false);
+
BottomPanel.setEnable(false,true, false, true);
+
break;
}
case 2: {
- this.imgPanel .setCaptions(" Options"
- , " Select from custom or default");
+ this.imgPanel .setCaptions(" Java to WSDL Options " ,
+ " Set the Options for the generator.");
+
this.plMiddle .setVisible(false);
+
this.outPanel.setVisible(false);
+
this.opPanel.setVisible(true);
- BottomPanel.setEnable(true,true, false, true);
+
+ BottomPanel.setEnable(true,true, true, true);
+
break;
}
case 3: {
- this.imgPanel .setCaptions(" Options"
- , " Select from custom or default");
+ this.imgPanel .setCaptions(" WSDL file Output location " ,
+ " Select the location for the generated WSDL.");
+
this.plMiddle .setVisible(false);
+
this.outPanel.setVisible(true);
+
this.opPanel.setVisible(false);
+
BottomPanel.setEnable(true,false, true, true);
+
break;
}
@@ -230,7 +240,7 @@
}
c = parent.getComponent(1);
if (c.isVisible()) {
- c.setBounds(insets.left, insets.top + 525, 500, 50);
+ c.setBounds(insets.left, insets.top + 525, 500, 50);
}
}
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java?view=diff&rev=523263&r1=523262&r2=523263
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java Wed Mar 28 03:25:11 2007
@@ -35,11 +35,11 @@
DefaultListModel listModel;
private String hint ="Hint : Please give the fully qualified class name, example :com.foo.BarService\n" +
- " Then add the folder or the jar file which contains that class file.\n" +
- " Finally check whether the class file can be loaded from the plugin.\n\n" +
- " If the class that you are going to load contains any dependencies\n" +
- " on other axis2 libraries ( for example like axiom*.jar), please add those\n" +
- " libraries as well and try to load the class.";
+ " Then add the folder or the jar file which contains that class file.\n" +
+ " Finally check whether the class file can be loaded from the plugin.\n\n" +
+ " If the class that you are going to load contains any dependencies\n" +
+ " on other axis2 libraries ( for example like axiom*.jar), please add those\n" +
+ " libraries as well and try to load the class.";
final JFileChooser FileChooser =new JFileChooser();
final JFileChooser DirChooser=new JFileChooser();
@@ -162,7 +162,6 @@
}
private void setDefaultPathAndName(File file) {
String defualtOutPutPath=file.getParent();
- System.out.println(defualtOutPutPath );
wsdlgenBean.setOutputLocation(defualtOutPutPath );
wsdlgenBean.setOutputWSDLName("services.wsdl");
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java?view=diff&rev=523263&r1=523262&r2=523263
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java Wed Mar 28 03:25:11 2007
@@ -117,7 +117,7 @@
}
-class OptionLayout implements LayoutManager {
+class OptionLayout implements LayoutManager {
public OptionLayout (){
@@ -143,9 +143,11 @@
}
public void layoutContainer(Container parent) {
+
Insets insets = parent.getInsets();
Component c;
+
c = parent.getComponent(0);
if (c.isVisible()) {
c.setBounds(insets.left + 24, insets.top +20,200, 24);
@@ -178,14 +180,15 @@
if (c.isVisible()) {
c.setBounds(insets.left + 225, insets.top + 140, 275, 24);
}
- /*c = parent.getComponent(8);
- if (c.isVisible()) {
- c.setBounds(insets.left + 24, insets.top + 150, 200, 24);
- }
- c = parent.getComponent(9);
- if (c.isVisible()) {
- c.setBounds(insets.left + 225, insets.top + 150, 275, 24);
- } */
+ c = parent.getComponent(8);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 24, insets.top + 180, 200, 24);
+ }
+ c = parent.getComponent(9);
+ if (c.isVisible()) {
+ c.setBounds(insets.left + 225, insets.top + 180, 275, 24);
+ }
+
}
Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java?view=diff&rev=523263&r1=523262&r2=523263
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java Wed Mar 28 03:25:11 2007
@@ -29,7 +29,7 @@
this.wsdlgenBean=wsdlgenBean;
- OptionLayout customLayout=new OptionLayout();
+ OutputLayout customLayout=new OutputLayout();
setLayout(customLayout);
setFont(new Font("Helvetica", Font.PLAIN, 12));
@@ -77,8 +77,6 @@
}
-
-
public void actionPerformed(ActionEvent e){
}
@@ -111,37 +109,38 @@
Insets insets = parent.getInsets();
Component c;
+
c = parent.getComponent(0);
if (c.isVisible()) {
- c.setBounds(insets.left + 24, insets.top + 30, 400, 24);
+ c.setBounds(insets.left + 24, insets.top + 10, 400, 24);
}
c = parent.getComponent(1);
if (c.isVisible()) {
- c.setBounds(insets.left + 24, insets.top + 80, 400, 24);
+ c.setBounds(insets.left + 24, insets.top + 40, 400, 24);
}
c = parent.getComponent(2);
if (c.isVisible()) {
- c.setBounds(insets.left + 24, insets.top + 110, 400, 24);
+ c.setBounds(insets.left + 24, insets.top + 70, 400, 24);
}
c = parent.getComponent(3);
if (c.isVisible()) {
- c.setBounds(insets.left + 24, insets.top + 140, 100, 24);
+ c.setBounds(insets.left + 24, insets.top + 110, 100, 24);
}
c = parent.getComponent(4);
if (c.isVisible()) {
- c.setBounds(insets.left + 200, insets.top + 140, 200, 24);
+ c.setBounds(insets.left + 130, insets.top + 110, 290, 24);
}
c = parent.getComponent(5);
if (c.isVisible()) {
- c.setBounds(insets.left + 350, insets.top + 140, 80, 24);
+ c.setBounds(insets.left + 420, insets.top + 110, 80, 24);
}
c = parent.getComponent(6);
if (c.isVisible()) {
- c.setBounds(insets.left + 24, insets.top + 170, 100, 24);
+ c.setBounds(insets.left + 24, insets.top + 150, 100, 24);
}
- c = parent.getComponent(6);
+ c = parent.getComponent(7);
if (c.isVisible()) {
- c.setBounds(insets.left + 200, insets.top + 170, 200, 24);
+ c.setBounds(insets.left + 130, insets.top + 150, 290, 24);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org