Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java?view=diff&rev=542211&r1=542210&r2=542211 ============================================================================== --- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java (original) +++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java Mon May 28 04:47:38 2007 @@ -1,206 +0,0 @@ -package org.apache.axis2.tools.idea; - -import org.apache.axis2.tools.bean.CodegenBean; - -import javax.swing.*; -import javax.xml.namespace.QName; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.util.ArrayList; - -import com.intellij.openapi.module.Module; - - -public class OptionPane extends JPanel implements ActionListener { - - - JLabel lblOption; - JRadioButton radDefaultClient; - JRadioButton radDefaultServer; - JRadioButton radDefaultBoth; - - JRadioButton radCustom; - ButtonGroup buttonGroup; - - CodegenBean codegenBean; - - QName serviceName; - String portName; - - public OptionPane() { - OptionPaneLayout customLayout = new OptionPaneLayout(); - - - setLayout(customLayout); - - lblOption = new JLabel(""); - add(lblOption); - - buttonGroup = new ButtonGroup(); - - radDefaultBoth = new JRadioButton("Generate both client and server code with default configurations", true); - buttonGroup.add(radDefaultBoth); - radDefaultBoth.setActionCommand("radDefaultBoth"); - add(radDefaultBoth); - radDefaultBoth.addActionListener(this); - - radDefaultClient = new JRadioButton("Generate client code with default configurations"); - radDefaultClient.setToolTipText("Generates the jar that contains the stub and places it in the lib folder under the project. The generated jar is added as a project dependancy "); - buttonGroup.add(radDefaultClient); - radDefaultClient.setActionCommand("radDefaultClient"); - add(radDefaultClient); - radDefaultClient.addActionListener(this); - - radDefaultServer = new JRadioButton("Generate Server code with default configurations"); - buttonGroup.add(radDefaultServer); - radDefaultServer.setActionCommand("radDefaultServer"); - radDefaultServer.setToolTipText("Generates the skeleton for the service and places it in a path specified by the user"); - add(radDefaultServer); - radDefaultServer.addActionListener(this); - - radCustom = new JRadioButton("Custom"); - buttonGroup.add(radCustom); - radCustom.setActionCommand("radCustom"); - radCustom.setToolTipText("Allows the user to choose custom settings for the generation process"); - add(radCustom); - radCustom.addActionListener(this); - - - setSize(getPreferredSize()); - - } - - - public void actionPerformed(ActionEvent e) { - - Object obj = e.getSource(); - - if (obj == radDefaultBoth) { - BottomPanel.setEnable(true,true, false, true); - } else if (obj == radDefaultClient) { - BottomPanel.setEnable(true,false, true, true); - } else if (obj == radDefaultServer) { - BottomPanel.setEnable(true,true, false, true); - } else if (obj == radCustom) { - BottomPanel.setEnable(true,true, false, true); - } - - } - - public void setDefaultBothConfigurations() { - - setDefaultCommonConfigurations(); - } - - public void setDefaultCommonConfigurations() { - - codegenBean.setLanguage("java"); - - codegenBean.setDatabindingName("adb"); - - codegenBean.setTestCase(false); - - codegenBean.setServiceName(serviceName.getLocalPart()); - - codegenBean.setPortName(portName); - - codegenBean.setPackageName("org.axis2"); - - - } - - public File setDefaultServerConfigurations() { - setDefaultCommonConfigurations(); - codegenBean.setServerSide(true); - codegenBean.setServerXML(true); - File temp = codegenBean.getTemp(); - codegenBean.setOutput(temp.getAbsolutePath()); - return temp; - - } - - public File setDefaultClientConfigurations() { - setDefaultCommonConfigurations(); - codegenBean.setServerSide(false); - codegenBean.setServerXML(false); - codegenBean.setPackageName(codegenBean.packageFromTargetNamespace()); - File temp = codegenBean.getTemp(); - codegenBean.setOutput(temp.getAbsolutePath()); - - return temp; - } - - public void setCodeGenBean(CodegenBean codegenBean) { - this.codegenBean = codegenBean; - java.util.List serviceList = new ArrayList(); - java.util.List portList = new ArrayList(); - - serviceList = codegenBean.getServiceList(); - if (serviceList.size() > 0) { - serviceName = (QName) serviceList.get(0); - portList = codegenBean.getPortNameList(serviceName); - } - if (portList.size() > 0) - portName = (String) portList.get(0); - - Module modules[] = codegenBean.getModules(); - if (modules == null){ - radDefaultBoth.setEnabled(false); - radDefaultClient.setEnabled(false); - radDefaultServer.setEnabled(false); - radCustom.setSelected(true); - } - } - - - class OptionPaneLayout implements LayoutManager { - public void removeLayoutComponent(Component comp) { - } - - public void layoutContainer(Container parent) { - Insets insets = parent.getInsets(); - - Component c; - c = parent.getComponent(0); - if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 8, 500, 24); - } - c = parent.getComponent(1); - if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 40, 500, 24); - } - c = parent.getComponent(2); - if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 70, 500, 24); - } - c = parent.getComponent(3); - if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 100, 500, 24); - } - c = parent.getComponent(4); - if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 130, 500, 24); - } - - } - - public void addLayoutComponent(String name, Component comp) { - } - - public Dimension minimumLayoutSize(Container parent) { - return null; - } - - public Dimension preferredLayoutSize(Container parent) { - Dimension dim = new Dimension(0, 0); - - Insets insets = parent.getInsets(); - dim.width = 565 + insets.left + insets.right; - dim.height = 600 + insets.top + insets.bottom; - - return dim; - } - } -}
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=542211&r1=542210&r2=542211 ============================================================================== --- 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 Mon May 28 04:47:38 2007 @@ -245,11 +245,11 @@ } c = parent.getComponent(0); if (c.isVisible()) { - c.setBounds(insets.left + 30, insets.top + 130, 150, 24); + c.setBounds(insets.left + 30, insets.top + 130, 350, 24); } c = parent.getComponent(1); if (c.isVisible()) { - c.setBounds(insets.left + 200, insets.top + 130, 150, 24); + c.setBounds(insets.left + 400, insets.top + 130, 80, 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=542211&r1=542210&r2=542211 ============================================================================== --- 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 Mon May 28 04:47:38 2007 @@ -4,13 +4,10 @@ import org.apache.axis2.util.URLProcessor; import javax.swing.*; -import javax.swing.table.TableModel; -import javax.swing.border.BevelBorder; import javax.xml.namespace.QName; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.Map; import java.util.Iterator; import java.util.Collection; @@ -35,6 +32,9 @@ public class SecondFrame extends JPanel implements ActionListener { + JLabel lblCodeGenOption; + JComboBox cmbCodeGenOption; + JLabel lblLangauge; JComboBox cmbLan; @@ -76,10 +76,17 @@ JTable table; + JScrollPane spTable; + CodegenBean codegenBean; + java.util.List serviceNameList; + QName serviceName; + String portName; + public SecondFrame() { + SecondFrameLayout customLayout = new SecondFrameLayout(); setFont(new Font("Helvetica", Font.PLAIN, 12)); @@ -128,8 +135,8 @@ cmbdbtype.setToolTipText("Select the databinding framework to be used in the generation process"); add(cmbdbtype); - chkTestCase = new JCheckBox("Generate Test Case", true); - chkTestCase.setVisible(false); + chkTestCase = new JCheckBox("Generate Test Case", false); + chkTestCase.setVisible(true); chkTestCase.setToolTipText("A test case will be generated if this is checked"); add(chkTestCase); @@ -145,7 +152,7 @@ buttonGroup = new ButtonGroup(); - rdBoth = new JRadioButton("Generate both sync and async", true); + rdBoth = new JRadioButton("Generate both sync and async", false); buttonGroup.add(rdBoth); add(rdBoth); @@ -165,11 +172,11 @@ serverSide.addActionListener(this); add(serverSide); - serviceXML = new JCheckBox("Generate default service.xml", true); + serviceXML = new JCheckBox("Generate default service.xml", false); serviceXML.setEnabled(false); add(serviceXML); - serverSideInterface = new JCheckBox("Generate an interface for skeleton", true); + serverSideInterface = new JCheckBox("Generate an interface for skeleton", false); serverSideInterface.setEnabled(false); add(serverSideInterface); @@ -189,12 +196,45 @@ model = new PackageNameTableModel(new Object [1][2]); table = new JTable(model); - add(new JScrollPane(table)); + spTable=new JScrollPane(table); + add(spTable); + + lblCodeGenOption =new JLabel("Codegen Option"); + add(lblCodeGenOption ); + + cmbCodeGenOption =new JComboBox(); + cmbCodeGenOption .addItem("default"); + cmbCodeGenOption .addItem("custom"); + cmbCodeGenOption .setToolTipText("Select the Codegen option"); + cmbCodeGenOption.addActionListener(this); + add(cmbCodeGenOption ); + + enabel(); Dimension dim = new Dimension(450, 600); setSize(dim); } + private void enabel(){ + cmbdbtype .setEnabled(false); + cmbLan .setEnabled(false); + cmbPortName .setEnabled(false); + cmbServiceName .setEnabled(false); + txtPacakgeName.setEnabled(false); + chkTestCase.setEnabled(false); + clientSide .setEnabled(false); + rdsyn .setEnabled(false); + rdBoth .setEnabled(false); + rdasync .setEnabled(false); + serverSide .setEnabled(false); + serverSideInterface .setEnabled(false); + serviceXML .setEnabled(false); + all.setEnabled(false); + table.setEnabled(false); + spTable.setEnabled(false); + + + } public void setCodeGenBean(CodegenBean codegenBean) { this.codegenBean = codegenBean; setStatus(); @@ -236,6 +276,35 @@ } + public void setDefaultBothConfigurations() { + + setDefaultCommonConfigurations(); + } + + public void setDefaultCommonConfigurations() { + + setStatus(); + + codegenBean.setLanguage("java"); + + codegenBean.setDatabindingName("adb"); + + codegenBean.setTestCase(false); + + codegenBean.setServerSide(false); + + codegenBean.setPackageName(codegenBean.packageFromTargetNamespace()); + + codegenBean.setServerXML(false); + + codegenBean.setServiceName(cmbServiceName.getSelectedItem().toString() ); + + codegenBean.setPortName(cmbPortName .getSelectedItem().toString()); + + codegenBean.setNamespace2packageList(getNs2PkgMapping()); + + } + /** * get the package derived by Namespace */ @@ -294,14 +363,13 @@ } else { codegenBean.setGenerateAll(true); - - } if (chkTestCase.isSelected()) { codegenBean.setTestCase(true); } else codegenBean.setTestCase(false); + codegenBean.setPackageName(txtPacakgeName.getText()); codegenBean.setServiceName(cmbServiceName.getSelectedItem().toString()); codegenBean.setPortName(cmbPortName.getSelectedItem().toString()); @@ -309,9 +377,9 @@ } /** - * get the package to namespace mappings - * @return - */ + * get the package to namespace mappings + * @return + */ public String getNs2PkgMapping(){ String returnList=""; String packageValue; @@ -321,14 +389,52 @@ ("".equals(returnList)?"":",") + (String)table.getValueAt(i,0)+ "=" + packageValue; - } return "".equals(returnList)?null:returnList; } - + private void setDefault(){ + buttonGroup.setSelected(rdasync.getModel(),false); + buttonGroup.setSelected(rdsyn .getModel(),false); + buttonGroup.setSelected(rdBoth.getModel(),false); + rdasync .setSelected(false); + rdsyn .setSelected(false); + rdBoth .setSelected(false); + serviceXML .setSelected(false); + serverSideInterface .setSelected(false); + BottomPanel.setEnable(true,true,false,true); + } public void actionPerformed(ActionEvent e) { Object obj = e.getSource(); - if (obj == cmbServiceName) { + if(obj == cmbCodeGenOption ){ + if(cmbCodeGenOption.getSelectedItem().equals("custom") ){ + setDefault(); + cmbdbtype .setEnabled(true); + cmbLan .setEnabled(true); + cmbPortName .setEnabled(true); + cmbServiceName .setEnabled(true); + txtPacakgeName.setEnabled(true); + chkTestCase.setEnabled(true); + clientSide .setEnabled(true); + rdsyn .setEnabled(true); + rdBoth .setEnabled(true); + rdasync .setEnabled(true); + serverSide .setEnabled(true); + serverSideInterface .setEnabled(false); + serviceXML .setEnabled(false); + all.setEnabled(true); + table.setEnabled(true); + spTable.setEnabled(true); + clientSide.setSelected(true); + rdBoth .setSelected(true); + BottomPanel.setEnable(true,true,false,true); + }else { + clientSide.setSelected(true); + rdBoth .setSelected(true); + setDefault(); + enabel(); + } + + }else if (obj == cmbServiceName) { int selindex = cmbServiceName.getSelectedIndex(); if (selindex>=0) { @@ -341,38 +447,24 @@ } } else if (obj == serverSide){ - if(clientSide.isSelected()){ - rdasync.setEnabled(true); - rdBoth.setEnabled(true); - rdsyn.setEnabled(true); - chkTestCase.setEnabled(true); - serviceXML.setEnabled(false); - serverSideInterface.setEnabled(false); - } - else - { + if(serverSide.isSelected() ) { + setDefault(); rdasync.setEnabled(false); rdBoth.setEnabled(false); rdsyn.setEnabled(false); - chkTestCase.setEnabled(false); serviceXML.setEnabled(true); serverSideInterface.setEnabled(true); + chkTestCase.setEnabled(false); + } } else if (obj == clientSide){ - if(serverSide.isSelected()){ - rdasync.setEnabled(false); - rdBoth.setEnabled(false); - rdsyn.setEnabled(false); - serviceXML.setEnabled(true); - chkTestCase.setEnabled(false); - serverSideInterface.setEnabled(true); - } - else - { + if(clientSide.isSelected() ) { + setDefault(); rdasync.setEnabled(true); rdBoth.setEnabled(true); rdsyn.setEnabled(true); + rdBoth .setSelected(true); chkTestCase.setEnabled(true); serviceXML.setEnabled(false); serverSideInterface.setEnabled(false); @@ -380,6 +472,7 @@ } else if (obj == all){ if(all.isSelected()){ + setDefault(); rdasync.setEnabled(false); rdBoth.setEnabled(false); rdsyn.setEnabled(false); @@ -388,7 +481,6 @@ chkTestCase.setEnabled(true); } - } } } @@ -426,51 +518,51 @@ // Language selection c = parent.getComponent(0); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 10, 192, 24); + c.setBounds(insets.left + 8, insets.top + 40, 192, 24); } c = parent.getComponent(1); if (c.isVisible()) { - c.setBounds(insets.left + 272, insets.top + 10, 250, 24); + c.setBounds(insets.left + 272, insets.top + 40, 250, 24); } // Service Name selection c = parent.getComponent(2); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 40, 192, 24); + c.setBounds(insets.left + 8, insets.top + 70, 192, 24); } c = parent.getComponent(3); if (c.isVisible()) { - c.setBounds(insets.left + 272, insets.top + 40, 250, 24); + c.setBounds(insets.left + 272, insets.top + 70, 250, 24); } // Port Name Selection c = parent.getComponent(4); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 70, 192, 24); + c.setBounds(insets.left + 8, insets.top + 100, 192, 24); } c = parent.getComponent(5); if (c.isVisible()) { - c.setBounds(insets.left + 272, insets.top + 70, 250, 24); + c.setBounds(insets.left + 272, insets.top + 100, 250, 24); } // Data Binding Selection - c = parent.getComponent(6); + c = parent.getComponent(8); if (c.isVisible()) { c.setBounds(insets.left + 8, insets.top + 130, 192, 24); } - c = parent.getComponent(7); + c = parent.getComponent(9); if (c.isVisible()) { c.setBounds(insets.left + 272, insets.top + 130, 250, 24); } //Package NAme Selection - c = parent.getComponent(8); + c = parent.getComponent(6); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 100, 192, 24); + c.setBounds(insets.left + 8, insets.top + 160, 192, 24); } - c = parent.getComponent(9); + c = parent.getComponent(7); if (c.isVisible()) { - c.setBounds(insets.left + 272, insets.top + 100, 250, 24); + c.setBounds(insets.left + 272, insets.top + 160, 250, 24); } @@ -478,87 +570,97 @@ // Test Case Selection c = parent.getComponent(10); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 160, 208, 24); + c.setBounds(insets.left + 8, insets.top + 185, 208, 24); } // JSeperator c = parent.getComponent(11); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 187, 530, 2); + c.setBounds(insets.left + 8, insets.top + 212, 530, 2); } // Client side options c = parent.getComponent(12); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 190, 168, 24); + c.setBounds(insets.left + 8, insets.top + 215, 168, 24); } // Service invocation both,sync,async c = parent.getComponent(13); if (c.isVisible()) { - c.setBounds(insets.left + 48, insets.top + 220, 210, 24); + c.setBounds(insets.left + 48, insets.top + 240, 210, 24); } c = parent.getComponent(14); if (c.isVisible()) { - c.setBounds(insets.left + 260, insets.top + 220, 140, 24); + c.setBounds(insets.left + 260, insets.top + 240, 140, 24); } c = parent.getComponent(15); if (c.isVisible()) { - c.setBounds(insets.left + 400, insets.top + 220, 145, 24); + c.setBounds(insets.left + 400, insets.top + 240, 145, 24); } // JSeperator c = parent.getComponent(16); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 247, 530, 2); + c.setBounds(insets.left + 8, insets.top + 267, 530, 2); } // Server side options c = parent.getComponent(17); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 250, 168, 24); + c.setBounds(insets.left + 8, insets.top + 270, 168, 24); } // Generate serverside, generate service XML c = parent.getComponent(18); if (c.isVisible()) { - c.setBounds(insets.left + 48, insets.top + 280, 200, 24); + c.setBounds(insets.left + 48, insets.top + 290, 200, 24); } c = parent.getComponent(19); if (c.isVisible()) { - c.setBounds(insets.left + 248, insets.top + 280, 250, 24); + c.setBounds(insets.left + 248, insets.top + 290, 250, 24); } // JSeperator c = parent.getComponent(20); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 307, 530, 2); + c.setBounds(insets.left + 8, insets.top + 317, 530, 2); } c = parent.getComponent(21); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 310, 200, 24); + c.setBounds(insets.left + 8, insets.top + 320, 200, 24); } // JSeperator c = parent.getComponent(22); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 337, 530, 2); + c.setBounds(insets.left + 8, insets.top + 347, 530, 2); } c = parent.getComponent(23); if (c.isVisible()) { - c.setBounds(insets.left + 8, insets.top + 340, 250, 24); + c.setBounds(insets.left + 8, insets.top + 350, 250, 24); } c = parent.getComponent(24); if (c.isVisible()) { c.setBounds(insets.left + 8, insets.top + 370, 522, 85); + } + + //Codegen Option + c = parent.getComponent(25); + if (c.isVisible()) { + c.setBounds(insets.left + 8, insets.top + 10, 192, 24); + } + c = parent.getComponent(26); + if (c.isVisible()) { + c.setBounds(insets.left + 272, insets.top + 10, 250, 24); } 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=542211&r1=542210&r2=542211 ============================================================================== --- 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 Mon May 28 04:47:38 2007 @@ -69,7 +69,18 @@ }else if(java2WSDLFrame.opPanel.isVisible()){ - java2WSDLFrame.setPanel(); + if( java2WSDLFrame.opPanel .txtService .getText().trim().equals("")){ + JOptionPane.showMessageDialog(java2WSDLFrame, + " Service name should be specified. ", + "Error!", + JOptionPane.ERROR_MESSAGE); + java2WSDLFrame.repaint(); + setEnable(true,false,false,true); + return; + }else{ + setEnable(true,true,true,true); + java2WSDLFrame.setPanel(); + } } @@ -83,20 +94,71 @@ Thread.currentThread().setContextClassLoader(java2WSDLFrame.getClassLoader()); } else if(obj ==btnFinish ){ - try { + java2WSDLFrame.outPanel.setOutput(); + java2WSDLFrame.opPanel .setNamespaceDefaults(); + + File outputDir = new File(java2WSDLFrame.outPanel .txtLocation .getText().trim()); + String outputName=java2WSDLFrame.outPanel.txtFileName.getText().trim(); + + if(java2WSDLFrame.opPanel.txtService .getText() .trim() .equals("") ){ + JOptionPane.showMessageDialog(java2WSDLFrame, + " Service name should be specified. ", + "Error!", + JOptionPane.ERROR_MESSAGE); + java2WSDLFrame.repaint(); + setEnable(true,false,false,true); + return; + } + + if (java2WSDLFrame.outPanel .rbtnSave .isSelected() ) + { + if(!outputDir.isDirectory() && !new FileFilter() .accept(outputName )){ + JOptionPane.showMessageDialog(java2WSDLFrame, + "Input a proper location for the output and name for WSDL.", + "Error!", + JOptionPane.ERROR_MESSAGE); + java2WSDLFrame.repaint(); + setEnable(true,false,false,true); + return; + } + if (!outputDir.isDirectory()) + { + JOptionPane.showMessageDialog(java2WSDLFrame, + "The Output Directory specified is invalid. Please provide a valid directory", + "Error!", + JOptionPane.ERROR_MESSAGE); + java2WSDLFrame.repaint(); + setEnable(true,false,false,true); + return; + } + if(!new FileFilter() .accept(outputName ) ){ + JOptionPane.showMessageDialog(java2WSDLFrame, + "Input a valid file name , Example : services.wsdl or services.xml", + "Error!", + JOptionPane.ERROR_MESSAGE); + java2WSDLFrame.repaint(); + setEnable(true,false,false,true); + return; + } + } + try { java2WSDLFrame.generatecode(); StringWriter writer = new StringWriter(); - JOptionPane.showMessageDialog(java2WSDLFrame, "Code genaration Successful !" + writer.toString(), - "Axis2 code generation", JOptionPane.INFORMATION_MESSAGE ); + JOptionPane.showMessageDialog(java2WSDLFrame, + "Code genaration Successful !" + writer.toString(), + "Axis2 code generation", + JOptionPane.INFORMATION_MESSAGE ); java2WSDLFrame.dispose(); } catch (Exception e1) { StringWriter writer = new StringWriter(); - JOptionPane.showMessageDialog(java2WSDLFrame, "Code genaration failed!" + writer.toString(), - "Axis2 code generation", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(java2WSDLFrame, + "Code genaration failed!" + writer.toString(), + "Axis2 code generation", + JOptionPane.ERROR_MESSAGE); java2WSDLFrame.dispose(); } 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=542211&r1=542210&r2=542211 ============================================================================== --- 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 Mon May 28 04:47:38 2007 @@ -22,7 +22,7 @@ Project project; private WsdlgenBean wsdlgenBean; - + private int defaultCloseOperation; public Java2WSDLFrame (){ windowLayout customLayout = new windowLayout(1); @@ -59,7 +59,7 @@ //add option panel - outPanel=new OutputPanel(wsdlgenBean); + outPanel=new OutputPanel(this,wsdlgenBean); outPanel .setVisible(false); getContentPane() .add(outPanel); @@ -73,9 +73,36 @@ } + + public void setDefaultCloseOperation(int operation) { + if (operation != DO_NOTHING_ON_CLOSE && + operation != HIDE_ON_CLOSE && + operation != DISPOSE_ON_CLOSE && + operation != EXIT_ON_CLOSE) { + throw new IllegalArgumentException("defaultCloseOperation must be one of: DO_NOTHING_ON_CLOSE, HIDE_ON_CLOSE, DISPOSE_ON_CLOSE, or EXIT_ON_CLOSE"); + } + if (this.defaultCloseOperation != operation) { + if (operation == EXIT_ON_CLOSE) { + SecurityManager security = System.getSecurityManager(); + if (security != null) { + security.checkExit(0); + } + } + int oldValue = this.defaultCloseOperation; + this.defaultCloseOperation = operation; + firePropertyChange("defaultCloseOperation", oldValue, operation); + } + } + public void setProject(Project project) { this.project = project; } + + public Project getActiveProject() { + return project; + + } + public ClassLoader getClassLoader() { return classLoader; } @@ -245,4 +272,4 @@ } -} \ No newline at end of file +} 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=542211&r1=542210&r2=542211 ============================================================================== --- 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 Mon May 28 04:47:38 2007 @@ -4,7 +4,6 @@ import org.apache.axis2.tools.bean.WsdlgenBean; import javax.swing.*; -import javax.swing.border.EtchedBorder; import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; @@ -162,8 +161,8 @@ } private void setDefaultPathAndName(File file) { String defualtOutPutPath=file.getParent(); - wsdlgenBean.setOutputLocation(defualtOutPutPath ); - wsdlgenBean.setOutputWSDLName("services.wsdl"); + java2WSDLFrame.outPanel.txtLocation .setText(defualtOutPutPath); + java2WSDLFrame.outPanel .txtFileName .setText("services.wsdl"); } @@ -219,7 +218,6 @@ public void updateStatusTextField(boolean success,String text){ if (success){ java2WSDLFrame.opPanel.setDefaultNamespaces(txtClass.getText()); - // java2WSDLFrame.outPanel.setNamespaceDefaults(); } lblTest.setText(text); } @@ -342,4 +340,4 @@ -} \ No newline at end of file +} 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=542211&r1=542210&r2=542211 ============================================================================== --- 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 Mon May 28 04:47:38 2007 @@ -4,12 +4,13 @@ import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; - +import java.awt.event.MouseListener ; +import java.awt.event.MouseEvent ; import org.apache.axis2.tools.bean.NamespaceFinder ; import org.apache.axis2.tools.bean.WsdlgenBean; -public class OptionPanel extends JPanel implements ActionListener { +public class OptionPanel extends JPanel implements ActionListener,MouseListener { private JLabel lblNsp; private JLabel lblNspPrefix; @@ -17,11 +18,11 @@ private JLabel lblSchemaTargetNspPrefix; private JLabel lblService; - private JTextField txtNsp; - private JTextField txtNspPrefix; - private JTextField txtSchemaTargetNsp; - private JTextField txtSchemaTargetNspPrefix; - private JTextField txtService; + JTextField txtNsp; + JTextField txtNspPrefix; + JTextField txtSchemaTargetNsp; + JTextField txtSchemaTargetNspPrefix; + JTextField txtService; Java2WSDLFrame java2WSDLFrame; WsdlgenBean wsdlgenBean; @@ -67,6 +68,8 @@ txtService =new JTextField(); add(txtService ); + txtService .addActionListener(this); + txtService.addMouseListener(this); setSize(getPreferredSize()); @@ -94,10 +97,57 @@ public void actionPerformed(ActionEvent e) { - + Object obj=e.getSource(); + if(obj ==txtService ){ + if (txtService .getText() != null && !txtService.getText().trim().equals("")) { + BottomPanel.setEnable(true,true, true, true); + wsdlgenBean.setServiceName(txtService.getText().trim()); + } + } + } + + public void mouseClicked(MouseEvent e) { + Object obj = e.getSource(); + if(obj ==txtService ){ + if (txtService .getText() != null && !txtService.getText().trim().equals("")) { + BottomPanel.setEnable(true,true, true, true); + wsdlgenBean.setServiceName(txtService.getText().trim()); + } + } + } + + public void mouseEntered(MouseEvent e) { + } + + public void mouseExited(MouseEvent e) { + Object obj = e.getSource(); + if(obj ==txtService ){ + if (txtService .getText() != null && !txtService.getText().trim().equals("")) { + BottomPanel.setEnable(true,true, true, true); + wsdlgenBean.setServiceName(txtService.getText().trim()); + } + } + } + + public void mousePressed(MouseEvent e) { + Object obj = e.getSource(); + if(obj ==txtService ){ + if (txtService .getText() != null && !txtService.getText().trim().equals("")) { + BottomPanel.setEnable(true,true, true, true); + wsdlgenBean.setServiceName(txtService.getText().trim()); + } + } + } + + public void mouseReleased(MouseEvent e) { + Object obj = e.getSource(); + if(obj ==txtService ){ + if (txtService .getText() != null && !txtService.getText().trim().equals("")) { + BottomPanel.setEnable(true,true, true, true); + wsdlgenBean.setServiceName(txtService.getText().trim()); + } + } } - - public void setDefaultNamespaces(String fullyQualifiedClassName){ this.txtNsp.setText(NamespaceFinder.getTargetNamespaceFromClass(fullyQualifiedClassName)); this.txtSchemaTargetNsp .setText(NamespaceFinder.getSchemaTargetNamespaceFromClass(fullyQualifiedClassName) ); @@ -107,7 +157,7 @@ setNamespaceDefaults(); } - private void setNamespaceDefaults(){ + public void setNamespaceDefaults(){ wsdlgenBean.setTargetNamespace(txtNsp.getText() ); wsdlgenBean.setTargetNamespacePrefix(txtNspPrefix .getText() ); wsdlgenBean.setSchemaTargetNamespace(txtSchemaTargetNsp .getText() ); 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=542211&r1=542210&r2=542211 ============================================================================== --- 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 Mon May 28 04:47:38 2007 @@ -1,14 +1,17 @@ package org.apache.axis2.tools.java2wsdl; import org.apache.axis2.tools.bean.WsdlgenBean; - import javax.swing.*; +import java.awt.event.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; +import java.awt.event.MouseListener ; +import java.awt.event.MouseEvent ; import java.awt.*; +import java.io.File; -public class OutputPanel extends JPanel implements ActionListener { +public class OutputPanel extends JPanel implements ActionListener,MouseListener { JLabel lblTitle; JLabel lblLocation; @@ -22,13 +25,14 @@ JButton btnBrowes; - final JFileChooser fc = new JFileChooser(); + final JFileChooser DirChooser=new JFileChooser(); private WsdlgenBean wsdlgenBean; + private Java2WSDLFrame java2WSDLFrame; - public OutputPanel(WsdlgenBean wsdlgenBean){ + public OutputPanel(Java2WSDLFrame java2WSDLFrame,WsdlgenBean wsdlgenBean){ this.wsdlgenBean=wsdlgenBean; - + this.java2WSDLFrame=java2WSDLFrame; OutputLayout customLayout=new OutputLayout(); setLayout(customLayout); @@ -40,28 +44,44 @@ rbtnAdd =new JRadioButton("Browes and Add the WSDL to a project on current workspace"); add(rbtnAdd ); + rbtnAdd .setSelected(false); + rbtnAdd .addActionListener(this); + rbtnSave =new JRadioButton("Browes and Save the WSDL file on local filesystem "); add(rbtnSave ); + rbtnSave .addActionListener(this); + rbtnSave .setSelected(true); + + lblLocation =new JLabel("OutPut Location"); add(lblLocation ); txtLocation =new JTextField(); add(txtLocation ); + txtLocation .setEnabled(true); + txtLocation .addActionListener(this); + txtLocation.addMouseListener(this); + btnBrowes=new JButton("Browse..."); add(btnBrowes); + btnBrowes.setEnabled(true); + btnBrowes.addActionListener(this); + lblFileName =new JLabel("OutPut File Name"); add(lblFileName ); txtFileName =new JTextField(); add(txtFileName ); + txtFileName .setEnabled(true); + txtFileName .addActionListener(this); + txtFileName .addMouseListener(this); - setSize(getPreferredSize()); - initializeDefaultSettings(); + setSize(getPreferredSize()); } @@ -71,17 +91,115 @@ txtFileName.setText(wsdlgenBean.getOutputWSDLName()); } - public void setNamespace(){ - wsdlgenBean.setTargetNamespace(txtLocation .getText() ); - wsdlgenBean.setTargetNamespacePrefix(txtFileName .getText() ); + public void setOutput(){ + + wsdlgenBean.setOutputLocation(txtLocation .getText() ); + wsdlgenBean.setOutputWSDLName(txtFileName .getText() ); } public void actionPerformed(ActionEvent e){ + Object obj=e.getSource(); + if(obj==btnBrowes) { + DirChooser .setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + int returnVal = DirChooser.showOpenDialog(this); + if (returnVal == JFileChooser.APPROVE_OPTION) { + DirChooser.setFileSelectionMode(JFileChooser .FILES_ONLY ); + File newfile = DirChooser.getSelectedFile(); + BottomPanel.setEnable(true,false, true, true); + txtLocation.setText(newfile.getAbsolutePath()); + } + } else if(obj == rbtnAdd ) { + rbtnSave .setSelected(false); + txtLocation .setEnabled(false); + btnBrowes.setEnabled(false); + txtFileName .setEnabled(false); + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setOutputLocation(java2WSDLFrame .getActiveProject().getProjectFilePath() ); + wsdlgenBean.setOutputWSDLName("Services.wsdl" ); + }else if(obj == rbtnSave ) { + rbtnAdd .setSelected(false); + txtLocation .setEnabled(true); + btnBrowes.setEnabled(true); + txtFileName .setEnabled(true); + + } else if(obj ==txtFileName ){ + if (txtFileName .getText() != null && !txtFileName.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtFileName.getText().trim()); + } + } else if(obj ==txtLocation ){ + if (txtLocation .getText() != null && !txtLocation.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtLocation.getText().trim()); + } + } + } + public void mouseClicked(MouseEvent e) { + Object obj = e.getSource(); + if(obj ==txtFileName ){ + if (txtFileName .getText() != null && !txtFileName.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtFileName.getText().trim()); + } + } else if(obj ==txtLocation ){ + if (txtLocation .getText() != null && !txtLocation.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtLocation.getText().trim()); + } + } + } + + public void mouseEntered(MouseEvent e) { + } + + public void mouseExited(MouseEvent e) { + Object obj = e.getSource(); + if(obj ==txtFileName ){ + if (txtFileName .getText() != null && !txtFileName.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtFileName.getText().trim()); + } + } else if(obj ==txtLocation ){ + if (txtLocation .getText() != null && !txtLocation.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtLocation.getText().trim()); + } + } + } + public void mousePressed(MouseEvent e) { + Object obj = e.getSource(); + if(obj ==txtFileName ){ + if (txtFileName .getText() != null && !txtFileName.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtFileName.getText().trim()); + } + } else if(obj ==txtLocation ){ + if (txtLocation .getText() != null && !txtLocation.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtLocation.getText().trim()); + } + } + } + + public void mouseReleased(MouseEvent e) { + Object obj = e.getSource(); + if(obj ==txtFileName ){ + if (txtFileName .getText() != null && !txtFileName.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtFileName.getText().trim()); + } + } else if(obj ==txtLocation ){ + if (txtLocation .getText() != null && !txtLocation.getText().trim().equals("")) { + BottomPanel.setEnable(true,false, true, true); + wsdlgenBean.setServiceName(txtLocation.getText().trim()); + } + } } } + class OutputLayout implements LayoutManager{ public OutputLayout (){ @@ -143,4 +261,4 @@ c.setBounds(insets.left + 130, insets.top + 150, 290, 24); } } -} \ No newline at end of file +} Modified: webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java?view=diff&rev=542211&r1=542210&r2=542211 ============================================================================== --- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java (original) +++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java Mon May 28 04:47:38 2007 @@ -44,7 +44,7 @@ Java2CodeFrame winj2c; Java2WSDLFrame winj2w; - + private int defaultCloseOperation; public Axi2PluginPage() { setBackground(Color.white); @@ -90,6 +90,28 @@ imglbl = new LogoPage(); getContentPane().add(imglbl); + } + + + + public void setDefaultCloseOperation(int operation) { + if (operation != DO_NOTHING_ON_CLOSE && + operation != HIDE_ON_CLOSE && + operation != DISPOSE_ON_CLOSE && + operation != EXIT_ON_CLOSE) { + throw new IllegalArgumentException("defaultCloseOperation must be one of: DO_NOTHING_ON_CLOSE, HIDE_ON_CLOSE, DISPOSE_ON_CLOSE, or EXIT_ON_CLOSE"); + } + if (this.defaultCloseOperation != operation) { + if (operation == EXIT_ON_CLOSE) { + SecurityManager security = System.getSecurityManager(); + if (security != null) { + security.checkExit(0); + } + } + int oldValue = this.defaultCloseOperation; + this.defaultCloseOperation = operation; + firePropertyChange("defaultCloseOperation", oldValue, operation); + } } public void showUI() { Modified: webservices/axis2/trunk/java/modules/tool/script/axis2.sh URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/axis2.sh?view=diff&rev=542211&r1=542210&r2=542211 ============================================================================== --- webservices/axis2/trunk/java/modules/tool/script/axis2.sh (original) +++ webservices/axis2/trunk/java/modules/tool/script/axis2.sh Mon May 28 04:47:38 2007 @@ -28,8 +28,25 @@ # ----------------------------------------------------------------------------- # Get the context and from that find the location of setenv.sh -sh `dirname $0`/setenv.sh +. `dirname $0`/setenv.sh + +#add any user given classpath's +USER_COMMANDS="" +prearg="" +for arg in "$@" +do + if [ $arg != -classpath ] && [ $arg != -cp ] && [ $prearg != -classpath ] && [ $prearg != -cp ] + then + USER_COMMANDS="$USER_COMMANDS ""$arg" + fi + + if [ $prearg=-classpath ] || [ $prearg=-cp ] + then + AXIS2_CLASSPATH="$arg":"$AXIS2_CLASSPATH" + fi + prearg=$arg +done $JAVA_HOME/bin/java -classpath "$AXIS2_CLASSPATH" \ --Daxis2.xml="$AXIS2_HOME/conf/axis2.xml" -Daxis2.repo="$AXIS2_HOME/repository" $* +-Daxis2.xml="$AXIS2_HOME/conf/axis2.xml" -Daxis2.repo="$AXIS2_HOME/repository" $USER_COMMANDS Modified: webservices/axis2/trunk/java/modules/tool/script/axis2server.sh URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/axis2server.sh?view=diff&rev=542211&r1=542210&r2=542211 ============================================================================== --- webservices/axis2/trunk/java/modules/tool/script/axis2server.sh (original) +++ webservices/axis2/trunk/java/modules/tool/script/axis2server.sh Mon May 28 04:47:38 2007 @@ -27,7 +27,7 @@ # ----------------------------------------------------------------------------- # Get the context and from that find the location of setenv.sh -sh `dirname $0`/setenv.sh +. `dirname $0`/setenv.sh java -classpath $AXIS2_CLASSPATH org.apache.axis2.transport.SimpleAxis2Server \ -repo $AXIS2_HOME/repository -conf $AXIS2_HOME/conf/axis2.xml $* --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]