jsmooth-cvs — notifications of cvs commits

[Jsmooth-cvs] jsmooth/skeletons/autodownload Makefile.win, 1.2, 1.3 execcab.cpp, 1.1, 1.2 execcab.h, 1.1, 1.2 main.cpp, 1.4, 1.5

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

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

Modified Files:
	Makefile.win execcab.cpp execcab.h main.cpp 
Log Message:
- adds current dir with ${EXECUTABLEPATH} support
- removes dependency to libmspack, now relies on setup api.


Index: execcab.h
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/autodownload/execcab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** execcab.h	1 Mar 2007 22:02:17 -0000	1.1
--- execcab.h	1 Apr 2007 22:18:05 -0000	1.2
***************
*** 27,32 ****
  #include <fstream>
  
  #include "FileUtils.h"
! #include "mspack/mspack.h"
  #include "execexe.h"
  
--- 27,34 ----
  #include <fstream>
  
+ #include <setupapi.h>
+ 
  #include "FileUtils.h"
! //#include "mspack/mspack.h"
  #include "execexe.h"
  

Index: execcab.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/autodownload/execcab.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** execcab.cpp	1 Mar 2007 22:02:17 -0000	1.1
--- execcab.cpp	1 Apr 2007 22:18:05 -0000	1.2
***************
*** 21,53 ****
  #include "execcab.h"
  
! std::string unpack_cab(std::string cabpath)
  {
!   struct mscab_decompressor *cabd;
!   struct mscabd_cabinet *cab;
!   struct mscabd_file *file;
!   int test;
  
    string tmpdir = FileUtils::createTempFileName("JSMOOTHDIR");
    CreateDirectoryA(tmpdir.c_str(), 0);
- 
    printf("Created %s\n", tmpdir.c_str());
  
-   MSPACK_SYS_SELFTEST(test);
-   if (test != MSPACK_ERR_OK) exit(0);
  
!   if ((cabd = mspack_create_cab_decompressor(NULL))) {
!     if ((cab = cabd->open(cabd, (char*)cabpath.c_str()))) {
!       for (file = cab->files; file; file = file->next) {
! 	string filepath = FileUtils::concFile(tmpdir, file->filename);
!         printf("%s: %d\n", file->filename, file->length);
! 	cabd->extract(cabd, file, (char*)filepath.c_str());
!       }
!       cabd->close(cabd, cab);
      }
-     mspack_destroy_cab_decompressor(cabd);
-   }
    return tmpdir;
  }
  
  bool exec_cabdir(string path)
  {
--- 21,124 ----
  #include "execcab.h"
  
! 
! LRESULT WINAPI CabinetCallback ( IN PVOID pMyInstallData,
!                      IN UINT Notification,
!                      IN UINT Param1,
!                      IN UINT Param2 )
  {
!   const char *pathdir = (char*)pMyInstallData;
!   LRESULT lRetVal = NO_ERROR;
!   //  TCHAR szTarget[MAX_PATH];
!   FILE_IN_CABINET_INFO *pInfo = NULL;
!   FILEPATHS *pFilePaths = NULL;
! 
!   //  lstrcpy(szTarget,g_szTargetPath);
! 
!   std::string fullpath(pathdir);
! 
!   switch(Notification)
!     {
!     case SPFILENOTIFY_FILEINCABINET:
  
+       pInfo = (FILE_IN_CABINET_INFO *)Param1;
+       fullpath = FileUtils::concFile(fullpath, pInfo->NameInCabinet);
+       // lstrcat(szTarget, pInfo->NameInCabinet);
+       lstrcpy(pInfo->FullTargetName, fullpath.c_str());
+       printf("request extraction of %s\n", pInfo->FullTargetName);
+       lRetVal = FILEOP_DOIT;  // Extract the file.
+       break;
+ 
+     case SPFILENOTIFY_FILEEXTRACTED:
+       pFilePaths = (FILEPATHS *)Param1;
+       printf ( "Extracted %s\n",pFilePaths->Target);
+       FileUtils::deleteOnReboot(string(pFilePaths->Target));
+       lRetVal = NO_ERROR;
+       break;
+ 
+     case SPFILENOTIFY_NEEDNEWCABINET: // Unexpected.
+       lRetVal = NO_ERROR;
+       break;
+     }
+ 
+   return lRetVal;
+ }
+ 
+ std::string cab_extract(std::string cabfilepath)
+ {
    string tmpdir = FileUtils::createTempFileName("JSMOOTHDIR");
    CreateDirectoryA(tmpdir.c_str(), 0);
    printf("Created %s\n", tmpdir.c_str());
  
  
!   if (!SetupIterateCabinet(cabfilepath.c_str(), 0, (PSP_FILE_CALLBACK)CabinetCallback, (void *)tmpdir.c_str()))
!     {
! //       DEBUG("Error extract cabinet)
! //       FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER |
! // 		     FORMAT_MESSAGE_FROM_SYSTEM |
! // 		     FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
! // 		     GetLastError(), MAKELANGID(LANG_NEUTRAL,
! // 						SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, 0, NULL );
! 
! //       MessageBox( NULL,(LPTSTR) lpMsgBuf,
! // 		  "SetupIterateCabinet() Error :",
! // 		  MB_OK | MB_ICONEXCLAMATION | MB_TOPMOST);
! 
!       printf("Error extracting the cab %s\n", cabfilepath.c_str());
      }
    return tmpdir;
  }
  
+ 
+ // std::string unpack_cab(std::string cabpath)
+ // {
+ //   struct mscab_decompressor *cabd;
+ //   struct mscabd_cabinet *cab;
+ //   struct mscabd_file *file;
+ //   int test;
+ 
+ //   string tmpdir = FileUtils::createTempFileName("JSMOOTHDIR");
+ //   CreateDirectoryA(tmpdir.c_str(), 0);
+ 
+ //   printf("Created %s\n", tmpdir.c_str());
+ 
+ //   MSPACK_SYS_SELFTEST(test);
+ //   if (test != MSPACK_ERR_OK) exit(0);
+ 
+ //   if ((cabd = mspack_create_cab_decompressor(NULL))) {
+ //     if ((cab = cabd->open(cabd, (char*)cabpath.c_str()))) {
+ //       for (file = cab->files; file; file = file->next) {
+ // 	string filepath = FileUtils::concFile(tmpdir, file->filename);
+ //         printf("%s: %d\n", file->filename, file->length);
+ // 	cabd->extract(cabd, file, (char*)filepath.c_str());
+ //       }
+ //       cabd->close(cabd, cab);
+ //     }
+ //     mspack_destroy_cab_decompressor(cabd);
+ //   }
+ //   return tmpdir;
+ // }
+ 
+ 
+ 
  bool exec_cabdir(string path)
  {
***************
*** 86,90 ****
  bool exec_cab(const std::string& file)
  {
!   std::string path = unpack_cab(file);
    return exec_cabdir(path);
  }
--- 157,162 ----
  bool exec_cab(const std::string& file)
  {
!   //  std::string path = unpack_cab(file);
!   std::string path = cab_extract(file);
    return exec_cabdir(path);
  }

Index: main.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/autodownload/main.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.cpp	4 Mar 2007 23:03:50 -0000	1.4
--- main.cpp	1 Apr 2007 22:18:05 -0000	1.5
***************
*** 85,94 ****
    DEBUG(string("Main class: ") + globalResMan->getMainName());
  
- 
    char curdir[256];
    GetCurrentDirectory(256, curdir);
    DEBUG(string("Currentdir: ") + curdir);
  
!   string newcurdir = globalResMan->getProperty(ResourceManager::KEY_CURRENTDIR);
    SetCurrentDirectory(newcurdir.c_str());
  
--- 85,93 ----
    DEBUG(string("Main class: ") + globalResMan->getMainName());
  
    char curdir[256];
    GetCurrentDirectory(256, curdir);
    DEBUG(string("Currentdir: ") + curdir);
  
!   string newcurdir = globalResMan->getCurrentDirectory();
    SetCurrentDirectory(newcurdir.c_str());
  

Index: Makefile.win
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/autodownload/Makefile.win,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.win	4 Mar 2007 23:03:50 -0000	1.2
--- Makefile.win	1 Apr 2007 22:18:05 -0000	1.3
***************
*** 2,7 ****
  
  PROJECTNAME=autodownload
! libmscabd_la_SOURCES = mspack/system.c mspack/cabd.c mspack/lzxd.c mspack/mszipd.c mspack/qtmd.c
! libmscabd_la_OBJS = system.o cabd.o lzxd.o mszipd.o qtmd.o
  
  SHELL = /bin/sh
--- 2,7 ----
  
  PROJECTNAME=autodownload
! ##libmscabd_la_SOURCES = mspack/system.c mspack/cabd.c mspack/lzxd.c mspack/mszipd.c mspack/qtmd.c
! ##libmscabd_la_OBJS = system.o cabd.o lzxd.o mszipd.o qtmd.o
  
  SHELL = /bin/sh
***************
*** 16,21 ****
  FLTK-LDFLAGS = $(shell fltk-config --ldflags)
  FLTK-CXXFLAGS = $(shell fltk-config --cxxflags)
! LINKLIBS = ../commonjava/CommonJava.a ../util-core/util-core.a mspack.a ../util-net/util-net.a
! LIBS =  -L"$(MINGW)/lib"  -L"/lib" -lws2_32 -L"/lib" -L"../commonjava" -mwindows -L"../util-core" $(LINKLIBS) $(FLTK-LDFLAGS)
  INCS =  -I"$(MINGW)/include"  -I"$(JDK)/include"  -I"$(JDK)/include/win32" 
  CXXINCS =  -I"$(MINGW)/include/c++"  -I"$(MINGW)/include/c++/mingw32"  -I"$(MINGW)/include/c++/backward"  -I"$(MINGW)/include"  -I"$(JDK)/include"  -I"$(JDK)/include/win32" -I"../commonjava" -I"../util-core" -I"../util-net" $(FLTK-CXXFLAGS)
--- 16,22 ----
  FLTK-LDFLAGS = $(shell fltk-config --ldflags)
  FLTK-CXXFLAGS = $(shell fltk-config --cxxflags)
! ##LINKLIBS = ../commonjava/CommonJava.a ../util-core/util-core.a mspack.a ../util-net/util-net.a
! LINKLIBS = ../commonjava/CommonJava.a ../util-core/util-core.a ../util-net/util-net.a
! LIBS =  -L"$(MINGW)/lib"  -L"/lib" -lws2_32 -L"/lib" -L"../commonjava" -mwindows -L"../util-core" $(LINKLIBS) $(FLTK-LDFLAGS) -lsetupapi
  INCS =  -I"$(MINGW)/include"  -I"$(JDK)/include"  -I"$(JDK)/include/win32" 
  CXXINCS =  -I"$(MINGW)/include/c++"  -I"$(MINGW)/include/c++/mingw32"  -I"$(MINGW)/include/c++/backward"  -I"$(MINGW)/include"  -I"$(JDK)/include"  -I"$(JDK)/include/win32" -I"../commonjava" -I"../util-core" -I"../util-net" $(FLTK-CXXFLAGS)
***************
*** 28,41 ****
  all: all-before $(BIN) all-after
  
! clean: clean-custom
! 	$(RM) $(OBJ) $(BIN) mspack.a
  
  $(BIN): $(LINKOBJ) $(LINKLIBS)
  	$(CPP) $(LINKOBJ) -o $(BIN) $(LIBS)
  
! mspack.a: $(libmscabd_la_SOURCES)
! 	$(CC) -c -Imspack $(libmscabd_la_SOURCES)
! 	ar r mspack.a $(libmscabd_la_OBJS)
! 	ranlib mspack.a
  
  JWrap_private.res: JWrap_private.rc mainres.rc 
--- 29,42 ----
  all: all-before $(BIN) all-after
  
! clean: 	clean-custom
! 	$(RM) $(OBJ) $(BIN) 
  
  $(BIN): $(LINKOBJ) $(LINKLIBS)
  	$(CPP) $(LINKOBJ) -o $(BIN) $(LIBS)
  
! #mspack.a: $(libmscabd_la_SOURCES)
! #	$(CC) -c -Imspack $(libmscabd_la_SOURCES)
! #	ar r mspack.a $(libmscabd_la_OBJS)
! #	ranlib mspack.a
  
  JWrap_private.res: JWrap_private.rc mainres.rc 

[Jsmooth-cvs] jsmooth/skeletons/samplejar sample.props,1.2,1.3

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

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

Modified Files:
	sample.props 
Log Message:
- adds current dir with ${EXECUTABLEPATH} support
- removes dependency to libmspack, now relies on setup api.


Index: sample.props
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/samplejar/sample.props,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sample.props	5 Mar 2007 06:58:39 -0000	1.2
--- sample.props	1 Apr 2007 22:18:06 -0000	1.3
***************
*** 3,7 ****
  classpath=
  jvmsearch=registry;jview;javahome;jrepath;jdkpath;exepath;
! minversion=1.1
  maxversion=
  currentdir=
--- 3,7 ----
  classpath=
  jvmsearch=registry;jview;javahome;jrepath;jdkpath;exepath;
! minversion=1.9
  maxversion=
  currentdir=

[Jsmooth-cvs] jsmooth/skeletons/simplewrap main.cpp,1.23,1.24

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

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

Modified Files:
	main.cpp 
Log Message:
- adds current dir with ${EXECUTABLEPATH} support
- removes dependency to libmspack, now relies on setup api.


Index: main.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/simplewrap/main.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** main.cpp	2 Mar 2007 23:04:54 -0000	1.23
--- main.cpp	1 Apr 2007 22:18:06 -0000	1.24
***************
*** 84,88 ****
      DEBUG(string("Currentdir: ") + curdir);
  
!     string newcurdir = globalResMan->getProperty(ResourceManager::KEY_CURRENTDIR);
      SetCurrentDirectory(newcurdir.c_str());
  
--- 84,88 ----
      DEBUG(string("Currentdir: ") + curdir);
  
!     string newcurdir = globalResMan->getCurrentDirectory();
      SetCurrentDirectory(newcurdir.c_str());
  

[Jsmooth-cvs] jsmooth/skeletons/commonjava ResourceManager.cpp, 1.15, 1.16 SunJVMLauncher.cpp, 1.22, 1.23

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

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

Modified Files:
	ResourceManager.cpp SunJVMLauncher.cpp 
Log Message:
- adds current dir with ${EXECUTABLEPATH} support
- removes dependency to libmspack, now relies on setup api.


Index: SunJVMLauncher.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/SunJVMLauncher.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** SunJVMLauncher.cpp	17 Mar 2007 08:50:38 -0000	1.22
--- SunJVMLauncher.cpp	1 Apr 2007 22:18:05 -0000	1.23
***************
*** 831,835 ****
      }
  
!   DeleteFile(tmpfilename.c_str());
    return result;
  }
--- 831,835 ----
      }
  
!   FileUtils::deleteOnReboot(tmpfilename);
    return result;
  }

Index: ResourceManager.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/ResourceManager.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ResourceManager.cpp	29 Mar 2007 20:16:44 -0000	1.15
--- ResourceManager.cpp	1 Apr 2007 22:18:05 -0000	1.16
***************
*** 105,116 ****
  
      std::string curdirmodifier = m_props.get(ResourceManager::KEY_CURRENTDIR);
      if (curdirmodifier.length()>0)
!         m_currentDirectory = FileUtils::concFile(FileUtils::getExecutablePath(), curdirmodifier);
      else
        {
          m_currentDirectory = FileUtils::getExecutablePath();
- 	m_currentDirectory = StringUtils::replace(m_currentDirectory, "${EXECUTABLEPATH}", exepath);
- 	m_currentDirectory = StringUtils::replaceEnvironmentVariable(m_currentDirectory);
        }
  }
  
--- 105,127 ----
  
      std::string curdirmodifier = m_props.get(ResourceManager::KEY_CURRENTDIR);
+     printf("curdirmodifier: [%s]\n", curdirmodifier.c_str());
      if (curdirmodifier.length()>0)
!       {
! 	if (curdirmodifier == "${EXECUTABLEPATH}")
! 	  {
! 	    printf("Replacing EXEPATH ... %s :: %s\n", curdirmodifier.c_str(), exepath.c_str());
! 	    m_currentDirectory = StringUtils::replace(curdirmodifier, "${EXECUTABLEPATH}", exepath);
! 	  }
! 	else
! 	  {
! 	    m_currentDirectory = FileUtils::concFile(FileUtils::getExecutablePath(), curdirmodifier);
! 	    m_currentDirectory = StringUtils::replaceEnvironmentVariable(m_currentDirectory);
! 	  }
!       }
      else
        {
          m_currentDirectory = FileUtils::getExecutablePath();
        }
+     printf("CURDIR SET TO: [%s]\n", m_currentDirectory.c_str());
  }
  
***************
*** 147,151 ****
        CloseHandle(temp);
        string s = tempname;
!       m_deleteOnFinalize.push_back(s);
      }
      
--- 158,163 ----
        CloseHandle(temp);
        string s = tempname;
!       //      m_deleteOnFinalize.push_back(s);
!       FileUtils::deleteOnReboot(s);
      }
      

[Jsmooth-cvs] jsmooth/skeletons/util-core FileUtils.cpp, 1.1, 1.2 FileUtils.h, 1.1, 1.2

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

Update of /cvsroot/jsmooth/jsmooth/skeletons/util-core
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32475/util-core

Modified Files:
	FileUtils.cpp FileUtils.h 
Log Message:
- adds current dir with ${EXECUTABLEPATH} support
- removes dependency to libmspack, now relies on setup api.


Index: FileUtils.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/util-core/FileUtils.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileUtils.cpp	1 Mar 2007 21:49:59 -0000	1.1
--- FileUtils.cpp	1 Apr 2007 22:18:06 -0000	1.2
***************
*** 146,147 ****
--- 146,152 ----
    return "";
  }
+ 
+ void FileUtils::deleteOnReboot(std::string file)
+ {
+   MoveFileEx(file.c_str(), 0, MOVEFILE_DELAY_UNTIL_REBOOT);
+ }

Index: FileUtils.h
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/util-core/FileUtils.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileUtils.h	1 Mar 2007 21:49:59 -0000	1.1
--- FileUtils.h	1 Apr 2007 22:18:06 -0000	1.2
***************
*** 110,113 ****
--- 110,115 ----
    static std::string getFileExtension(const std::string& filename);
  
+   static void deleteOnReboot(std::string file);
+ 
  };
  

[Jsmooth-cvs] jsmooth/skeletons/consolewrapper main.cpp,1.13,1.14

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

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

Modified Files:
	main.cpp 
Log Message:
- adds current dir with ${EXECUTABLEPATH} support
- removes dependency to libmspack, now relies on setup api.


Index: main.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/consolewrapper/main.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main.cpp	24 Mar 2007 12:42:06 -0000	1.13
--- main.cpp	1 Apr 2007 22:18:06 -0000	1.14
***************
*** 77,81 ****
      }
    
- 
      ResourceManager* globalResMan = new ResourceManager("JAVA", PROPID, JARID);
  
--- 77,80 ----
***************
*** 99,103 ****
      GetCurrentDirectory(256, curdir);
  
!     string newcurdir = globalResMan->getProperty(ResourceManager::KEY_CURRENTDIR);
      SetCurrentDirectory(newcurdir.c_str());
  
--- 98,102 ----
      GetCurrentDirectory(256, curdir);
  
!     string newcurdir = globalResMan->getCurrentDirectory();
      SetCurrentDirectory(newcurdir.c_str());
  

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

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

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

Modified Files:
	SkeletonProperty.java 
Log Message:
Added Auto Download URL Editor for skeleton properties


Index: SkeletonProperty.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/skeleton/SkeletonProperty.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SkeletonProperty.java	27 Mar 2007 20:21:03 -0000	1.3
--- SkeletonProperty.java	30 Mar 2007 22:23:03 -0000	1.4
***************
*** 16,19 ****
--- 16,20 ----
      static public String TYPE_TEXTAREA = "textarea";
      static public String TYPE_BOOLEAN = "boolean";
+     static public String TYPE_AUTODOWNLOADURL = "autodownloadurl";
  	
      private String m_idName = "";

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui/skeleditors CheckBoxEditor.java, 1.1, 1.2 TextAreaEditor.java, 1.1, 1.2

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

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

Modified Files:
	CheckBoxEditor.java TextAreaEditor.java 
Log Message:
Added Auto Download URL Editor for skeleton properties


Index: CheckBoxEditor.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/skeleditors/CheckBoxEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CheckBoxEditor.java	27 Mar 2007 20:21:02 -0000	1.1
--- CheckBoxEditor.java	30 Mar 2007 22:23:03 -0000	1.2
***************
*** 34,46 ****
      {
  	m_comp = new JCheckBox();
- // 	m_comp.addActionListener(new ActionListener() {
- // 		public void actionPerformed(ActionEvent e)
- // 		{
- // 		    if (CheckBoxEditor.this.m_comp.isSelected())
- // 			set("1");
- // 		    else
- // 			set("0");
- // 		}
- // 	    });
      }
  
--- 34,37 ----

Index: TextAreaEditor.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/skeleditors/TextAreaEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextAreaEditor.java	27 Mar 2007 20:21:02 -0000	1.1
--- TextAreaEditor.java	30 Mar 2007 22:23:03 -0000	1.2
***************
*** 34,42 ****
  	m_comp = new JTextArea(5, 40);
  	PlainDocument doc = new PlainDocument();
- // 	doc.addDocumentListener(new DocumentListener() {
- // 		public void insertUpdate(DocumentEvent e) { TextAreaEditor.this.set(m_comp.getText());  }
- // 		public void removeUpdate(DocumentEvent e) { TextAreaEditor.this.set(m_comp.getText());  }
- // 		public void changedUpdate(DocumentEvent e){ TextAreaEditor.this.set(m_comp.getText());  }
- // 	    });
  	m_comp.setDocument(doc);
  	m_sp = new JScrollPane(m_comp);
--- 34,37 ----

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

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

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

Modified Files:
	SkeletonPropertiesEditor.java 
Log Message:
Added Auto Download URL Editor for skeleton properties


Index: SkeletonPropertiesEditor.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/SkeletonPropertiesEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SkeletonPropertiesEditor.java	29 Mar 2007 21:18:21 -0000	1.2
--- SkeletonPropertiesEditor.java	30 Mar 2007 22:23:03 -0000	1.3
***************
*** 85,88 ****
--- 85,92 ----
  			spe = new CheckBoxEditor();
  		    }
+ 		else if (sprops[i].getType().equalsIgnoreCase(SkeletonProperty.TYPE_AUTODOWNLOADURL))
+ 		    {
+ 			spe = new AutoDownloadURLEditor();
+ 		    }
  
  		if (spe == null)

[Jsmooth-cvs] jsmooth Changelog,1.26,1.27

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

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

Modified Files:
	Changelog 
Log Message:
added some entries


Index: Changelog
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/Changelog,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Changelog	27 Mar 2007 20:22:14 -0000	1.26
--- Changelog	29 Mar 2007 21:21:57 -0000	1.27
***************
*** 4,7 ****
--- 4,9 ----
  	- Changed the GUI for the skeleton editors
  	- Added I18N support for skeleton texts
+ 	- Current-directory setting now accepts sys. env. variables and
+ 	the special ${EXECUTABLEPATH} variable.
  
  0.9.9-2

[Jsmooth-cvs] jsmooth/skeletons/autodownload autodownload.skel, 1.3, 1.4 description.skel, 1.1, NONE

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

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

Modified Files:
	autodownload.skel 
Removed Files:
	description.skel 
Log Message:
removed


--- description.skel DELETED ---

Index: autodownload.skel
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/autodownload/autodownload.skel,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** autodownload.skel	27 Mar 2007 20:16:57 -0000	1.3
--- autodownload.skel	29 Mar 2007 21:21:15 -0000	1.4
***************
*** 13,17 ****
  <label>SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_LABEL</label>
  <type>textarea</type>
! <value>SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_VALUE</value>
  </skeletonProperties>
  <skeletonProperties>
--- 13,17 ----
  <label>SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_LABEL</label>
  <type>textarea</type>
! <value>Java has not been found on your computer. Do you want to download it?</value>
  </skeletonProperties>
  <skeletonProperties>

[Jsmooth-cvs] jsmooth/src/locale Texts.properties, 1.4, 1.5 Texts_fr.properties, 1.1, 1.2

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

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

Modified Files:
	Texts.properties Texts_fr.properties 
Log Message:
removed some entries 


Index: Texts.properties
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/locale/Texts.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Texts.properties	28 Mar 2007 20:16:53 -0000	1.4
--- Texts.properties	29 Mar 2007 21:18:59 -0000	1.5
***************
*** 82,86 ****
  SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_DESCRIPTION=When no JVM is found in the target computer, the user is prompted with the message defined below. Then, the default browser is launched with the URL defined here.
  SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_LABEL=Message
- ###SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_VALUE=Java has not been found on your computer. Do you want to download it?
  SKEL_AUTODOWNLOAD_PROPERTY_DLURL_DESCRIPTION=The Sun's Auto Download URL for the JVM that should be downloaded by the wrapper when no JVM is found. Select the version of the JVM needed by your application. Select the highest possible version.
  SKEL_AUTODOWNLOAD_PROPERTY_DLURL_LABEL=Java VM to download
--- 82,85 ----

Index: Texts_fr.properties
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/locale/Texts_fr.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Texts_fr.properties	28 Mar 2007 20:17:29 -0000	1.1
--- Texts_fr.properties	29 Mar 2007 21:18:59 -0000	1.2
***************
*** 81,85 ****
  SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_DESCRIPTION=Quand aucune JVM n'est trouvée sur l'ordinateur de l'utilisateur, ce dernier se voit proposer le téléchargement d'une JVM en utilisant ce message.
  SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_LABEL=Message
- ###SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_VALUE=Java has not been found on your computer. Do you want to download it?
  SKEL_AUTODOWNLOAD_PROPERTY_DLURL_DESCRIPTION=Une URL du service Auto Download de Sun, permettant de téléchargement un installateur de JVM. Choisissez la version maximale supportée par votre application (généralement la plus récente).
  SKEL_AUTODOWNLOAD_PROPERTY_DLURL_LABEL=JVM à télécharger
--- 81,84 ----

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui/editors SkeletonPropertiesEditor.java, 1.1, 1.2

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

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

Modified Files:
	SkeletonPropertiesEditor.java 
Log Message:
set default values for skeleton properties


Index: SkeletonPropertiesEditor.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/SkeletonPropertiesEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SkeletonPropertiesEditor.java	27 Mar 2007 20:21:02 -0000	1.1
--- SkeletonPropertiesEditor.java	29 Mar 2007 21:18:21 -0000	1.2
***************
*** 133,136 ****
--- 133,137 ----
  
  	JSmoothModelBean.Property[] jsprop = m_model.getSkeletonProperties();
+ 	System.out.println("jsprop is null ? " + jsprop + " / " + ((jsprop!=null)?jsprop.length:-1));
  	if (jsprop != null)
  	    {
***************
*** 142,158 ****
  			    spe.valueChanged(p.getValue());
  		    }
- 
- 		// 		for (int i=0; i<jsprop.length; i++)
- 		// 		    {
- 		// 			System.out.println("......prop " + jsprop[i].getKey() + "=" + jsprop[i].getValue());
- 		// 			for (Enumeration e=m_editors.elements(); e.hasMoreElements(); )
- 		// 			    {
- 		// 				SkelPropEditor spe = (SkelPropEditor)e.nextElement();
- 		// 				if (spe.getIdName().equals(jsprop[i].getKey()))
- 		// 				    spe.valueChanged(jsprop[i].getValue());
- 		// 			    }
- 		// 		    }
  	    }
  
  
  	System.out.println("DONE NOTHING! " +m_currentSkelName + "/" + m_model.getSkeletonName());
--- 143,168 ----
  			    spe.valueChanged(p.getValue());
  		    }
  	    }
+ 	else
+ 	    { // if no properties are defined for this model, we use the default values
+ 		
+ 		SkeletonBean skel = Main.SKELETONS.getSkeleton( m_model.getSkeletonName() );
+ 		SkeletonProperty[] sprops = null;
+ 		if (skel != null)
+ 		    sprops = skel.getSkeletonProperties();
  
+ 		if (sprops != null)
+ 		    {
+ 			for (Enumeration e=m_editors.elements(); e.hasMoreElements(); )
+ 			    {
+ 				SkelPropEditor spe = (SkelPropEditor)e.nextElement();				
+ 				for (int i=0; i<sprops.length; i++)
+ 				    {
+ 					if (sprops[i].getIdName().equals(spe.getIdName()))
+ 					    spe.valueChanged(sprops[i].getValue());
+ 				    }
+ 			    }			
+ 		    }
+ 	    }
  
  	System.out.println("DONE NOTHING! " +m_currentSkelName + "/" + m_model.getSkeletonName());

[Jsmooth-cvs] jsmooth/skeletons/commonjava ResourceManager.cpp, 1.14, 1.15

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

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

Modified Files:
	ResourceManager.cpp 
Log Message:
current-directory setting now accepts sys. env. variables and the special ${EXECUTABLEPATH} variable.


Index: ResourceManager.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/ResourceManager.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ResourceManager.cpp	17 Mar 2007 08:50:38 -0000	1.14
--- ResourceManager.cpp	29 Mar 2007 20:16:44 -0000	1.15
***************
*** 108,112 ****
          m_currentDirectory = FileUtils::concFile(FileUtils::getExecutablePath(), curdirmodifier);
      else
!         m_currentDirectory = FileUtils::getExecutablePath();    
  }
  
--- 108,116 ----
          m_currentDirectory = FileUtils::concFile(FileUtils::getExecutablePath(), curdirmodifier);
      else
!       {
!         m_currentDirectory = FileUtils::getExecutablePath();
! 	m_currentDirectory = StringUtils::replace(m_currentDirectory, "${EXECUTABLEPATH}", exepath);
! 	m_currentDirectory = StringUtils::replaceEnvironmentVariable(m_currentDirectory);
!       }
  }
  

[Jsmooth-cvs] jsmooth/src/locale Texts_fr.properties,NONE,1.1

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

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

Added Files:
	Texts_fr.properties 
Log Message:
french localization support


--- NEW FILE: Texts_fr.properties ---
(This appears to be a binary file; contents omitted.)

[Jsmooth-cvs] jsmooth/src/locale Texts.properties,1.3,1.4

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

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

Modified Files:
	Texts.properties 
Log Message:
added skel support


Index: Texts.properties
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/locale/Texts.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Texts.properties	27 Mar 2007 20:21:02 -0000	1.3
--- Texts.properties	28 Mar 2007 20:16:53 -0000	1.4
***************
*** 18,22 ****
  #
  SKELETONCHOOSER_LABEL=Skeleton Selection
! SKELETONCHOOSER_HELP=A skeleton is an empty wrapper that launch your application. Each skeleton has its own behaviour regarding the application configuration and what is done when no JRE is found on the end-user's computer.<p>Read carefully their descriptions before picking one.
  EXECUTABLE_LABEL=Executable Binary
  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.
--- 18,22 ----
  #
  SKELETONCHOOSER_LABEL=Skeleton Selection
! SKELETONCHOOSER_HELP=A skeleton is an empty wrapper that launches your application. Each skeleton has its own behaviour regarding the application configuration and what is done when no JRE is found on the end-user's computer.<p>Read carefully their descriptions before picking one.
  EXECUTABLE_LABEL=Executable Binary
  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.

[Jsmooth-cvs] jsmooth/skeletons/simplewrap/samplejar/classes .cvsignore, NONE, 1.1

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

Update of /cvsroot/jsmooth/jsmooth/skeletons/simplewrap/samplejar/classes
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30132/skeletons/simplewrap/samplejar/classes

Added Files:
	.cvsignore 
Log Message:
added .cvsignore


--- NEW FILE: .cvsignore ---
*.class

[Jsmooth-cvs] jsmooth/lib riverlayout.jar,NONE,1.1

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

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

Added Files:
	riverlayout.jar 
Log Message:
added new library


--- NEW FILE: riverlayout.jar ---
(This appears to be a binary file; contents omitted.)

[Jsmooth-cvs] jsmooth Changelog,1.25,1.26

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

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

Modified Files:
	Changelog 
Log Message:
update


Index: Changelog
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/Changelog,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Changelog	18 Mar 2007 18:35:20 -0000	1.25
--- Changelog	27 Mar 2007 20:22:14 -0000	1.26
***************
*** 1,2 ****
--- 1,8 ----
+ 0.9.9-3
+ 	- Fixed bug #1463939: Command line parameters parsing 
+ 	- Changed the GUI for property editors of jsmoothmodel bean
+ 	- Changed the GUI for the skeleton editors
+ 	- Added I18N support for skeleton texts
+ 
  0.9.9-2
  	- Fixed missing quotes for command-line arguments

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui/skeleditors CheckBoxEditor.java, NONE, 1.1 SkelPanel.java, NONE, 1.1 SkelPropEditor.java, NONE, 1.1 StringEditor.java, NONE, 1.1 TextAreaEditor.java, NONE, 1.1

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

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

Added Files:
	CheckBoxEditor.java SkelPanel.java SkelPropEditor.java 
	StringEditor.java TextAreaEditor.java 
Log Message:
Added new skeleton properties edition
Changed overall GUI for editors


--- NEW FILE: CheckBoxEditor.java ---
/*
  JSmooth: a VM wrapper toolkit for Windows
  Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...>
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */

package net.charabia.jsmoothgen.application.gui.skeleditors;

import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import java.util.*;
import java.awt.event.*;

public class CheckBoxEditor extends SkelPropEditor
{
    JCheckBox m_comp;

    public CheckBoxEditor()
    {
	m_comp = new JCheckBox();
// 	m_comp.addActionListener(new ActionListener() {
// 		public void actionPerformed(ActionEvent e)
// 		{
// 		    if (CheckBoxEditor.this.m_comp.isSelected())
// 			set("1");
// 		    else
// 			set("0");
// 		}
// 	    });
    }

    public java.awt.Component getGUI()
    {
	return m_comp;
    }

    public void valueChanged(String val)
    {
	if (val.toString().equals("1"))
	    m_comp.setSelected(true);
	else
	    m_comp.setSelected(false);
    }

    public boolean labelAtLeft()
    {
	return false;
    }

    public void set(String o) { if ("1".equals(o)) m_comp.setSelected(true); else m_comp.setSelected(false); }
    public String get() {return m_comp.isSelected()?"1":"0"; }

}

--- NEW FILE: StringEditor.java ---
/*
  JSmooth: a VM wrapper toolkit for Windows
  Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...>
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */

package net.charabia.jsmoothgen.application.gui.skeleditors;

import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import java.util.*;

public class StringEditor extends SkelPropEditor
{
    JTextField m_comp;

    public StringEditor()
    {
	m_comp = new JTextField();
	PlainDocument doc = new PlainDocument();
// 	doc.addDocumentListener(new DocumentListener() {
// 				public void insertUpdate(DocumentEvent e) { StringEditor.this.set(m_comp.getText());  }
// 				public void removeUpdate(DocumentEvent e) { StringEditor.this.set(m_comp.getText());  }
// 				public void changedUpdate(DocumentEvent e){ StringEditor.this.set(m_comp.getText());  }
// 	    });
	m_comp.setDocument(doc);
    }

    public java.awt.Component getGUI()
    {
	return m_comp;
    }

    public void valueChanged(String val)
    {
	m_comp.setText(val);
    }

    public void set(String o) { m_comp.setText(o); }
    public String get() {return m_comp.getText(); }

}

--- NEW FILE: SkelPropEditor.java ---
/*
  JSmooth: a VM wrapper toolkit for Windows
  Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...>
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */

package net.charabia.jsmoothgen.application.gui.skeleditors;

import net.charabia.jsmoothgen.skeleton.*;
import net.charabia.jsmoothgen.application.*;
import net.charabia.jsmoothgen.application.gui.*;
import net.charabia.jsmoothgen.application.gui.util.*;

import net.charabia.jsmoothgen.skeleton.*;

abstract public class SkelPropEditor
{
    protected SkeletonProperty m_property;
    
    public void bind(SkeletonProperty prop)
    {
	m_property = prop;
    }

    public String getIdName()
    {
	return m_property.getIdName();
    }
    
    
    public boolean labelAtLeft()
    {
	return true;
    }

    public abstract java.awt.Component getGUI();
    public abstract void valueChanged(String val);

    public abstract void set(String o);
    public abstract String get();
//     {
// 	System.out.println("setvalue of " + o + " on " + m_property);
// 	m_property.setValue(o.toString());
//     }

//     {
// 	System.out.println("getvalue from " + m_property + "=" + m_property.getValue());
// 	return m_property.getValue();
//     }

}


--- NEW FILE: TextAreaEditor.java ---
/*
  JSmooth: a VM wrapper toolkit for Windows
  Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...>
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */

package net.charabia.jsmoothgen.application.gui.skeleditors;

import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import java.util.*;

public class TextAreaEditor extends SkelPropEditor
{
    JTextArea m_comp;
    JScrollPane m_sp;
    public TextAreaEditor()
    {
	m_comp = new JTextArea(5, 40);
	PlainDocument doc = new PlainDocument();
// 	doc.addDocumentListener(new DocumentListener() {
// 		public void insertUpdate(DocumentEvent e) { TextAreaEditor.this.set(m_comp.getText());  }
// 		public void removeUpdate(DocumentEvent e) { TextAreaEditor.this.set(m_comp.getText());  }
// 		public void changedUpdate(DocumentEvent e){ TextAreaEditor.this.set(m_comp.getText());  }
// 	    });
	m_comp.setDocument(doc);
	m_sp = new JScrollPane(m_comp);
    }

    public java.awt.Component getGUI()
    {
	return m_sp;
    }

    public void valueChanged(String val)
    {
	m_comp.setText(val);
    }

    public void set(String o) { m_comp.setText(o); }
    public String get() {return m_comp.getText(); }

}

--- NEW FILE: SkelPanel.java ---
/*
  JSmooth: a VM wrapper toolkit for Windows
  Copyright (C) 2003-2007 Rodrigo Reyes <re...@ch...>
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */

package net.charabia.jsmoothgen.application.gui.skeleditors;

import net.charabia.jsmoothgen.skeleton.*;
import net.charabia.jsmoothgen.application.*;
import net.charabia.jsmoothgen.application.gui.*;
import net.charabia.jsmoothgen.application.gui.util.*;
import javax.swing.*;
import java.awt.*;
import java.util.*;
import com.l2fprod.common.swing.*;
import com.l2fprod.common.propertysheet.*;
import java.lang.reflect.*;

import se.datadosen.component.RiverLayout;

public class SkelPanel extends JPanel
{
    static public class BTest
    {
	public void setStringTest(String t)
	    { }
	public String getStringTest()
	    { return "TEST"; }
    }

    public SkelPanel()
    {
	setLayout(new RiverLayout());
    }

    public void addBean(SkelPropEditor ed, String label)
    {
	add("p left", new JLabel(label));
	add("tab hfill", ed.getGUI());
    }

}

[Jsmooth-cvs] jsmooth/src/locale Texts.properties,1.2,1.3

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

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

Modified Files:
	Texts.properties 
Log Message:
Added new skeleton properties edition
Changed overall GUI for editors


Index: Texts.properties
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/locale/Texts.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Texts.properties	19 Feb 2007 21:25:15 -0000	1.2
--- Texts.properties	27 Mar 2007 20:21:02 -0000	1.3
***************
*** 18,22 ****
  #
  SKELETONCHOOSER_LABEL=Skeleton Selection
! SKELETONCHOOSER_HELP=Choose your skeleton wrapper according to how your executable binary should run. Read carefully the description of the wrappers, they may have limitations in some context.
  EXECUTABLE_LABEL=Executable Binary
  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.
--- 18,22 ----
  #
  SKELETONCHOOSER_LABEL=Skeleton Selection
! SKELETONCHOOSER_HELP=A skeleton is an empty wrapper that launch your application. Each skeleton has its own behaviour regarding the application configuration and what is done when no JRE is found on the end-user's computer.<p>Read carefully their descriptions before picking one.
  EXECUTABLE_LABEL=Executable Binary
  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.
***************
*** 26,57 ****
  SKELETONPROPERTIES_HELP=The table above shows the properties associated to the selected skeleton. Change the values of the properties to customize the behaviour of the native executable wrapper generated.
  ICONLOCATION_LABEL=Executable Icon
! ICONLOCATION_HELP=Optionnally, you can select an icon to be compiled with the executable. This icon is typically used by the operating system to represent the file.<p>You should prefer .ICO files, as this is the format natively used for Win32 executable images, but <tt>GIF</tt>, <tt>JPEG</tt>, or <tt>PNG</tt> files should work fine, at the expense of an image quality decrease.
  ARGUMENTS_LABEL=Application Arguments
! ARGUMENTS_HELP=Arguments can be passed to the application at launch time. This option allows you to specify default arguments. The expected behaviour of the wrappers is to use those arguments only if none are passed by the user (in other words, they are overloaded by manual arguments).
  EMBEDDEDJAR_LABEL=Embedded jar
! EMBEDDEDJAR_HELP=You can embed a jar file into the compiled executable. This jar file is extracted each time the executable binary is launched. This is typically used to create a single binary that contains everything (for instance for an installer).
  EMBEDDEDJAR_CHECKBOX=Use an embedded jar
  CLASSPATH_LABEL=Classpath
! CLASSPATH_HELP=Specify here the classpath used by the java application.<p>You can select jar or zip files, but also directories.
  MINVERSION_LABEL=Minimum JVM Version
! MINVERSION_HELP=Specify here the minimum java version that your application needs to run properly.<p>For instance, <tt>1.2</tt> or <tt>1.4.2</tt> should be fine.
  MAXVERSION_LABEL=Maximum JVM Version
! MAXVERSION_HELP=Specify here the minimum java version that your application needs to run properly.<p>Most of the time, you won't need to set anything here because Java ensure a very good backward compatibility. However, in some specific cases, you may need to target an older VM.<p><b>NOTE</b>: To limit your application to using JVM, say, 1.2, it is best to specify 1.2.999 as the maximum. This is because users may have a 1.2.x installed (1.2 is equivalent to 1.2.0 for JSmooth).
  MAINCLASS_LABEL=Main class
  MAINCLASS_HELP=Choose the main class, among all the classes available in the classpath.
  JVMBUNDLE_LABEL=JVM Bundle
  JVMBUNDLE_CHECKBOX=Use a JVM bundled with your application
! JVMBUNDLE_HELP=Use this option only if you intend to bundle a full JVM with your application distribution. This option specifies the directory where JSmooth should be able to find a full-featured JVM.<p>For instance, people often distribute a Java Virtual Machine under a <tt>jre</tt> or a <tt>java</tt> sub-directory of the distribution root, as thus this is the value expected here.
  JVMSEARCH_LABEL=JVM Search Sequence
  JVMSEARCH_HELP=This is where you can specify the order in which the JVM available are looked for.<p>The default is to search first in the Windows registry, then in standard environment variables, then in the system Path, then check if JView is installed.<p>The default should be fine for most users, but you can customize this search order by moving the elements up or down (preferred element are on top).
  MAXMEMORY_LABEL=Maximum Memory
! MAXMEMORY_HELP=The maximum memory that the JVM is allowed to allocate. The default depends on the JVM implementation, but a common value is 64MB. One should typically change it to a higher number for applications that consume lot of memory.
  UNIT_MB=MB
  UNIT_KB=KB
  UNIT_BYTE=B
  INITIALMEMORY_LABEL=Initial Memory Allocation
! INITIALMEMORY_HELP=JVMs often start with a small memory allocation. If your application allocates a lot of memory during the startup, increasing the initial memory allocated by the VM can dramatically speed up the launch.
  JAVAPROP_LABEL=Java Properties
! JAVAPROP_HELP=You can specify environment variable that are passed to the Java Virtual Machine at launch time.<p>Such variables are are typically accessed with the <tt>System.getProperty()</tt> method.
  JAVAPROP_DIALOG_TITLE=Java Property Edition
  JAVAPROP_DIALOG_LABEL=Property
--- 26,57 ----
  SKELETONPROPERTIES_HELP=The table above shows the properties associated to the selected skeleton. Change the values of the properties to customize the behaviour of the native executable wrapper generated.
  ICONLOCATION_LABEL=Executable Icon
! ICONLOCATION_HELP=Optionnally, you can select an icon to be compiled with the executable. This icon is typically used by the operating system to represent the file.<p>You should prefer .ICO files, as this is the format natively used for Win32 executable images, but <tt>GIF</tt>, <tt>JPEG</tt>, or <tt>PNG</tt> files should work fine, at the expense of an image quality decrease due to the color reduction process.
  ARGUMENTS_LABEL=Application Arguments
! ARGUMENTS_HELP=Arguments can be passed to the application at launch time.<br>This option allows you to specify default arguments.<p>The expected behaviour of the wrappers is to use those arguments <u>only if none are passed by the user</u> (in other words, they are overloaded by manual arguments).
  EMBEDDEDJAR_LABEL=Embedded jar
! EMBEDDEDJAR_HELP=You can embed a jar file into the compiled executable. This jar file is extracted each time the executable binary is launched. This is typically used to create a single binary that contains everything (for instance for an installer).<br>You should keep it as small as possible for good performances.
  EMBEDDEDJAR_CHECKBOX=Use an embedded jar
  CLASSPATH_LABEL=Classpath
! CLASSPATH_HELP=Specify here the classpath used by the java application.<p>You can select jar or zip files, but also directories of classes.
  MINVERSION_LABEL=Minimum JVM Version
! MINVERSION_HELP=Specify here the <b>minimum</b> java version that your application needs to run properly.<p>For instance, <tt>1.2</tt> or <tt>1.4.2</tt> should be fine.
  MAXVERSION_LABEL=Maximum JVM Version
! MAXVERSION_HELP=Specify here the <b>maximum</b> java version that your application needs to run properly.<p>Most of the time, you won't need to set anything here because Java ensure a very good backward compatibility. However, in some specific cases, you may need to target an older VM.<p><b>NOTE</b>: To limit your application to using JVM, say, 1.2, it is best to specify 1.2.999 as the maximum. This is because users may have a 1.2.x with x>0 installed (1.2 is equivalent to 1.2.0 for JSmooth).
  MAINCLASS_LABEL=Main class
  MAINCLASS_HELP=Choose the main class, among all the classes available in the classpath.
  JVMBUNDLE_LABEL=JVM Bundle
  JVMBUNDLE_CHECKBOX=Use a JVM bundled with your application
! JVMBUNDLE_HELP=Use this option only if you intend to bundle a full JVM with your application distribution.<p>Bundling a JVM does <b>NOT</b> mean that the executable contains a JRE (which is a very bad idea), but rather installing a JRE as a sub-folder of your application (without the official Sun installer).<p>This option specifies the directory where JSmooth should be able to find a JRE directory containing bin and lib sub-directory.<p>For instance, people often distribute a Java Virtual Machine under a <tt>jre</tt> or a <tt>java</tt> sub-directory of their application root.
  JVMSEARCH_LABEL=JVM Search Sequence
  JVMSEARCH_HELP=This is where you can specify the order in which the JVM available are looked for.<p>The default is to search first in the Windows registry, then in standard environment variables, then in the system Path, then check if JView is installed.<p>The default should be fine for most users, but you can customize this search order by moving the elements up or down (preferred element are on top).
  MAXMEMORY_LABEL=Maximum Memory
! MAXMEMORY_HELP=The maximum memory that the JVM is allowed to allocate. The default depends on the JVM implementation, but a common value is 64MB or 128MB. One should typically change it to a higher number for applications that consume lot of memory.
  UNIT_MB=MB
  UNIT_KB=KB
  UNIT_BYTE=B
  INITIALMEMORY_LABEL=Initial Memory Allocation
! INITIALMEMORY_HELP=JVMs often start with a small memory allocation.<p>If your application allocates a lot of memory during the startup, increasing the initial memory allocated by the VM can dramatically speed up the launch.
  JAVAPROP_LABEL=Java Properties
! JAVAPROP_HELP=You can specify environment variables that are passed to the Java Virtual Machine at launch time.<p>Such variables are are typically accessed with the <tt>System.getProperty()</tt> method.
  JAVAPROP_DIALOG_TITLE=Java Property Edition
  JAVAPROP_DIALOG_LABEL=Property
***************
*** 64,65 ****
--- 64,113 ----
  #
  UNKNOWN_SKEL=Selected skeleton is unknown.
+ #
+ # GUI LABELS
+ #
+ GUI_LABEL_EXECUTABLE_SETTINGS=Executable Settings
+ GUI_LABEL_APPLICATION_SETTINGS=Application Settings
+ GUI_LABEL_EMBEDDEDJAR_SETTINGS=Embbeded jar settings
+ GUI_LABEL_JAVA_VERSION=Java version settings
+ GUI_LABEL_BUNDLEDJRE=JRE (if bundled with your application)
+ GUI_LABEL_MEMORYSETTINGS=Memory Settings
+ 
+ #
+ # SKELETON TEXTS
+ #
+ SKEL_CHOOSER_NONE=none
+ SKEL_AUTODOWNLOAD_PROPERTY_DESCRIPTION=This skeleton wraps <b>GUI applications</b>.<ul><li>No console I/O is displayed <li>If no Java VM is found, the wrapper asks the user to download and install a Java VM using Sun's Auto Download service.</ul> Arguments can be passed to the application (either use the JSmooth default argument mechanism, or create a shortcut with arguments).
+ 
+ SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_DESCRIPTION=When no JVM is found in the target computer, the user is prompted with the message defined below. Then, the default browser is launched with the URL defined here.
+ SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_LABEL=Message
+ ###SKEL_AUTODOWNLOAD_PROPERTY_MESSAGE_VALUE=Java has not been found on your computer. Do you want to download it?
+ SKEL_AUTODOWNLOAD_PROPERTY_DLURL_DESCRIPTION=The Sun's Auto Download URL for the JVM that should be downloaded by the wrapper when no JVM is found. Select the version of the JVM needed by your application. Select the highest possible version.
+ SKEL_AUTODOWNLOAD_PROPERTY_DLURL_LABEL=Java VM to download
+ #
+ SKEL_GENERIC_PROPERTY_SINGLEPROCESS_DESCRIPTION=The default behaviour is to launch the java application in a different (detached)  process. If you want to force the wrapper to launch the Java application in the same process than the exe, than select this option.
+ SKEL_GENERIC_PROPERTY_SINGLEPROCESS_LABEL=Launch java app in the exe process
+ SKEL_GENERIC_PROPERTY_DEBUG_DESCRIPTION=Enable the jsmooth debug console.
+ SKEL_GENERIC_PROPERTY_DEBUG_LABEL=Debug console
+ 
+ #
+ SKEL_CUSTOMDOWNLOAD_DESCRIPTION=This skeleton wraps <b>GUI applications</b>.<ul> <li>No console I/O is displayed <li>If no Java VM is found, the user is proposed to download and execute a file from the web. <li>The URL that the wrapper uses to download a file when no JVM is found must be defined in the wrapper. The URL can point on a .exe, a .cab, or any other filetype. Please note that some enterprise firewalls filter executable files. </ul> Arguments can be passed to the application (either use the JSmooth default argument mechanism, or create a shortcut with arguments).
+ SKEL_CUSTOMDOWNLOAD_PROPERTY_MESSAGE_DESCRIPTION=When no JVM is found in the target computer, the user is prompted with the message defined below. Then, the default browser is launched with the URL defined here.
+ SKEL_CUSTOMDOWNLOAD_PROPERTY_MESSAGE_LABEL=Message
+ SKEL_CUSTOMDOWNLOAD_PROPERTY_URL_DESCRIPTION=URL of a file to download and execute. It must start with http://.....
+ SKEL_CUSTOMDOWNLOAD_PROPERTY_URL_LABEL=URL
+ #
+ SKEL_CONSOLEWRAPPER_DESCRIPTION=This skeleton wraps <b>console applications</b>. <ul> <li> Standard Input/Output and Error streams are available <li> If no Java VM is found, it displays a default message. </ul> Although it is designed for console application (i.e. launched from the command.com shell prompt), it can launch standard GUI application. In such a case, any output of the java application (from System.out or System.err) is displayed in the a DOS Console.
+ 
+ SKEL_CUSTOMWRAPPER_PROPERTY_MESSAGE_DESCRIPTION=When no JVM is found in the target computer, the following message is displayed on the console.
+ SKEL_CUSTOMWRAPPER_PROPERTY_MESSAGE_LABEL=Message
+ 
+ SKEL_CUSTOMWRAPPER_PROPERTY_KEYPRESS_DESCRIPTION=The wrapper waits a keypress on the console when the application exits.
+ SKEL_CUSTOMWRAPPER_PROPERTY_KEYPRESS_LABEL=PressKey
+ 
+ SKEL_SIMPLEWRAPPER_DESCRIPTION=This skeleton wraps <b>GUI applications</b>.<ul>  <li>No console I/O is displayed <li>If no Java VM is found, it is able to display a configurable URL (typically to a java download page). </ul> Arguments can be passed to the application (either use the JSmooth default argument mechanism, or create a shortcut with arguments).
+ SKEL_SIMPLEWRAPPER_PROPERTY_MESSAGE_DESCRIPTION=When no JVM is found in the target computer, the user is prompted with the message defined below. Then, the default browser is launched with the URL defined here.
+ SKEL_SIMPLEWRAPPER_PROPERTY_MESSAGE_LABEL=Message
+ SKEL_SIMPLEWRAPPER_PROPERTY_URL_DESCRIPTION=If the user selects YES to the message prompted above, the default web browser is launched with this URL.
+ SKEL_SIMPLEWRAPPER_PROPERTY_URL_LABEL=URL
+ 

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application/gui/editors SkeletonPropertiesEditor.java, NONE, 1.1 ClassPath.java, 1.1, 1.2 JVMSearchSequence.java, 1.1, 1.2 JavaProperties.java, 1.2, 1.3 SkeletonChooser.java, 1.1, 1.2 SkeletonProperties.java, 1.3, 1.4

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

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

Modified Files:
	ClassPath.java JVMSearchSequence.java JavaProperties.java 
	SkeletonChooser.java SkeletonProperties.java 
Added Files:
	SkeletonPropertiesEditor.java 
Log Message:
Added new skeleton properties edition
Changed overall GUI for editors


--- NEW FILE: SkeletonPropertiesEditor.java ---
/*
  JSmooth: a VM wrapper toolkit for Windows
  Copyright (C) 2003 Rodrigo Reyes <re...@ch...>
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */

package net.charabia.jsmoothgen.application.gui.editors;

import net.charabia.jsmoothgen.application.gui.skeleditors.*;

import net.charabia.jsmoothgen.skeleton.*;
import net.charabia.jsmoothgen.application.*;
import net.charabia.jsmoothgen.application.gui.*;
import net.charabia.jsmoothgen.application.gui.util.*;
import javax.swing.*;
import java.awt.*;
import java.util.*;
import com.l2fprod.common.swing.*;
import com.l2fprod.common.propertysheet.*;

import se.datadosen.component.RiverLayout;

public class SkeletonPropertiesEditor extends Editor implements JSmoothModelBean.SkeletonChangedListener
{
    private String m_currentSkelName = null;
    private SkeletonBean m_skel = null;
    private SkelPanel    m_panel = new SkelPanel();
    private Vector       m_editors = new Vector();

    public SkeletonPropertiesEditor()
    {
	setLayout(new BorderLayout());
	add(m_panel, BorderLayout.CENTER);
    }

    public void rebuildProperties()
    {
	System.out.println("=============================================");
	System.out.println("=============================================");
	System.out.println("===   REBUILD PROPERTIES !!!!     ===========");
	System.out.println("=============================================");
	System.out.println("=============================================");

	m_skel = null;
	if (m_currentSkelName != null)
	    m_skel = Main.SKELETONS.getSkeleton(m_currentSkelName);

	SkeletonProperty[] sprops = null;
	if (m_skel != null)
	    sprops = m_skel.getSkeletonProperties();
	else
	    sprops = new SkeletonProperty[0];

	m_panel.removeAll();
	m_panel.setLayout(new RiverLayout());
	m_editors.clear();

	for (int i=0; i<sprops.length; i++)
	    {
		SkelPropEditor spe = null;
		if (sprops[i].getType().equalsIgnoreCase(SkeletonProperty.TYPE_STRING))
		    {
			spe = new StringEditor();
		    }
		else if (sprops[i].getType().equalsIgnoreCase(SkeletonProperty.TYPE_TEXTAREA))
		    {
			spe = new TextAreaEditor();
		    }
		else if (sprops[i].getType().equalsIgnoreCase(SkeletonProperty.TYPE_BOOLEAN))
		    {
			spe = new CheckBoxEditor();
		    }

		if (spe == null)
		    {
			spe = new StringEditor();
		    }

		m_editors.add(spe);
		spe.bind(sprops[i]);

		if (spe.labelAtLeft())
		    {
			m_panel.add("br", new JLabel(Main.local(sprops[i].getLabel())));
			m_panel.add("tab", new HelpButton(Main.local(sprops[i].getDescription())));
			m_panel.add("tab hfill", spe.getGUI());
		    }
		else
		    {
			m_panel.add("br right", spe.getGUI());
			m_panel.add("tab", new HelpButton(Main.local(sprops[i].getDescription())));
			m_panel.add("tab hfill", new JLabel(Main.local(sprops[i].getLabel())));
		    }
	    }

	revalidate();
	m_panel.revalidate();
	doLayout();
	m_panel.doLayout();
    }

    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();
	    }

	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();
	    }

	JSmoothModelBean.Property[] jsprop = m_model.getSkeletonProperties();
	if (jsprop != null)
	    {
		for (Enumeration e=m_editors.elements(); e.hasMoreElements(); )
		    {
			SkelPropEditor spe = (SkelPropEditor)e.nextElement();
			JSmoothModelBean.Property p = getPropertyInstance(spe.getIdName());
			if (p != null)
			    spe.valueChanged(p.getValue());
		    }

		// 		for (int i=0; i<jsprop.length; i++)
		// 		    {
		// 			System.out.println("......prop " + jsprop[i].getKey() + "=" + jsprop[i].getValue());
		// 			for (Enumeration e=m_editors.elements(); e.hasMoreElements(); )
		// 			    {
		// 				SkelPropEditor spe = (SkelPropEditor)e.nextElement();
		// 				if (spe.getIdName().equals(jsprop[i].getKey()))
		// 				    spe.valueChanged(jsprop[i].getValue());
		// 			    }
		// 		    }
	    }


	System.out.println("DONE NOTHING! " +m_currentSkelName + "/" + m_model.getSkeletonName());
    }

    JSmoothModelBean.Property getPropertyInstance(String name)
    {
	JSmoothModelBean.Property[] jsprop = m_model.getSkeletonProperties();
	for (int i=0; i<jsprop.length; i++)
	    {
		if (jsprop[i].getKey().equals(name))
		    return jsprop[i];
	    }
	return null;
    }
    
    public void updateModel()
    {
	if (m_skel != null)
	    {
		JSmoothModelBean.Property[] props = new JSmoothModelBean.Property[m_editors.size()];
		int index = 0;
		for (Enumeration e=m_editors.elements(); e.hasMoreElements(); )
		    {
			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());
			props[index].setValue(spe.get());
			index++;
		    }
		m_model.setSkeletonProperties(props);
	    }

// 	if (m_skel != null)
// 	    {
// 		System.out.println("UPDATE MODEL for skeletons...");
// 		SkeletonProperty[] sp = m_skel.getSkeletonProperties();
// 		JSmoothModelBean.Property[] props = new JSmoothModelBean.Property[sp.length];
// 		for (int i=0; i<sp.length; i++)
// 		    {
// 			props[i] = new JSmoothModelBean.Property();
// 			props[i].setKey(sp[i].getIdName());
// 			props[i].setValue(sp[i].getValue());
// 			System.out.println(props[i]);
// 		    }
// 		m_model.setSkeletonProperties(props);
// 	    }

    }


    public void skeletonChanged()
    {
	//	dataChanged();
	rebuildProperties();
	dataChanged();
    }
    
    public String getLabel()
    {
	return "SKELETONPROPERTIES_LABEL";
    }

    public String getDescription()
    {
	return "SKELETONPROPERTIES_HELP";
    }

    public boolean needsBigSpace()
    {
	return true;
    }
    
}

Index: ClassPath.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/ClassPath.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClassPath.java	16 Mar 2004 08:05:16 -0000	1.1
--- ClassPath.java	27 Mar 2007 20:21:02 -0000	1.2
***************
*** 95,97 ****
--- 95,103 ----
      }
          
+     public boolean needsBigSpace()
+     {
+ 	return true;
+     }
+ 
  }
+ 

Index: SkeletonChooser.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/SkeletonChooser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SkeletonChooser.java	16 Mar 2004 08:05:16 -0000	1.1
--- SkeletonChooser.java	27 Mar 2007 20:21:02 -0000	1.2
***************
*** 31,51 ****
  import com.l2fprod.common.propertysheet.*;
  
  public class SkeletonChooser extends Editor implements JSmoothModelBean.SkeletonChangedListener
  {
      private JComboBox m_skelcombo = new JComboBox();
!     private HTMLPane m_skeldesc = new HTMLPane() {
! 	    public java.awt.Dimension getPreferredSize()
! 	    {
! 		java.awt.Dimension d = super.getPreferredSize();
! 		if (d.height<100)
! 		    d.height=100;
! 		return d;
! 	    }
! 	};
  
      public SkeletonChooser()
      {
! 	PanelLayout pl = new PanelLayout();
! 	setLayout(pl);
  	m_skelcombo.addItem("<none>");
  	for (Iterator i=Main.SKELETONS.getIteratorNoDebugName(); i.hasNext(); )
--- 31,56 ----
  import com.l2fprod.common.propertysheet.*;
  
+ import se.datadosen.component.RiverLayout;
+ 
  public class SkeletonChooser extends Editor implements JSmoothModelBean.SkeletonChangedListener
  {
      private JComboBox m_skelcombo = new JComboBox();
! //     private HTMLPane m_skeldesc = new HTMLPane() {
! // 	    public java.awt.Dimension getPreferredSize()
! // 	    {
! // 		java.awt.Dimension d = super.getPreferredSize();
! // 		if (d.height<100)
! // 		    d.height=100;
! // 		return d;
! // 	    }
! // 	};
! 
!     private JEditorPane m_skeldesc = new JEditorPane("text/html","<html></html>");
  
      public SkeletonChooser()
      {
! 	//	PanelLayout pl = new PanelLayout();
! 	//	setLayout(pl);
! 	setLayout(new RiverLayout());
  	m_skelcombo.addItem("<none>");
  	for (Iterator i=Main.SKELETONS.getIteratorNoDebugName(); i.hasNext(); )
***************
*** 53,58 ****
  		m_skelcombo.addItem(i.next().toString());
  	    }
! 	add(m_skelcombo);
!  	add(m_skeldesc);
  
  	m_skelcombo.addActionListener(new java.awt.event.ActionListener()  {
--- 58,75 ----
  		m_skelcombo.addItem(i.next().toString());
  	    }
! 	add("hfill", m_skelcombo);
! 	JPanel jp = new JPanel();
! 	jp.setLayout(new java.awt.BorderLayout());
! 	jp.add(new JScrollPane(m_skeldesc) {
! 		public java.awt.Dimension getMinimumSize()
! 		{
! 		    return new java.awt.Dimension(10,100);
! 		}
! 		public java.awt.Dimension getPreferredSize()
! 		{
! 		    return new java.awt.Dimension(10,100);
! 		}
! 	    }, java.awt.BorderLayout.CENTER);
! 	add("br hfill", jp);
  
  	m_skelcombo.addActionListener(new java.awt.event.ActionListener()  {
***************
*** 74,82 ****
  		
   	SkeletonBean skel = Main.SKELETONS.getSkeleton(skelname);
! 
   	System.out.println("SKEL: " + skel.toString());
   	if (skel != null)
   	    {
!  		m_skeldesc.setText(skel.getDescription());
   	    }
      }
--- 91,100 ----
  		
   	SkeletonBean skel = Main.SKELETONS.getSkeleton(skelname);
! 	
   	System.out.println("SKEL: " + skel.toString());
   	if (skel != null)
   	    {
!  		m_skeldesc.setText(Main.local(skel.getDescription()));
! 		m_skeldesc.setCaretPosition(0);
   	    }
      }
***************
*** 90,94 ****
  		if (skel != null)
  		    {
! 			m_skeldesc.setText(skel.getDescription());
  			m_skelcombo.setSelectedItem(skelname);
  		    }
--- 108,113 ----
  		if (skel != null)
  		    {
! 			m_skeldesc.setText(Main.local(skel.getDescription()));
! 			m_skeldesc.setCaretPosition(0);
  			m_skelcombo.setSelectedItem(skelname);
  		    }
***************
*** 97,100 ****
--- 116,120 ----
  			m_skelcombo.setSelectedItem("");
  			m_skeldesc.setText("");
+ 			m_skeldesc.setCaretPosition(0);
  		    }
  	    }
***************
*** 102,106 ****
  	    {
  		m_skelcombo.setSelectedItem("");
! 		m_skeldesc.setText("<none>");
  	    }
      }
--- 122,127 ----
  	    {
  		m_skelcombo.setSelectedItem("");
! 		m_skeldesc.setText(Main.local("SKEL_CHOOSER_NONE"));
! 		m_skeldesc.setCaretPosition(0);
  	    }
      }
***************
*** 134,136 ****
--- 155,162 ----
      }
  
+     public boolean needsBigSpace()
+     {
+ 	return true;
+     }
+ 
  }

Index: SkeletonProperties.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/SkeletonProperties.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SkeletonProperties.java	5 Mar 2007 06:56:41 -0000	1.3
--- SkeletonProperties.java	27 Mar 2007 20:21:02 -0000	1.4
***************
*** 72,76 ****
  		    SkeletonPropertyProxy spp = (SkeletonPropertyProxy)property;
  		    String pname = spp.getTypeName();
! 
  		    if (pname.equals("boolean"))
  			new com.l2fprod.common.beans.editor.BooleanAsCheckBoxPropertyEditor();
--- 72,76 ----
  		    SkeletonPropertyProxy spp = (SkeletonPropertyProxy)property;
  		    String pname = spp.getTypeName();
! 		    
  		    if (pname.equals("boolean"))
  			new com.l2fprod.common.beans.editor.BooleanAsCheckBoxPropertyEditor();
***************
*** 237,241 ****
  		return;
  	    }
- 
  	if ( ! m_model.getSkeletonName().equalsIgnoreCase(m_currentSkelName))
  	    {
--- 237,240 ----
***************
*** 268,272 ****
      }
      
- 
      public String getLabel()
      {
--- 267,270 ----
***************
*** 278,281 ****
--- 276,284 ----
  	return "SKELETONPROPERTIES_HELP";
      }
+ 
+     public boolean needsBigSpace()
+     {
+ 	return true;
+     }
      
  }

Index: JavaProperties.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/JavaProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JavaProperties.java	19 Feb 2007 21:16:55 -0000	1.2
--- JavaProperties.java	27 Mar 2007 20:21:02 -0000	1.3
***************
*** 95,98 ****
--- 95,103 ----
  	return "JAVAPROP_HELP";
      }
+ 
+     public boolean needsBigSpace()
+     {
+ 	return true;
+     }
          
  }

Index: JVMSearchSequence.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/editors/JVMSearchSequence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JVMSearchSequence.java	16 Mar 2004 08:05:16 -0000	1.1
--- JVMSearchSequence.java	27 Mar 2007 20:21:02 -0000	1.2
***************
*** 82,85 ****
--- 82,90 ----
  	return "JVMSEARCH_HELP";
      }
+ 
+     public boolean needsBigSpace()
+     {
+ 	return true;
+     }
          
  }

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

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

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

Modified Files:
	SkeletonProperty.java 
Log Message:
Added new skeleton properties edition
Changed overall GUI for editors


Index: SkeletonProperty.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/skeleton/SkeletonProperty.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SkeletonProperty.java	16 Mar 2004 08:09:14 -0000	1.2
--- SkeletonProperty.java	27 Mar 2007 20:21:03 -0000	1.3
***************
*** 13,30 ****
  public class SkeletonProperty
  {
! 	static public String TYPE_STRING = "string";
! 	static public String TYPE_TEXTAREA = "textarea";
! 	static public String TYPE_BOOLEAN = "boolean";
  	
! 	private String m_idName = "";
! 	private String m_shortName = "";
! 	private String m_description = "";
! 	private String m_type = "";
! 	private String m_value = "";
  	
! 	/** Creates a new instance of SkeletonProperty */
! 	public SkeletonProperty()
! 	{
! 	}
  
      public SkeletonProperty(SkeletonProperty sp)
--- 13,30 ----
  public class SkeletonProperty
  {
!     static public String TYPE_STRING = "string";
!     static public String TYPE_TEXTAREA = "textarea";
!     static public String TYPE_BOOLEAN = "boolean";
  	
!     private String m_idName = "";
!     private String m_shortName = "";
!     private String m_description = "";
!     private String m_type = "";
!     private String m_value = "";
  	
!     /** Creates a new instance of SkeletonProperty */
!     public SkeletonProperty()
!     {
!     }
  
      public SkeletonProperty(SkeletonProperty sp)
***************
*** 37,89 ****
      }
  
! 	public void setIdName(String idName)
! 	{
! 		m_idName = idName;
! 	}
  	
! 	public String getIdName()
! 	{
! 		return m_idName;
! 	}
  
! 	public void setLabel(String name)
! 	{
! 		m_shortName = name;
! 	}
  	
! 	public String getLabel()
! 	{
! 		return m_shortName;
! 	}
  	
! 	public void setDescription(String desc)
! 	{
! 		m_description = desc;
! 	}
  	
! 	public String getDescription()
! 	{
! 		return m_description;
! 	}
  
! 	public void setType(String type)
! 	{
! 		m_type = type;
! 	}
  	
! 	public String getType()
! 	{
! 		return m_type;
! 	}
  
! 	public void setValue(String value)
! 	{
! 		m_value = value;
! 	}
  	
! 	public String getValue()
! 	{
! 		return m_value;
! 	}
  
  }
--- 37,90 ----
      }
  
!     public void setIdName(String idName)
!     {
! 	m_idName = idName;
!     }
  	
!     public String getIdName()
!     {
! 	return m_idName;
!     }
  
!     public void setLabel(String name)
!     {
! 	m_shortName = name;
!     }
  	
!     public String getLabel()
!     {
! 	return m_shortName;
!     }
  	
!     public void setDescription(String desc)
!     {
! 	m_description = desc;
!     }
  	
!     public String getDescription()
!     {
! 	return m_description;
!     }
  
!     public void setType(String type)
!     {
! 	m_type = type;
!     }
  	
!     public String getType()
!     {
! 	return m_type;
!     }
  
!     public void setValue(String value)
!     {
! 	System.out.println("SkeletonProperty.setValue:" + value);
! 	m_value = value;
!     }
  	
!     public String getValue()
!     {
! 	return m_value;
!     }
  
  }

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

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

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

Modified Files:
	Editor.java Main.java MasterPanel.java 
Log Message:
Added new skeleton properties edition
Changed overall GUI for editors


Index: MasterPanel.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/MasterPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MasterPanel.java	16 Mar 2004 08:05:15 -0000	1.1
--- MasterPanel.java	27 Mar 2007 20:21:02 -0000	1.2
***************
*** 31,34 ****
--- 31,36 ----
  import com.l2fprod.common.swing.*;
  
+ import se.datadosen.component.RiverLayout;
+ 
  public class MasterPanel extends JPanel
  {
***************
*** 49,78 ****
      private String m_currentPanelName = "";
  
!     private Class[] m_skelElements = { net.charabia.jsmoothgen.application.gui.editors.SkeletonChooser.class, net.charabia.jsmoothgen.application.gui.editors.SkeletonProperties.class };
  
!     private Class[] m_execElements = { 
! 	net.charabia.jsmoothgen.application.gui.editors.ExecutableName.class ,
! 	net.charabia.jsmoothgen.application.gui.editors.ExecutableIcon.class ,
! 	net.charabia.jsmoothgen.application.gui.editors.CurrentDirectory.class
      };
  
!     private Class[] m_appElements = {
! 	net.charabia.jsmoothgen.application.gui.editors.MainClass.class,
! 	net.charabia.jsmoothgen.application.gui.editors.ApplicationArguments.class,
! 	net.charabia.jsmoothgen.application.gui.editors.EmbeddedJar.class,
! 	net.charabia.jsmoothgen.application.gui.editors.ClassPath.class
      };
  
!     private Class[] m_jvmSelElements = {
! 	net.charabia.jsmoothgen.application.gui.editors.MinVersion.class,
! 	net.charabia.jsmoothgen.application.gui.editors.MaxVersion.class,
! 	net.charabia.jsmoothgen.application.gui.editors.JVMBundle.class,
! 	net.charabia.jsmoothgen.application.gui.editors.JVMSearchSequence.class
      };
  
!     private Class[] m_jvmCfgElements = {
! 	net.charabia.jsmoothgen.application.gui.editors.MaxMemoryHeap.class,
! 	net.charabia.jsmoothgen.application.gui.editors.InitialMemoryHeap.class,
! 	net.charabia.jsmoothgen.application.gui.editors.JavaProperties.class
      };
  
--- 51,90 ----
      private String m_currentPanelName = "";
  
!     private Object[] m_skelElements = { 
! 	new net.charabia.jsmoothgen.application.gui.editors.SkeletonChooser(), 
! 	new net.charabia.jsmoothgen.application.gui.editors.SkeletonPropertiesEditor() 
! 	//	new net.charabia.jsmoothgen.application.gui.editors.SkeletonProperties()
!     };
  
!     private Object[] m_execElements = { 
! 	"GUI_LABEL_EXECUTABLE_SETTINGS",
! 	new net.charabia.jsmoothgen.application.gui.editors.ExecutableName() ,
! 	new net.charabia.jsmoothgen.application.gui.editors.ExecutableIcon() ,
! 	new net.charabia.jsmoothgen.application.gui.editors.CurrentDirectory()
      };
  
!     private Object[] m_appElements = {
! 	"GUI_LABEL_APPLICATION_SETTINGS",
! 	new net.charabia.jsmoothgen.application.gui.editors.MainClass(),
! 	new net.charabia.jsmoothgen.application.gui.editors.ApplicationArguments(),
! 	"GUI_LABEL_EMBEDDEDJAR_SETTINGS",
! 	new net.charabia.jsmoothgen.application.gui.editors.EmbeddedJar(),
! 	new net.charabia.jsmoothgen.application.gui.editors.ClassPath()
      };
  
!     private Object[] m_jvmSelElements = {
! 	"GUI_LABEL_JAVA_VERSION",
! 	new net.charabia.jsmoothgen.application.gui.editors.MinVersion(),
! 	new net.charabia.jsmoothgen.application.gui.editors.MaxVersion(),
! 	"GUI_LABEL_BUNDLEDJRE",
! 	new net.charabia.jsmoothgen.application.gui.editors.JVMBundle(),
! 	new net.charabia.jsmoothgen.application.gui.editors.JVMSearchSequence()
      };
  
!     private Object[] m_jvmCfgElements = {
! 	"GUI_LABEL_MEMORYSETTINGS",
! 	new net.charabia.jsmoothgen.application.gui.editors.MaxMemoryHeap(),
! 	new net.charabia.jsmoothgen.application.gui.editors.InitialMemoryHeap(),
! 	new net.charabia.jsmoothgen.application.gui.editors.JavaProperties()
      };
  
***************
*** 86,91 ****
  	scp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
  
! 	PanelLayout pl = new PanelLayout();
! 	m_mainpanel.setLayout(pl);
  
  	addAction("Skeleton", "/icons/stock_new-template.png", m_skelElements);
--- 98,104 ----
  	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);
***************
*** 109,113 ****
      }
  
!     private void addAction(final String name, String iconloc, final Class[] els)
      {
  	final Action a = new AbstractAction( name, new ImageIcon(getClass().getResource(iconloc))) {
--- 122,126 ----
      }
  
!     private void addAction(final String name, String iconloc, final Object[] els)
      {
  	final Action a = new AbstractAction( name, new ImageIcon(getClass().getResource(iconloc))) {
***************
*** 126,130 ****
      }
  
!     public void setupPanel(Class[] els)
      {
  	fireUpdateModel();
--- 139,143 ----
      }
  
!     public void setupPanel(Object[] els)
      {
  	fireUpdateModel();
***************
*** 139,162 ****
  	    return;
  
  	for (int i=0; i<els.length; i++)
  	    {
! 		try {
! 		    //		    Editor ed = (Editor)els[i].newInstance();
! 		    Editor ed = m_edPool.getInstance(els[i]);
  
! 		    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(help);
! 		    m_displayedElements.add(ed);
  
! 		} catch (Exception exc)
  		    {
! 			exc.printStackTrace();
  		    }
  	    }
  	m_mainpanelVBar.setValue(0);
--- 152,239 ----
  	    return;
  
+ 	JPanel pgroup = null;
+ 
  	for (int i=0; i<els.length; i++)
  	    {
! 		if (els[i] instanceof Editor)
! 		    {
! 			//			Editor ed = m_edPool.getInstance(els[i]);
! 			Editor ed = (Editor)els[i];
! 			if (ed.needsBigSpace() && (pgroup != null))
! 			    {
! 				m_mainpanel.add("br hfill", pgroup);
! 				pgroup = null;
! 			    }
  
! 			if (pgroup == null)
! 			    {
! 				pgroup = new JPanel();
! 				pgroup.setLayout(new RiverLayout());
! 				javax.swing.border.TitledBorder title = BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED), "");
! 			    }
  
! 			//		    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()));
! 				pgroup.setBorder(title);
! 				pgroup.add("left vtop", new HelpButton(getLocaleText(ed.getDescription())));
! 				pgroup.add("tab left hfill", ed);
! 				String gc = "br hfill";
!  				if (i+1>=els.length)
!  				    gc = "p hfill vfill";
! 				m_mainpanel.add(gc, pgroup);
! 				pgroup = null;
! 			    }
! 			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);
! 		    }
! 		else if (els[i] instanceof String)
  		    {
! 			System.out.println("TITLE: " + els[i]);
! 			if (pgroup != null)
! 			    {
! 				m_mainpanel.add("br hfill", pgroup);
! 				pgroup = null;
! 			    }
! 
! 			pgroup = new JPanel();
! 			pgroup.setLayout(new RiverLayout());
! 
! 			javax.swing.border.TitledBorder title = BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED), getLocaleText((String)els[i]));
! 			pgroup.setBorder(title);
  		    }
+ 
+ 		// 		try {
+ 
+ 		// 		} catch (Exception exc)
+ 		// 		    {
+ 		// 			exc.printStackTrace();
+ 		// 		    }
+ 	    }
+ 	if (pgroup != null)
+ 	    {
+ 		m_mainpanel.add("p hfill", pgroup);
  	    }
  	m_mainpanelVBar.setValue(0);
***************
*** 261,266 ****
  	    m_model.normalizePaths(m_modelLocation.getParentFile(), true);
  	    JSmoothModelPersistency.save(m_modelLocation, m_model);
! 
! 	    fireModelChanged();
  	    return true;
  	} catch (java.io.IOException iox)
--- 338,343 ----
  	    m_model.normalizePaths(m_modelLocation.getParentFile(), true);
  	    JSmoothModelPersistency.save(m_modelLocation, m_model);
! 	    System.out.println("saving model " + m_model);
! 	    //	    fireModelChanged();
  	    return true;
  	} catch (java.io.IOException iox)

Index: Editor.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/Editor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Editor.java	16 Mar 2004 08:05:15 -0000	1.1
--- Editor.java	27 Mar 2007 20:21:02 -0000	1.2
***************
*** 61,64 ****
--- 61,69 ----
      abstract public String getDescription();
  
+     public boolean needsBigSpace()
+     {
+ 	return false;
+     }
+ 
      protected java.io.File getAbsolutePath(java.io.File f)
      {

Index: Main.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/gui/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Main.java	19 Feb 2007 21:16:55 -0000	1.3
--- Main.java	27 Mar 2007 20:21:02 -0000	1.4
***************
*** 134,138 ****
  	    {
  	    }
! 	return key;
      }
  
--- 134,138 ----
  	    {
  	    }
! 	return "["+key+"]";
      }
  

[Jsmooth-cvs] jsmooth/src/net/charabia/jsmoothgen/application JSmoothModelBean.java, 1.13, 1.14 PropertiesBuilder.java, 1.13, 1.14

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

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

Modified Files:
	JSmoothModelBean.java PropertiesBuilder.java 
Log Message:
Added new skeleton properties edition
Changed overall GUI for editors


Index: PropertiesBuilder.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/PropertiesBuilder.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** PropertiesBuilder.java	7 Mar 2004 19:20:53 -0000	1.13
--- PropertiesBuilder.java	27 Mar 2007 20:21:02 -0000	1.14
***************
*** 107,110 ****
--- 107,111 ----
              addPair("classpath", makePathConc(relcp), out);
          }
+ 
  	//
  	// Adds all the skeleton-specific properties

Index: JSmoothModelBean.java
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/src/net/charabia/jsmoothgen/application/JSmoothModelBean.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** JSmoothModelBean.java	16 Mar 2004 08:09:13 -0000	1.13
--- JSmoothModelBean.java	27 Mar 2007 20:21:02 -0000	1.14
***************
*** 146,152 ****
      public void setSkeletonName(String name)
      {
! 	m_skeletonName = name;
! 	fireSkeletonChanged();
! 	fireChanged();
      }
  	
--- 146,155 ----
      public void setSkeletonName(String name)
      {
! 	if (name != m_skeletonName)
! 	    {
! 		m_skeletonName = name;
! 		fireSkeletonChanged();
! 		fireChanged();
! 	    }
      }
  	
***************
*** 158,163 ****
      public void setExecutableName(String name)
      {
! 	m_executableName = name;
! 	fireChanged();
      }
  
--- 161,169 ----
      public void setExecutableName(String name)
      {
! 	if (name != m_executableName)
! 	    {
! 		m_executableName = name;
! 		fireChanged();
! 	    }
      }
  
***************
*** 165,170 ****
      public void setCurrentDirectory(String curdir)
      {
!         m_currentDirectory = curdir;
!         fireChanged();
      }
      
--- 171,179 ----
      public void setCurrentDirectory(String curdir)
      {
! 	if (curdir != m_currentDirectory)
! 	    {
! 		m_currentDirectory = curdir;
! 		fireChanged();
! 	    }
      }
      
***************
*** 181,186 ****
      public void setIconLocation(String name)
      {
! 	m_iconLocation = name;
! 	fireChanged();
      }
  
--- 190,198 ----
      public void setIconLocation(String name)
      {
! 	if (name != m_iconLocation)
! 	    {
! 		m_iconLocation = name;
! 		fireChanged();
! 	    }
      }
  
***************
*** 203,208 ****
      public void setJarLocation(String name)
      {
! 	m_jarLocation = name;
! 	fireChanged();
      }
  
--- 215,223 ----
      public void setJarLocation(String name)
      {
! 	if (name != m_jarLocation)
! 	    {
! 		m_jarLocation = name;
! 		fireChanged();
! 	    }
      }
  
***************
*** 215,220 ****
      public void setMainClassName(String name)
      {
! 	m_mainClassName = name;
! 	fireChanged();
      }
  
--- 230,238 ----
      public void setMainClassName(String name)
      {
! 	if (name != m_mainClassName)
! 	    {
! 		m_mainClassName = name;
! 		fireChanged();
! 	    }
      }
  
***************
*** 281,284 ****
--- 299,305 ----
      public void setSkeletonProperties(JSmoothModelBean.Property[] props)
      {
+ // 	for (int i=0; i<props.length; i++)
+ // 	    System.out.println("SET PROPERTY: " + props[i].getIdName() + "=" + props[i].getValue());
+ 
  	m_skelproperties = props;
  	fireChanged();