[hg] main-silver: Merge Bugtracking and Tasks options panels

  • From: Jan Peska < >
  • To:
  • Subject: [hg] main-silver: Merge Bugtracking and Tasks options panels
  • Date: Fri, 03 May 2013 03:48:09 -0700

changeset 68fddd07c322 in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/68fddd07c322
description:
        Merge Bugtracking and Tasks options panels

diffstat:

 
bugtracking/src/org/netbeans/modules/bugtracking/tasks/settings/DashboardOptions.java
           |   18 +-
 
bugtracking/src/org/netbeans/modules/bugtracking/tasks/settings/DashboardOptionsController.java
 |  118 ----------
 
bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptions.java 
                  |   14 +-
 
bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.form
              |   85 +++++-
 
bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java
              |   71 ++++-
 bugtracking/src/org/netbeans/modules/bugtracking/util/Bundle.properties      
                   |   15 +-
 6 files changed, 155 insertions(+), 166 deletions(-)

diffs (527 lines):

diff --git 
a/bugtracking/src/org/netbeans/modules/bugtracking/tasks/settings/DashboardOptions.java
 
b/bugtracking/src/org/netbeans/modules/bugtracking/tasks/settings/DashboardOptions.java
--- 
a/bugtracking/src/org/netbeans/modules/bugtracking/tasks/settings/DashboardOptions.java
+++ 
b/bugtracking/src/org/netbeans/modules/bugtracking/tasks/settings/DashboardOptions.java
@@ -54,7 +54,7 @@
  */
 public class DashboardOptions extends javax.swing.JPanel implements 
DocumentListener {
 
-    PropertyChangeSupport support = new PropertyChangeSupport(this);
+    private PropertyChangeSupport support = new PropertyChangeSupport(this);
     private boolean dataValid;
 
     /**
@@ -239,7 +239,11 @@
     private javax.swing.JTextField txtSync;
     // End of variables declaration//GEN-END:variables
 
-    void update() {
+    public PropertyChangeSupport getPropertySupport() {
+        return support;
+    }
+    
+    public void update() {
         txtLimitNumber.getDocument().removeDocumentListener(this);
         txtSync.getDocument().removeDocumentListener(this);
         loadSettings();
@@ -248,7 +252,7 @@
         validate(false);
     }
 
-    void applyChanges() {
+    public void applyChanges() {
         final DashboardSettings settings = DashboardSettings.getInstance();
         boolean autoSync = cbSync.isSelected();
         settings.setAutoSync(autoSync, false);
@@ -261,12 +265,16 @@
         settings.setTasksLimitQuery(cbLimitQuery.isSelected(), true);
     }
 
-    boolean isDataValid() {
+    public void cancel() {
+        //do nothing
+    }
+
+    public boolean isDataValid() {
         validate(false);
         return dataValid;
     }
 
-    boolean isChanged() {
+    public boolean isChanged() {
         final DashboardSettings settings = DashboardSettings.getInstance();
         return cbSync.isSelected() != settings.isAutoSync()
                 || 
!txtSync.getText().trim().equals(settings.getAutoSyncValue() + "")
diff --git 
a/bugtracking/src/org/netbeans/modules/bugtracking/tasks/settings/DashboardOptionsController.java
 
b/bugtracking/src/org/netbeans/modules/bugtracking/tasks/settings/DashboardOptionsController.java
deleted file mode 100644
--- 
a/bugtracking/src/org/netbeans/modules/bugtracking/tasks/settings/DashboardOptionsController.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2012 Sun Microsystems, Inc.
- */
-package org.netbeans.modules.bugtracking.tasks.settings;
-
-import java.beans.PropertyChangeListener;
-import javax.swing.JComponent;
-import org.netbeans.spi.options.OptionsPanelController;
-import org.openide.util.HelpCtx;
-import org.openide.util.Lookup;
-
-/**
- *
- * @author jpeska
- */
-@OptionsPanelController.SubRegistration(
-    id = DashboardOptionsController.OPTIONS_PATH,
-    displayName = "#LBL_Options",
-    keywords = "#KW_Dashboard",
-    keywordsCategory = "Advanced/Dashboard"
-)
-public class DashboardOptionsController extends OptionsPanelController {
-
-    public static final String OPTIONS_PATH = "Dashboard"; // NOI18N
-    private DashboardOptions dashboardOptions;
-
-    @Override
-    public void update() {
-        getOptions().update();
-    }
-
-    @Override
-    public void applyChanges() {
-        if (isChanged()) {
-            getOptions().applyChanges();
-        }
-    }
-
-    @Override
-    public void cancel() {
-        //do nothing
-    }
-
-    @Override
-    public boolean isValid() {
-        return getOptions().isDataValid();
-    }
-
-    @Override
-    public boolean isChanged() {
-        return getOptions().isChanged();
-    }
-
-    @Override
-    public JComponent getComponent(Lookup masterLookup) {
-        return getOptions();
-    }
-
-    @Override
-    public HelpCtx getHelpCtx() {
-        return new HelpCtx ("netbeans.optionsDialog.advanced.dashboard");
-    }
-
-    @Override
-    public void addPropertyChangeListener(PropertyChangeListener l) {
-        getOptions().support.addPropertyChangeListener(l);
-    }
-
-    @Override
-    public void removePropertyChangeListener(PropertyChangeListener l) {
-        getOptions().support.removePropertyChangeListener(l);
-    }
-
-    private DashboardOptions getOptions() {
-        if( null == dashboardOptions ) {
-            dashboardOptions = new DashboardOptions();
-        }
-        return dashboardOptions;
-    }
-}
diff --git 
a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptions.java
 
b/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptions.java
--- 
a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptions.java
+++ 
b/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptions.java
@@ -49,6 +49,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import javax.swing.JComponent;
+import org.netbeans.modules.bugtracking.tasks.settings.DashboardOptions;
 import org.netbeans.spi.options.AdvancedOption;
 import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.HelpCtx;
@@ -71,11 +72,13 @@
         private BugtrackingOptionsPanel panel;
         private boolean initialized = false;
         private Map<String, OptionsPanelController> categoryToController = 
new HashMap<String, OptionsPanelController>();
+        private DashboardOptions tasksPanel;
 
         public BugtrackingOptions() {
             if (initialized) return;
             initialized = true;
-            panel = new BugtrackingOptionsPanel();
+            tasksPanel = new DashboardOptions();
+            panel = new BugtrackingOptionsPanel(tasksPanel);
             
             Lookup lookup = Lookups.forPath("BugtrackingOptionsDialog"); // 
NOI18N
             Iterator<? extends AdvancedOption> it = lookup.lookup(new 
Lookup.Template<AdvancedOption> (AdvancedOption.class)).
@@ -99,12 +102,14 @@
             for (OptionsPanelController c: categoryToController.values()) {
                 c.removePropertyChangeListener(l);
             }
+            tasksPanel.getPropertySupport().removePropertyChangeListener(l);
         }
         
         public void addPropertyChangeListener(PropertyChangeListener l) {
             for (OptionsPanelController c: categoryToController.values()) {
                 c.addPropertyChangeListener(l);
             }
+            tasksPanel.getPropertySupport().addPropertyChangeListener(l);
         }
         
         public void update() {
@@ -112,6 +117,7 @@
             while (it.hasNext()) {
                 it.next().update();
             }
+            tasksPanel.update();
         }
         
         public void applyChanges() {
@@ -119,6 +125,7 @@
             while (it.hasNext()) {
                 it.next().applyChanges();
             }
+            tasksPanel.applyChanges();
         }
         
         public void cancel() {
@@ -126,6 +133,7 @@
             while (it.hasNext()) {
                 it.next().cancel();
             }
+            tasksPanel.cancel();
         }
         
         public boolean isValid() {
@@ -135,7 +143,7 @@
                     return false;
                 }
             }
-            return true;
+            return tasksPanel.isDataValid();
         }
         
         public boolean isChanged() {
@@ -145,7 +153,7 @@
                     return true;
                 }
             }
-            return false;
+            return tasksPanel.isChanged();
         }
         
         public HelpCtx getHelpCtx() {
diff --git 
a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.form
 
b/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.form
--- 
a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.form
+++ 
b/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.form
@@ -24,31 +24,49 @@
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="jScrollPane1" min="-2" pref="104" max="-2" 
attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="containerPanel" pref="246" max="32767" 
attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="containerPanel" pref="370" max="32767" 
attributes="0"/>
+          </Group>
+          <Component id="dummyTasksPanel" alignment="0" max="32767" 
attributes="0"/>
+          <Group type="102" attributes="0">
+              <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jSeparator3" max="32767" attributes="0"/>
           </Group>
           <Group type="102" alignment="0" attributes="0">
-              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+              <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
+              <Component id="jSeparator2" pref="420" max="32767" 
attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="1" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="jLabel5" alignment="0" min="-2" max="-2" 
attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="-2" pref="7" max="-2" attributes="0"/>
+                      <Component id="jSeparator3" min="-2" pref="10" 
max="-2" attributes="0"/>
+                  </Group>
+              </Group>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="1" attributes="0">
-                  <Group type="102" attributes="0">
-                      <EmptySpace min="31" pref="31" max="31" 
attributes="0"/>
-                      <Component id="containerPanel" pref="259" max="32767" 
attributes="0"/>
+                  <Component id="jScrollPane1" min="-2" pref="148" max="-2" 
attributes="0"/>
+                  <Component id="containerPanel" min="-2" pref="148" 
max="-2" attributes="0"/>
                   </Group>
-                  <Group type="102" alignment="1" attributes="0">
-                      <Component id="jLabel1" min="-2" max="-2" 
attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jScrollPane1" pref="268" max="32767" 
attributes="0"/>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="jLabel4" alignment="0" min="-2" max="-2" 
attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="-2" pref="7" max="-2" attributes="0"/>
+                      <Component id="jSeparator2" min="-2" pref="10" 
max="-2" attributes="0"/>
                   </Group>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <Component id="dummyTasksPanel" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -79,19 +97,42 @@
         </Component>
       </SubComponents>
     </Container>
-    <Component class="javax.swing.JLabel" name="jLabel1">
-      <Properties>
-        <Property name="labelFor" type="java.awt.Component" 
editor="org.netbeans.modules.form.ComponentChooserEditor">
-          <ComponentRef name="versioningSystemsList"/>
-        </Property>
-        <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString 
bundle="org/netbeans/modules/bugtracking/util/Bundle.properties" 
key="LBL_OptionsPanelName" 
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, 
&quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-    </Component>
     <Container class="javax.swing.JPanel" name="containerPanel">
 
       <Layout 
class="org.netbeans.modules.form.compat2.layouts.DesignCardLayout"/>
     </Container>
+    <Container class="javax.swing.JPanel" name="dummyTasksPanel">
+
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+          </Group>
+        </DimensionLayout>
+        <DimensionLayout dim="1">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <EmptySpace min="0" pref="119" max="32767" attributes="0"/>
+          </Group>
+        </DimensionLayout>
+      </Layout>
+    </Container>
+    <Component class="javax.swing.JLabel" name="jLabel4">
+      <Properties>
+        <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString 
bundle="org/netbeans/modules/bugtracking/util/Bundle.properties" 
key="BugtrackingOptionsPanel.jLabel4.text_1" 
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, 
&quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JSeparator" name="jSeparator2">
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel5">
+      <Properties>
+        <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString 
bundle="org/netbeans/modules/bugtracking/util/Bundle.properties" 
key="BugtrackingOptionsPanel.jLabel5.text_1" 
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, 
&quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JSeparator" name="jSeparator3">
+    </Component>
   </SubComponents>
 </Form>
diff --git 
a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java
 
b/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java
--- 
a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java
+++ 
b/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java
@@ -46,6 +46,7 @@
 
 import java.awt.CardLayout;
 import javax.swing.DefaultListModel;
+import javax.swing.GroupLayout;
 import javax.swing.JComponent;
 import org.netbeans.api.options.OptionsDisplayer;
 import org.netbeans.spi.options.OptionsPanelController;
@@ -58,8 +59,9 @@
 class BugtrackingOptionsPanel extends javax.swing.JPanel {
     
     /** Creates new form VcsAdvancedOptionsPanel */
-    public BugtrackingOptionsPanel() {
+    public BugtrackingOptionsPanel(JComponent tasksComponent) {
         initComponents();
+        ((GroupLayout)getLayout()).replace(dummyTasksPanel, tasksComponent);
     }
     
     public void addPanel(String name, JComponent component) {
@@ -77,8 +79,12 @@
 
         jScrollPane1 = new javax.swing.JScrollPane();
         versioningSystemsList = new javax.swing.JList();
-        jLabel1 = new javax.swing.JLabel();
         containerPanel = new javax.swing.JPanel();
+        dummyTasksPanel = new javax.swing.JPanel();
+        jLabel4 = new javax.swing.JLabel();
+        jSeparator2 = new javax.swing.JSeparator();
+        jLabel5 = new javax.swing.JLabel();
+        jSeparator3 = new javax.swing.JSeparator();
 
         setBorder(javax.swing.BorderFactory.createEmptyBorder(4, 0, 0, 0));
 
@@ -92,35 +98,62 @@
         jScrollPane1.setViewportView(versioningSystemsList);
         
versioningSystemsList.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BugtrackingOptionsPanel.class,
 "BugtrackigSystemsList.AccessibleContext.accessibleDescription")); // NOI18N
 
-        jLabel1.setLabelFor(versioningSystemsList);
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel1, 
org.openide.util.NbBundle.getMessage(BugtrackingOptionsPanel.class, 
"LBL_OptionsPanelName")); // NOI18N
+        containerPanel.setLayout(new java.awt.CardLayout());
 
-        containerPanel.setLayout(new java.awt.CardLayout());
+        javax.swing.GroupLayout dummyTasksPanelLayout = new 
javax.swing.GroupLayout(dummyTasksPanel);
+        dummyTasksPanel.setLayout(dummyTasksPanelLayout);
+        dummyTasksPanelLayout.setHorizontalGroup(
+            
dummyTasksPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 0, Short.MAX_VALUE)
+        );
+        dummyTasksPanelLayout.setVerticalGroup(
+            
dummyTasksPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 119, Short.MAX_VALUE)
+        );
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel4, 
org.openide.util.NbBundle.getMessage(BugtrackingOptionsPanel.class, 
"BugtrackingOptionsPanel.jLabel4.text_1")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel5, 
org.openide.util.NbBundle.getMessage(BugtrackingOptionsPanel.class, 
"BugtrackingOptionsPanel.jLabel5.text_1")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
             
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
                 .addComponent(jScrollPane1, 
javax.swing.GroupLayout.PREFERRED_SIZE, 104, 
javax.swing.GroupLayout.PREFERRED_SIZE)
-                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(containerPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 246, Short.MAX_VALUE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(containerPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 370, Short.MAX_VALUE))
+            .addComponent(dummyTasksPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE)
             .addGroup(layout.createSequentialGroup()
-                .addComponent(jLabel1)
-                .addContainerGap())
+                .addComponent(jLabel5)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jSeparator3))
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(jLabel4)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jSeparator2, 
javax.swing.GroupLayout.DEFAULT_SIZE, 420, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
             
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, 
layout.createSequentialGroup()
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel5)
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(7, 7, 7)
+                        .addComponent(jSeparator3, 
javax.swing.GroupLayout.PREFERRED_SIZE, 10, 
javax.swing.GroupLayout.PREFERRED_SIZE)))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(jScrollPane1, 
javax.swing.GroupLayout.PREFERRED_SIZE, 148, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(containerPanel, 
javax.swing.GroupLayout.PREFERRED_SIZE, 148, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel4)
                     .addGroup(layout.createSequentialGroup()
-                        .addGap(31, 31, 31)
-                        .addComponent(containerPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 258, Short.MAX_VALUE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel1)
+                        .addGap(7, 7, 7)
+                        .addComponent(jSeparator2, 
javax.swing.GroupLayout.PREFERRED_SIZE, 10, 
javax.swing.GroupLayout.PREFERRED_SIZE)))
                         
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jScrollPane1, 
javax.swing.GroupLayout.DEFAULT_SIZE, 268, Short.MAX_VALUE)))
-                .addContainerGap())
+                .addComponent(dummyTasksPanel, 
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
@@ -132,8 +165,12 @@
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JPanel containerPanel;
-    private javax.swing.JLabel jLabel1;
+    private javax.swing.JPanel dummyTasksPanel;
+    private javax.swing.JLabel jLabel4;
+    private javax.swing.JLabel jLabel5;
     private javax.swing.JScrollPane jScrollPane1;
+    private javax.swing.JSeparator jSeparator2;
+    private javax.swing.JSeparator jSeparator3;
     private javax.swing.JList versioningSystemsList;
     // End of variables declaration//GEN-END:variables
     
diff --git 
a/bugtracking/src/org/netbeans/modules/bugtracking/util/Bundle.properties 
b/bugtracking/src/org/netbeans/modules/bugtracking/util/Bundle.properties
--- a/bugtracking/src/org/netbeans/modules/bugtracking/util/Bundle.properties
+++ b/bugtracking/src/org/netbeans/modules/bugtracking/util/Bundle.properties
@@ -124,4 +124,17 @@
 Attachment.ApplyPatchAction.name=Apply
 Attachment.open.progress=Opening attachment {0}
 Attachment.saveToFile.progress=Saving attachment {0}
-Attachment.applyPatch.progress=Applying patch {0}
\ No newline at end of file
+Attachment.applyPatch.progress=Applying patch {0}
+BugtrackingOptionsPanel.cbLimitQuery.text=Queries
+
+BugtrackingOptionsPanel.cbSync.text=Synchronize Tasks automatically every
+BugtrackingOptionsPanel.jLabel4.text=Tasks Limit
+BugtrackingOptionsPanel.jLabel3.text=minutes
+BugtrackingOptionsPanel.jLabel2.text=Synchronization
+BugtrackingOptionsPanel.jLabel5.text=tasks
+BugtrackingOptionsPanel.cbLimit.text=Show first
+BugtrackingOptionsPanel.jLabel6.text=Apply to:
+BugtrackingOptionsPanel.cbLimitCategory.text=Categories
+BugtrackingOptionsPanel.jLabel7.text=Tasks window:
+BugtrackingOptionsPanel.jLabel4.text_1=Tasks window
+BugtrackingOptionsPanel.jLabel5.text_1=Issue Tracking Systems

[hg] main-silver: Merge Bugtracking and Tasks options panels

Jan Peska 05/03/2013

Project Features

About this Project

ConnectedDeveloper was started in November 2009, is owned by tpavek, and has 66 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20140418.2d69abc). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close