package rename PACKAGE_RENAME-jaga
authorjglick@netbeans.org
Tue, 25 Apr 2000 12:55:38 +0000
changeset 17145071ee86ec6
parent 170 87096058c1bf
child 172 bc532a2f23cb
package rename
vcscvs/manifest.mf
vcscvs/src/org/netbeans/modules/vcs/cmdline/CommandLines.properties
vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsCustomizer.form
vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsCustomizer.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsFileSystem.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsFileSystemBeanInfo.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.form
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranches.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsDiff.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsLogInfo.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsModuleSelector.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsModuleSelectorDialog.form
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsModuleSelectorDialog.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsRevisionGraph.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsRevisionGraphItem.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/list/CvsListCommand.java
vcscvs/src/org/netbeans/modules/vcs/cmdline/list/CvsListRecursiveCommand.java
     1.1 --- a/vcscvs/manifest.mf	Tue Apr 25 07:40:35 2000 +0000
     1.2 +++ b/vcscvs/manifest.mf	Tue Apr 25 12:55:38 2000 +0000
     1.3 @@ -1,10 +1,10 @@
     1.4 -OpenIDE-Module: com.netbeans.developer.modules.vcs.cmdline/1
     1.5 +OpenIDE-Module: org.netbeans.modules.vcs.cmdline/1
     1.6  OpenIDE-Module-Name: CVS
     1.7  OpenIDE-Module-Specification-Version: 1.1
     1.8  OpenIDE-Module-Implementation-Version: 1.1
     1.9  Class-Path: ext/regexp.jar
    1.10  
    1.11 -Name: com/netbeans/developer/modules/vcs/cmdline/CvsFileSystem.class
    1.12 +Name: org/netbeans/modules/vcs/cmdline/CvsFileSystem.class
    1.13  Display-Name: CVS
    1.14  OpenIDE-Module-Class: Filesystem
    1.15 -Help: com.netbeans.developer.modules.vcs.cmdline.CvsFileSystem.CREATE
    1.16 +Help: org.netbeans.modules.vcs.cmdline.CvsFileSystem.CREATE
     2.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/CommandLines.properties	Tue Apr 25 07:40:35 2000 +0000
     2.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/CommandLines.properties	Tue Apr 25 12:55:38 2000 +0000
     2.3 @@ -47,14 +47,14 @@
     2.4  
     2.5  #EXEC_IMPORT_UNIX=${RUN} ${CD} \\"$[? DIR] [${ROOTDIR}${PS}${MODULE}${DIR}] [$[? MODULE] [${ROOTDIR}${PS}${MODULE}] [${ROOTDIR}]]\\"; cvs import -I filesystem.attributes -m \\"project created\\" \\"$[? DIR] [${MODULE}${DIR}${PS}${FILE}] [$[? MODULE_S] [${MODULE}${FILE}] [$[? FILE] [${FILE}] [.]]]\\" vendor-tag release-tag ${NUR}
     2.6  
     2.7 -EXEC_LIST_WIN=com.netbeans.developer.modules.vcs.cmdline.list.CvsListCommand.class cmd /X /C \"set CVSROOT=\\\":${SERVERTYPE}:${CVSROOT}\\\"&& ${CD} ${WORKDIR}&& \\\"${CVS_EXE}\\\" status -l\"
     2.8 -EXEC_LIST_UNIX=com.netbeans.developer.modules.vcs.cmdline.list.CvsListCommand.class sh -c \"CVSROOT=\\\":${SERVERTYPE}:${CVSROOT}\\\"; export CVSROOT; ${CD} \\\"${WORKDIR}\\\"; \\\"${CVS_EXE}\\\" status -l\"
     2.9 -EXEC_LIST_CYGWIN=com.netbeans.developer.modules.vcs.cmdline.list.CvsListCommand.class ${SHELL} -c "CVSROOT\=\\\"\\\"\:${SERVERTYPE}\:${CVSROOT_\\/}\\\"\\\";\ export\ CVSROOT;\ ${CD}\ \\\"\\\"${WORKDIR}\\\"\\\"; \\\"\\\"${CVS_EXE}\\\"\\\" status -l"
    2.10 +EXEC_LIST_WIN=org.netbeans.modules.vcs.cmdline.list.CvsListCommand.class cmd /X /C \"set CVSROOT=\\\":${SERVERTYPE}:${CVSROOT}\\\"&& ${CD} ${WORKDIR}&& \\\"${CVS_EXE}\\\" status -l\"
    2.11 +EXEC_LIST_UNIX=org.netbeans.modules.vcs.cmdline.list.CvsListCommand.class sh -c \"CVSROOT=\\\":${SERVERTYPE}:${CVSROOT}\\\"; export CVSROOT; ${CD} \\\"${WORKDIR}\\\"; \\\"${CVS_EXE}\\\" status -l\"
    2.12 +EXEC_LIST_CYGWIN=org.netbeans.modules.vcs.cmdline.list.CvsListCommand.class ${SHELL} -c "CVSROOT\=\\\"\\\"\:${SERVERTYPE}\:${CVSROOT_\\/}\\\"\\\";\ export\ CVSROOT;\ ${CD}\ \\\"\\\"${WORKDIR}\\\"\\\"; \\\"\\\"${CVS_EXE}\\\"\\\" status -l"
    2.13  REGEX_LIST=^(File\:.*Status\:.*$)|(^.*status.*$)|(^.*server.*$)
    2.14  
    2.15 -EXEC_LIST_SUB_WIN=com.netbeans.developer.modules.vcs.cmdline.list.CvsListRecursiveCommand.class cmd /X /C \"set CVSROOT=\\\":${SERVERTYPE}:${CVSROOT}\\\"&& ${CD} ${WORKDIR}&& \\\"${CVS_EXE}\\\" -Q status -R\"
    2.16 -EXEC_LIST_SUB_UNIX=com.netbeans.developer.modules.vcs.cmdline.list.CvsListRecursiveCommand.class sh -c \"CVSROOT=\\\":${SERVERTYPE}:${CVSROOT}\\\"; export CVSROOT; ${CD} \\\"${WORKDIR}\\\"; \\\"${CVS_EXE}\\\" -Q status -R\"
    2.17 -EXEC_LIST_SUB_CYGWIN=com.netbeans.developer.modules.vcs.cmdline.list.CvsListRecursiveCommand.class ${SHELL} -c "CVSROOT\=\\\"\\\"\:${SERVERTYPE}\:${CVSROOT_\\/}\\\"\\\";\ export\ CVSROOT;\ ${CD}\ \\\"\\\"${WORKDIR}\\\"\\\"; \\\"\\\"${CVS_EXE}\\\"\\\" -Q status -R"
    2.18 +EXEC_LIST_SUB_WIN=org.netbeans.modules.vcs.cmdline.list.CvsListRecursiveCommand.class cmd /X /C \"set CVSROOT=\\\":${SERVERTYPE}:${CVSROOT}\\\"&& ${CD} ${WORKDIR}&& \\\"${CVS_EXE}\\\" -Q status -R\"
    2.19 +EXEC_LIST_SUB_UNIX=org.netbeans.modules.vcs.cmdline.list.CvsListRecursiveCommand.class sh -c \"CVSROOT=\\\":${SERVERTYPE}:${CVSROOT}\\\"; export CVSROOT; ${CD} \\\"${WORKDIR}\\\"; \\\"${CVS_EXE}\\\" -Q status -R\"
    2.20 +EXEC_LIST_SUB_CYGWIN=org.netbeans.modules.vcs.cmdline.list.CvsListRecursiveCommand.class ${SHELL} -c "CVSROOT\=\\\"\\\"\:${SERVERTYPE}\:${CVSROOT_\\/}\\\"\\\";\ export\ CVSROOT;\ ${CD}\ \\\"\\\"${WORKDIR}\\\"\\\"; \\\"\\\"${CVS_EXE}\\\"\\\" -Q status -R"
    2.21  REGEX_LIST_SUB=^(File\:.*Status\:.*$)|(Repository revision.*$)
    2.22  
    2.23  #REGEX_LIST_SRV=^(File\:.*Status\:.*$)|(^.*server.*$)
    2.24 @@ -100,9 +100,9 @@
    2.25  EXEC_WATCH_OFF_UNIX=${RUNCDM} \\"${CVS_EXE}\\" watch off $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.26  EXEC_WATCH_OFF_CYGWIN=${RUNCDM} \\"\\"${CVS_EXE}\\"\\" watch off $[? FILE] [\\"\\"${FILE}\\"\\"] [] ${NUR}
    2.27  
    2.28 -EXEC_WATCH_ADD_WIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsWatch.class ${RUNCDM} \\"${CVS_EXE}\\" watch remove all $[? FILE] [\\"${FILE}\\"] []&& \\"${CVS_EXE}\\" watch add ${ACTIONS} ${RECURSIVE} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.29 -EXEC_WATCH_ADD_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsWatch.class ${RUNCDM} \\"${CVS_EXE}\\" watch remove all $[? FILE] [\\"${FILE}\\"] []; \\"${CVS_EXE}\\" watch add ${ACTIONS} ${RECURSIVE} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.30 -EXEC_WATCH_ADD_CYGWIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsWatch.class ${RUNCDM} \\"\\"${CVS_EXE}\\"\\" watch remove all $[? FILE] [\\"\\"${FILE}\\"\\"] []; \\"\\"${CVS_EXE}\\"\\" watch add ${ACTIONS} ${RECURSIVE} $[? FILE] [\\"\\"${FILE}\\"\\"] [] ${NUR}
    2.31 +EXEC_WATCH_ADD_WIN=org.netbeans.modules.vcs.cmdline.commands.CvsWatch.class ${RUNCDM} \\"${CVS_EXE}\\" watch remove all $[? FILE] [\\"${FILE}\\"] []&& \\"${CVS_EXE}\\" watch add ${ACTIONS} ${RECURSIVE} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.32 +EXEC_WATCH_ADD_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsWatch.class ${RUNCDM} \\"${CVS_EXE}\\" watch remove all $[? FILE] [\\"${FILE}\\"] []; \\"${CVS_EXE}\\" watch add ${ACTIONS} ${RECURSIVE} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.33 +EXEC_WATCH_ADD_CYGWIN=org.netbeans.modules.vcs.cmdline.commands.CvsWatch.class ${RUNCDM} \\"\\"${CVS_EXE}\\"\\" watch remove all $[? FILE] [\\"\\"${FILE}\\"\\"] []; \\"\\"${CVS_EXE}\\"\\" watch add ${ACTIONS} ${RECURSIVE} $[? FILE] [\\"\\"${FILE}\\"\\"] [] ${NUR}
    2.34  
    2.35  EXEC_WATCHERS_WIN=${RUNCDM} \\"${CVS_EXE}\\" watchers $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.36  EXEC_WATCHERS_UNIX=${RUNCDM} \\"${CVS_EXE}\\" watchers $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.37 @@ -127,32 +127,32 @@
    2.38  #EXEC_UPDATE_MODULE_CYGWIN=${RUN} \\"\\"${CVS_EXE}\\"\\" update $[? MODULE_NAME] [\\"${MODULE_NAME}\\"] [.] ${NUR}
    2.39  
    2.40  #EXEC_UPDATE_UNIX=${RUNCDM} cvs update $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.41 -EXEC_DIFF=com.netbeans.developer.modules.vcs.cmdline.commands.CvsDiff.class ${CHECKOUT_CMD} ${DIFF_CMD}
    2.42 -EXEC_TAGS=com.netbeans.developer.modules.vcs.cmdline.commands.CvsAddTag.class ${LOG_INFO_CMD} ${ADD_TAG_CMD}
    2.43 -EXEC_CHECKOUT_REV_WIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Checkout Revision" ${LOG_INFO_CMD} ${RUN} \\"${CVS_EXE}\\" checkout -r ${REVISION} -N \\"${MODPATH}\\" ${NUR}
    2.44 -EXEC_CHECKOUT_REV_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Checkout Revision" ${LOG_INFO_CMD} ${RUN} \\"${CVS_EXE}\\" checkout -r ${REVISION} -N \\"${MODPATH}\\" ${NUR}
    2.45 -EXEC_CHECKOUT_REV_CYGWIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Checkout Revision" ${LOG_INFO_CMD} ${RUN} \\"\\"${CVS_EXE}\\"\\" checkout -r ${REVISION} -N \\"\\"${MODPATH}\\"\\" ${NUR}
    2.46 -#EXEC_CHECKOUT_REV_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Checkout Revision" ${LOG_INFO_CMD} ${RUN} cvs checkout -r ${REVISION} -N \\"${MODPATH}\\" ${NUR}
    2.47 -EXEC_UPDATE_REV_WIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Update Revision" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" update -r ${REVISION} \\"$[? FILE] [${FILE}] []\\" ${NUR}
    2.48 -EXEC_UPDATE_REV_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Update Revision" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" update -r ${REVISION} \\"$[? FILE] [${FILE}] []\\" ${NUR}
    2.49 -EXEC_UPDATE_REV_CYGWIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Update Revision" ${LOG_INFO_CMD} ${RUNCDM} \\"\\"${CVS_EXE}\\"\\" update -r ${REVISION} \\"\\"$[? FILE] [${FILE}] []\\"\\" ${NUR}
    2.50 -#EXEC_UPDATE_REV_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Update Revision" ${LOG_INFO_CMD} ${RUNCDM} cvs update -r ${REVISION} \\"$[? FILE] [${FILE}] []\\" ${NUR}
    2.51 +EXEC_DIFF=org.netbeans.modules.vcs.cmdline.commands.CvsDiff.class ${CHECKOUT_CMD} ${DIFF_CMD}
    2.52 +EXEC_TAGS=org.netbeans.modules.vcs.cmdline.commands.CvsAddTag.class ${LOG_INFO_CMD} ${ADD_TAG_CMD}
    2.53 +EXEC_CHECKOUT_REV_WIN=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Checkout Revision" ${LOG_INFO_CMD} ${RUN} \\"${CVS_EXE}\\" checkout -r ${REVISION} -N \\"${MODPATH}\\" ${NUR}
    2.54 +EXEC_CHECKOUT_REV_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Checkout Revision" ${LOG_INFO_CMD} ${RUN} \\"${CVS_EXE}\\" checkout -r ${REVISION} -N \\"${MODPATH}\\" ${NUR}
    2.55 +EXEC_CHECKOUT_REV_CYGWIN=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Checkout Revision" ${LOG_INFO_CMD} ${RUN} \\"\\"${CVS_EXE}\\"\\" checkout -r ${REVISION} -N \\"\\"${MODPATH}\\"\\" ${NUR}
    2.56 +#EXEC_CHECKOUT_REV_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Checkout Revision" ${LOG_INFO_CMD} ${RUN} cvs checkout -r ${REVISION} -N \\"${MODPATH}\\" ${NUR}
    2.57 +EXEC_UPDATE_REV_WIN=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Update Revision" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" update -r ${REVISION} \\"$[? FILE] [${FILE}] []\\" ${NUR}
    2.58 +EXEC_UPDATE_REV_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Update Revision" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" update -r ${REVISION} \\"$[? FILE] [${FILE}] []\\" ${NUR}
    2.59 +EXEC_UPDATE_REV_CYGWIN=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Update Revision" ${LOG_INFO_CMD} ${RUNCDM} \\"\\"${CVS_EXE}\\"\\" update -r ${REVISION} \\"\\"$[? FILE] [${FILE}] []\\"\\" ${NUR}
    2.60 +#EXEC_UPDATE_REV_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class "CVS Update Revision" ${LOG_INFO_CMD} ${RUNCDM} cvs update -r ${REVISION} \\"$[? FILE] [${FILE}] []\\" ${NUR}
    2.61  
    2.62 -EXEC_COMMIT_REV_WIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Commit To Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" commit -r ${REVISION} -m \\"${REASON}\\" \\"$[? FILE] [${FILE}] [.]\\" ${NUR}
    2.63 -EXEC_COMMIT_REV_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Commit To Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" commit -r ${REVISION} -m \\"${REASON}\\" \\"$[? FILE] [${FILE}] [.]\\" ${NUR}
    2.64 -EXEC_COMMIT_REV_CYGWIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Commit To Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"\\"${CVS_EXE}\\"\\" commit -r ${REVISION} -m \\"\\"${REASON}\\"\\" \\"\\"$[? FILE] [${FILE}] [.]\\"\\" ${NUR}
    2.65 +EXEC_COMMIT_REV_WIN=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Commit To Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" commit -r ${REVISION} -m \\"${REASON}\\" \\"$[? FILE] [${FILE}] [.]\\" ${NUR}
    2.66 +EXEC_COMMIT_REV_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Commit To Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" commit -r ${REVISION} -m \\"${REASON}\\" \\"$[? FILE] [${FILE}] [.]\\" ${NUR}
    2.67 +EXEC_COMMIT_REV_CYGWIN=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Commit To Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"\\"${CVS_EXE}\\"\\" commit -r ${REVISION} -m \\"\\"${REASON}\\"\\" \\"\\"$[? FILE] [${FILE}] [.]\\"\\" ${NUR}
    2.68  
    2.69 -#EXEC_COMMIT_REV_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Commit To Branch" ${LOG_INFO_CMD} ${RUNCDM} cvs commit -r ${REVISION} -m \\"${REASON}\\" \\"$[? FILE] [${FILE}] [.]\\" ${NUR}
    2.70 +#EXEC_COMMIT_REV_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Commit To Branch" ${LOG_INFO_CMD} ${RUNCDM} cvs commit -r ${REVISION} -m \\"${REASON}\\" \\"$[? FILE] [${FILE}] [.]\\" ${NUR}
    2.71  EXEC_REM_STICKY_WIN=${RUNCDM} \\"${CVS_EXE}\\" update -A $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.72  EXEC_REM_STICKY_UNIX=${RUNCDM} \\"${CVS_EXE}\\" update -A $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.73  EXEC_REM_STICKY_CYGWIN=${RUNCDM} \\"\\"${CVS_EXE}\\"\\" update -A $[? FILE] [\\"\\"${FILE}\\"\\"] [] ${NUR}
    2.74  #EXEC_REM_STICKY_UNIX=${RUNCDM} cvs update -A $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.75 -EXEC_MERGE_WIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Merge Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" update -j ${REVISION} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.76 -EXEC_MERGE_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Merge Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" update -j ${REVISION} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.77 -EXEC_MERGE_CYGWIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Merge Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"\\"${CVS_EXE}\\"\\" update -j ${REVISION} $[? FILE] [\\"\\"${FILE}\\"\\"] [] ${NUR}
    2.78 -#EXEC_MERGE_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Merge Branch" ${RUNCDM} cvs update -j ${REVISION} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.79 +EXEC_MERGE_WIN=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Merge Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" update -j ${REVISION} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.80 +EXEC_MERGE_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Merge Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"${CVS_EXE}\\" update -j ${REVISION} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.81 +EXEC_MERGE_CYGWIN=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Merge Branch" ${LOG_INFO_CMD} ${RUNCDM} \\"\\"${CVS_EXE}\\"\\" update -j ${REVISION} $[? FILE] [\\"\\"${FILE}\\"\\"] [] ${NUR}
    2.82 +#EXEC_MERGE_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsRevisionCommand.class -b "CVS Merge Branch" ${RUNCDM} cvs update -j ${REVISION} $[? FILE] [\\"${FILE}\\"] [] ${NUR}
    2.83  EXEC_LOGIN=${RUN} ${CVS_EXE} login
    2.84 -EXEC_BRANCHES=com.netbeans.developer.modules.vcs.cmdline.commands.CvsBranches.class ${LOG_INFO_CMD} ${CHECKOUT_CMD} ${DIFF_CMD}
    2.85 +EXEC_BRANCHES=org.netbeans.modules.vcs.cmdline.commands.CvsBranches.class ${LOG_INFO_CMD} ${CHECKOUT_CMD} ${DIFF_CMD}
    2.86  EXEC_INIT_WIN=${RUN} \\"${CVS_EXE}\\" init ${NUR}
    2.87  EXEC_INIT_UNIX=${RUN} \\"${CVS_EXE}\\" init ${NUR}
    2.88  EXEC_INIT_CYGWIN=${RUN} \\"\\"${CVS_EXE}\\"\\" init ${NUR}
    2.89 @@ -194,9 +194,9 @@
    2.90  VAR_CVS_EXE=cvs
    2.91  VAR_SHELL=c:\\cygnus\\cygwin-b20\\H-i586-cygwin32\\bin\\sh.exe
    2.92  VAR_CYGWINBIN=c:/cygnus/cygwin-b20/H-i586-cygwin32/bin
    2.93 -VAR_MODULE_SELECT_WIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsModuleSelector.class ${RUN} \\"${CVS_EXE}\\" checkout -c ${NUR}
    2.94 -VAR_MODULE_SELECT_UNIX=com.netbeans.developer.modules.vcs.cmdline.commands.CvsModuleSelector.class ${RUN} \\"${CVS_EXE}\\" checkout -c ${NUR}
    2.95 -VAR_MODULE_SELECT_CYGWIN=com.netbeans.developer.modules.vcs.cmdline.commands.CvsModuleSelector.class ${RUN} \\"\\"${CVS_EXE}\\"\\" checkout -c ${NUR}
    2.96 +VAR_MODULE_SELECT_WIN=org.netbeans.modules.vcs.cmdline.commands.CvsModuleSelector.class ${RUN} \\"${CVS_EXE}\\" checkout -c ${NUR}
    2.97 +VAR_MODULE_SELECT_UNIX=org.netbeans.modules.vcs.cmdline.commands.CvsModuleSelector.class ${RUN} \\"${CVS_EXE}\\" checkout -c ${NUR}
    2.98 +VAR_MODULE_SELECT_CYGWIN=org.netbeans.modules.vcs.cmdline.commands.CvsModuleSelector.class ${RUN} \\"\\"${CVS_EXE}\\"\\" checkout -c ${NUR}
    2.99  
   2.100  VAR_REMOVE_MSG=Are you sure you want to delete the file ${FILE} ?
   2.101  VAR_REMOVEDIR_MSG=
     3.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsCustomizer.form	Tue Apr 25 07:40:35 2000 +0000
     3.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsCustomizer.form	Tue Apr 25 12:55:38 2000 +0000
     3.3 @@ -1,6 +1,6 @@
     3.4  <?xml version="1.0" encoding="ISO-8859-1" ?>
     3.5  
     3.6 -<Form version="1.0" type="com.netbeans.developer.modules.loaders.form.forminfo.JPanelFormInfo">
     3.7 +<Form version="1.0" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
     3.8    <Properties>
     3.9      <Property name="opaque" type="boolean" editor="sun.beans.editors.BoolEditor" value="false"/>
    3.10    </Properties>
    3.11 @@ -14,14 +14,14 @@
    3.12      <SyntheticProperty name="encoding" type="java.lang.String" value="ISO-8859-1"/>
    3.13    </SyntheticProperties>
    3.14  
    3.15 -  <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
    3.16 +  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
    3.17    <SubComponents>
    3.18      <Container class="javax.swing.JPanel" name="connectionPanel">
    3.19        <Properties>
    3.20 -        <Property name="border" type="javax.swing.border.Border" editor="com.netbeans.developer.explorer.propertysheet.editors.BorderEditor">
    3.21 -          <Border info="com.netbeans.developerx.loaders.form.formeditor.border.TitledBorderInfo">
    3.22 +        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
    3.23 +          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
    3.24              <TitledBorder title="CVS Connection Type">
    3.25 -              <Border PropertyName="innerBorder" info="com.netbeans.developerx.loaders.form.formeditor.border.EtchedBorderInfo">
    3.26 +              <Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
    3.27                  <EtchetBorder/>
    3.28                </Border>
    3.29              </TitledBorder>
    3.30 @@ -29,20 +29,20 @@
    3.31          </Property>
    3.32        </Properties>
    3.33        <Constraints>
    3.34 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    3.35 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    3.36            <GridBagConstraints anchor="10" fill="1" gridHeight="1" gridWidth="1" gridX="0" gridY="0" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.4"/>
    3.37          </Constraint>
    3.38        </Constraints>
    3.39  
    3.40 -      <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
    3.41 +      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
    3.42        <SubComponents>
    3.43          <Component class="javax.swing.JRadioButton" name="localRadioButton">
    3.44            <Properties>
    3.45              <Property name="selected" type="boolean" editor="sun.beans.editors.BoolEditor" value="true"/>
    3.46 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
    3.47 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.localRadioButton.text"/>
    3.48 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
    3.49 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.localRadioButton.text"/>
    3.50              </Property>
    3.51 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
    3.52 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
    3.53                <Connection component="serverRadioButton" type="bean"/>
    3.54              </Property>
    3.55            </Properties>
    3.56 @@ -51,18 +51,18 @@
    3.57              <EventHandler event="actionPerformed" handler="localRadioButtonActionPerformed"/>
    3.58            </Events>
    3.59            <Constraints>
    3.60 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    3.61 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    3.62                <GridBagConstraints anchor="17" fill="2" gridHeight="1" gridWidth="2" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
    3.63              </Constraint>
    3.64 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
    3.65 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
    3.66            </Constraints>
    3.67          </Component>
    3.68          <Component class="javax.swing.JRadioButton" name="serverRadioButton">
    3.69            <Properties>
    3.70 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
    3.71 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.serverRadioButton.text"/>
    3.72 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
    3.73 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.serverRadioButton.text"/>
    3.74              </Property>
    3.75 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
    3.76 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
    3.77                <Connection component="pserverRadioButton" type="bean"/>
    3.78              </Property>
    3.79            </Properties>
    3.80 @@ -71,18 +71,18 @@
    3.81              <EventHandler event="actionPerformed" handler="serverRadioButtonActionPerformed"/>
    3.82            </Events>
    3.83            <Constraints>
    3.84 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    3.85 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    3.86                <GridBagConstraints anchor="17" fill="2" gridHeight="1" gridWidth="2" gridX="0" gridY="1" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
    3.87              </Constraint>
    3.88 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
    3.89 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
    3.90            </Constraints>
    3.91          </Component>
    3.92          <Component class="javax.swing.JRadioButton" name="pserverRadioButton">
    3.93            <Properties>
    3.94 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
    3.95 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.pserverRadioButton.text"/>
    3.96 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
    3.97 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.pserverRadioButton.text"/>
    3.98              </Property>
    3.99 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.100 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.101                <Connection component="userTextField" type="bean"/>
   3.102              </Property>
   3.103            </Properties>
   3.104 @@ -91,34 +91,34 @@
   3.105              <EventHandler event="actionPerformed" handler="pserverRadioButtonActionPerformed"/>
   3.106            </Events>
   3.107            <Constraints>
   3.108 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.109 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.110                <GridBagConstraints anchor="17" fill="2" gridHeight="1" gridWidth="2" gridX="0" gridY="2" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   3.111              </Constraint>
   3.112 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   3.113 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   3.114            </Constraints>
   3.115          </Component>
   3.116          <Component class="javax.swing.JLabel" name="userNameLabel">
   3.117            <Properties>
   3.118 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.119 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.userNameLabel.text"/>
   3.120 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.121 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.userNameLabel.text"/>
   3.122              </Property>
   3.123            </Properties>
   3.124            <Constraints>
   3.125 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.126 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.127                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="3" insetsBottom="8" insetsLeft="32" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.128              </Constraint>
   3.129 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   3.130 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   3.131            </Constraints>
   3.132          </Component>
   3.133          <Component class="javax.swing.JTextField" name="userTextField">
   3.134            <Properties>
   3.135 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.136 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.userTextField.toolTipText"/>
   3.137 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.138 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.userTextField.toolTipText"/>
   3.139              </Property>
   3.140 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.141 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.142                <Connection type="value" value="" valueType="java.lang.String"/>
   3.143              </Property>
   3.144 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.145 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.146                <Connection component="serverTextField" type="bean"/>
   3.147              </Property>
   3.148            </Properties>
   3.149 @@ -128,20 +128,20 @@
   3.150              <EventHandler event="focusLost" handler="userTextFieldFocusLost"/>
   3.151            </Events>
   3.152            <Constraints>
   3.153 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.154 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.155                <GridBagConstraints anchor="17" fill="2" gridHeight="1" gridWidth="0" gridX="1" gridY="3" insetsBottom="8" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   3.156              </Constraint>
   3.157 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   3.158 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   3.159            </Constraints>
   3.160          </Component>
   3.161        </SubComponents>
   3.162      </Container>
   3.163      <Container class="javax.swing.JPanel" name="propsPanel">
   3.164        <Properties>
   3.165 -        <Property name="border" type="javax.swing.border.Border" editor="com.netbeans.developer.explorer.propertysheet.editors.BorderEditor">
   3.166 -          <Border info="com.netbeans.developerx.loaders.form.formeditor.border.TitledBorderInfo">
   3.167 +        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
   3.168 +          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
   3.169              <TitledBorder title="CVS Settings">
   3.170 -              <Border PropertyName="innerBorder" info="com.netbeans.developerx.loaders.form.formeditor.border.EtchedBorderInfo">
   3.171 +              <Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
   3.172                  <EtchetBorder/>
   3.173                </Border>
   3.174              </TitledBorder>
   3.175 @@ -149,25 +149,25 @@
   3.176          </Property>
   3.177        </Properties>
   3.178        <Constraints>
   3.179 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.180 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.181            <GridBagConstraints anchor="10" fill="1" gridHeight="1" gridWidth="2" gridX="0" gridY="1" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.5"/>
   3.182          </Constraint>
   3.183        </Constraints>
   3.184  
   3.185 -      <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
   3.186 +      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
   3.187        <SubComponents>
   3.188          <Component class="javax.swing.JTextField" name="serverTextField">
   3.189            <Properties>
   3.190 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.191 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.serverTextField.toolTipText"/>
   3.192 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.193 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.serverTextField.toolTipText"/>
   3.194              </Property>
   3.195 -            <Property name="preferredSize" type="java.awt.Dimension" editor="com.netbeans.developer.editors.DimensionEditor">
   3.196 +            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
   3.197                <Dimension value="[150, 20]"/>
   3.198              </Property>
   3.199 -            <Property name="minimumSize" type="java.awt.Dimension" editor="com.netbeans.developer.editors.DimensionEditor">
   3.200 +            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
   3.201                <Dimension value="[150, 20]"/>
   3.202              </Property>
   3.203 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.204 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.205                <Connection component="repositoryTextField" type="bean"/>
   3.206              </Property>
   3.207            </Properties>
   3.208 @@ -177,41 +177,41 @@
   3.209              <EventHandler event="focusLost" handler="serverTextFieldFocusLost"/>
   3.210            </Events>
   3.211            <Constraints>
   3.212 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.213 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.214                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="2" gridX="1" gridY="0" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.8" weightY="0.0"/>
   3.215              </Constraint>
   3.216            </Constraints>
   3.217          </Component>
   3.218          <Component class="javax.swing.JLabel" name="serverLabel">
   3.219            <Properties>
   3.220 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.221 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.serverLabel.text"/>
   3.222 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.223 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.serverLabel.text"/>
   3.224              </Property>
   3.225            </Properties>
   3.226            <Constraints>
   3.227 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.228 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.229                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="0" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.230              </Constraint>
   3.231            </Constraints>
   3.232          </Component>
   3.233          <Component class="javax.swing.JLabel" name="repositoryLabel">
   3.234            <Properties>
   3.235 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.236 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.repositoryLabel.text"/>
   3.237 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.238 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.repositoryLabel.text"/>
   3.239              </Property>
   3.240            </Properties>
   3.241            <Constraints>
   3.242 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.243 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.244                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="1" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.245              </Constraint>
   3.246            </Constraints>
   3.247          </Component>
   3.248          <Component class="javax.swing.JTextField" name="repositoryTextField">
   3.249            <Properties>
   3.250 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.251 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.repositoryTextField.toolTipText"/>
   3.252 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.253 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.repositoryTextField.toolTipText"/>
   3.254              </Property>
   3.255 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.256 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.257                <Connection component="rootDirTextField" type="bean"/>
   3.258              </Property>
   3.259            </Properties>
   3.260 @@ -221,17 +221,17 @@
   3.261              <EventHandler event="focusLost" handler="repositoryTextFieldFocusLost"/>
   3.262            </Events>
   3.263            <Constraints>
   3.264 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.265 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.266                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="2" gridX="1" gridY="1" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.8" weightY="0.0"/>
   3.267              </Constraint>
   3.268            </Constraints>
   3.269          </Component>
   3.270          <Component class="javax.swing.JButton" name="repositoryButton">
   3.271            <Properties>
   3.272 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.273 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.repositoryButton.text"/>
   3.274 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.275 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.repositoryButton.text"/>
   3.276              </Property>
   3.277 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.278 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.279                <Connection component="rootDirTextField" type="bean"/>
   3.280              </Property>
   3.281            </Properties>
   3.282 @@ -240,29 +240,29 @@
   3.283              <EventHandler event="actionPerformed" handler="repositoryButtonActionPerformed"/>
   3.284            </Events>
   3.285            <Constraints>
   3.286 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.287 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.288                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="0" gridX="3" gridY="1" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.289              </Constraint>
   3.290            </Constraints>
   3.291          </Component>
   3.292          <Component class="javax.swing.JLabel" name="rootDirLabel">
   3.293            <Properties>
   3.294 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.295 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.rootDirLabel.text"/>
   3.296 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.297 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.rootDirLabel.text"/>
   3.298              </Property>
   3.299            </Properties>
   3.300            <Constraints>
   3.301 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.302 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.303                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="2" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.304              </Constraint>
   3.305            </Constraints>
   3.306          </Component>
   3.307          <Component class="javax.swing.JTextField" name="rootDirTextField">
   3.308            <Properties>
   3.309 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.310 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.rootDirTextField.toolTipText"/>
   3.311 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.312 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.rootDirTextField.toolTipText"/>
   3.313              </Property>
   3.314 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.315 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.316                <Connection component="moduleTextField" type="bean"/>
   3.317              </Property>
   3.318            </Properties>
   3.319 @@ -272,17 +272,17 @@
   3.320              <EventHandler event="focusLost" handler="rootDirTextFieldFocusLost"/>
   3.321            </Events>
   3.322            <Constraints>
   3.323 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.324 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.325                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="2" gridX="1" gridY="2" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.8" weightY="0.0"/>
   3.326              </Constraint>
   3.327            </Constraints>
   3.328          </Component>
   3.329          <Component class="javax.swing.JButton" name="browseButton">
   3.330            <Properties>
   3.331 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.332 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.browseButton.text"/>
   3.333 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.334 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.browseButton.text"/>
   3.335              </Property>
   3.336 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.337 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.338                <Connection component="refreshTextField" type="bean"/>
   3.339              </Property>
   3.340            </Properties>
   3.341 @@ -291,29 +291,29 @@
   3.342              <EventHandler event="actionPerformed" handler="browseButtonActionPerformed"/>
   3.343            </Events>
   3.344            <Constraints>
   3.345 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.346 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.347                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="0" gridX="3" gridY="2" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.348              </Constraint>
   3.349            </Constraints>
   3.350          </Component>
   3.351          <Component class="javax.swing.JLabel" name="moduleLabel">
   3.352            <Properties>
   3.353 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.354 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.moduleLabel.text"/>
   3.355 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.356 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.moduleLabel.text"/>
   3.357              </Property>
   3.358            </Properties>
   3.359            <Constraints>
   3.360 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.361 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.362                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="3" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.363              </Constraint>
   3.364            </Constraints>
   3.365          </Component>
   3.366          <Component class="javax.swing.JTextField" name="moduleTextField">
   3.367            <Properties>
   3.368 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.369 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.moduleTextField.toolTipText"/>
   3.370 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.371 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.moduleTextField.toolTipText"/>
   3.372              </Property>
   3.373 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.374 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.375                <Connection component="relMountTextField" type="bean"/>
   3.376              </Property>
   3.377            </Properties>
   3.378 @@ -323,15 +323,15 @@
   3.379              <EventHandler event="focusLost" handler="moduleTextFieldFocusLost"/>
   3.380            </Events>
   3.381            <Constraints>
   3.382 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.383 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.384                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="2" gridX="1" gridY="3" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.8" weightY="0.0"/>
   3.385              </Constraint>
   3.386            </Constraints>
   3.387          </Component>
   3.388          <Component class="javax.swing.JButton" name="moduleSelectButton">
   3.389            <Properties>
   3.390 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.391 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.moduleSelectButton.text"/>
   3.392 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.393 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.moduleSelectButton.text"/>
   3.394              </Property>
   3.395            </Properties>
   3.396  
   3.397 @@ -339,29 +339,29 @@
   3.398              <EventHandler event="actionPerformed" handler="moduleSelectButtonActionPerformed"/>
   3.399            </Events>
   3.400            <Constraints>
   3.401 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.402 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.403                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="0" gridX="3" gridY="3" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.404              </Constraint>
   3.405            </Constraints>
   3.406          </Component>
   3.407          <Component class="javax.swing.JLabel" name="relMountLabel">
   3.408            <Properties>
   3.409 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.410 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.relMountLabel.text"/>
   3.411 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.412 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.relMountLabel.text"/>
   3.413              </Property>
   3.414            </Properties>
   3.415            <Constraints>
   3.416 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.417 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.418                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="4" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.419              </Constraint>
   3.420            </Constraints>
   3.421          </Component>
   3.422          <Component class="javax.swing.JTextField" name="relMountTextField">
   3.423            <Properties>
   3.424 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.425 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.relMountTextField.toolTipText"/>
   3.426 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.427 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.relMountTextField.toolTipText"/>
   3.428              </Property>
   3.429 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.430 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.431                <Connection component="cvsExeTextField" type="bean"/>
   3.432              </Property>
   3.433            </Properties>
   3.434 @@ -371,29 +371,29 @@
   3.435              <EventHandler event="focusLost" handler="relMountTextFieldFocusLost"/>
   3.436            </Events>
   3.437            <Constraints>
   3.438 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.439 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.440                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="2" gridX="1" gridY="4" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   3.441              </Constraint>
   3.442            </Constraints>
   3.443          </Component>
   3.444          <Component class="javax.swing.JLabel" name="cvsExeLabel">
   3.445            <Properties>
   3.446 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.447 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cvsExeLabel.text"/>
   3.448 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.449 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cvsExeLabel.text"/>
   3.450              </Property>
   3.451            </Properties>
   3.452            <Constraints>
   3.453 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.454 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.455                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="5" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.456              </Constraint>
   3.457            </Constraints>
   3.458          </Component>
   3.459          <Component class="javax.swing.JTextField" name="cvsExeTextField">
   3.460            <Properties>
   3.461 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.462 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cvsExeTextField.toolTipText"/>
   3.463 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.464 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cvsExeTextField.toolTipText"/>
   3.465              </Property>
   3.466 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.467 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.468                <Connection component="cygwinCheckBox" type="bean"/>
   3.469              </Property>
   3.470            </Properties>
   3.471 @@ -403,15 +403,15 @@
   3.472              <EventHandler event="focusLost" handler="cvsExeTextFieldFocusLost"/>
   3.473            </Events>
   3.474            <Constraints>
   3.475 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.476 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.477                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="2" gridX="1" gridY="5" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   3.478              </Constraint>
   3.479            </Constraints>
   3.480          </Component>
   3.481          <Component class="javax.swing.JButton" name="cvsExeButton">
   3.482            <Properties>
   3.483 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.484 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cvsExeButton.text"/>
   3.485 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.486 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cvsExeButton.text"/>
   3.487              </Property>
   3.488            </Properties>
   3.489  
   3.490 @@ -419,20 +419,20 @@
   3.491              <EventHandler event="actionPerformed" handler="cvsExeButtonActionPerformed"/>
   3.492            </Events>
   3.493            <Constraints>
   3.494 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.495 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.496                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="0" gridX="3" gridY="5" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.497              </Constraint>
   3.498            </Constraints>
   3.499          </Component>
   3.500          <Component class="javax.swing.JCheckBox" name="cygwinCheckBox">
   3.501            <Properties>
   3.502 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.503 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinCheckBox.toolTipText"/>
   3.504 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.505 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinCheckBox.toolTipText"/>
   3.506              </Property>
   3.507 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.508 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinCheckBox.text"/>
   3.509 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.510 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinCheckBox.text"/>
   3.511              </Property>
   3.512 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.513 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.514                <Connection component="cygwinTextField" type="bean"/>
   3.515              </Property>
   3.516            </Properties>
   3.517 @@ -441,29 +441,29 @@
   3.518              <EventHandler event="actionPerformed" handler="cygwinCheckBoxActionPerformed"/>
   3.519            </Events>
   3.520            <Constraints>
   3.521 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.522 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.523                <GridBagConstraints anchor="17" fill="2" gridHeight="1" gridWidth="3" gridX="0" gridY="6" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   3.524              </Constraint>
   3.525            </Constraints>
   3.526          </Component>
   3.527          <Component class="javax.swing.JLabel" name="cygwinLabel">
   3.528            <Properties>
   3.529 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.530 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinLabel.text"/>
   3.531 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.532 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinLabel.text"/>
   3.533              </Property>
   3.534            </Properties>
   3.535            <Constraints>
   3.536 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.537 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.538                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="7" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.539              </Constraint>
   3.540            </Constraints>
   3.541          </Component>
   3.542          <Component class="javax.swing.JTextField" name="cygwinTextField">
   3.543            <Properties>
   3.544 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.545 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinTextField.toolTipText"/>
   3.546 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.547 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinTextField.toolTipText"/>
   3.548              </Property>
   3.549 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.550 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.551                <Connection component="refreshTextField" type="bean"/>
   3.552              </Property>
   3.553            </Properties>
   3.554 @@ -473,15 +473,15 @@
   3.555              <EventHandler event="focusLost" handler="cygwinTextFieldFocusLost"/>
   3.556            </Events>
   3.557            <Constraints>
   3.558 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.559 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.560                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="2" gridX="1" gridY="7" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   3.561              </Constraint>
   3.562            </Constraints>
   3.563          </Component>
   3.564          <Component class="javax.swing.JButton" name="cygwinButton">
   3.565            <Properties>
   3.566 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.567 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinButton.text"/>
   3.568 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.569 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.cygwinButton.text"/>
   3.570              </Property>
   3.571            </Properties>
   3.572  
   3.573 @@ -489,36 +489,36 @@
   3.574              <EventHandler event="actionPerformed" handler="cygwinButtonActionPerformed"/>
   3.575            </Events>
   3.576            <Constraints>
   3.577 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.578 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.579                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="3" gridY="7" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.580              </Constraint>
   3.581            </Constraints>
   3.582          </Component>
   3.583          <Component class="javax.swing.JLabel" name="refreshLabel">
   3.584            <Properties>
   3.585 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.586 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.refreshLabel.text"/>
   3.587 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.588 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.refreshLabel.text"/>
   3.589              </Property>
   3.590            </Properties>
   3.591            <Constraints>
   3.592 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.593 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.594                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="8" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.595              </Constraint>
   3.596            </Constraints>
   3.597          </Component>
   3.598          <Component class="javax.swing.JTextField" name="refreshTextField">
   3.599            <Properties>
   3.600 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.601 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.refreshTextField.toolTipText"/>
   3.602 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.603 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.refreshTextField.toolTipText"/>
   3.604              </Property>
   3.605 -            <Property name="preferredSize" type="java.awt.Dimension" editor="com.netbeans.developer.editors.DimensionEditor">
   3.606 +            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
   3.607                <Dimension value="[50, 20]"/>
   3.608              </Property>
   3.609 -            <Property name="minimumSize" type="java.awt.Dimension" editor="com.netbeans.developer.editors.DimensionEditor">
   3.610 +            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
   3.611                <Dimension value="[50, 20]"/>
   3.612              </Property>
   3.613 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.editors.StringEditor" value="0"/>
   3.614 -            <Property name="nextFocusableComponent" type="java.awt.Component" editor="com.netbeans.developer.modules.loaders.form.RADConnectionPropertyEditor">
   3.615 +            <Property name="text" type="java.lang.String" editor="org.netbeans.beaninfo.editors.StringEditor" value="0"/>
   3.616 +            <Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
   3.617                <Connection component="loginButton" type="bean"/>
   3.618              </Property>
   3.619            </Properties>
   3.620 @@ -528,27 +528,27 @@
   3.621              <EventHandler event="focusLost" handler="refreshTextFieldFocusLost"/>
   3.622            </Events>
   3.623            <Constraints>
   3.624 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.625 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.626                <GridBagConstraints anchor="17" fill="2" gridHeight="1" gridWidth="1" gridX="1" gridY="8" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.4" weightY="0.0"/>
   3.627              </Constraint>
   3.628            </Constraints>
   3.629          </Component>
   3.630          <Component class="javax.swing.JLabel" name="jLabel10">
   3.631            <Properties>
   3.632 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.633 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.jLabel10.text"/>
   3.634 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.635 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.jLabel10.text"/>
   3.636              </Property>
   3.637            </Properties>
   3.638            <Constraints>
   3.639 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.640 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.641                <GridBagConstraints anchor="17" fill="2" gridHeight="1" gridWidth="1" gridX="2" gridY="8" insetsBottom="0" insetsLeft="0" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.6" weightY="0.0"/>
   3.642              </Constraint>
   3.643            </Constraints>
   3.644          </Component>
   3.645          <Component class="javax.swing.JButton" name="loginButton">
   3.646            <Properties>
   3.647 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   3.648 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.loginButton.text"/>
   3.649 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   3.650 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/Bundle.properties" key="CvsCustomizer.loginButton.text"/>
   3.651              </Property>
   3.652            </Properties>
   3.653  
   3.654 @@ -556,7 +556,7 @@
   3.655              <EventHandler event="actionPerformed" handler="loginButtonActionPerformed"/>
   3.656            </Events>
   3.657            <Constraints>
   3.658 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.659 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   3.660                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="0" gridY="9" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   3.661              </Constraint>
   3.662            </Constraints>
     4.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsCustomizer.java	Tue Apr 25 07:40:35 2000 +0000
     4.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsCustomizer.java	Tue Apr 25 12:55:38 2000 +0000
     4.3 @@ -11,7 +11,7 @@
     4.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
     4.5   */
     4.6  
     4.7 -package com.netbeans.developer.modules.vcs.cmdline;
     4.8 +package org.netbeans.modules.vcs.cmdline;
     4.9  import java.io.*;
    4.10  import java.util.*;
    4.11  import java.beans.*;
    4.12 @@ -25,8 +25,8 @@
    4.13  import org.openide.*;
    4.14  import org.openide.util.*;
    4.15  
    4.16 -import com.netbeans.developer.modules.vcs.*;
    4.17 -import com.netbeans.developer.modules.vcs.util.*;
    4.18 +import org.netbeans.modules.vcs.*;
    4.19 +import org.netbeans.modules.vcs.util.*;
    4.20  
    4.21  /** Customizer
    4.22   *
    4.23 @@ -1160,7 +1160,7 @@
    4.24    String g(String s) {
    4.25      D.deb("getting "+s);
    4.26      return NbBundle.getBundle
    4.27 -      ("com.netbeans.developer.modules.vcs.cmdline.Bundle").getString (s);
    4.28 +      ("org.netbeans.modules.vcs.cmdline.Bundle").getString (s);
    4.29    }
    4.30    String  g(String s, Object obj) {
    4.31      return MessageFormat.format (g(s), new Object[] { obj });
     5.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsFileSystem.java	Tue Apr 25 07:40:35 2000 +0000
     5.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsFileSystem.java	Tue Apr 25 12:55:38 2000 +0000
     5.3 @@ -11,7 +11,7 @@
     5.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
     5.5   */
     5.6  
     5.7 -package com.netbeans.developer.modules.vcs.cmdline;
     5.8 +package org.netbeans.modules.vcs.cmdline;
     5.9  import java.awt.*;
    5.10  import java.io.*;
    5.11  import java.util.*;
    5.12 @@ -22,8 +22,8 @@
    5.13  import org.openide.util.actions.*;
    5.14  import org.openide.util.NbBundle;
    5.15  import org.openide.*;
    5.16 -import com.netbeans.developer.modules.vcs.*;
    5.17 -import com.netbeans.developer.modules.vcs.util.*;
    5.18 +import org.netbeans.modules.vcs.*;
    5.19 +import org.netbeans.modules.vcs.util.*;
    5.20  import org.openide.filesystems.FileObject;
    5.21  import org.openide.filesystems.FileSystem;
    5.22  import org.openide.filesystems.FileSystem.Status;
    5.23 @@ -113,7 +113,7 @@
    5.24      VcsConfigVariable var = (VcsConfigVariable) variablesByName.get ("SERVERTYPE"); // NOI18N
    5.25      var.setValue (serverType);
    5.26      //var = (VcsConfigVariable) variablesByName.get ("PS"); // NOI18N
    5.27 -    //ResourceBundle bu = NbBundle.getBundle ("com.netbeans.developer.modules.vcs.cmdline.CommandLines"); // NOI18N
    5.28 +    //ResourceBundle bu = NbBundle.getBundle ("org.netbeans.modules.vcs.cmdline.CommandLines"); // NOI18N
    5.29      /*
    5.30      if(serverType==CVS_SERVER_LOCAL) {
    5.31        //var.setValue (PS_LOCAL);
    5.32 @@ -202,7 +202,7 @@
    5.33    
    5.34    private void setConfiguration () {
    5.35      //System.out.println("CvsFileSystem   readConfiguration ()"); // NOI18N
    5.36 -    ResourceBundle bu = NbBundle.getBundle ("com.netbeans.developer.modules.vcs.cmdline.CommandLines"); // NOI18N
    5.37 +    ResourceBundle bu = NbBundle.getBundle ("org.netbeans.modules.vcs.cmdline.CommandLines"); // NOI18N
    5.38      Vector vars = new Vector ();
    5.39      String osName;
    5.40      String os = System.getProperty("os.name");
    5.41 @@ -231,7 +231,7 @@
    5.42      vars.add (new VcsConfigVariable ("WORKDIR", "", bu.getString ("VAR_WORKDIR"+osName), false, false, false, ""));
    5.43      vars.add (new VcsConfigVariable ("SERVERTYPE", "", "local", false, false, false, "")); // NOI18N
    5.44      vars.add (new VcsConfigVariable ("SHOWLOCALFILES", "", "true", false, false, false, "")); // NOI18N
    5.45 -    vars.add (new VcsConfigVariable ("WRAPPER", "", "com.netbeans.developer.modules.vcs.cmdline.CvsList", false, false, false, "")); // NOI18N
    5.46 +    vars.add (new VcsConfigVariable ("WRAPPER", "", "org.netbeans.modules.vcs.cmdline.CvsList", false, false, false, "")); // NOI18N
    5.47      vars.add (new VcsConfigVariable ("CHECKOUT_CMD", "", bu.getString ("VAR_CHECKOUT_CMD"+osName), false, false, false, ""));
    5.48      vars.add (new VcsConfigVariable ("DIFF_CMD", "", bu.getString ("VAR_DIFF_CMD"+osName), false, false, false, ""));
    5.49      vars.add (new VcsConfigVariable ("LOG_INFO_CMD", "", bu.getString ("VAR_LOG_INFO_CMD"+osName), false, false, false, ""));
    5.50 @@ -272,7 +272,7 @@
    5.51      } else osName = "_UNIX"; // NOI18N
    5.52      D.deb("OS = "+os+" => osName = "+osName); // NOI18N
    5.53  
    5.54 -    ResourceBundle bu = NbBundle.getBundle ("com.netbeans.developer.modules.vcs.cmdline.CommandLines"); // NOI18N
    5.55 +    ResourceBundle bu = NbBundle.getBundle ("org.netbeans.modules.vcs.cmdline.CommandLines"); // NOI18N
    5.56      //VcsConfigVariable var = (VcsConfigVariable) variablesByName.get ("CP"); // NOI18N
    5.57      //var.setValue (bu.getString ("VAR_CP"+osName));
    5.58      VcsConfigVariable var = (VcsConfigVariable) variablesByName.get ("MODPATH"); // NOI18N
    5.59 @@ -742,7 +742,7 @@
    5.60    protected String g(String s) {
    5.61      D.deb("getting: "+s);
    5.62      return NbBundle.getBundle
    5.63 -      ("com.netbeans.developer.modules.vcs.cmdline.BundleCVS").getString (s);
    5.64 +      ("org.netbeans.modules.vcs.cmdline.BundleCVS").getString (s);
    5.65    }
    5.66    
    5.67  
     6.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsFileSystemBeanInfo.java	Tue Apr 25 07:40:35 2000 +0000
     6.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/CvsFileSystemBeanInfo.java	Tue Apr 25 12:55:38 2000 +0000
     6.3 @@ -11,13 +11,13 @@
     6.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
     6.5   */
     6.6  
     6.7 -package com.netbeans.developer.modules.vcs.cmdline;
     6.8 +package org.netbeans.modules.vcs.cmdline;
     6.9  import java.beans.*;
    6.10  import java.util.ResourceBundle;
    6.11  
    6.12  import org.openide.util.NbBundle;
    6.13  import org.openide.filesystems.*;
    6.14 -import com.netbeans.developer.modules.vcs.util.*;
    6.15 +import org.netbeans.modules.vcs.util.*;
    6.16  
    6.17  /** BeanInfo for CommandLineVcsFileSystem.
    6.18   * 
    6.19 @@ -58,7 +58,7 @@
    6.20        };
    6.21  
    6.22        ResourceBundle bundle = NbBundle.getBundle
    6.23 -	("com.netbeans.developer.modules.vcs.cmdline.Bundle"); // NOI18N
    6.24 +	("org.netbeans.modules.vcs.cmdline.Bundle"); // NOI18N
    6.25        rootDirectory.setDisplayName      (bundle.getString("PROP_rootDirectory"));
    6.26        rootDirectory.setShortDescription (bundle.getString("HINT_rootDirectory"));
    6.27        debug.setDisplayName              (bundle.getString("PROP_debug"));
    6.28 @@ -76,7 +76,7 @@
    6.29    /* Provides the VCSFileSystem's icon */
    6.30    public java.awt.Image getIcon(int type) {
    6.31      if (icon == null) {
    6.32 -      icon = loadImage("/com/netbeans/developer/modules/vcs/cmdline/cvs.gif"); // NOI18N
    6.33 +      icon = loadImage("/org/netbeans/modules/vcs/cmdline/cvs.gif"); // NOI18N
    6.34        icon32 = icon;
    6.35      }
    6.36      if ((type == java.beans.BeanInfo.ICON_COLOR_16x16) || (type == java.beans.BeanInfo.ICON_MONO_16x16))
    6.37 @@ -95,7 +95,7 @@
    6.38  
    6.39    public BeanDescriptor getBeanDescriptor(){
    6.40      D.deb("getBeanDescriptor()"); // NOI18N
    6.41 -    return new BeanDescriptor(CvsFileSystem.class, com.netbeans.developer.modules.vcs.cmdline.CvsCustomizer.class);
    6.42 +    return new BeanDescriptor(CvsFileSystem.class, org.netbeans.modules.vcs.cmdline.CvsCustomizer.class);
    6.43    }
    6.44    
    6.45  }
     7.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.form	Tue Apr 25 07:40:35 2000 +0000
     7.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.form	Tue Apr 25 12:55:38 2000 +0000
     7.3 @@ -1,6 +1,6 @@
     7.4  <?xml version="1.0" encoding="ISO-8859-1" ?>
     7.5  
     7.6 -<Form version="1.0" type="com.netbeans.developer.modules.loaders.form.forminfo.JFrameFormInfo">
     7.7 +<Form version="1.0" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
     7.8    <SyntheticProperties>
     7.9      <SyntheticProperty name="menuBar" value="-84,-19,0,5,116,0,9,40,78,111,32,77,101,110,117,41"/>
    7.10      <SyntheticProperty name="formSize" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-56,0,0,1,44"/>
    7.11 @@ -19,51 +19,51 @@
    7.12    <AuxValues>
    7.13    </AuxValues>
    7.14  
    7.15 -  <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
    7.16 +  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
    7.17    <SubComponents>
    7.18      <Container class="javax.swing.JPanel" name="headPanel">
    7.19        <Constraints>
    7.20 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.21 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.22            <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
    7.23          </Constraint>
    7.24 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignBorderLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignBorderLayout$BorderConstraintsDescription">
    7.25 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
    7.26            <BorderConstraints direction="North"/>
    7.27          </Constraint>
    7.28        </Constraints>
    7.29  
    7.30 -      <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
    7.31 +      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
    7.32      </Container>
    7.33      <Container class="javax.swing.JPanel" name="infoPanel1">
    7.34        <Constraints>
    7.35 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.36 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.37            <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="-1" gridY="1" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
    7.38          </Constraint>
    7.39        </Constraints>
    7.40  
    7.41 -      <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
    7.42 +      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
    7.43        <SubComponents>
    7.44          <Component class="javax.swing.JLabel" name="revALabel">
    7.45            <Properties>
    7.46 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
    7.47 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.revALabel.text"/>
    7.48 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
    7.49 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.revALabel.text"/>
    7.50              </Property>
    7.51            </Properties>
    7.52            <Constraints>
    7.53 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.54 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.55                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
    7.56              </Constraint>
    7.57 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
    7.58 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
    7.59            </Constraints>
    7.60          </Component>
    7.61          <Component class="javax.swing.JTextField" name="revATextField">
    7.62            <Properties>
    7.63 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
    7.64 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.revATextField.toolTipText"/>
    7.65 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
    7.66 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.revATextField.toolTipText"/>
    7.67              </Property>
    7.68              <Property name="editable" type="boolean" editor="sun.beans.editors.BoolEditor" value="false"/>
    7.69            </Properties>
    7.70            <Constraints>
    7.71 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.72 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.73                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
    7.74              </Constraint>
    7.75            </Constraints>
    7.76 @@ -72,35 +72,35 @@
    7.77      </Container>
    7.78      <Container class="javax.swing.JPanel" name="infoPanel2">
    7.79        <Constraints>
    7.80 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.81 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.82            <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="-1" gridY="2" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
    7.83          </Constraint>
    7.84        </Constraints>
    7.85  
    7.86 -      <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
    7.87 +      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
    7.88        <SubComponents>
    7.89          <Component class="javax.swing.JLabel" name="revBLabel">
    7.90            <Properties>
    7.91 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
    7.92 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.revBLabel.text"/>
    7.93 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
    7.94 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.revBLabel.text"/>
    7.95              </Property>
    7.96            </Properties>
    7.97            <Constraints>
    7.98 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
    7.99 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.100                <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
   7.101              </Constraint>
   7.102 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   7.103 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   7.104            </Constraints>
   7.105          </Component>
   7.106          <Component class="javax.swing.JTextField" name="revBTextField">
   7.107            <Properties>
   7.108 -            <Property name="toolTipText" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   7.109 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.revBTextField.toolTipText"/>
   7.110 +            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   7.111 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.revBTextField.toolTipText"/>
   7.112              </Property>
   7.113              <Property name="editable" type="boolean" editor="sun.beans.editors.BoolEditor" value="false"/>
   7.114            </Properties>
   7.115            <Constraints>
   7.116 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.117 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.118                <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="8" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   7.119              </Constraint>
   7.120            </Constraints>
   7.121 @@ -109,47 +109,47 @@
   7.122      </Container>
   7.123      <Container class="javax.swing.JPanel" name="branchPanel">
   7.124        <Properties>
   7.125 -        <Property name="preferredSize" type="java.awt.Dimension" editor="com.netbeans.developer.editors.DimensionEditor">
   7.126 +        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
   7.127            <Dimension value="[300, 200]"/>
   7.128          </Property>
   7.129        </Properties>
   7.130        <Constraints>
   7.131 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.132 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.133            <GridBagConstraints anchor="10" fill="1" gridHeight="1" gridWidth="1" gridX="-1" gridY="3" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="1.0"/>
   7.134          </Constraint>
   7.135        </Constraints>
   7.136  
   7.137 -      <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
   7.138 +      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
   7.139        <SubComponents>
   7.140          <Container class="javax.swing.JScrollPane" name="branchScrollPane">
   7.141            <Properties>
   7.142 -            <Property name="preferredSize" type="java.awt.Dimension" editor="com.netbeans.developer.editors.DimensionEditor">
   7.143 +            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
   7.144                <Dimension value="[200, 200]"/>
   7.145              </Property>
   7.146            </Properties>
   7.147            <Constraints>
   7.148 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.149 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.150                <GridBagConstraints anchor="10" fill="1" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="1.0"/>
   7.151              </Constraint>
   7.152            </Constraints>
   7.153  
   7.154 -          <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.support.JScrollPaneSupportLayout"/>
   7.155 +          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
   7.156          </Container>
   7.157        </SubComponents>
   7.158      </Container>
   7.159      <Container class="javax.swing.JPanel" name="buttonPanel">
   7.160        <Constraints>
   7.161 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.162 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.163            <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="-1" gridY="4" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   7.164          </Constraint>
   7.165        </Constraints>
   7.166  
   7.167 -      <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
   7.168 +      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
   7.169        <SubComponents>
   7.170          <Component class="javax.swing.JButton" name="diffButton">
   7.171            <Properties>
   7.172 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   7.173 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.diffButton.text"/>
   7.174 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   7.175 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.diffButton.text"/>
   7.176              </Property>
   7.177            </Properties>
   7.178  
   7.179 @@ -157,16 +157,16 @@
   7.180              <EventHandler event="actionPerformed" handler="diffButtonActionPerformed"/>
   7.181            </Events>
   7.182            <Constraints>
   7.183 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.184 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.185                <GridBagConstraints anchor="10" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   7.186              </Constraint>
   7.187 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   7.188 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   7.189            </Constraints>
   7.190          </Component>
   7.191          <Component class="javax.swing.JButton" name="closeButton">
   7.192            <Properties>
   7.193 -            <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   7.194 -              <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.closeButton.text"/>
   7.195 +            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   7.196 +              <ResourceString bundle="org/netbeans/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.closeButton.text"/>
   7.197              </Property>
   7.198            </Properties>
   7.199  
   7.200 @@ -174,10 +174,10 @@
   7.201              <EventHandler event="actionPerformed" handler="closeButtonActionPerformed"/>
   7.202            </Events>
   7.203            <Constraints>
   7.204 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.205 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   7.206                <GridBagConstraints anchor="10" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   7.207              </Constraint>
   7.208 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   7.209 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
   7.210            </Constraints>
   7.211          </Component>
   7.212        </SubComponents>
     8.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.java	Tue Apr 25 07:40:35 2000 +0000
     8.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.java	Tue Apr 25 12:55:38 2000 +0000
     8.3 @@ -11,7 +11,7 @@
     8.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
     8.5   */
     8.6  
     8.7 -package com.netbeans.developer.modules.vcs.cmdline.commands;
     8.8 +package org.netbeans.modules.vcs.cmdline.commands;
     8.9  
    8.10  import javax.swing.*;
    8.11  import java.util.*;
     9.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranches.java	Tue Apr 25 07:40:35 2000 +0000
     9.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranches.java	Tue Apr 25 12:55:38 2000 +0000
     9.3 @@ -11,11 +11,11 @@
     9.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
     9.5   */
     9.6  
     9.7 -package com.netbeans.developer.modules.vcs.cmdline.commands;
     9.8 +package org.netbeans.modules.vcs.cmdline.commands;
     9.9  
    9.10 -import com.netbeans.developer.modules.vcs.cmdline.*;
    9.11 -import com.netbeans.developer.modules.vcs.util.*;
    9.12 -import com.netbeans.developer.modules.vcs.cmdline.exec.*;
    9.13 +import org.netbeans.modules.vcs.cmdline.*;
    9.14 +import org.netbeans.modules.vcs.util.*;
    9.15 +import org.netbeans.modules.vcs.cmdline.exec.*;
    9.16  import java.util.*;
    9.17  
    9.18  /** 
    10.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsDiff.java	Tue Apr 25 07:40:35 2000 +0000
    10.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsDiff.java	Tue Apr 25 12:55:38 2000 +0000
    10.3 @@ -11,12 +11,12 @@
    10.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
    10.5   */
    10.6  
    10.7 -package com.netbeans.developer.modules.vcs.cmdline.commands;
    10.8 +package org.netbeans.modules.vcs.cmdline.commands;
    10.9  
   10.10 -import com.netbeans.developer.modules.vcs.cmdline.*;
   10.11 -import com.netbeans.developer.modules.vcs.util.*;
   10.12 -import com.netbeans.developer.modules.vcs.VcsFileSystem;
   10.13 -import com.netbeans.developer.modules.vcs.cmdline.exec.*;
   10.14 +import org.netbeans.modules.vcs.cmdline.*;
   10.15 +import org.netbeans.modules.vcs.util.*;
   10.16 +import org.netbeans.modules.vcs.VcsFileSystem;
   10.17 +import org.netbeans.modules.vcs.cmdline.exec.*;
   10.18  import org.openide.nodes.*;
   10.19  import org.openide.loaders.DataObject;
   10.20  import org.openide.filesystems.FileObject;
    11.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsLogInfo.java	Tue Apr 25 07:40:35 2000 +0000
    11.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsLogInfo.java	Tue Apr 25 12:55:38 2000 +0000
    11.3 @@ -11,12 +11,12 @@
    11.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
    11.5   */
    11.6  
    11.7 -package com.netbeans.developer.modules.vcs.cmdline.commands;
    11.8 +package org.netbeans.modules.vcs.cmdline.commands;
    11.9  
   11.10 -import com.netbeans.developer.modules.vcs.cmdline.*;
   11.11 -import com.netbeans.developer.modules.vcs.VcsFileSystem;
   11.12 -import com.netbeans.developer.modules.vcs.util.*;
   11.13 -import com.netbeans.developer.modules.vcs.cmdline.exec.*;
   11.14 +import org.netbeans.modules.vcs.cmdline.*;
   11.15 +import org.netbeans.modules.vcs.VcsFileSystem;
   11.16 +import org.netbeans.modules.vcs.util.*;
   11.17 +import org.netbeans.modules.vcs.cmdline.exec.*;
   11.18  import java.util.*;
   11.19  import java.io.*;
   11.20  
    12.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsModuleSelector.java	Tue Apr 25 07:40:35 2000 +0000
    12.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsModuleSelector.java	Tue Apr 25 12:55:38 2000 +0000
    12.3 @@ -11,17 +11,17 @@
    12.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
    12.5   */
    12.6  
    12.7 -package com.netbeans.developer.modules.vcs.cmdline.commands;
    12.8 +package org.netbeans.modules.vcs.cmdline.commands;
    12.9  
   12.10  import java.util.*;
   12.11  
   12.12  import org.openide.*;
   12.13  import org.openide.util.*;
   12.14  
   12.15 -import com.netbeans.developer.modules.vcs.cmdline.*;
   12.16 -import com.netbeans.developer.modules.vcs.cmdline.exec.*;
   12.17 -import com.netbeans.developer.modules.vcs.util.*;
   12.18 -import com.netbeans.developer.modules.vcs.cmdline.VcsVariableSelector;
   12.19 +import org.netbeans.modules.vcs.cmdline.*;
   12.20 +import org.netbeans.modules.vcs.cmdline.exec.*;
   12.21 +import org.netbeans.modules.vcs.util.*;
   12.22 +import org.netbeans.modules.vcs.cmdline.VcsVariableSelector;
   12.23  
   12.24  /** 
   12.25   *
   12.26 @@ -156,7 +156,7 @@
   12.27      if (stdoutNRListener != null) ec.addStdoutNoRegexListener(stdoutNRListener);
   12.28      if (stderrNRListener != null) ec.addStderrNoRegexListener(stderrNRListener);
   12.29      if (stderrNRListener != null) stderrNRListener.match(NbBundle.getBundle
   12.30 -      ("com.netbeans.developer.modules.vcs.cmdline.Bundle").getString ("MSG_VariableSelector")+
   12.31 +      ("org.netbeans.modules.vcs.cmdline.Bundle").getString ("MSG_VariableSelector")+
   12.32        ": "+prepared); // NOI18N
   12.33      try{
   12.34        ec.addStdoutRegexListener(this, dataRegex);
    13.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsModuleSelectorDialog.form	Tue Apr 25 07:40:35 2000 +0000
    13.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsModuleSelectorDialog.form	Tue Apr 25 12:55:38 2000 +0000
    13.3 @@ -1,6 +1,6 @@
    13.4  <?xml version="1.0" encoding="ISO-8859-1" ?>
    13.5  
    13.6 -<Form version="1.0" type="com.netbeans.developer.modules.loaders.form.forminfo.JDialogFormInfo">
    13.7 +<Form version="1.0" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
    13.8    <SyntheticProperties>
    13.9      <SyntheticProperty name="menuBar" type="java.lang.String" value="(No Menu)"/>
   13.10      <SyntheticProperty name="formSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-56,0,0,1,44"/>
   13.11 @@ -19,35 +19,35 @@
   13.12    <AuxValues>
   13.13    </AuxValues>
   13.14  
   13.15 -  <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout"/>
   13.16 +  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
   13.17    <SubComponents>
   13.18      <Component class="javax.swing.JLabel" name="statusLabel">
   13.19        <Constraints>
   13.20 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   13.21 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   13.22            <GridBagConstraints anchor="17" fill="2" gridHeight="1" gridWidth="2" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="8" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   13.23          </Constraint>
   13.24        </Constraints>
   13.25      </Component>
   13.26      <Container class="javax.swing.JScrollPane" name="listScrollPane">
   13.27        <Constraints>
   13.28 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   13.29 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   13.30            <GridBagConstraints anchor="10" fill="1" gridHeight="1" gridWidth="2" gridX="-1" gridY="1" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="8" ipadX="0" ipadY="0" weightX="1.0" weightY="1.0"/>
   13.31          </Constraint>
   13.32        </Constraints>
   13.33  
   13.34 -      <Layout class="com.netbeans.developerx.loaders.form.formeditor.layouts.support.JScrollPaneSupportLayout"/>
   13.35 +      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
   13.36        <SubComponents>
   13.37          <Component class="javax.swing.JList" name="moduleList">
   13.38            <Constraints>
   13.39 -            <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.support.JScrollPaneSupportLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.support.JScrollPaneSupportLayout$JScrollPaneConstraintsDescription"/>
   13.40 +            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout$JScrollPaneConstraintsDescription"/>
   13.41            </Constraints>
   13.42          </Component>
   13.43        </SubComponents>
   13.44      </Container>
   13.45      <Component class="javax.swing.JButton" name="okButton">
   13.46        <Properties>
   13.47 -        <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   13.48 -          <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/commands/Bundle.properties" key="CvsModuleSelectorDialog.okButton.text"/>
   13.49 +        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   13.50 +          <ResourceString bundle="org/netbeans/modules/vcs/cmdline/commands/Bundle.properties" key="CvsModuleSelectorDialog.okButton.text"/>
   13.51          </Property>
   13.52        </Properties>
   13.53  
   13.54 @@ -55,15 +55,15 @@
   13.55          <EventHandler event="actionPerformed" handler="okButtonActionPerformed"/>
   13.56        </Events>
   13.57        <Constraints>
   13.58 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   13.59 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   13.60            <GridBagConstraints anchor="10" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="2" insetsBottom="8" insetsLeft="8" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   13.61          </Constraint>
   13.62        </Constraints>
   13.63      </Component>
   13.64      <Component class="javax.swing.JButton" name="cancelButton">
   13.65        <Properties>
   13.66 -        <Property name="text" type="java.lang.String" editor="com.netbeans.developer.modules.i18n.ResourceBundleStringFormEditor">
   13.67 -          <ResourceString bundle="com/netbeans/developer/modules/vcs/cmdline/commands/Bundle.properties" key="CvsModuleSelectorDialog.cancelButton.text"/>
   13.68 +        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
   13.69 +          <ResourceString bundle="org/netbeans/modules/vcs/cmdline/commands/Bundle.properties" key="CvsModuleSelectorDialog.cancelButton.text"/>
   13.70          </Property>
   13.71        </Properties>
   13.72  
   13.73 @@ -71,7 +71,7 @@
   13.74          <EventHandler event="actionPerformed" handler="cancelButtonActionPerformed"/>
   13.75        </Events>
   13.76        <Constraints>
   13.77 -        <Constraint layoutClass="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout" value="com.netbeans.developerx.loaders.form.formeditor.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   13.78 +        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
   13.79            <GridBagConstraints anchor="10" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="2" insetsBottom="8" insetsLeft="0" insetsRight="8" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
   13.80          </Constraint>
   13.81        </Constraints>
    14.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsModuleSelectorDialog.java	Tue Apr 25 07:40:35 2000 +0000
    14.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsModuleSelectorDialog.java	Tue Apr 25 12:55:38 2000 +0000
    14.3 @@ -11,11 +11,11 @@
    14.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
    14.5   */
    14.6  
    14.7 -package com.netbeans.developer.modules.vcs.cmdline.commands;
    14.8 +package org.netbeans.modules.vcs.cmdline.commands;
    14.9  
   14.10  import org.openide.*;
   14.11  
   14.12 -import com.netbeans.developer.modules.vcs.util.*;
   14.13 +import org.netbeans.modules.vcs.util.*;
   14.14  
   14.15  /** 
   14.16   *
    15.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsRevisionGraph.java	Tue Apr 25 07:40:35 2000 +0000
    15.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsRevisionGraph.java	Tue Apr 25 12:55:38 2000 +0000
    15.3 @@ -11,7 +11,7 @@
    15.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
    15.5   */
    15.6  
    15.7 -package com.netbeans.developer.modules.vcs.cmdline.commands;
    15.8 +package org.netbeans.modules.vcs.cmdline.commands;
    15.9  
   15.10  import java.util.*;
   15.11  
    16.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsRevisionGraphItem.java	Tue Apr 25 07:40:35 2000 +0000
    16.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsRevisionGraphItem.java	Tue Apr 25 12:55:38 2000 +0000
    16.3 @@ -11,7 +11,7 @@
    16.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
    16.5   */
    16.6  
    16.7 -package com.netbeans.developer.modules.vcs.cmdline.commands;
    16.8 +package org.netbeans.modules.vcs.cmdline.commands;
    16.9  
   16.10  import java.util.*;
   16.11  
    17.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/list/CvsListCommand.java	Tue Apr 25 07:40:35 2000 +0000
    17.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/list/CvsListCommand.java	Tue Apr 25 12:55:38 2000 +0000
    17.3 @@ -11,12 +11,12 @@
    17.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
    17.5   */
    17.6  
    17.7 -package com.netbeans.developer.modules.vcs.cmdline.list;
    17.8 +package org.netbeans.modules.vcs.cmdline.list;
    17.9  
   17.10 -import com.netbeans.developer.modules.vcs.cmdline.VcsListCommand;
   17.11 -import com.netbeans.developer.modules.vcs.cmdline.Variables;
   17.12 -import com.netbeans.developer.modules.vcs.util.*;
   17.13 -import com.netbeans.developer.modules.vcs.cmdline.exec.*;
   17.14 +import org.netbeans.modules.vcs.cmdline.VcsListCommand;
   17.15 +import org.netbeans.modules.vcs.cmdline.Variables;
   17.16 +import org.netbeans.modules.vcs.util.*;
   17.17 +import org.netbeans.modules.vcs.cmdline.exec.*;
   17.18  
   17.19  import java.io.*;
   17.20  import java.util.*;
    18.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/list/CvsListRecursiveCommand.java	Tue Apr 25 07:40:35 2000 +0000
    18.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/list/CvsListRecursiveCommand.java	Tue Apr 25 12:55:38 2000 +0000
    18.3 @@ -11,13 +11,13 @@
    18.4   * Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
    18.5   */
    18.6  
    18.7 -package com.netbeans.developer.modules.vcs.cmdline.list;
    18.8 +package org.netbeans.modules.vcs.cmdline.list;
    18.9  
   18.10 -import com.netbeans.developer.modules.vcs.cmdline.VcsListRecursiveCommand;
   18.11 -import com.netbeans.developer.modules.vcs.cmdline.Variables;
   18.12 -import com.netbeans.developer.modules.vcs.VcsDirContainer;
   18.13 -import com.netbeans.developer.modules.vcs.util.*;
   18.14 -import com.netbeans.developer.modules.vcs.cmdline.exec.*;
   18.15 +import org.netbeans.modules.vcs.cmdline.VcsListRecursiveCommand;
   18.16 +import org.netbeans.modules.vcs.cmdline.Variables;
   18.17 +import org.netbeans.modules.vcs.VcsDirContainer;
   18.18 +import org.netbeans.modules.vcs.util.*;
   18.19 +import org.netbeans.modules.vcs.cmdline.exec.*;
   18.20  
   18.21  import java.io.*;
   18.22  import java.util.*;