changed label to Browse, and removed some junk from a .form file

Author: dj3500

Hightail/src/org/hightail/ui/ProblemJPanel.form

@@ -26,7 +26,7 @@
                       <Component id="executableFileLabel" min="-2" max="-2" attributes="0"/>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="sourceFile" max="32767" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="openContainingDirectoryButton" min="-2" max="-2" attributes="0"/>
                   </Group>
               </Group>
@@ -232,7 +232,7 @@
     </Container>
     <Component class="javax.swing.JButton" name="openContainingDirectoryButton">
       <Properties>
-        <Property name="text" type="java.lang.String" value="Open containing directory"/>
+        <Property name="text" type="java.lang.String" value="Browse..."/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="openContainingDirectoryButtonActionPerformed"/>

Hightail/src/org/hightail/ui/ProblemJPanel.java

@@ -217,7 +217,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addGap(29, 29, 29))
         );
 
-        openContainingDirectoryButton.setText("Open containing directory");
+        openContainingDirectoryButton.setText("Browse...");
         openContainingDirectoryButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 openContainingDirectoryButtonActionPerformed(evt);
@@ -240,7 +240,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                         .addComponent(executableFileLabel)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addComponent(sourceFile)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addComponent(openContainingDirectoryButton)))
                 .addContainerGap())
         );

Hightail/src/org/hightail/ui/TestcaseJDialog.form

@@ -7,6 +7,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosing"/>
@@ -59,13 +60,8 @@
                   </Group>
                   <Group type="102" alignment="1" attributes="0">
                       <EmptySpace max="-2" attributes="0"/>
-<<<<<<< HEAD
-                      <Component id="timeLimitTextField" max="32767" attributes="0"/>
-                      <EmptySpace type="separate" max="-2" attributes="0"/>
-=======
                       <Component id="timeLimitTextField" min="-2" pref="38" max="-2" attributes="0"/>
                       <EmptySpace pref="36" max="32767" attributes="0"/>
->>>>>>> a865b4309985a615ee45e30ec288424582406259
                       <Component id="cancelButton" min="-2" pref="100" max="-2" attributes="0"/>
                       <EmptySpace type="separate" max="-2" attributes="0"/>
                       <Component id="saveButton" min="-2" pref="100" max="-2" attributes="0"/>
@@ -190,8 +186,8 @@
       <SubComponents>
         <Component class="javax.swing.JTextArea" name="programOutputTextarea">
           <Properties>
-            <Property name="columns" type="int" value="20"/>
             <Property name="editable" type="boolean" value="false"/>
+            <Property name="columns" type="int" value="20"/>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
               <Font name="Courier New" size="12" style="0"/>
             </Property>

Hightail/src/org/hightail/ui/TestcaseJDialog.java

@@ -178,8 +178,8 @@ public void windowClosing(java.awt.event.WindowEvent evt) {
         expectedOutputTextarea.setRows(5);
         jScrollPane1.setViewportView(expectedOutputTextarea);
 
-        programOutputTextarea.setColumns(20);
         programOutputTextarea.setEditable(false);
+        programOutputTextarea.setColumns(20);
         programOutputTextarea.setFont(new java.awt.Font("Courier New", 0, 12)); // NOI18N
         programOutputTextarea.setRows(5);
         jScrollPane3.setViewportView(programOutputTextarea);
@@ -239,8 +239,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                             .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 280, javax.swing.GroupLayout.PREFERRED_SIZE)))
                     .addGroup(layout.createSequentialGroup()
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(timeLimitTextField)
-                        .addGap(18, 18, 18)
+                        .addComponent(timeLimitTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 36, Short.MAX_VALUE)
                         .addComponent(cancelButton, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addGap(18, 18, 18)
                         .addComponent(saveButton, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)))