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/04/05 07:06:15 UTC
svn commit: r525700 - in
/webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools:
bean/ idea/
Author: sandakith
Date: Wed Apr 4 22:06:14 2007
New Revision: 525700
URL: http://svn.apache.org/viewvc?view=rev&rev=525700
Log:
Axis2 2472 improving the userbility and making the both plugin user interfaces simillar
Modified:
webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java
webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java
webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java
webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java
webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java
webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java
Modified: webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java?view=diff&rev=525700&r1=525699&r2=525700
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java (original)
+++ webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java Wed Apr 4 22:06:14 2007
@@ -469,8 +469,8 @@
public File getTemp() {
String time = Calendar.getInstance().getTime().toString().replace(':', '-');
- File temp = new File( getActiveProject().getProjectFilePath() + File.separator + "temp-" + time);
- return temp;
+ return new File( getOutput() + File.separator + "temp-" + time);
+
}
public Module[] getModules() {
Modified: webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java?view=diff&rev=525700&r1=525699&r2=525700
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java (original)
+++ webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java Wed Apr 4 22:06:14 2007
@@ -89,35 +89,38 @@
{
if (!outputDir.isDirectory())
{
- JOptionPane.showMessageDialog(java2CodeFrame, "The Output Directory specified is invalid. Please provide a valid directory",
+ JOptionPane.showMessageDialog(java2CodeFrame, "The Output Directory specified is invalid. Please provide a valid directory",
"Error!", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.repaint();
return;
}
}
- String selected = java2CodeFrame.optionPane.buttonGroup.getSelection().getActionCommand();
+ String selected = java2CodeFrame.secondPanel.cmbCodeGenOption.getSelectedItem().toString() ;
+ if (selected.equalsIgnoreCase("default")) {
+ File temp = java2CodeFrame.secondPanel.codegenBean.getTemp();
+ java2CodeFrame.secondPanel.setDefaultCommonConfigurations();
+ java2CodeFrame.secondPanel.codegenBean.setOutput(temp.getAbsolutePath() );
- if (selected.equalsIgnoreCase("radDefaultClient")) {
- File temp = java2CodeFrame.optionPane.setDefaultClientConfigurations();
- try {
- java2CodeFrame.generateDefaultClientCode(temp);
- } catch (Exception e1) {
- StringWriter writer = new StringWriter();
- JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
- java2CodeFrame.dispose();
- return;
- }
+ try {
- JOptionPane.showMessageDialog(java2CodeFrame, "Code generation successful!",
- "Axis2 code generation", JOptionPane.INFORMATION_MESSAGE);
+ java2CodeFrame.generateDefaultClientCode( temp) ;
+ } catch (Exception e1) {
+ StringWriter writer = new StringWriter();
+ JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
+ "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.dispose();
return;
-
}
- else if (selected.equalsIgnoreCase("radCustom")) {
+ JOptionPane.showMessageDialog(java2CodeFrame, "Code generation successful!",
+ "Axis2 code generation", JOptionPane.INFORMATION_MESSAGE);
+ java2CodeFrame.dispose();
+ return;
+
+ }
+
+ else if (selected.equalsIgnoreCase("custom")) {
String output = java2CodeFrame.outputpane.buttonGroup.getSelection().getActionCommand();
@@ -130,44 +133,10 @@
java2CodeFrame.copyDirectory(new File(temp + File.separator + "src"), new File((String) java2CodeFrame.outputpane.cmbModuleSrc.getSelectedItem()));
File src = new File(temp + File.separator + "resources");
if (src.isDirectory())
- java2CodeFrame.copyDirectory(src, new File((String) java2CodeFrame.outputpane.cmbModuleSrc.getSelectedItem() + File.separator + ".." + File.separator + "resources"));
+ java2CodeFrame.copyDirectory(src, new File((String) java2CodeFrame.outputpane.cmbModuleSrc.getSelectedItem() + File.separator + ".." + File.separator + "resources"));
java2CodeFrame.deleteDirectory(temp);
} catch (Exception e1) {
- StringWriter writer = new StringWriter();
- JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
- java2CodeFrame.dispose();
- return;
- }
-
- }
- else
- {
-
- try {
-
- java2CodeFrame.generatecode();
-
- } catch (Exception e1) {
- StringWriter writer = new StringWriter();
- JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
- java2CodeFrame.dispose();
- return;
- }
- }
- } else if (selected.equalsIgnoreCase("radDefaultServer")) {
-
- File temp = java2CodeFrame.optionPane.setDefaultServerConfigurations();
- String output = java2CodeFrame.outputpane.buttonGroup.getSelection().getActionCommand();
-
- if (output.equalsIgnoreCase("radCurrentProject")) {
-
- try {
-
- java2CodeFrame.generateDefaultServerCode(temp, (String) java2CodeFrame.outputpane.cmbModuleSrc.getSelectedItem());
- } catch (Exception e1) {
StringWriter writer = new StringWriter();
JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
"Axis2 code generation", JOptionPane.ERROR_MESSAGE);
@@ -175,40 +144,13 @@
return;
}
-
- } else {
- String path = java2CodeFrame.outputpane.txtoutput.getText();
- File outputPath = new File(path);
- if (outputPath.exists()) {
- try {
- java2CodeFrame.generateDefaultServerCodeCustomLocation(path);
- } catch (Exception e1) {
- StringWriter writer = new StringWriter();
- JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
- java2CodeFrame.dispose();
- return;
- }
-
- } else {
- JOptionPane.showMessageDialog(java2CodeFrame, "Invalid file path!",
- "Error!!!", JOptionPane.INFORMATION_MESSAGE);
- return;
- }
-
-
}
- } else if (selected.equalsIgnoreCase("radDefaultBoth")) {
-
- File temp = java2CodeFrame.optionPane.setDefaultServerConfigurations();
- String output = java2CodeFrame.outputpane.buttonGroup.getSelection().getActionCommand();
+ else
+ {
- if (output.equalsIgnoreCase("radCurrentProject")) {
try {
- java2CodeFrame.generateDefaultServerCode(temp, (String) java2CodeFrame.outputpane.cmbModuleSrc.getSelectedItem());
- File temp2 = java2CodeFrame.optionPane.setDefaultClientConfigurations();
- java2CodeFrame.generateDefaultClientCode(temp2);
+ java2CodeFrame.generatecode();
} catch (Exception e1) {
StringWriter writer = new StringWriter();
@@ -216,54 +158,28 @@
"Axis2 code generation", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.dispose();
return;
-
}
+ }
- } else {
- String path = java2CodeFrame.outputpane.txtoutput.getText();
- File outputPath = new File(path);
- if (outputPath.exists()) {
- try {
- java2CodeFrame.generateDefaultServerCodeCustomLocation(path);
- File temp2 = java2CodeFrame.optionPane.setDefaultClientConfigurations();
- java2CodeFrame.generateDefaultClientCode(temp2);
- } catch (Exception e1) {
- StringWriter writer = new StringWriter();
- JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
- java2CodeFrame.dispose();
- return;
- }
-
- } else {
- JOptionPane.showMessageDialog(java2CodeFrame, "Invalid file path!",
- "Error!!!", JOptionPane.INFORMATION_MESSAGE);
- return;
- }
+ }
+ try {
+ java2CodeFrame.generatecode();
- }
+ } catch (Exception e1) {
+ System.out.println(e1);
+ StringWriter writer = new StringWriter();
+ JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
+ "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
+ java2CodeFrame.dispose();
+ return;
}
-
JOptionPane.showMessageDialog(java2CodeFrame, "Code generation successful!",
"Axis2 code generation", JOptionPane.INFORMATION_MESSAGE);
java2CodeFrame.dispose();
return;
} else if (obj == btnNext) {
-
- if (java2CodeFrame.optionPane.isVisible()) {
-
- String selected = java2CodeFrame.optionPane.buttonGroup.getSelection().getActionCommand();
-
-
- if (selected.equalsIgnoreCase("radDefaultServer") || selected.equalsIgnoreCase("radDefaultBoth")) {
-
- java2CodeFrame.increasePanelID();
-
- }
-
- }
java2CodeFrame.setPane();
}
Modified: webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java?view=diff&rev=525700&r1=525699&r2=525700
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java (original)
+++ webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java Wed Apr 4 22:06:14 2007
@@ -11,7 +11,6 @@
import org.apache.axis2.tools.bean.CodegenBean;
import org.apache.axis2.tools.bean.SrcCompiler;
import org.apache.ideaplugin.bean.JarFileWriter;
-import org.apache.ideaplugin.frames.Axi2PluginPage;
import javax.swing.*;
import javax.wsdl.WSDLException;
@@ -48,7 +47,6 @@
// SecondPanel secondPanel;
SecondFrame secondPanel;
OutPutPane outputpane;
- OptionPane optionPane;
private int panleID = 0;
private ClassLoader classLoader;
@@ -79,10 +77,6 @@
BottomPanel.setEnable(false,false, false, true);
getContentPane().add(lblBottom);
- optionPane = new OptionPane();
- optionPane.setVisible(false);
- getContentPane().add(optionPane);
-
secondPanel = new SecondFrame();
secondPanel.setVisible(false);
getContentPane().add(secondPanel);
@@ -190,40 +184,38 @@
try {
codegenBean.generate();
SrcCompiler compiler = new SrcCompiler();
- compiler.compileSource(temp.getAbsolutePath());
+ 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().getProjectFilePath() + File.separator + "lib");
+ final File lib = new File(temp.getAbsolutePath() + File.separator + "lib");
if (!lib.isDirectory()) {
lib.mkdir();
}
JarFileWriter jarFileWriter = new JarFileWriter();
- jarFileWriter.writeJarFile(lib, name + ".jar", new File(temp + File.separator + "classes"));
+ jarFileWriter.writeJarFile(lib, name + ".jar", new File(temp.getAbsolutePath() + File.separator + "classes"));
Project project = codegenBean.getActiveProject();
final LibraryTable table = (LibraryTable) project.getComponent(LibraryTable.class);
-
-
-
ApplicationManager.getApplication().runWriteAction(new
Runnable() {
public void run() {
-
String url = VirtualFileManager.constructUrl(JarFileSystem.PROTOCOL, lib.getAbsolutePath() + File.separator + name + ".jar") + JarFileSystem.JAR_SEPARATOR;
-
-
VirtualFile jarVirtualFile = VirtualFileManager.getInstance().findFileByUrl(url);
Library myLibrary = table.createLibrary(name);
Library.ModifiableModel libraryModel = myLibrary.getModifiableModel();
libraryModel.addRoot(jarVirtualFile, OrderRootType.CLASSES);
libraryModel.commit();
-
}
});
+
+ copyDirectory(new File(temp + File.separator + "src"), new File(codegenBean.getOutput()+File.separator + ".." + File.separator + "src") );
+ copyDirectory(new File(temp + File.separator + "lib"), new File(codegenBean.getOutput() + File.separator + ".." + File.separator + "lib"));
+
} catch (Exception e1) {
+
throw e1;
}
finally {
@@ -246,18 +238,6 @@
panleID--;
break;
}
- panel_3.setCaptions(" Options"
- , " Select from custom or default");
- this.secondPanel.setVisible(false);
- this.plMiddle.setVisible(false);
- if (this.optionPane.codegenBean == null)
- this.optionPane.setCodeGenBean(codegenBean);
- this.optionPane.setVisible(true);
- this.outputpane.setVisible(false);
- BottomPanel.setEnable(true,true, false, true);
- break;
- }
- case 2: {
panel_3.setCaptions(" Custom Options"
, " Set the options for the code generation");
@@ -266,26 +246,16 @@
this.secondPanel.setCodeGenBean(codegenBean);
this.secondPanel.setStatus();
this.plMiddle.setVisible(false);
- this.optionPane.setVisible(false);
this.outputpane.setVisible(false);
BottomPanel.setEnable(true,true, false, true);
break;
}
- case 3: {
- String result;
- 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);
- panleID--;
- break;
- }
+ case 2: {
panel_3.setCaptions(" Set the output location for the generated code"
, " set the output project for the generated code");
this.secondPanel.setVisible(false);
this.plMiddle.setVisible(false);
- this.optionPane.setVisible(false);
outputpane.loadCmbCurrentProject();
outputpane.loadcmbModuleSrcProject();
this.outputpane.setVisible(true);
@@ -322,51 +292,20 @@
, " Welcome to the Axis2 code generation wizard. Select the WSDL file");
this.secondPanel.setVisible(false);
this.plMiddle.setVisible(true);
-
- this.optionPane.setVisible(false);
this.outputpane.setVisible(false);
BottomPanel.setEnable(false,true, false, true);
break;
}
case 1: {
-
- panel_3.setCaptions(" Options"
- , " Select from custom or default");
- this.secondPanel.setVisible(false);
- this.plMiddle.setVisible(false);
- this.outputpane.setVisible(false);
- this.optionPane.setVisible(true);
- BottomPanel.setEnable(true,true, false, true);
- break;
- }
- case 2: {
- if (!this.optionPane.radCustom.isSelected())
- {
-
- this.backButtonImpl();
- break;
- }
panel_3.setCaptions(" Custom Options"
, " Set the options for the code generation");
this.secondPanel.setVisible(true);
this.plMiddle.setVisible(false);
- this.optionPane.setVisible(false);
this.outputpane.setVisible(false);
BottomPanel.setEnable(true,true, false, true);
break;
}
- case 3: {
- panel_3.setCaptions(" Set the output location for the generated code"
- , " set the output project for the generated code");
- this.secondPanel.setVisible(false);
- this.plMiddle.setVisible(false);
- this.optionPane.setVisible(false);
-
- this.outputpane.setVisible(true);
- BottomPanel.setEnable(true,false, true, true);
- break;
- }
}
}
@@ -377,13 +316,6 @@
public void setMiddlerPanel(int panel) {
this.panleID = panel;
- if (panleID == 2) {
- panel_3.setCaptions(" Options"
- , " Set the options for the code generation");
- this.secondPanel.setVisible(true);
- this.plMiddle.setVisible(false);
- BottomPanel.setEnable(true,true, true, true);
- }
this.pack();
this.show();
}
@@ -436,10 +368,6 @@
c.setBounds(insets.left, insets.top + 80, 600, 480);
}
c = parent.getComponent(4);
- if (c.isVisible()) {
- c.setBounds(insets.left, insets.top + 80, 600, 480);
- }
- c = parent.getComponent(5);
if (c.isVisible()) {
c.setBounds(insets.left, insets.top + 80, 600, 480);
}
Modified: webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java?view=diff&rev=525700&r1=525699&r2=525700
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java (original)
+++ webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java Wed Apr 4 22:06:14 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/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java?view=diff&rev=525700&r1=525699&r2=525700
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java (original)
+++ webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java Wed Apr 4 22:06:14 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/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java?view=diff&rev=525700&r1=525699&r2=525700
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java (original)
+++ webservices/axis2/branches/java/1_2/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondFrame.java Wed Apr 4 22:06:14 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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org