Merge branch 'nb80' into nb81

Conflicts:
	pom.xml

Author: junichi11

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.junichi11</groupId>
     <artifactId>netbeans-github-issues</artifactId>
-    <version>0.2.1</version>
+    <version>0.2.2-SNAPSHOT</version>
     <packaging>nbm</packaging>
     <build>
         <plugins>

src/main/java/com/junichi11/netbeans/modules/github/issues/GitHubIssuesConfig.java

@@ -49,7 +49,6 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
@@ -261,9 +260,16 @@ public String[] getTemplateNames() {
         names.add(DEFAULT_TEMPLATE_NAME);
         Preferences preferences = getPreferences().node(TEMPLATE);
         try {
+            // contains the default template if it was edited
             String[] childrenNames = preferences.keys();
-            names.addAll(Arrays.asList(childrenNames));
-            return names.toArray(new String[childrenNames.length + 1]);
+            int count = 1; // default template
+            for (String childName : childrenNames) {
+                if (!childName.equals(DEFAULT_TEMPLATE_NAME)) {
+                    names.add(childName);
+                    count++;
+                }
+            }
+            return names.toArray(new String[count]);
         } catch (BackingStoreException ex) {
             Exceptions.printStackTrace(ex);
         }

src/main/java/com/junichi11/netbeans/modules/github/issues/issue/ui/InsertTemplatePanel.form

@@ -31,9 +31,6 @@
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="0"/>
         </Property>
-        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/junichi11/netbeans/modules/github/issues/issue/ui/Bundle.properties" key="InsertTemplatePanel.templatesComboBox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[200, 27]"/>
         </Property>

src/main/java/com/junichi11/netbeans/modules/github/issues/issue/ui/InsertTemplatePanel.java

@@ -77,7 +77,6 @@ private void initComponents() {
 
         templatesComboBox = new javax.swing.JComboBox<String>();
 
-        templatesComboBox.setToolTipText(org.openide.util.NbBundle.getMessage(InsertTemplatePanel.class, "InsertTemplatePanel.templatesComboBox.toolTipText")); // NOI18N
         templatesComboBox.setPreferredSize(new java.awt.Dimension(200, 27));
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);

src/main/resources/com/junichi11/netbeans/modules/github/issues/issue/ui/Bundle.properties

@@ -56,7 +56,6 @@ GitHubIssuePanel.insertTemplateButton.toolTipText=Insert Template
 GitHubIssuePanel.insertTemplateButton.text=
 GitHubIssuePanel.manageTemplatesButton.toolTipText=Manage Templates
 GitHubIssuePanel.manageTemplatesButton.text=
-InsertTemplatePanel.templatesComboBox.toolTipText=
 TemplatePanel.nameLabel.text=Name:
 TemplatePanel.nameTextField.text=
 TemplatePanel.errorLabel.text=ERROR