Sanity check on connecting. Also IDE update.

git-svn-id: file:///home/svn/framework3/trunk@11043 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Matt Weeks 2010-11-14 20:12:20 +00:00
parent 9d0cf722fa
commit 7f53f36150
4 changed files with 12 additions and 4 deletions

Binary file not shown.

View File

@ -291,15 +291,18 @@ is divided into following sections:
<attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${build.classes.dir}" name="destdir"/>
<sequential> <sequential>
<fail unless="javac.includes">Must set javac.includes</fail> <fail unless="javac.includes">Must set javac.includes</fail>
<pathconvert pathsep="," property="javac.includes.binary"> <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
<path> <path>
<filelist dir="@{destdir}" files="${javac.includes}"/> <filelist dir="@{destdir}" files="${javac.includes}"/>
</path> </path>
<globmapper from="*.java" to="*.class"/> <globmapper from="*.java" to="*.class"/>
</pathconvert> </pathconvert>
<tempfile deleteonexit="true" property="javac.includesfile.binary"/>
<echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
<delete> <delete>
<files includes="${javac.includes.binary}"/> <files includesfile="${javac.includesfile.binary}"/>
</delete> </delete>
<delete file="${javac.includesfile.binary}"/>
</sequential> </sequential>
</macrodef> </macrodef>
</target> </target>

View File

@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.38.1.45
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=84c180dd nbproject/build-impl.xml.data.CRC32=84c180dd
nbproject/build-impl.xml.script.CRC32=49dce8a6 nbproject/build-impl.xml.script.CRC32=0dcf2878
nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45 nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45

View File

@ -30,6 +30,11 @@ public class OpenConnectionDialog extends javax.swing.JDialog {
} }
public static RpcConnection getConnection(MainFrame mainframe) { public static RpcConnection getConnection(MainFrame mainframe) {
if(mainframe.rpcConn != null){
JOptionPane.showMessageDialog(mainframe.getFrame(), "You are already connected!\n"
+ "Exit before making a new connection.");
throw new RuntimeException("Already connected");
}
//try saved connection credentials //try saved connection credentials
try{ try{
Map info = MsfguiApp.getPropertiesNode(); Map info = MsfguiApp.getPropertiesNode();