[Mc4j-cvs] mc4j/src/org/mc4j/console/connection/create CreateWizardDescriptor.java,1.2,1.3 CreateMBe
Brought to you by:
ghinkl
Menu
▾
▴
[Mc4j-cvs] mc4j/src/org/mc4j/console/connection/create CreateWizardDescriptor.java,1.2,1.3 CreateMBeanAction.java,1.2,1.3 CreateVisualPanel.java,1.2,1.3 CreateWizardIterator.java,1.2,1.3 CallCreateVisualPanel.java,1.2,1.3
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/connection/create Modified Files: CreateWizardDescriptor.java CreateMBeanAction.java CreateVisualPanel.java CreateWizardIterator.java CallCreateVisualPanel.java Log Message: Merging EMS into head for the 2.0 release work Index: CallCreateVisualPanel.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CallCreateVisualPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CallCreateVisualPanel.java 5 Oct 2004 05:15:57 -0000 1.2 --- CallCreateVisualPanel.java 12 Apr 2006 19:13:59 -0000 1.3 *************** *** 21,33 **** import javax.swing.*; - import javax.swing.border.Border; import javax.swing.event.ChangeListener; - import javax.management.ObjectName; - import javax.management.NotCompliantMBeanException; - import javax.management.MBeanRegistrationException; - import javax.management.ReflectionException; - import javax.management.MBeanException; - import javax.management.MalformedObjectNameException; - import javax.management.InstanceAlreadyExistsException; import java.awt.*; --- 21,25 ---- *************** *** 55,60 **** public void executeCreate() { try { ! ObjectName objectName = new ObjectName(this.data.getObjectName()); ! this.descriptor.getServer().createMBean(this.data.getClassName(), objectName); this.textArea.setText( --- 47,51 ---- public void executeCreate() { try { ! this.descriptor.getConnection().createMBean(this.data.getClassName(), this.data.getObjectName()); this.textArea.setText( Index: CreateMBeanAction.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CreateMBeanAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreateMBeanAction.java 5 Oct 2004 05:15:57 -0000 1.2 --- CreateMBeanAction.java 12 Apr 2006 19:13:59 -0000 1.3 *************** *** 17,37 **** package org.mc4j.console.connection.create; ! import java.awt.Dialog; ! ! import javax.swing.SwingUtilities; ! import org.openide.DialogDisplayer; import org.openide.ErrorManager; - import org.openide.WizardDescriptor; import org.openide.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.actions.NodeAction; ! import org.mc4j.console.connection.persistence.ConnectionSetDatabase; ! import org.mc4j.console.connection.persistence.ConnectionSettings; ! import org.mc4j.console.connection.wizard.ConnectionDescriptor; ! import org.mc4j.console.connection.ConnectionNode; ! import org.mc4j.console.ManagementNode; ! import org.mc4j.console.IConnectionNode; /** --- 17,29 ---- package org.mc4j.console.connection.create; ! import org.mc4j.console.connection.ConnectionNode; import org.openide.DialogDisplayer; import org.openide.ErrorManager; import org.openide.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.actions.NodeAction; ! import javax.swing.*; ! import java.awt.*; /** *************** *** 50,54 **** ConnectionNode node = (ConnectionNode) nodes[0]; ! final CreateWizardDescriptor desc = new CreateWizardDescriptor(node.getMBeanServer()); --- 42,46 ---- ConnectionNode node = (ConnectionNode) nodes[0]; ! final CreateWizardDescriptor desc = new CreateWizardDescriptor(node.getEmsConnection()); Index: CreateWizardIterator.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CreateWizardIterator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreateWizardIterator.java 5 Oct 2004 05:15:57 -0000 1.2 --- CreateWizardIterator.java 12 Apr 2006 19:13:59 -0000 1.3 *************** *** 17,20 **** --- 17,25 ---- package org.mc4j.console.connection.create; + import org.openide.WizardDescriptor; + import org.openide.util.NbBundle; + + import javax.swing.event.ChangeEvent; + import javax.swing.event.ChangeListener; import java.io.IOException; import java.io.ObjectInputStream; *************** *** 24,41 **** import java.util.Set; - import javax.swing.event.ChangeEvent; - import javax.swing.event.ChangeListener; - import javax.management.MBeanServer; - - import org.openide.WizardDescriptor; - import org.openide.util.NbBundle; - - import org.mc4j.console.ManagementNode; - import org.mc4j.console.connection.wizard.ConnectionDescriptor; - import org.mc4j.console.connection.wizard.ConnectionVisualPanel; - import org.mc4j.console.connection.wizard.ServerInstallPanel; - import org.mc4j.console.connection.wizard.ClassPathListPanel; - import org.mc4j.console.connection.wizard.JBossConnectorChoicePanel; - /** * --- 29,32 ---- *************** *** 47,54 **** private CreateWizardDescriptor descriptor; - private MBeanServer server; // You should define what panels you want to use here: ! public CreateWizardIterator(MBeanServer server) { } --- 38,44 ---- private CreateWizardDescriptor descriptor; // You should define what panels you want to use here: ! public CreateWizardIterator() { } *************** *** 79,83 **** private transient int index = 0; ! protected final int getIndex() { return index; --- 69,73 ---- private transient int index = 0; ! protected final int getIndex() { return index; Index: CreateVisualPanel.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CreateVisualPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreateVisualPanel.java 5 Oct 2004 05:15:57 -0000 1.2 --- CreateVisualPanel.java 12 Apr 2006 19:13:59 -0000 1.3 *************** *** 17,26 **** package org.mc4j.console.connection.create; import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import javax.swing.event.ChangeListener; - import javax.management.ObjectName; - import javax.management.MalformedObjectNameException; import java.awt.*; --- 17,25 ---- package org.mc4j.console.connection.create; + import org.mc4j.ems.connection.EmsMalformedObjectNameException; import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import javax.swing.event.ChangeListener; import java.awt.*; *************** *** 126,132 **** private void objectNameTextLabelKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_objectNameTextLabelKeyTyped try { ! ObjectName name = ! new ObjectName(this.objectNameTextLabel.getText()); ! } catch (MalformedObjectNameException e) { this.objectNameTextLabel.setForeground(Color.red); } --- 125,132 ---- private void objectNameTextLabelKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_objectNameTextLabelKeyTyped try { ! ! this.descriptor.getConnection().buildObjectName( ! this.objectNameTextLabel.getText()); ! } catch (EmsMalformedObjectNameException e) { this.objectNameTextLabel.setForeground(Color.red); } Index: CreateWizardDescriptor.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CreateWizardDescriptor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreateWizardDescriptor.java 5 Oct 2004 05:15:57 -0000 1.2 --- CreateWizardDescriptor.java 12 Apr 2006 19:13:59 -0000 1.3 *************** *** 17,32 **** package org.mc4j.console.connection.create; ! import java.awt.Dimension; ! import java.awt.Toolkit; ! import java.net.MalformedURLException; ! import java.net.URL; ! import org.openide.WizardDescriptor; import org.openide.util.NbBundle; ! import org.mc4j.console.connection.persistence.ConnectionSettings; ! import org.mc4j.console.connection.wizard.ConnectionIterator; ! ! import javax.management.MBeanServer; /** --- 17,27 ---- package org.mc4j.console.connection.create; ! import org.mc4j.ems.connection.EmsConnection; import org.openide.WizardDescriptor; import org.openide.util.NbBundle; ! import java.awt.*; ! import java.net.MalformedURLException; ! import java.net.URL; /** *************** *** 40,44 **** private CreateMBeanData data; ! private MBeanServer server; /** Make a descriptor suited to use ConnectionIterator. --- 35,39 ---- private CreateMBeanData data; ! private EmsConnection connection; /** Make a descriptor suited to use ConnectionIterator. *************** *** 46,52 **** * style guidelines. */ ! public CreateWizardDescriptor(MBeanServer server) { ! this(new CreateWizardIterator(server)); ! this.server = server; this.data = new CreateMBeanData(); --- 41,47 ---- * style guidelines. */ ! public CreateWizardDescriptor(EmsConnection connection) { ! this(new CreateWizardIterator()); ! this.connection = connection; this.data = new CreateMBeanData(); *************** *** 58,63 **** } ! public MBeanServer getServer() { ! return server; } --- 53,58 ---- } ! public EmsConnection getConnection() { ! return connection; } |
