You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/07/14 04:33:31 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell BeanShellGUI.java BeanShellKernel.java BeanShellKernelProxy.java
donaldp 2002/07/13 19:33:31
Modified: src/java/org/apache/avalon/phoenix/components/kernel/beanshell
BeanShellGUI.java BeanShellKernel.java
BeanShellKernelProxy.java
Log:
Style
Revision Changes Path
1.2 +34 -41 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellGUI.java
Index: BeanShellGUI.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellGUI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BeanShellGUI.java 4 Jun 2002 22:03:26 -0000 1.1
+++ BeanShellGUI.java 14 Jul 2002 02:33:31 -0000 1.2
@@ -7,31 +7,28 @@
*/
package org.apache.avalon.phoenix.components.kernel.beanshell;
-import bsh.Interpreter;
import bsh.EvalError;
+import bsh.Interpreter;
import bsh.util.JConsole;
-import org.apache.avalon.phoenix.interfaces.Kernel;
-import javax.swing.JPanel;
-import javax.swing.JFrame;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
import java.awt.BorderLayout;
import java.awt.Dimension;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-
+import java.awt.event.ActionListener;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import org.apache.avalon.phoenix.interfaces.Kernel;
/**
- * Class BeanShellGUI
- *
- *
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision$
*/
-public class BeanShellGUI extends JPanel implements ActionListener
+public class BeanShellGUI
+ extends JPanel
+ implements ActionListener
{
-
private JConsole m_jConsole;
private Interpreter m_interpreter;
private Thread m_thread;
@@ -40,22 +37,21 @@
/**
* Construct a BeanShellGUI with a handle on the Kernel.
*/
- public BeanShellGUI(Kernel kernel)
+ public BeanShellGUI( Kernel kernel )
{
-
- this.setPreferredSize(new Dimension(600, 480));
+ setPreferredSize( new Dimension( 600, 480 ) );
m_jConsole = new JConsole();
- this.setLayout(new BorderLayout());
- this.add(m_jConsole, BorderLayout.CENTER);
+ this.setLayout( new BorderLayout() );
+ this.add( m_jConsole, BorderLayout.CENTER );
- m_interpreter = new Interpreter(m_jConsole);
+ m_interpreter = new Interpreter( m_jConsole );
try
{
- m_interpreter.set("phoenix-kernel", kernel);
+ m_interpreter.set( "phoenix-kernel", kernel );
}
- catch (EvalError ee)
+ catch( EvalError ee )
{
ee.printStackTrace();
}
@@ -67,41 +63,38 @@
*/
public void init()
{
-
- m_frame = new JFrame("BeanShell - Phoenix management");
- m_frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- m_frame.getContentPane().add(this,BorderLayout.CENTER);
+ m_frame = new JFrame( "BeanShell - Phoenix management" );
+ m_frame.setDefaultCloseOperation( JFrame.DO_NOTHING_ON_CLOSE );
+ m_frame.getContentPane().add( this, BorderLayout.CENTER );
JMenuBar menubar = new JMenuBar();
- JMenu menu = new JMenu("File");
- JMenuItem mi = new JMenuItem("Close");
+ JMenu menu = new JMenu( "File" );
+ JMenuItem mi = new JMenuItem( "Close" );
- mi.addActionListener(this);
- menu.add(mi);
- menubar.add(menu);
+ mi.addActionListener( this );
+ menu.add( mi );
+ menubar.add( menu );
- m_frame.setJMenuBar(menubar);
+ m_frame.setJMenuBar( menubar );
- m_thread = new Thread(m_interpreter);
+ m_thread = new Thread( m_interpreter );
m_thread.start();
- m_frame.setVisible(true);
+ m_frame.setVisible( true );
m_frame.pack();
}
-
/**
* Method actionPerformed by the menu options.
*
- * @param e the action event.
+ * @param event the action event.
*
*/
- public void actionPerformed(ActionEvent e)
+ public void actionPerformed( final ActionEvent event )
{
+ final String command = event.getActionCommand();
- String com = e.getActionCommand();
-
- if (com.equals("Close"))
+ if( command.equals( "Close" ) )
{
m_thread.interrupt();
m_frame.dispose();
1.2 +10 -11 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernel.java
Index: BeanShellKernel.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BeanShellKernel.java 4 Jun 2002 22:03:26 -0000 1.1
+++ BeanShellKernel.java 14 Jul 2002 02:33:31 -0000 1.2
@@ -7,29 +7,28 @@
package org.apache.avalon.phoenix.components.kernel.beanshell;
+import org.apache.avalon.excalibur.proxy.DynamicProxy;
import org.apache.avalon.phoenix.components.kernel.DefaultKernel;
import org.apache.avalon.phoenix.interfaces.Kernel;
-import org.apache.avalon.excalibur.proxy.DynamicProxy;
-public class BeanShellKernel extends DefaultKernel
+public class BeanShellKernel
+ extends DefaultKernel
{
-
private Kernel m_kernel;
/**
* Overides Initialize from DefaultKernel
- *
- * @throws Exception
*/
- public void initialize() throws Exception
+ public void initialize()
+ throws Exception
{
super.initialize();
- m_kernel = (Kernel) DynamicProxy.newInstance(
- new BeanShellKernelProxy(this), new Class[] {Kernel.class});
- BeanShellGUI beanShell = new BeanShellGUI(m_kernel);
+ final BeanShellKernelProxy proxy = new BeanShellKernelProxy( this );
+ final Class[] interfaces = new Class[]{Kernel.class};
+ m_kernel = (Kernel)DynamicProxy.newInstance( proxy, interfaces );
+
+ final BeanShellGUI beanShell = new BeanShellGUI( m_kernel );
beanShell.init();
}
-
-
}
1.2 +16 -16 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java
Index: BeanShellKernelProxy.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BeanShellKernelProxy.java 4 Jun 2002 22:03:26 -0000 1.1
+++ BeanShellKernelProxy.java 14 Jul 2002 02:33:31 -0000 1.2
@@ -7,43 +7,43 @@
*/
package org.apache.avalon.phoenix.components.kernel.beanshell;
-import org.apache.avalon.phoenix.interfaces.Kernel;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.phoenix.interfaces.Application;
+import org.apache.avalon.phoenix.interfaces.Kernel;
import org.apache.avalon.phoenix.metadata.SarMetaData;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.log.Hierarchy;
-public class BeanShellKernelProxy implements Kernel
+public class BeanShellKernelProxy
+ implements Kernel
{
private transient Kernel m_kernel;
/**
* Construct a Proxy to the Kernel that does not implement all methods.
- *
*/
- public BeanShellKernelProxy(Kernel kernel)
+ public BeanShellKernelProxy( final Kernel kernel )
{
m_kernel = kernel;
}
- public void addApplication(SarMetaData metaData,
- ClassLoader classLoader,
- Hierarchy hierarchy,
- Configuration server)
- throws Exception
+ public void addApplication( SarMetaData metaData,
+ ClassLoader classLoader,
+ Hierarchy hierarchy,
+ Configuration server )
+ throws Exception
{
- throw new UnsupportedOperationException("This is not supported for non-kernel visitors");
+ throw new UnsupportedOperationException( "This is not supported for non-kernel visitors" );
}
- public void removeApplication(String name)
- throws Exception
+ public void removeApplication( final String name )
+ throws Exception
{
- m_kernel.removeApplication(name);
+ m_kernel.removeApplication( name );
}
- public Application getApplication(String name)
+ public Application getApplication( final String name )
{
- return m_kernel.getApplication(name);
+ return m_kernel.getApplication( name );
}
public String[] getApplicationNames()
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>