[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui JavaApp.java,1.11,1.12

[<re...@us...>]

Update of /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26627/src/net/charabia/jsmoothgen/application/gui

Modified Files:
	JavaApp.java 
Log Message:
fixes bug #909610 (	Class chooser not working when "embedded jar" not selected)
JarClassChooser now also displays all the classes available in the classpath.

Index: JavaApp.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/JavaApp.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JavaApp.java	19 Nov 2003 22:17:16 -0000	1.11
--- JavaApp.java	5 Mar 2004 13:14:00 -0000	1.12
***************
*** 202,217 ****
          // Add your handling code here:
          try {
!             File jar = m_jarLocation.getFile();
!             if (jar.isAbsolute() == false)
! 		{
! 		    jar = new File(m_basedir, jar.toString());
! 		}
!             JarFile jf = new JarFile(jar);
!             if (m_classchooser == null)
  		{
  		    m_classchooser = new JarClassChooser(JOptionPane.getFrameForComponent(this), true);
  		    m_classchooser.setLocationRelativeTo(this);
  		}
!             m_classchooser.setJar(jf);
              System.out.println("Classname to set: " + m_mainClassName.getText());
              m_classchooser.setClassName((m_mainClassName.getText()!=null)?m_mainClassName.getText():"");
--- 202,232 ----
          // Add your handling code here:
          try {
! 	    if (m_classchooser == null)
  		{
  		    m_classchooser = new JarClassChooser(JOptionPane.getFrameForComponent(this), true);
  		    m_classchooser.setLocationRelativeTo(this);
  		}
! 	    m_classchooser.clear();
! 
! 	    if (m_embedJar.isSelected() && (m_jarLocation.getFile() != null))
! 		{
! 		    File jar = m_jarLocation.getFile();
! 		    if (jar.isAbsolute() == false)
! 			{
! 			    jar = new File(m_basedir, jar.toString());
! 			}
! 		    JarFile jf = new JarFile(jar);	    
! 		    m_classchooser.addJar(jf);
! 		}
! 
! 	    Object[] cpels = m_classPathList.getData();
! 	    for (int i=0; i<cpels.length; i++)
! 		{
! 		    File f = (File)cpels[i];
! 		    if (f.isAbsolute() == false)
! 			f = new File(m_basedir, f.toString());
! 		    m_classchooser.addJar(new JarFile(f));
! 		}
! 
              System.out.println("Classname to set: " + m_mainClassName.getText());
              m_classchooser.setClassName((m_mainClassName.getText()!=null)?m_mainClassName.getText():"");