New attempt to fix a NPE when adding IvyIDEA facet with IntelliJ 13.1…

… (fixes issue 132)
guymahieu · Mar 26, 2014 · dbf5638 · dbf5638
1 parent 38b559f
commit dbf5638
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/main/java/META-INF/plugin.xml b/src/main/java/META-INF/plugin.xml
@@ -4,7 +4,7 @@
     <description><![CDATA[Resolves module dependencies through Ivy
         <p>Features:
             <ul>
-                <li>Apache Ivy integration (up to v2.3.0); no need for external ant build scripts to be called</li>
+                <li>Apache Ivy integration (up to v2.4.0-rc1); no need for external ant build scripts to be called</li>
                 <li>Automatic ivy configuration of modules using facets (for modules containing an ivy.xml file)</li>
                 <li>Detection of dependencies that are really other intellij modules in the same project; these are added as module references</li>
                 <li>Detect source/document/jar type ivy artifacts in dependencies and add them as such to the module</li>
@@ -16,6 +16,10 @@
     </description>
     <change-notes><![CDATA[
         <p>
+            <strong>1.0.10</strong>
+            <ul>
+                <li>Fixed compatibility issue with IntelliJ 13.1</li>
+            </ul>
             <strong>1.0.9</strong>
             <ul>
                 <li>Added an extra configuration option to always attach the source/javadoc artifacts, even when
@@ -95,7 +99,7 @@
             </ul>
         </p>]]>
     </change-notes>
-    <version>1.0.9</version>
+    <version>1.0.10</version>
     <vendor email="guy.mahieu@gmail.com" url="http://www.clarent.org" logo="/ivyidea16.png">Guy Mahieu</vendor>
     <idea-version since-build="3000"/>
     <application-components>

diff --git a/src/main/java/org/clarent/ivyidea/intellij/facet/ui/BasicSettingsTab.java b/src/main/java/org/clarent/ivyidea/intellij/facet/ui/BasicSettingsTab.java
@@ -126,7 +126,7 @@ private void updateIvySettingsFileTextfield() {
     }
 
     private void updateConfigurationsTable() {
-        tblConfigurationSelection.setEnabled(chkOnlyResolveSpecificConfigs.isSelected());
+        tblConfigurationSelection.setConfigurationsEnabled(chkOnlyResolveSpecificConfigs.isSelected());
     }
 
     private void updateIvySettingsUIState() {
@@ -274,7 +274,7 @@ public void reset() {
             } else {
                 tblConfigurationSelection.setModel(new ConfigurationSelectionTableModel());
                 selectedConfigurations = new HashSet<Configuration>();
-                tblConfigurationSelection.setEnabled(false);
+                tblConfigurationSelection.setConfigurationsEnabled(false);
             }
             updateUI();
         }

diff --git a/...in/java/org/clarent/ivyidea/intellij/facet/ui/components/ConfigurationSelectionTable.java b/...in/java/org/clarent/ivyidea/intellij/facet/ui/components/ConfigurationSelectionTable.java
@@ -19,7 +19,6 @@
 import com.intellij.ui.BooleanTableCellEditor;
 import com.intellij.ui.BooleanTableCellRenderer;
 import com.intellij.util.ui.Table;
-import com.intellij.util.ui.UIUtil;
 import org.apache.ivy.core.module.descriptor.Configuration;
 
 import javax.swing.*;
@@ -39,9 +38,10 @@
 
 public class ConfigurationSelectionTable extends Table {
 
+    private boolean configurationsEnabled = true;
+
     public ConfigurationSelectionTable() {
         super(new ConfigurationSelectionTableModel());
-        setForeground(UIUtil.getTableForeground());
         initComponents();
     }
 
@@ -50,6 +50,10 @@ public void setModel(TableModel dataModel) {
         initComponents();
     }
 
+    public void setConfigurationsEnabled(boolean configurationsEnabled) {
+        this.configurationsEnabled = configurationsEnabled;
+    }
+
     public Set<Configuration> getSelectedConfigurations() {
         return ((ConfigurationSelectionTableModel) getModel()).getSelectedConfigurations();
     }
@@ -71,7 +75,7 @@ private void initComponents() {
         getColumnModel().getColumn(0).setCellRenderer(new BooleanTableCellRenderer() {
             public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
                 final Component rendererComponent = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-                rendererComponent.setEnabled(table.isEnabled());
+                rendererComponent.setEnabled(configurationsEnabled);
                 return rendererComponent;
             }
         });
@@ -103,7 +107,7 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
                     setToolTipText(null);
                     rendererComponent.setFont(regularFont);
                 }
-                rendererComponent.setEnabled(table.isEnabled());
+                rendererComponent.setEnabled(configurationsEnabled);
                 return rendererComponent;
             }
         });
@@ -112,7 +116,7 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
         getColumnModel().getColumn(2).setCellRenderer(new DefaultTableCellRenderer() {
             public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
                 final Component rendererComponent = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-                rendererComponent.setEnabled(table.isEnabled());
+                rendererComponent.setEnabled(configurationsEnabled);
                 return rendererComponent;
             }
         });