Merge pull request #8 from ljo/develop

[ignore] Adding unit MB in the launcher configuration dialog to make it ...
eXist-db · Jul 29, 2013 · 6a02a6c · 6a02a6c
2 parents c105757 + 877726f
commit 6a02a6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/org/exist/launcher/ConfigurationDialog.form b/src/org/exist/launcher/ConfigurationDialog.form
@@ -160,7 +160,7 @@
     <Component class="javax.swing.JSpinner" name="collectionCache">
       <Properties>
         <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
-          <SpinnerModel initial="48" maximum="256" minimum="16" numberType="java.lang.Integer" stepSize="16" type="number"/>
+          <SpinnerModel initial="48" maximum="256" minimum="48" numberType="java.lang.Integer" stepSize="16" type="number"/>
         </Property>
       </Properties>
       <Events>
@@ -187,7 +187,7 @@
     </Component>
     <Component class="javax.swing.JLabel" name="lbCurrentUsage">
       <Properties>
-        <Property name="text" type="java.lang.String" value="Memory usage:"/>
+        <Property name="text" type="java.lang.String" value="Memory usage (in MB):"/>
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -264,7 +264,7 @@
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel11">
       <Properties>
-        <Property name="text" type="java.lang.String" value="&lt;html&gt;&lt;p&gt;Total cache size should not exceed 1/3 of max memory unless you have more than 2gb available.&lt;/p&gt;&lt;/html&gt;"/>
+        <Property name="text" type="java.lang.String" value="&lt;html&gt;&lt;p&gt;Total cache size should not exceed 1/3 of max memory unless you have more than 2GB available. These sizes are in megabytes.&lt;/p&gt;&lt;/html&gt;"/>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[280, 48]"/>
         </Property>

diff --git a/src/org/exist/launcher/ConfigurationDialog.java b/src/org/exist/launcher/ConfigurationDialog.java
@@ -267,7 +267,7 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) {
         gridBagConstraints.insets = new java.awt.Insets(0, 13, 0, 22);
         getContentPane().add(jLabel8, gridBagConstraints);
 
-        lbCurrentUsage.setText("Memory usage:");
+        lbCurrentUsage.setText("Memory usage (in MB):");
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 1;
         gridBagConstraints.gridy = 3;
@@ -326,7 +326,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         gridBagConstraints.insets = new java.awt.Insets(0, 22, 0, 0);
         getContentPane().add(dataDir, gridBagConstraints);
 
-        jLabel11.setText("<html><p>Total cache size should not exceed 1/3 of max memory unless you have more than 2gb available.</p></html>");
+        jLabel11.setText("<html><p>Total cache size should not exceed 1/3 of max memory unless you have more than 2GB available. These sizes are in megabytes.</p></html>");
         jLabel11.setPreferredSize(new java.awt.Dimension(280, 48));
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 4;