[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module ProfilerExecutor.java,1.2,1.3

[Pavel V. <va...@us...>]

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module
In directory usw-pr-cvs1:/tmp/cvs-serv7488

Modified Files:
	ProfilerExecutor.java 
Log Message:
by lukas

Index: ProfilerExecutor.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/ProfilerExecutor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ProfilerExecutor.java	26 Feb 2002 00:32:24 -0000	1.2
--- ProfilerExecutor.java	10 Sep 2002 19:29:10 -0000	1.3
***************
*** 64,67 ****
--- 64,69 ----
                  NbBundle.getMessage(ProfilerExecutor.class, "HINT_profilerFormat")
              );
+     /** Library default value of connectMode */
+     private static final int CONNECT_MODE_DEFAULT=MODE_SERVER;
      /** Holds value of property alloc. */
      private boolean alloc=true;        
***************
*** 109,118 ****
  
      protected Process createProcess (ExecInfo info) throws IOException {
!         return getExternalExecutor ().exec (new ProfilerFormat (info,
                                              getClassPath (),
                                              getBootClassPath (),
                                              getRepositoryPath (),
                                              getLibraryPath (),
!                                             getProfilerOptions()));
      }
      
--- 111,125 ----
  
      protected Process createProcess (ExecInfo info) throws IOException {
!         ProfilerFormat format=new ProfilerFormat (info,
                                              getClassPath (),
                                              getBootClassPath (),
                                              getRepositoryPath (),
                                              getLibraryPath (),
!                                             getProfilerOptions());
!         NbProcessDescriptor exe=getExternalExecutor ();
!         // visual clue to what is being executed
!         System.out.print( format.format(exe.getProcessName())+" " );
!         System.out.println( format.format(exe.getArguments()) );
!         return exe.exec (format, getEnvironmentVariables ());
      }
      
***************
*** 166,182 ****
          options.append(',').append("mon_thread=").append(isMonThread());
          options.append(',').append("commun_type=").append(communName(getCommunType()));
!         if (!"".equals(getCommunHost())) {
!             options.append(',').append("commun_host=").append(getCommunHost());
          }
-         if (0!=getCommunPort()) {
-             options.append(',').append("commun_port=").append(getCommunPort());
-         }
-         if (0!=getCommunShmemSize()) {
-             options.append(',').append("commun_shmem_size=").append(getCommunShmemSize());
-         }
-         if (!"".equals(getCommunShmemID())) {
-             options.append(',').append("commun_shmem_id=").append(getCommunShmemID());
-         }
-         options.append(',').append("connect_mode=").append(modeName(getConnectMode()));
          return options.toString();
      }
--- 173,193 ----
          options.append(',').append("mon_thread=").append(isMonThread());
          options.append(',').append("commun_type=").append(communName(getCommunType()));
!         if (getCommunType()==COMMUN_SOCKET) {
!             if (!"".equals(getCommunHost())) {
!                 options.append(',').append("commun_host=").append(getCommunHost());
!             }
!             if (0!=getCommunPort()) {
!                 options.append(',').append("commun_port=").append(getCommunPort());
!             }
!             if (CONNECT_MODE_DEFAULT!=getConnectMode())
!                 options.append(',').append("connect_mode=").append(modeName(getConnectMode()));
!         } else {
!             if (0!=getCommunShmemSize()) {
!                 options.append(',').append("commun_shmem_size=").append(getCommunShmemSize());
!             }
!             if (!"".equals(getCommunShmemID())) {
!                 options.append(',').append("commun_shmem_id=").append(getCommunShmemID());
!             }
          }
          return options.toString();
      }
***************
*** 547,550 ****
--- 558,564 ----
  /*
   * $Log$
+  * Revision 1.3  2002/09/10 19:29:10  vachis
+  * by lukas
+  *
   * Revision 1.2  2002/02/26 00:32:24  stolis
   * Forgotten '=' characters added.