jsmooth-cvs Mailing List for JSmooth (Page 7)

Status: Beta

Brought to you by: reyes

jsmooth-cvs — notifications of cvs commits

You can subscribe to this list here.

2004	_Jan	_Feb	_Mar (64)	_Apr	_May	_Jun	_Jul	_Aug (44)	_Sep	_Oct (1)	_Nov	_Dec
2005	_Jan	_Feb	_Mar	_Apr (23)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2007	_Jan	_Feb (35)	_Mar (75)	_Apr (105)	_May (89)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2008	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (12)	_Nov	_Dec
2014	_Jan	_Feb (1)	_Mar	_Apr	_May	_Jun	_Jul (1)	_Aug	_Sep	_Oct (1)	_Nov (1)	_Dec
2015	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (1)
2016	_Jan (4)	_Feb (1)	_Mar	_Apr (2)	_May (1)	_Jun	_Jul (1)	_Aug (1)	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 5 6 7 8 9 .. 18 > >> (Page 7 of 18)

[Jsmooth-cvs] jsmooth/src/locale Texts.properties,1.10,1.11

From: Rodrigo R. <re...@us...> - 2007-04-07 21:26:48

Update of /cvsroot/jsmooth/jsmooth/src/locale
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10753/src/locale

Modified Files:
	Texts.properties 
Log Message:
fixes typos


Index: Texts.properties
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/locale/Texts.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Texts.properties	7 Apr 2007 09:51:50 -0000	1.10
--- Texts.properties	7 Apr 2007 21:26:44 -0000	1.11
***************
*** 122,126 ****
  General Public License. Please read the License.txt file that \
  comes with the package. Additional software bundled with JSmooth may come with their own license, please check.\
! <p> The executable generated (the launchers created by JSmooth) are under the LGPL with a "runtime exception" similar to the gcc licence exception: It is not required that you distribute the source code with, nor that you publish a notice mentionning jsmooth. <br> \
  <ul> \
  <li> For the latest news on JSmooth, visit the <a href="http://jsmooth.sourceforge.net/">web site</a> \
--- 122,126 ----
  General Public License. Please read the License.txt file that \
  comes with the package. Additional software bundled with JSmooth may come with their own license, please check.\
! <p> The executable generated (the launchers created by JSmooth) are under the LGPL with a "runtime exception" similar to the gcc licence exception: It is not required that you distribute the source code with it, nor that you publish a notice mentionning jsmooth. <br> \
  <ul> \
  <li> For the latest news on JSmooth, visit the <a href="http://jsmooth.sourceforge.net/">web site</a> \

[Jsmooth-cvs] jsmooth build.number,1.30,1.31

From: Rodrigo R. <re...@us...> - 2007-04-07 21:17:18

Update of /cvsroot/jsmooth/jsmooth
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7071

Modified Files:
	build.number 
Log Message:
release update


Index: build.number
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/build.number,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** build.number	7 Apr 2007 10:47:32 -0000	1.30
--- build.number	7 Apr 2007 21:17:13 -0000	1.31
***************
*** 1,3 ****
  #Build Number for ANT. Do not edit!
! #Sat Apr 07 12:05:44 CEST 2007
! build.number=185
--- 1,3 ----
  #Build Number for ANT. Do not edit!
! #Sat Apr 07 23:09:35 CEST 2007
! build.number=190

[Jsmooth-cvs] jsmooth Changelog,1.32,1.33

From: Rodrigo R. <re...@us...> - 2007-04-07 21:08:36

Update of /cvsroot/jsmooth/jsmooth
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3485

Modified Files:
	Changelog 
Log Message:
update


Index: Changelog
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/Changelog,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Changelog	7 Apr 2007 10:33:11 -0000	1.32
--- Changelog	7 Apr 2007 21:08:32 -0000	1.33
***************
*** 9,12 ****
--- 9,13 ----
  	- Added destination directory parameter in ant task (as suggested
  	in http://sourceforge.net/mailarchive/message.php?msg_name=20050920090245.99697.qmail%40web53103.mail.yahoo.com)
+ 	- Fixed initial jsmooth window size issue
  	
  0.9.9-3	(2007-04-03)

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui Main.java, 1.6, 1.7

From: Rodrigo R. <re...@us...> - 2007-04-07 11:54:16

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

Modified Files:
	Main.java 
Log Message:
Fixes initial jsmooth window size issue and persistency of maximized windows


Index: Main.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/Main.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Main.java	7 Apr 2007 10:47:33 -0000	1.6
--- Main.java	7 Apr 2007 11:54:12 -0000	1.7
***************
*** 298,305 ****
      {
  	Preferences prefs = Preferences.systemNodeForPackage(this.getClass());
- 	System.out.println("prefs: " + prefs);
- 
  	prefs.putInt("window-state", this.getExtendedState());
! 	setExtendedState(NORMAL);
  
  	prefs.putInt("window-x", (int)this.getLocation().getX());
--- 298,303 ----
      {
  	Preferences prefs = Preferences.systemNodeForPackage(this.getClass());
  	prefs.putInt("window-state", this.getExtendedState());
! 	//	setExtendedState(NORMAL);
  
  	prefs.putInt("window-x", (int)this.getLocation().getX());
***************
*** 315,318 ****
--- 313,317 ----
  	Preferences prefs = Preferences.systemNodeForPackage(this.getClass());
  	this.setExtendedState(prefs.getInt("window-state", Frame.NORMAL));
+ 
  	if (prefs.getInt("window-x", -1) > 0)
  	    {
***************
*** 327,330 ****
--- 326,334 ----
  		setExtendedState(prefs.getInt("window-state", NORMAL));
  	    }
+ 	else
+ 	    {
+ 		this.setSize(500, 400);
+ 		setExtendedState(prefs.getInt("window-state", NORMAL));
+ 	    }
      }

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui/editors CurrentDirectory.java, 1.2, 1.3 EmbeddedJar.java, 1.1, 1.2 ExecutableIcon.java, 1.1, 1.2 InitialMemoryHeap.java, 1.1, 1.2 JVMBundle.java, 1.1, 1.2 MainClass.java, 1.2, 1.3 SkeletonChooser.java, 1.3, 1.4 SkeletonPropertiesEditor.java, 1.3, 1.4

From: Rodrigo R. <re...@us...> - 2007-04-07 10:47:37

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

Modified Files:
	CurrentDirectory.java EmbeddedJar.java ExecutableIcon.java 
	InitialMemoryHeap.java JVMBundle.java MainClass.java 
	SkeletonChooser.java SkeletonPropertiesEditor.java 
Log Message:
removed some unnecessary debug traces


Index: SkeletonPropertiesEditor.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/SkeletonPropertiesEditor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SkeletonPropertiesEditor.java	30 Mar 2007 22:23:03 -0000	1.3
--- SkeletonPropertiesEditor.java	7 Apr 2007 10:47:33 -0000	1.4
***************
*** 50,58 ****
      public void rebuildProperties()
      {
! 	System.out.println("=============================================");
! 	System.out.println("=============================================");
! 	System.out.println("===   REBUILD PROPERTIES !!!!     ===========");
! 	System.out.println("=============================================");
! 	System.out.println("=============================================");
  
  	m_skel = null;
--- 50,58 ----
      public void rebuildProperties()
      {
! // 	System.out.println("=============================================");
! // 	System.out.println("=============================================");
! // 	System.out.println("===   REBUILD PROPERTIES !!!!     ===========");
! // 	System.out.println("=============================================");
! // 	System.out.println("=============================================");
  
  	m_skel = null;
***************
*** 120,128 ****
      public void dataChanged()
      {
! 	System.out.println("========================================================");
! 	System.out.println("SkeletonPropertiesEditor: data changed, " + m_model.getSkeletonName());
  	if (m_model.getSkeletonName() == null)
  	    {
! 		System.out.println("SkeletonPropertiesEditor, no name");
  		m_currentSkelName = null;
  		rebuildProperties();
--- 120,128 ----
      public void dataChanged()
      {
! // 	System.out.println("========================================================");
! // 	System.out.println("SkeletonPropertiesEditor: data changed, " + m_model.getSkeletonName());
  	if (m_model.getSkeletonName() == null)
  	    {
! // 		System.out.println("SkeletonPropertiesEditor, no name");
  		m_currentSkelName = null;
  		rebuildProperties();
***************
*** 131,135 ****
  	if ((m_model != null) && (m_model.getSkeletonName() != null) && (!m_model.getSkeletonName().equalsIgnoreCase(m_currentSkelName)))
  	    {
! 		System.out.println("SkeletonPropertiesEditor, different...");
  		m_currentSkelName = m_model.getSkeletonName();
  		rebuildProperties();
--- 131,135 ----
  	if ((m_model != null) && (m_model.getSkeletonName() != null) && (!m_model.getSkeletonName().equalsIgnoreCase(m_currentSkelName)))
  	    {
! // 		System.out.println("SkeletonPropertiesEditor, different...");
  		m_currentSkelName = m_model.getSkeletonName();
  		rebuildProperties();
***************
*** 137,141 ****
  
  	JSmoothModelBean.Property[] jsprop = m_model.getSkeletonProperties();
! 	System.out.println("jsprop is null ? " + jsprop + " / " + ((jsprop!=null)?jsprop.length:-1));
  	if (jsprop != null)
  	    {
--- 137,141 ----
  
  	JSmoothModelBean.Property[] jsprop = m_model.getSkeletonProperties();
! // 	System.out.println("jsprop is null ? " + jsprop + " / " + ((jsprop!=null)?jsprop.length:-1));
  	if (jsprop != null)
  	    {
***************
*** 170,174 ****
  	    }
  
! 	System.out.println("DONE NOTHING! " +m_currentSkelName + "/" + m_model.getSkeletonName());
      }
  
--- 170,174 ----
  	    }
  
! // 	System.out.println("DONE NOTHING! " +m_currentSkelName + "/" + m_model.getSkeletonName());
      }
  
***************
*** 193,197 ****
  		    {
  			SkelPropEditor spe = (SkelPropEditor)e.nextElement();
! 			System.out.println("IMODEL property " + spe + "/" + spe.getIdName() + "=" + spe.get());
  			props[index] = new JSmoothModelBean.Property();
  			props[index].setKey(spe.getIdName());
--- 193,197 ----
  		    {
  			SkelPropEditor spe = (SkelPropEditor)e.nextElement();
! // 			System.out.println("IMODEL property " + spe + "/" + spe.getIdName() + "=" + spe.get());
  			props[index] = new JSmoothModelBean.Property();
  			props[index].setKey(spe.getIdName());

Index: InitialMemoryHeap.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/InitialMemoryHeap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InitialMemoryHeap.java	16 Mar 2004 08:05:16 -0000	1.1
--- InitialMemoryHeap.java	7 Apr 2007 10:47:33 -0000	1.2
***************
*** 61,65 ****
  	int value;
  
! 	System.out.println("Parsing " + m_args.getText());
  
  	try {
--- 61,65 ----
  	int value;
  
! // 	System.out.println("Parsing " + m_args.getText());
  
  	try {
***************
*** 71,75 ****
  		return;
  	    }
! 	System.out.println("sel index: " + m_units.getSelectedIndex() + " / " + value + " / " + (value*1024*1024));
  
  	switch(m_units.getSelectedIndex())
--- 71,75 ----
  		return;
  	    }
! // 	System.out.println("sel index: " + m_units.getSelectedIndex() + " / " + value + " / " + (value*1024*1024));
  
  	switch(m_units.getSelectedIndex())
***************
*** 88,92 ****
  	    }
  
! 	System.out.println("Resulting initmem: " + m_model.getInitialMemoryHeap());
      }
  
--- 88,92 ----
  	    }
  
! // 	System.out.println("Resulting initmem: " + m_model.getInitialMemoryHeap());
      }
  

Index: SkeletonChooser.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/SkeletonChooser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SkeletonChooser.java	6 Apr 2007 16:27:10 -0000	1.3
--- SkeletonChooser.java	7 Apr 2007 10:47:33 -0000	1.4
***************
*** 92,96 ****
   	SkeletonBean skel = Main.SKELETONS.getSkeleton(skelname);
  	
!  	System.out.println("SKEL: " + skel.toString());
   	if (skel != null)
   	    {
--- 92,96 ----
   	SkeletonBean skel = Main.SKELETONS.getSkeleton(skelname);
  	
! //  	System.out.println("SKEL: " + skel.toString());
   	if (skel != null)
   	    {

Index: EmbeddedJar.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/EmbeddedJar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EmbeddedJar.java	16 Mar 2004 08:05:16 -0000	1.1
--- EmbeddedJar.java	7 Apr 2007 10:47:33 -0000	1.2
***************
*** 46,50 ****
  		public void actionPerformed(java.awt.event.ActionEvent e)
  		{
! 		    System.out.println("Embedded jar, checkbox action");
  		    m_selector.setEnabled(m_checker.isSelected());
  		    updateModel();
--- 46,50 ----
  		public void actionPerformed(java.awt.event.ActionEvent e)
  		{
! // 		    System.out.println("Embedded jar, checkbox action");
  		    m_selector.setEnabled(m_checker.isSelected());
  		    updateModel();

Index: JVMBundle.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/JVMBundle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JVMBundle.java	16 Mar 2004 08:05:16 -0000	1.1
--- JVMBundle.java	7 Apr 2007 10:47:33 -0000	1.2
***************
*** 51,54 ****
--- 51,57 ----
  		}
  	    });
+ 
+ 	if (m_model != null)
+ 	    dataChanged();
      }
  
***************
*** 61,64 ****
--- 64,68 ----
  		m_selector.setBaseDir(getBaseDir());
  		m_selector.setFile(null);
+ 		m_selector.setEnabled(false);
  	    }
  	else
***************
*** 67,70 ****
--- 71,75 ----
  		m_selector.setBaseDir(getBaseDir());
  		m_selector.setFile(new java.io.File(bundle));
+ 		m_selector.setEnabled(true);
  	    }
      }
***************
*** 75,79 ****
  	    {
  		File f = m_selector.getFile();
! 		m_model.setBundledJVMPath(f.toString());
  	    }
  	else
--- 80,87 ----
  	    {
  		File f = m_selector.getFile();
! 		if (f != null)
! 		    m_model.setBundledJVMPath(f.toString());
! 		else
! 		    m_model.setBundledJVMPath("");
  	    }
  	else

Index: CurrentDirectory.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/CurrentDirectory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CurrentDirectory.java	1 Apr 2007 22:19:05 -0000	1.2
--- CurrentDirectory.java	7 Apr 2007 10:47:33 -0000	1.3
***************
*** 62,69 ****
      public void dataChanged()
      {
! 	System.out.println("CurDir, basedir=" + getBaseDir());
  	m_selector.setBaseDir(getBaseDir());
  	String dir = m_model.getCurrentDirectory();
! 	System.out.println("Cur Directory data changed: " + dir);
  
  	if ("${EXECUTABLEPATH}".equals(dir))
--- 62,69 ----
      public void dataChanged()
      {
! // 	System.out.println("CurDir, basedir=" + getBaseDir());
  	m_selector.setBaseDir(getBaseDir());
  	String dir = m_model.getCurrentDirectory();
! // 	System.out.println("Cur Directory data changed: " + dir);
  
  	if ("${EXECUTABLEPATH}".equals(dir))
***************
*** 90,94 ****
      public void updateModel()
      {
! 	System.out.println("UPDATE MODEL: " + m_selector.getFile());
  
  	if (m_forceExePath.isSelected())
--- 90,94 ----
      public void updateModel()
      {
! // 	System.out.println("UPDATE MODEL: " + m_selector.getFile());
  
  	if (m_forceExePath.isSelected())

Index: ExecutableIcon.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/ExecutableIcon.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExecutableIcon.java	16 Mar 2004 08:05:16 -0000	1.1
--- ExecutableIcon.java	7 Apr 2007 10:47:33 -0000	1.2
***************
*** 48,52 ****
  		public void fileSelected(String filename)
  		{
! 		    System.out.println("new icon: " + filename);
  		    setIconLocation(new File(filename));
  		}
--- 48,52 ----
  		public void fileSelected(String filename)
  		{
! // 		    System.out.println("new icon: " + filename);
  		    setIconLocation(new File(filename));
  		}
***************
*** 99,103 ****
  	ImageIcon icon = null;
  	
! 	System.out.println("setIconLocation: " + iconfile);
  
  	if (iconfile.toString().toUpperCase().endsWith(".ICO"))
--- 99,103 ----
  	ImageIcon icon = null;
  	
! // 	System.out.println("setIconLocation: " + iconfile);
  
  	if (iconfile.toString().toUpperCase().endsWith(".ICO"))

Index: MainClass.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/MainClass.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MainClass.java	19 Feb 2007 21:16:55 -0000	1.2
--- MainClass.java	7 Apr 2007 10:47:33 -0000	1.3
***************
*** 103,107 ****
  	    {
  		File f = (File)i.next();
! 		System.out.println("Adding jar <" + f + ">");
  		try {
  		    chooser.addJar(new JarFile(f));
--- 103,107 ----
  	    {
  		File f = (File)i.next();
! // 		System.out.println("Adding jar <" + f + ">");
  		try {
  		    chooser.addJar(new JarFile(f));

[Jsmooth-cvs] jsmooth build.number,1.29,1.30

From: Rodrigo R. <re...@us...> - 2007-04-07 10:47:37

Update of /cvsroot/jsmooth/jsmooth
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18097

Modified Files:
	build.number 
Log Message:
removed some unnecessary debug traces


Index: build.number
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/build.number,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** build.number	7 Apr 2007 09:51:50 -0000	1.29
--- build.number	7 Apr 2007 10:47:32 -0000	1.30
***************
*** 1,3 ****
  #Build Number for ANT. Do not edit!
! #Sat Apr 07 09:58:54 CEST 2007
! build.number=182
--- 1,3 ----
  #Build Number for ANT. Do not edit!
! #Sat Apr 07 12:05:44 CEST 2007
! build.number=185

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui Main.java, 1.5, 1.6 MasterPanel.java, 1.3, 1.4

From: Rodrigo R. <re...@us...> - 2007-04-07 10:47:37

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

Modified Files:
	Main.java MasterPanel.java 
Log Message:
removed some unnecessary debug traces


Index: MasterPanel.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/MasterPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MasterPanel.java	6 Apr 2007 16:27:10 -0000	1.3
--- MasterPanel.java	7 Apr 2007 10:47:33 -0000	1.4
***************
*** 151,155 ****
  	m_displayedElements.removeAllElements();
  
! 	System.out.println("Adding " + els);
  
  	if (els == null)
--- 151,155 ----
  	m_displayedElements.removeAllElements();
  
! 	//	System.out.println("Adding " + els);
  
  	if (els == null)
***************
*** 218,222 ****
  		else if (els[i] instanceof String)
  		    {
! 			System.out.println("TITLE: " + els[i]);
  			if (pgroup != null)
  			    {
--- 218,222 ----
  		else if (els[i] instanceof String)
  		    {
! 			//			System.out.println("TITLE: " + els[i]);
  			if (pgroup != null)
  			    {
***************
*** 285,289 ****
      private void attachAll()
      {
! 	System.out.println("Attaching all with " + m_modelLocation + ": " + m_model);
  	for (Iterator i=m_displayedElements.iterator(); i.hasNext(); )
  	    {
--- 285,289 ----
      private void attachAll()
      {
! 	//	System.out.println("Attaching all with " + m_modelLocation + ": " + m_model);
  	for (Iterator i=m_displayedElements.iterator(); i.hasNext(); )
  	    {
***************
*** 344,348 ****
  	    m_model.normalizePaths(m_modelLocation.getParentFile(), true);
  	    JSmoothModelPersistency.save(m_modelLocation, m_model);
! 	    System.out.println("saving model " + m_model);
  	    //	    fireModelChanged();
  	    return true;
--- 344,348 ----
  	    m_model.normalizePaths(m_modelLocation.getParentFile(), true);
  	    JSmoothModelPersistency.save(m_modelLocation, m_model);
! 	    //	    System.out.println("saving model " + m_model);
  	    //	    fireModelChanged();
  	    return true;
***************
*** 385,389 ****
  		out = new File(m_model.getExecutableName());
  
! 	    System.out.println("out = "+ out.getAbsolutePath());
  	    ExeCompiler compiler = new ExeCompiler();
  	    ExeCompiler.CompilerRunner runner = compiler.getRunnable(skelroot, skel, basedir, m_model, out);
--- 385,389 ----
  		out = new File(m_model.getExecutableName());
  
! 	    //	    System.out.println("out = "+ out.getAbsolutePath());
  	    ExeCompiler compiler = new ExeCompiler();
  	    ExeCompiler.CompilerRunner runner = compiler.getRunnable(skelroot, skel, basedir, m_model, out);
***************
*** 406,410 ****
  	    String[] cmd = new String[]{ f.getAbsolutePath() };
  	    
! 	    System.out.println("RUNNING " + cmd[0] + " @ " + basedir);
  	    CommandRunner.run(cmd, f.getParentFile());
  	} catch (Exception exc)
--- 406,410 ----
  	    String[] cmd = new String[]{ f.getAbsolutePath() };
  	    
! 	    //	    System.out.println("RUNNING " + cmd[0] + " @ " + basedir);
  	    CommandRunner.run(cmd, f.getParentFile());
  	} catch (Exception exc)

Index: Main.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/Main.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Main.java	2 Apr 2007 19:41:39 -0000	1.5
--- Main.java	7 Apr 2007 10:47:33 -0000	1.6
***************
*** 245,249 ****
  			dia.setCompiler(compiler.getCompiler());
  			dia.compile(compiler);
- 			System.out.println("FINISH !!");			
  			//			return dia.getResult();
  		    }
--- 245,248 ----

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui/util FileSelectionTextField.java, 1.8, 1.9

From: Rodrigo R. <re...@us...> - 2007-04-07 10:47:37

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

Modified Files:
	FileSelectionTextField.java 
Log Message:
removed some unnecessary debug traces


Index: FileSelectionTextField.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/util/FileSelectionTextField.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FileSelectionTextField.java	16 Mar 2004 08:05:16 -0000	1.8
--- FileSelectionTextField.java	7 Apr 2007 10:47:33 -0000	1.9
***************
*** 143,147 ****
      public void setFile(java.io.File f)
      {
! 	System.out.println("Setting File: " + f + " / " + m_basedir);
  	if (f == null)
  	    {
--- 143,147 ----
      public void setFile(java.io.File f)
      {
! 	//	System.out.println("Setting File: " + f + " / " + m_basedir);
  	if (f == null)
  	    {
***************
*** 162,166 ****
  		m_filename.setText(f.toString());
  	    }
! 	System.out.println("Filename: " + m_filename.getText());
      }
      
--- 162,166 ----
  		m_filename.setText(f.toString());
  	    }
! 	//	System.out.println("Filename: " + m_filename.getText());
      }

[Jsmooth-cvs] jsmooth Changelog,1.31,1.32

From: Rodrigo R. <re...@us...> - 2007-04-07 10:33:17

Update of /cvsroot/jsmooth/jsmooth
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12230

Modified Files:
	Changelog 
Log Message:
fixed some dates


Index: Changelog
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/Changelog,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Changelog	7 Apr 2007 09:51:50 -0000	1.31
--- Changelog	7 Apr 2007 10:33:11 -0000	1.32
***************
*** 5,8 ****
--- 5,12 ----
  	- Fixed bug #1694136: Typos in strings 
  	- Added welcome panel
+ 	- Fixed bug relative to the jvm bundle selection when enabled but
+ 	no directory was defined
+ 	- Added destination directory parameter in ant task (as suggested
+ 	in http://sourceforge.net/mailarchive/message.php?msg_name=20050920090245.99697.qmail%40web53103.mail.yahoo.com)
  	
  0.9.9-3	(2007-04-03)
***************
*** 42,46 ****
  	- Updated the documentation w/ arguments mngmt
  	
! 0.9.8
  	- Fixed the classpath in JRE1.2+ VM DLL instanciation
  	- Added a jvm.dll search when the location is not defined in the
--- 46,50 ----
  	- Updated the documentation w/ arguments mngmt
  	
! 0.9.8	(2007-02-20)
  	- Fixed the classpath in JRE1.2+ VM DLL instanciation
  	- Added a jvm.dll search when the location is not defined in the
***************
*** 59,63 ****
  	- Fixes some issues with JVM1.1 process-spawning
  	
! 0.9.7
  	- Changed the GUI: now it uses l2f-common and does not rely on the
  	netbeans' form editor to build the interfaces. This is a major
--- 63,67 ----
  	- Fixes some issues with JVM1.1 process-spawning
  	
! 0.9.7	(2004-03-16)
  	- Changed the GUI: now it uses l2f-common and does not rely on the
  	netbeans' form editor to build the interfaces. This is a major
***************
*** 69,73 ****
  	launched in debug mode.
  	
! 0.9.6
  	- Now the JVM look-up method also takes the installed JDK into
  	account (not only the installed JRE)
--- 73,77 ----
  	launched in debug mode.
  	
! 0.9.6	(2004-03-06)
  	- Now the JVM look-up method also takes the installed JDK into
  	account (not only the installed JRE)
***************
*** 86,90 ****
  	- fixed bug #880439 (Jvm search from environment variables)
  	
! 0.9.5
  	- ! Made the jar embedding optional. Now, one can choose to
  	include or not a jar file in the exe. If the jar is not included,
--- 90,94 ----
  	- fixed bug #880439 (Jvm search from environment variables)
  	
! 0.9.5	(2003-11-23)
  	- ! Made the jar embedding optional. Now, one can choose to
  	include or not a jar file in the exe. If the jar is not included,
***************
*** 105,109 ****
  	- Fixed the README file
  	
! 0.9.4
  	- ! Added Ant Task support 
  	- ! Added Command Line compiler
--- 109,113 ----
  	- Fixed the README file
  	
! 0.9.4	(2003-09-23)
  	- ! Added Ant Task support 
  	- ! Added Command Line compiler
***************
*** 120,124 ****
  	properties
  	
! 0.9.3
  	- Added Java Properties management in JSmoothGen
  	- Added variable management for java properties in wrappers 
--- 124,128 ----
  	properties
  	
! 0.9.3	(2003-09-13)
  	- Added Java Properties management in JSmoothGen
  	- Added variable management for java properties in wrappers 
***************
*** 140,148 ****
  	- Fixed issue with parameter string ending with a backslash. 
  	
! 0.9.2 (5 Sept 2003)
  	- Fixed a bug that prevented jsmoothgen to compile if the JIMI API
  	is not in the path
  
! 0.9.1 (03 Sept 2003)
  	- Added the Console Wrapper
  	- Fixed a bug on the Windowed Wrapper (java.exe was called instead of javaw.exe)
--- 144,152 ----
  	- Fixed issue with parameter string ending with a backslash. 
  	
! 0.9.2	(2003-09-05)
  	- Fixed a bug that prevented jsmoothgen to compile if the JIMI API
  	is not in the path
  
! 0.9.1	(2003-09-03)
  	- Added the Console Wrapper
  	- Fixed a bug on the Windowed Wrapper (java.exe was called instead of javaw.exe)
***************
*** 151,155 ****
  	- Fixed several minor bugs
  
! 0.9 (28 Aug 2003)
  	- First public release
  	- Window Wrapper available
\ No newline at end of file
--- 155,159 ----
  	- Fixed several minor bugs
  
! 0.9	(2003-08-31)
  	- First public release
  	- Window Wrapper available
\ No newline at end of file

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/skeleton SkeletonProperty.java, 1.4, 1.5

From: Rodrigo R. <re...@us...> - 2007-04-07 10:09:30

Update of /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/skeleton
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2815/src/net/charabia/jsmoothgen/skeleton

Modified Files:
	SkeletonProperty.java 
Log Message:
removed a debug trace


Index: SkeletonProperty.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/skeleton/SkeletonProperty.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SkeletonProperty.java	30 Mar 2007 22:23:03 -0000	1.4
--- SkeletonProperty.java	7 Apr 2007 10:09:27 -0000	1.5
***************
*** 80,84 ****
      public void setValue(String value)
      {
- 	System.out.println("SkeletonProperty.setValue:" + value);
  	m_value = value;
      }
--- 80,83 ----

[Jsmooth-cvs] jsmooth/ant/net/charabia/jsmooth/ant JSmoothGen.java, 1.2, 1.3

From: Rodrigo R. <re...@us...> - 2007-04-07 10:08:25

Update of /cvsroot/jsmooth/jsmooth/ant/net/charabia/jsmooth/ant
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1648/ant/net/charabia/jsmooth/ant

Modified Files:
	JSmoothGen.java 
Log Message:
adds a destination dir parameter, as suggested and implemented by c_inconnu here: http://sourceforge.net/mailarchive/message.php?msg_name=20050920090245.99697.qmail%40web53103.mail.yahoo.com


Index: JSmoothGen.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/ant/net/charabia/jsmooth/ant/JSmoothGen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JSmoothGen.java	6 Mar 2004 20:57:09 -0000	1.2
--- JSmoothGen.java	7 Apr 2007 10:08:21 -0000	1.3
***************
*** 28,35 ****
  public class JSmoothGen extends org.apache.tools.ant.Task
  {
      private java.io.File m_prjfile;
      private java.io.File m_skeletonRoot;
!     private boolean verbose;
!     
      public void setProject(java.io.File prjfile)
      {
--- 28,58 ----
  public class JSmoothGen extends org.apache.tools.ant.Task
  {
+     /** JSmooth project file. */
      private java.io.File m_prjfile;
+ 
+     /** JSmooth skeletons root directory. */
      private java.io.File m_skeletonRoot;
! 
!     /** Log level. */
!     private boolean m_verbose;
! 
!     /** Destination directory for the generated executable. */
!     private File m_destdir;
! 
!     /**
!      * Sets the destination directory for the generated executable.
!      *
!      * @param destdir the destination directory for the generated executable.
!      */
!     public void setDestdir(java.io.File destdir)
!     {
!         m_destdir = destdir;
!     }
! 
!     /**
!      * Sets the JSmooth project file.
!      *
!      * @param prjfile the JSmooth project file.
!      */
      public void setProject(java.io.File prjfile)
      {
***************
*** 37,40 ****
--- 60,68 ----
      }
  
+     /**
+      * Sets the JSmooth skeletons root directory.
+      *
+      * @param skeletonRoot the JSmooth skeletons root directory.
+      */
      public void setSkeletonRoot(java.io.File skeletonRoot)
      {
***************
*** 42,48 ****
      }
  
      public void setVerbose(boolean val) 
      {
!         verbose = val;
      }
  
--- 70,81 ----
      }
  
+     /**
+      * Sets the log level to verbose or not.
+      *
+      * @param verbose the log level to verbose or not.
+      */
      public void setVerbose(boolean val) 
      {
!         m_verbose = val;
      }
  
***************
*** 70,81 ****
  	    File basedir = prj.getParentFile();
  
  	    SkeletonList skelList = new SkeletonList(m_skeletonRoot);
  
- 	    File out = new File(basedir, model.getExecutableName());
  	    SkeletonBean skel = skelList.getSkeleton(model.getSkeletonName());
  	    File skelroot = skelList.getDirectory(skel);
  	    
  	    final ExeCompiler compiler = new ExeCompiler();
! 	    if (verbose) {
                  compiler.addListener(new ExeCompiler.StepListener() {
  			public void complete() {}
--- 103,124 ----
  	    File basedir = prj.getParentFile();
  
+             File out;
+             if (m_destdir == null)
+             {
+                 out = new File(basedir, model.getExecutableName());
+             }
+             else
+             {
+                 out = new File(m_destdir, model.getExecutableName());
+             }
+             log("Executable file is " + out);
+ 
  	    SkeletonList skelList = new SkeletonList(m_skeletonRoot);
  
  	    SkeletonBean skel = skelList.getSkeleton(model.getSkeletonName());
  	    File skelroot = skelList.getDirectory(skel);
  	    
  	    final ExeCompiler compiler = new ExeCompiler();
! 	    if (m_verbose) {
                  compiler.addListener(new ExeCompiler.StepListener() {
  			public void complete() {}

[Jsmooth-cvs] jsmooth Changelog,1.30,1.31 build.number,1.28,1.29

From: Rodrigo R. <re...@us...> - 2007-04-07 09:51:57

Update of /cvsroot/jsmooth/jsmooth
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27831

Modified Files:
	Changelog build.number 
Log Message:
text update


Index: build.number
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/build.number,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** build.number	6 Apr 2007 16:27:10 -0000	1.28
--- build.number	7 Apr 2007 09:51:50 -0000	1.29
***************
*** 1,3 ****
  #Build Number for ANT. Do not edit!
! #Fri Apr 06 12:07:24 CEST 2007
! build.number=181
--- 1,3 ----
  #Build Number for ANT. Do not edit!
! #Sat Apr 07 09:58:54 CEST 2007
! build.number=182

Index: Changelog
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/Changelog,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Changelog	6 Apr 2007 16:27:09 -0000	1.30
--- Changelog	7 Apr 2007 09:51:50 -0000	1.31
***************
*** 6,10 ****
  	- Added welcome panel
  	
! 0.9.9-3
  	- Fixed bug #1463939: Command line parameters parsing 
  	- Changed the GUI for property editors of jsmoothmodel bean
--- 6,10 ----
  	- Added welcome panel
  	
! 0.9.9-3	(2007-04-03)
  	- Fixed bug #1463939: Command line parameters parsing 
  	- Changed the GUI for property editors of jsmoothmodel bean
***************
*** 22,31 ****
  	file association.
  	
! 0.9.9-2
  	- Fixed missing quotes for command-line arguments
  	- Fixed issue #1679934: jvm properties not defined properly when
  	starting the JVM DLL.
  
! 0.9.9
  	- Added a new skeleton called autodownload, that is able to
  	download and install a JRE (or whatever) when no VM is available.
--- 22,31 ----
  	file association.
  	
! 0.9.9-2	(2007-03-18)
  	- Fixed missing quotes for command-line arguments
  	- Fixed issue #1679934: jvm properties not defined properly when
  	starting the JVM DLL.
  
! 0.9.9	(2007-03-05)
  	- Added a new skeleton called autodownload, that is able to
  	download and install a JRE (or whatever) when no VM is available.

[Jsmooth-cvs] jsmooth/src/locale Texts.properties, 1.9, 1.10 Texts_fr.properties, 1.5, 1.6

From: Rodrigo R. <re...@us...> - 2007-04-07 09:51:57

Update of /cvsroot/jsmooth/jsmooth/src/locale
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27831/src/locale

Modified Files:
	Texts.properties Texts_fr.properties 
Log Message:
text update


Index: Texts.properties
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/locale/Texts.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Texts.properties	6 Apr 2007 16:27:10 -0000	1.9
--- Texts.properties	7 Apr 2007 09:51:50 -0000	1.10
***************
*** 22,27 ****
  EXECUTABLE_HELP=This is the name given to the executable binary.<br>It must end with the ".exe" suffix. For instance, <tt>myprogram.exe</tt> is just fine.
  CURRENTDIR_LABEL=Current Directory
! CURRENTDIR_HELP=Selects the directory to be set as the "current directory" of the the application, when launched. <p>Just leave it empty if you don't need any modification of this value at startup.<p>Typical use of this option is to go up one level when the executable is in a <tt>bin</tt> subdirectory of the program root.<p><b>WARNING</b>: Unlike the other files or directory options, which are all relative to the project file, this value is always relative to the generated executable location. That is, if you set <tt>".."</tt> or "an\\other\\dir" here, the generated wrapper will change to this directory from <u>its</u> own current directory.
! CURRENTDIR_FORCEEXEPATH=Sets the executable folder as current directory of the application
  CURRENTDIR_FORCEEXEPATH_HELP=If this option is selected, the current directory of your application is forced to be the directory where the executable is installed.
  SKELETONPROPERTIES_LABEL=Skeleton Properties
--- 22,27 ----
  EXECUTABLE_HELP=This is the name given to the executable binary.<br>It must end with the ".exe" suffix. For instance, <tt>myprogram.exe</tt> is just fine.
  CURRENTDIR_LABEL=Current Directory
! CURRENTDIR_HELP=Define here the directory to be set as the working directory of the the application, when launched. <p>Just leave it empty if you don't need any modification of this value at startup.<p>Typical use of this option is to go up one level when the executable is in a <tt>bin</tt> subdirectory of the program root.<p><b>WARNING</b>: Unlike the other files or directory options, which are all relative to the project file, this value is always relative to the generated executable location. That is, if you set <tt>".."</tt> or "an\\other\\dir" here, the generated wrapper will change to this directory from <u>its</u> own current directory.<p> You can also use the ${EXECUTABLEPATH} keyword, which will be replaced at runtime by the directory of the executable.
! CURRENTDIR_FORCEEXEPATH=Sets the executable folder as current directory of the application. This is equivalent to setting the "current dir" as "${EXECUTABLEPATH}".
  CURRENTDIR_FORCEEXEPATH_HELP=If this option is selected, the current directory of your application is forced to be the directory where the executable is installed.
  SKELETONPROPERTIES_LABEL=Skeleton Properties

Index: Texts_fr.properties
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/locale/Texts_fr.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Texts_fr.properties	6 Apr 2007 16:27:10 -0000	1.5
--- Texts_fr.properties	7 Apr 2007 09:51:50 -0000	1.6
***************
*** 22,27 ****
  EXECUTABLE_HELP=Indiquez le nom à donner à votre exécutable. <br>Il doit finir par ".exe" de manière à être correctement reconnu par Windows. Par exemple <tt>monprogramme.exe</tt>.
  CURRENTDIR_LABEL=Répertoire de travail
! CURRENTDIR_HELP=Sélectionnez le répertoire qui sera considéré comme le répertoire de travail (également appelé "répertoire courant") par votre application. <p>Vous pouvez laisser ce champ vide si votre application n'en a pas besoin ou si la valeur par défaut vous convient (celle-ci étant le répertoire d'où l'exécutable a été lancé). <p> Un exemple courant d'utilisation de ce paramètre est de remonter d'un niveau à la racine du répertoire d'installation de votre application, lorsque l'exécutable se trouve dans un sous-répertoire <tt>bin/</tt>. <p> <b>ATTENTION</b>: Contrairement aux autres fichiers et répertoires d'un projet JSmooth, qui sont tous relatifs au fichier projet (.jsmooth), celui-ci est relatif au répertoire courant de l'application. <br> Par exemple, si vous mettez la valeur <tt>..</tt> ou <tt>un/autre/repertoire</tt>, le lanceur changera le répertoire de travail de votre application relativement au chemin courant.
! CURRENTDIR_FORCEEXEPATH=Définit le répertoire de l'exécutable comme répertoire courant
  CURRENTDIR_FORCEEXEPATH_HELP=Si cette option est cochée, JSmooth définit le répertoire où se trouve l'exécutable comme répertoire courant au démarrage.
  If this option is selected, the current directory of your application is forced to be the directory where the executable is installed.
--- 22,27 ----
  EXECUTABLE_HELP=Indiquez le nom à donner à votre exécutable. <br>Il doit finir par ".exe" de manière à être correctement reconnu par Windows. Par exemple <tt>monprogramme.exe</tt>.
  CURRENTDIR_LABEL=Répertoire de travail
! CURRENTDIR_HELP=Sélectionnez le répertoire qui sera considéré comme le répertoire de travail (également appelé "répertoire courant") par votre application. <p>Vous pouvez laisser ce champ vide si votre application n'en a pas besoin ou si la valeur par défaut vous convient (celle-ci étant le répertoire d'où l'exécutable a été lancé). <p> Un exemple courant d'utilisation de ce paramètre est de remonter d'un niveau à la racine du répertoire d'installation de votre application, lorsque l'exécutable se trouve dans un sous-répertoire <tt>bin/</tt>. <p> <b>ATTENTION</b>: Contrairement aux autres fichiers et répertoires d'un projet JSmooth, qui sont tous relatifs au fichier projet (.jsmooth), celui-ci est relatif au répertoire courant de l'application. <br> Par exemple, si vous mettez la valeur <tt>..</tt> ou <tt>un/autre/repertoire</tt>, le lanceur changera le répertoire de travail de votre application relativement au chemin courant. <p> Vous pouvez également utiliser le mot clé  ${EXECUTABLEPATH}, qui sera remplacé au lancement par le répertoire où se situe l'exécutable.
! CURRENTDIR_FORCEEXEPATH=Définit le répertoire de l'exécutable comme répertoire courant. Ceci est équivalent au mot clé ${EXECUTABLEPATH} positionné dans le champ texte.
  CURRENTDIR_FORCEEXEPATH_HELP=Si cette option est cochée, JSmooth définit le répertoire où se trouve l'exécutable comme répertoire courant au démarrage.
  If this option is selected, the current directory of your application is forced to be the directory where the executable is installed.

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui Editor.java, 1.2, 1.3 MasterPanel.java, 1.2, 1.3

From: Rodrigo R. <re...@us...> - 2007-04-06 16:27:16

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

Modified Files:
	Editor.java MasterPanel.java 
Log Message:
adds welcome panel


Index: MasterPanel.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/MasterPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MasterPanel.java	27 Mar 2007 20:21:02 -0000	1.2
--- MasterPanel.java	6 Apr 2007 16:27:10 -0000	1.3
***************
*** 39,42 ****
--- 39,43 ----
      private JPanel m_mainpanel = new JPanel();
      private JScrollBar m_mainpanelVBar;
+     private JScrollPane m_scrollpane;
  
      //    private ResourceBundle m_texts;
***************
*** 89,105 ****
      };
  
      public MasterPanel()
      {
  	setLayout(new BorderLayout());
! 	add(BorderLayout.WEST, new JScrollPane(m_leftBar));
! 	JScrollPane scp = new JScrollPane(m_mainpanel);
! 	m_mainpanelVBar = scp.getVerticalScrollBar();
  	add(BorderLayout.CENTER, scp);
  	scp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
! 
! 	//	PanelLayout pl = new PanelLayout();
! 	//	m_mainpanel.setLayout(pl);
  	m_mainpanel.setLayout(new RiverLayout());
  
  	addAction("Skeleton", "/icons/stock_new-template.png", m_skelElements);
  	addAction("Executable", "/icons/stock_autopilot-24.png", m_execElements);
--- 90,109 ----
      };
  
+     private Object[] m_jsInfo = {
+ 	new net.charabia.jsmoothgen.application.gui.editors.JSmoothInfo()
+     };
+ 
      public MasterPanel()
      {
  	setLayout(new BorderLayout());
! 	add(BorderLayout.WEST, m_scrollpane = new JScrollPane(m_leftBar));
!  	JScrollPane scp = new JScrollPane(m_mainpanel);
!  	m_mainpanelVBar = scp.getVerticalScrollBar();
  	add(BorderLayout.CENTER, scp);
  	scp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
! 	//	add(BorderLayout.CENTER, m_mainpanel);
  	m_mainpanel.setLayout(new RiverLayout());
  
+ 	addAction("Welcome", "/icons/stock_form-properties.png", m_jsInfo);
  	addAction("Skeleton", "/icons/stock_new-template.png", m_skelElements);
  	addAction("Executable", "/icons/stock_autopilot-24.png", m_execElements);
***************
*** 108,112 ****
  	addAction("JVM Configuration", "/icons/stock_form-properties.png", m_jvmCfgElements);
  	
! 	//	m_texts = PropertyResourceBundle.getBundle("locale.Texts");
      }
  
--- 112,116 ----
  	addAction("JVM Configuration", "/icons/stock_form-properties.png", m_jvmCfgElements);
  	
! 	setupPanel(m_jsInfo);
      }
  
***************
*** 173,186 ****
  			    }
  
! 			//		    Editor ed = (Editor)els[i].newInstance();
! 
! 			//  		    OptionalHelpPanel help = new OptionalHelpPanel();
! 			//  		    help.getContentPane().setLayout(new BorderLayout());
! 			//  		    help.getContentPane().add(BorderLayout.CENTER, ed);
! 			//  		    help.setLabel(getLocaleText(ed.getLabel()));
! 			//  		    help.setHelpText(getLocaleText(ed.getDescription()));
! 			// 		    m_mainpanel.add("p left hfill", help);
! 
! 			if (ed.needsBigSpace())
  			    {
  				javax.swing.border.TitledBorder title = BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED), getLocaleText(ed.getLabel()));
--- 177,192 ----
  			    }
  
! 			if (ed.needsFullSpace())
! 			    {
! 				pgroup.add("left hfill vfill", ed);
! 				String gc = "br hfill vfill";
! 				m_mainpanel.add(gc, ed);
! 				ed.setMaximumSize(new java.awt.Dimension(300,300));
! 				m_mainpanel.add("tab", new JLabel("..."));
! 				pgroup = null;
! 				// m_scrollpane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
! 				//m_scrollpane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
! 			    }
! 			else if (ed.needsBigSpace())
  			    {
  				javax.swing.border.TitledBorder title = BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED), getLocaleText(ed.getLabel()));
***************
*** 196,211 ****
  			else
  			    {
! 				pgroup.add("br left", new JLabel(getLocaleText(ed.getLabel())));
! 				pgroup.add("tab", new HelpButton(getLocaleText(ed.getDescription())));
! 				pgroup.add("tab hfill", ed);
  			    }
  
- 			// 		    jp.setBorder(title);
- 			// 		    jp.setLayout(new BorderLayout());
- 			// 		    jp.add(ed, BorderLayout.CENTER);
- 			// 		    m_mainpanel.add("p left hfill", jp);
- 			// 		    m_mainpanel.add("p left", new JLabel(ed.getLabel()));
- 			// 		    m_mainpanel.add("tab hfill", ed);
- 
  			m_displayedElements.add(ed);
  		    }
--- 202,217 ----
  			else
  			    {
! 				if (ed.useDescription())
! 				    {
! 					pgroup.add("br left", new JLabel(getLocaleText(ed.getLabel())));
! 					pgroup.add("tab", new HelpButton(getLocaleText(ed.getDescription())));
! 					pgroup.add("tab hfill", ed);
! 				    }
! 				else
! 				    {
! 					pgroup.add("left hfill", ed);
! 				    }
  			    }
  
  			m_displayedElements.add(ed);
  		    }

Index: Editor.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/Editor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Editor.java	27 Mar 2007 20:21:02 -0000	1.2
--- Editor.java	6 Apr 2007 16:27:10 -0000	1.3
***************
*** 66,69 ****
--- 66,79 ----
      }
  
+     public boolean needsFullSpace()
+     {
+ 	return false;
+     }
+ 
+     public boolean useDescription()
+     {
+ 	return true;
+     }
+ 
      protected java.io.File getAbsolutePath(java.io.File f)
      {

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui/util HTMLPane.java, 1.3, 1.4