Cleanup before 0.9.2 release.

groboclown · Jun 20, 2017 · b2e9b3c · b2e9b3c
1 parent 64c7fe1
commit b2e9b3c
Show file tree

Hide file tree

Showing 9 changed files with 279 additions and 143 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@
 ### Overview
 
 * Started Helix Swarm integration.
+* Minor improvements to the configuration panel.
 * Bug fixes.
 
 ### Details
@@ -14,13 +15,15 @@
     * The beginnings of Helix Swarm server integration is present in the code.
         It checks whether the Perforce server has a Swarm server registered with it,
         and will attempt to make a connection to the registered Swarm servers.
-* Bug fixes.
+* Minor improvements to the configuration panel.
     * Changed (again) the method for looking up the directory path for different
       configurations.  Configurations now can be associated with the VCS roots,
       rather than the project root.  This means that file location configurations
       will mark themselves as the directory where the file is located (or up to the
       VCS roots); future work may include a "global" file location vs. a local
       file location. (#148) 
+    * Joined problems and resolved properties into a single panel.
+* Bug fixes.
     * Fixed the pop-up link text no longer show an invalid character.
     * Added a minor improvement that limits the number of duplicate "enter a password"
       error messages in some circumstances.

diff --git a/plugin/META-INF/plugin.xml b/plugin/META-INF/plugin.xml
@@ -8,7 +8,14 @@
         <ol>
           <li><em>0.9.2</em>
             <ol>
-                <li>Fixed the pop-up link text no longer show an invalid character.</li>
+                <li>Started Helix Swarm integration.</li>
+                <li>Minor improvements to the configuration panel.</li>
+                <li>Changed (again) the method for looking up the directory path for different
+                configurations.  Configurations now can be associated with the VCS roots,
+                rather than the project root.</li>
+                <li>Added a minor improvement that limits the number of duplicate "enter a password"
+                error messages in some circumstances.</li>
+                <li>Dead code clean up.</li>
             </ol>
           </li>
           <li><em>0.9.1</em>

diff --git a/plugin/src/net/groboclown/idea/p4ic/P4Bundle.properties b/plugin/src/net/groboclown/idea/p4ic/P4Bundle.properties
@@ -484,4 +484,7 @@ user-prefs.show-shelved=Show shel&ved files
 user-prefs.show-shelved.tooltip=Show the shelved files in the changelist view
 shelve.changes.action=Shelve changes to server
 action.shelve=Shelve open files
-configpart.no.roots=No VCS roots for project, and no root defined for part
+configpart.no.roots=No VCS roots for project, and no root defined for part
+config.resolved.problem-panel=Problems:
+config.resolved.config-panel=Resolved Configuration:
+config.resolve.other-roots-have-errors=Other root directories have problems.
diff --git a/plugin/src/net/groboclown/idea/p4ic/swarm/SwarmConnectionComponent.java b/plugin/src/net/groboclown/idea/p4ic/swarm/SwarmConnectionComponent.java
@@ -93,7 +93,7 @@ public void refreshSwarmConfigsFor(@NotNull Project project) {
                 final SwarmConfig config = server.createSwarmConfig();
                 if (config != null) {
                     LOG.info("Trying Swarm Server " + config.getUri() + "; username " +
-                            config.getUsername() + "; ticket " + config.getTicket());
+                            config.getUsername());
                     final SwarmClient client = SwarmClientFactory.createSwarmClient(config);
                     validClients.put(server.getClientServerId(), client);
                     LOG.info("Found valid swarm server: " + config);

diff --git a/plugin/src/net/groboclown/idea/p4ic/ui/RevertedFilesDialog.java b/plugin/src/net/groboclown/idea/p4ic/ui/RevertedFilesDialog.java
@@ -107,6 +107,28 @@ private List<String> exceptionDisplay(@NotNull final Collection<P4StatusMessage>
         return ret;
     }
 
+    /**
+     * @noinspection ALL
+     */
+    private Font getFont1494608681498(String fontName, int style, int size, Font currentFont) {
+        if (currentFont == null) {
+            return null;
+        }
+        String resultName;
+        if (fontName == null) {
+            resultName = currentFont.getName();
+        } else {
+            Font testFont = new Font(fontName, Font.PLAIN, 10);
+            if (testFont.canDisplay('a') && testFont.canDisplay('1')) {
+                resultName = fontName;
+            } else {
+                resultName = currentFont.getName();
+            }
+        }
+        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(),
+                size >= 0 ? size : currentFont.getSize());
+    }
+
     /**
      * Method generated by IntelliJ IDEA GUI Designer
      * >>> IMPORTANT!! <<<
@@ -210,7 +232,7 @@ private List<String> exceptionDisplay(@NotNull final Collection<P4StatusMessage>
     /**
      * @noinspection ALL
      */
-    private Font getFont1494608681498(String fontName, int style, int size, Font currentFont) {
+    private Font $$$getFont$$$(String fontName, int style, int size, Font currentFont) {
         if (currentFont == null) {
             return null;
         }

diff --git a/plugin/src/net/groboclown/idea/p4ic/ui/checkin/P4SubmitPanel.java b/plugin/src/net/groboclown/idea/p4ic/ui/checkin/P4SubmitPanel.java
@@ -431,6 +431,28 @@ private Font getFont1494608681498(String fontName, int style, int size, Font cur
         label2.setLabelFor(myJobStatus);
     }
 
+    /**
+     * @noinspection ALL
+     */
+    private Font $$$getFont$$$(String fontName, int style, int size, Font currentFont) {
+        if (currentFont == null) {
+            return null;
+        }
+        String resultName;
+        if (fontName == null) {
+            resultName = currentFont.getName();
+        } else {
+            Font testFont = new Font(fontName, Font.PLAIN, 10);
+            if (testFont.canDisplay('a') && testFont.canDisplay('1')) {
+                resultName = fontName;
+            } else {
+                resultName = currentFont.getName();
+            }
+        }
+        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(),
+                size >= 0 ? size : currentFont.getSize());
+    }
+
     /**
      * @noinspection ALL
      */

diff --git a/plugin/src/net/groboclown/idea/p4ic/ui/config/ResolvedPropertiesPanel.form b/plugin/src/net/groboclown/idea/p4ic/ui/config/ResolvedPropertiesPanel.form
@@ -55,64 +55,63 @@
           </grid>
         </children>
       </grid>
-      <tabbedpane id="550eb" binding="resolutionTabbedPane">
+      <grid id="9f6e1" layout-manager="FormLayout">
+        <rowspec value="center:max(d;4px):noGrow"/>
+        <rowspec value="top:4dlu:noGrow"/>
+        <rowspec value="center:max(d;4px):noGrow"/>
+        <rowspec value="top:4dlu:noGrow"/>
+        <rowspec value="center:d:grow"/>
+        <colspec value="fill:d:grow"/>
         <constraints border-constraint="Center"/>
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="a0af" layout-manager="BorderLayout" hgap="0" vgap="0">
+          <grid id="3d51a" binding="myProblemsPanel" layout-manager="FormLayout">
+            <rowspec value="center:d:grow"/>
+            <colspec value="fill:d:grow"/>
             <constraints>
-              <tabbedpane title-resource-bundle="net/groboclown/idea/p4ic/P4Bundle" title-key="configurations.resolved-values.tab"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+              <forms/>
             </constraints>
             <properties/>
-            <border type="empty">
-              <size top="4" left="4" bottom="4" right="4"/>
-            </border>
+            <border type="line" title-resource-bundle="net/groboclown/idea/p4ic/P4Bundle" title-key="config.resolved.problem-panel"/>
             <children>
-              <scrollpane id="5e2fc">
-                <constraints border-constraint="Center"/>
-                <properties>
-                  <verticalScrollBarPolicy value="22"/>
-                </properties>
-                <border type="none"/>
-                <children>
-                  <component id="8e2eb" class="javax.swing.JTextArea" binding="resolvedValuesText">
-                    <constraints/>
-                    <properties>
-                      <font swing-font="TextArea.font"/>
-                      <rows value="8"/>
-                    </properties>
-                  </component>
-                </children>
-              </scrollpane>
+              <component id="77ae7" class="javax.swing.JList" binding="selectedProblemsList">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+                  <forms/>
+                </constraints>
+                <properties/>
+              </component>
             </children>
           </grid>
-          <grid id="5f8a1" layout-manager="BorderLayout" hgap="0" vgap="0">
+          <grid id="eb0cf" layout-manager="FormLayout">
+            <rowspec value="center:d:grow"/>
+            <colspec value="fill:d:grow"/>
             <constraints>
-              <tabbedpane title-resource-bundle="net/groboclown/idea/p4ic/P4Bundle" title-key="configuration.problems-list.tab"/>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+              <forms/>
             </constraints>
             <properties/>
-            <border type="empty">
-              <size top="4" left="4" bottom="4" right="4"/>
-            </border>
+            <border type="line" title-resource-bundle="net/groboclown/idea/p4ic/P4Bundle" title-key="config.resolved.config-panel"/>
             <children>
-              <scrollpane id="d8cd4">
-                <constraints border-constraint="Center"/>
-                <properties>
-                  <visible value="true"/>
-                </properties>
-                <border type="none"/>
-                <children>
-                  <component id="7a703" class="javax.swing.JList" binding="configProblemsList">
-                    <constraints/>
-                    <properties/>
-                  </component>
-                </children>
-              </scrollpane>
+              <component id="2e48c" class="javax.swing.JTextArea" binding="resolvedValuesText">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+                  <forms/>
+                </constraints>
+                <properties/>
+              </component>
             </children>
           </grid>
+          <vspacer id="d23e1">
+            <constraints>
+              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+              <forms defaultalign-vert="false"/>
+            </constraints>
+          </vspacer>
         </children>
-      </tabbedpane>
+      </grid>
     </children>
   </grid>
 </form>