From 1d64aab461050116f2de608c8f68bdda4d161c33 Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Sun, 23 Mar 2008 15:09:25 +0100 Subject: [PATCH] Add missing NetBeans *.form files. Fix Resource Bundle references in *.form files. --- .gitignore | 6 +- .../netbeans/modules/git/options/Bundle.properties | 40 +-- src/org/netbeans/modules/git/options/GitPanel.form | 16 +- src/org/netbeans/modules/git/options/GitPanel.java | 12 +- .../netbeans/modules/git/options/LabelsPanel.form | 5 +- .../netbeans/modules/git/options/LabelsPanel.java | 2 +- .../modules/git/options/PropertiesPanel.form | 4 +- .../modules/git/options/PropertiesPanel.java | 4 +- .../modules/git/ui/clone/CloneCompletedPanel.form | 95 +++++ .../modules/git/ui/clone/CloneCompletedPanel.java | 21 +- .../netbeans/modules/git/ui/clone/ClonePanel.form | 169 +++++++++ .../netbeans/modules/git/ui/clone/ClonePanel.java | 2 +- .../modules/git/ui/commit/CommitPanel.form | 151 ++++++++ .../modules/git/ui/commit/CommitPanel.java | 14 +- .../modules/git/ui/diff/ExportDiffPanel.form | 128 +++++++ .../modules/git/ui/diff/MultiDiffPanel.form | 228 ++++++++++++ .../modules/git/ui/diff/MultiDiffPanel.java | 12 +- .../modules/git/ui/log/SearchCriteriaPanel.form | 22 +- .../modules/git/ui/log/SearchCriteriaPanel.java | 2 +- .../modules/git/ui/log/SearchHistoryPanel.form | 16 +- .../modules/git/ui/log/SearchHistoryPanel.java | 2 +- .../modules/git/ui/merge/MergeRevisionsPanel.form | 56 +++ .../modules/git/ui/merge/MergeRevisionsPanel.java | 2 +- .../modules/git/ui/properties/PropertiesPanel.form | 108 ++++++ .../git/ui/repository/RepositoryDialogPanel.form | 52 +++ .../modules/git/ui/repository/RepositoryPanel.form | 391 +++++++++++++++++++++ .../modules/git/ui/repository/RepositoryPanel.java | 56 ++- .../modules/git/ui/rollback/BackoutPanel.form | 174 +++++++++ .../modules/git/ui/rollback/BackoutPanel.java | 6 +- .../modules/git/ui/rollback/StripPanel.form | 193 ++++++++++ .../modules/git/ui/rollback/StripPanel.java | 10 +- .../modules/git/ui/status/VersioningPanel.form | 12 +- .../modules/git/ui/status/VersioningPanel.java | 6 +- ...atePanel.form => RevertModificationsPanel.form} | 52 +-- .../git/ui/update/RevertModificationsPanel.java | 8 +- .../modules/git/ui/update/UpdatePanel.form | 16 +- .../modules/git/ui/update/UpdatePanel.java | 8 +- .../ui/wizards/CloneDestinationDirectoryPanel.form | 14 +- .../modules/git/ui/wizards/ClonePathsPanel.form | 12 +- .../modules/git/ui/wizards/ClonePathsPanel.java | 6 +- .../git/ui/wizards/CloneRepositoryPanel.form | 2 +- 41 files changed, 1944 insertions(+), 191 deletions(-) create mode 100644 src/org/netbeans/modules/git/ui/diff/ExportDiffPanel.form create mode 100644 src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.form create mode 100644 src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.form copy src/org/netbeans/modules/git/ui/update/{UpdatePanel.form => RevertModificationsPanel.form} (63%) diff --git a/.gitignore b/.gitignore index c795b05..652c67e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ -build \ No newline at end of file +build +nbproject/build-impl.xml +nbproject/genfiles.properties +nbproject/platform.properties +nbproject/private diff --git a/src/org/netbeans/modules/git/options/Bundle.properties b/src/org/netbeans/modules/git/options/Bundle.properties index 712e6fc..811152f 100644 --- a/src/org/netbeans/modules/git/options/Bundle.properties +++ b/src/org/netbeans/modules/git/options/Bundle.properties @@ -45,14 +45,14 @@ CTL_Properties_Action_OK = OK AdvancedOption_DisplayName_Mercurial=Git AdvancedOption_Tooltip_Mercurial=Git Global Options -MercurialPanel.jLabel1.text=Git &User Name\: +GitPanel.jLabel1.text=Git &User Name\: -MercurialPanel.jLabel3.text=(Changes will not take effect until the IDE is restarted.) +GitPanel.jLabel3.text=(Changes will not take effect until the IDE is restarted.) -MercurialPanel.jLabel2.text=Git &Executable Path\: -MercurialPanel.jCheckBox1.text=On Re&vert Modifications save Locally Modified files to .orig +GitPanel.jLabel2.text=Git &Executable Path\: +GitPanel.jCheckBox1.text=On Re&vert Modifications save Locally Modified files to .orig -MercurialPanel.browseButton.text=&Browse... +GitPanel.browseButton.text=&Browse... ACSD_BrowseFolder = Lets you browse for directory for Git executable. Browse_title=Browse for the Git Executable @@ -62,32 +62,32 @@ OK_Button=OK MercurialExec=Folders -MercurialPanel.jPanel1.border.title=Git Status Labels +GitPanel.jPanel1.border.title=Git Status Labels -MercurialPanel.addButton.text=&Add Variable ... -MercurialPanel.annotationTextField.text=[{status}; {folder}] +GitPanel.addButton.text=&Add Variable ... +GitPanel.annotationTextField.text=[{status}; {folder}] -MercurialPanel.jLabel3.text=&Format +GitPanel.jLabel3.text=&Format -MercurialPanel.annotationTextField.toolTipText='{'{0}'}' stays for Revision
'{'{1}'}' stays for Status
'{'{2}'}' stays for Branch or Tag Name
+GitPanel.annotationTextField.toolTipText='{'{0}'}' stays for Revision
'{'{1}'}' stays for Status
'{'{2}'}' stays for Branch or Tag Name
-MercurialPanel.label.revision = stays for Revision -MercurialPanel.label.status = stays for Status -MercurialPanel.label.folder = stays for Branch or Tag Name +GitPanel.label.revision = stays for Revision +GitPanel.label.status = stays for Status +GitPanel.label.folder = stays for Branch or Tag Name MSG_STATUS_LABEL_WITH_REVSION_TITLE = Revision Label Performance MSG_STATUS_LABEL_WITH_REVSION_MSG = Revision labels {revision} have been added.\n\nThis can seriously effect performance when viewing Mercurial controlled Projects.\nUsing Show Annotations or Show History on selected files is a more efficient way to get revision information. -MercurialPanel.labelVariables.title=Select Variables -MercurialPanel.labelVariables.acsd=Lets you select a Variable +GitPanel.labelVariables.title=Select Variables +GitPanel.labelVariables.acsd=Lets you select a Variable -MercurialPanel.jLabel4.text=Use this button to specify the extensions to be loaded by Git +GitPanel.jLabel4.text=Use this button to specify the extensions to be loaded by Git -MecurialPanel.jPanel2.border.title=Git Extensions -MercurialPanel.manageButton.text=&Manage Extensions +GitPanel.jPanel2.border.title=Git Extensions +GitPanel.manageButton.text=&Manage Extensions LBL_Properties_Progress=Scanning Git Extensions @@ -95,9 +95,9 @@ MSG_WARN_FIELD_TITLE = Invalid Field MSG_WARN_USER_NAME_TEXT = The text specified in the Git User Name is not a valid email address. MSG_WARN_EXEC_PATH_TEXT = The directory specified in the Git Executable path does not contain Git program. -MercurialPanel.ExportFilename.text=&Default Export Filename\: +GitPanel.ExportFilename.text=&Default Export Filename\: -MercurialPanel.browseButton2.text=B&rowse... +GitPanel.browseButton2.text=B&rowse... PropertiesPanel.jLabel2.text=Property &Name: diff --git a/src/org/netbeans/modules/git/options/GitPanel.form b/src/org/netbeans/modules/git/options/GitPanel.form index 46d189a..9df35d0 100644 --- a/src/org/netbeans/modules/git/options/GitPanel.form +++ b/src/org/netbeans/modules/git/options/GitPanel.form @@ -29,16 +29,16 @@ - + - - + + - + @@ -139,7 +139,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -216,8 +216,8 @@ - - + + diff --git a/src/org/netbeans/modules/git/options/GitPanel.java b/src/org/netbeans/modules/git/options/GitPanel.java index 081cca3..f966d5e 100644 --- a/src/org/netbeans/modules/git/options/GitPanel.java +++ b/src/org/netbeans/modules/git/options/GitPanel.java @@ -119,7 +119,7 @@ final class GitPanel extends javax.swing.JPanel { .add(jLabel3) .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) .add(annotationTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 405, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 155, Short.MAX_VALUE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 494, Short.MAX_VALUE) .add(addButton) .addContainerGap()) ); @@ -136,7 +136,7 @@ final class GitPanel extends javax.swing.JPanel { addButton.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(GitPanel.class, "ACSD_addButton")); // NOI18N - jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(GitPanel.class, "MecurialPanel.jPanel2.border.title"))); // NOI18N + jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jPanel2.border.title"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jLabel4.text")); // NOI18N @@ -190,15 +190,15 @@ final class GitPanel extends javax.swing.JPanel { .add(exportFilename, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(userNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 769, Short.MAX_VALUE) + .add(userNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 971, Short.MAX_VALUE) .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(exportFilenameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 458, Short.MAX_VALUE) - .add(org.jdesktop.layout.GroupLayout.TRAILING, executablePathTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 458, Short.MAX_VALUE)) + .add(exportFilenameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 559, Short.MAX_VALUE) + .add(org.jdesktop.layout.GroupLayout.TRAILING, executablePathTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 559, Short.MAX_VALUE)) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) .add(execPathBrowseButton) - .add(exportFilenameBrowseButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 302, Short.MAX_VALUE)))))) + .add(exportFilenameBrowseButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 403, Short.MAX_VALUE)))))) .addContainerGap()) ); layout.setVerticalGroup( diff --git a/src/org/netbeans/modules/git/options/LabelsPanel.form b/src/org/netbeans/modules/git/options/LabelsPanel.form index 8f6216d..095c4f5 100644 --- a/src/org/netbeans/modules/git/options/LabelsPanel.form +++ b/src/org/netbeans/modules/git/options/LabelsPanel.form @@ -1,7 +1,8 @@ -
+ + @@ -47,4 +48,4 @@ - \ No newline at end of file + diff --git a/src/org/netbeans/modules/git/options/LabelsPanel.java b/src/org/netbeans/modules/git/options/LabelsPanel.java index 8bf344d..de02173 100644 --- a/src/org/netbeans/modules/git/options/LabelsPanel.java +++ b/src/org/netbeans/modules/git/options/LabelsPanel.java @@ -60,7 +60,7 @@ public class LabelsPanel extends javax.swing.JPanel { * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { jScrollPane1 = new javax.swing.JScrollPane(); diff --git a/src/org/netbeans/modules/git/options/PropertiesPanel.form b/src/org/netbeans/modules/git/options/PropertiesPanel.form index bd644cf..daee86d 100644 --- a/src/org/netbeans/modules/git/options/PropertiesPanel.form +++ b/src/org/netbeans/modules/git/options/PropertiesPanel.form @@ -27,8 +27,8 @@ - - + + diff --git a/src/org/netbeans/modules/git/options/PropertiesPanel.java b/src/org/netbeans/modules/git/options/PropertiesPanel.java index fbbd661..0987e56 100644 --- a/src/org/netbeans/modules/git/options/PropertiesPanel.java +++ b/src/org/netbeans/modules/git/options/PropertiesPanel.java @@ -170,8 +170,8 @@ public class PropertiesPanel extends javax.swing.JPanel implements PreferenceCha .add(jLabel1)) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) - .add(org.jdesktop.layout.GroupLayout.LEADING, comboName, 0, 307, Short.MAX_VALUE) - .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 307, Short.MAX_VALUE)) + .add(org.jdesktop.layout.GroupLayout.LEADING, comboName, 0, 470, Short.MAX_VALUE) + .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 470, Short.MAX_VALUE)) .add(layout.createSequentialGroup() .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(btnRemove))))) diff --git a/src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.form b/src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.form index e69de29..f310555 100644 --- a/src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.form +++ b/src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.form @@ -0,0 +1,95 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.java b/src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.java index 36dd918..cd3359d 100644 --- a/src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.java +++ b/src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.java @@ -58,13 +58,13 @@ final class CloneCompletedPanel extends javax.swing.JPanel { * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; setLayout(new java.awt.GridBagLayout()); - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3001")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jLabel1, "null"); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; @@ -72,41 +72,38 @@ final class CloneCompletedPanel extends javax.swing.JPanel { gridBagConstraints.insets = new java.awt.Insets(0, 3, 3, 0); add(jLabel1, gridBagConstraints); - org.openide.awt.Mnemonics.setLocalizedText(againCheckBox, org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3002")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(againCheckBox, "null"); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 0); add(againCheckBox, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.weighty = 1.0; add(jPanel1, gridBagConstraints); - org.openide.awt.Mnemonics.setLocalizedText(openButton, org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3003")); // NOI18N - java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/mercurial/ui/clone/Bundle"); // NOI18N - openButton.setToolTipText(bundle.getString("TT_OpenProject")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(openButton, "null"); + openButton.setToolTipText("null"); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.weightx = 1.0; gridBagConstraints.insets = new java.awt.Insets(3, 0, 0, 3); add(openButton, gridBagConstraints); - org.openide.awt.Mnemonics.setLocalizedText(createButton, org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3004")); // NOI18N - createButton.setToolTipText(bundle.getString("TT_CreateProject")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(createButton, "null"); + createButton.setToolTipText("null"); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.insets = new java.awt.Insets(3, 3, 0, 3); add(createButton, gridBagConstraints); - org.openide.awt.Mnemonics.setLocalizedText(closeButton, org.openide.util.NbBundle.getMessage(CloneCompletedPanel.class, "BK3005")); // NOI18N - closeButton.setToolTipText(bundle.getString("TT_Close")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(closeButton, "null"); + closeButton.setToolTipText("null"); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.insets = new java.awt.Insets(3, 3, 0, 0); add(closeButton, gridBagConstraints); - }// //GEN-END:initComponents diff --git a/src/org/netbeans/modules/git/ui/clone/ClonePanel.form b/src/org/netbeans/modules/git/ui/clone/ClonePanel.form index e69de29..e91a78b 100644 --- a/src/org/netbeans/modules/git/ui/clone/ClonePanel.form +++ b/src/org/netbeans/modules/git/ui/clone/ClonePanel.form @@ -0,0 +1,169 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/org/netbeans/modules/git/ui/clone/ClonePanel.java b/src/org/netbeans/modules/git/ui/clone/ClonePanel.java index 75c57fe..946bb76 100644 --- a/src/org/netbeans/modules/git/ui/clone/ClonePanel.java +++ b/src/org/netbeans/modules/git/ui/clone/ClonePanel.java @@ -129,7 +129,7 @@ public class ClonePanel extends javax.swing.JPanel implements ActionListener { .add(toLabel))) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(fromTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 258, Short.MAX_VALUE) + .add(fromTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 270, Short.MAX_VALUE) .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) .add(toCloneField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 165, Short.MAX_VALUE) diff --git a/src/org/netbeans/modules/git/ui/commit/CommitPanel.form b/src/org/netbeans/modules/git/ui/commit/CommitPanel.form index e69de29..266774f 100644 --- a/src/org/netbeans/modules/git/ui/commit/CommitPanel.form +++ b/src/org/netbeans/modules/git/ui/commit/CommitPanel.form @@ -0,0 +1,151 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/org/netbeans/modules/git/ui/commit/CommitPanel.java b/src/org/netbeans/modules/git/ui/commit/CommitPanel.java index 646b4e9..c01a757 100644 --- a/src/org/netbeans/modules/git/ui/commit/CommitPanel.java +++ b/src/org/netbeans/modules/git/ui/commit/CommitPanel.java @@ -160,14 +160,14 @@ public class CommitPanel extends javax.swing.JPanel implements PreferenceChangeL filesPanel.setLayout(filesPanelLayout); filesPanelLayout.setHorizontalGroup( filesPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 626, Short.MAX_VALUE) + .add(0, 610, Short.MAX_VALUE) ); filesPanelLayout.setVerticalGroup( filesPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 196, Short.MAX_VALUE) + .add(0, 173, Short.MAX_VALUE) ); - recentLink.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/recent_messages.png"))); // NOI18N + recentLink.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/recent_messages.png"))); // NOI18N recentLink.setToolTipText(org.openide.util.NbBundle.getMessage(CommitPanel.class, "CTL_CommitForm_RecentMessages")); // NOI18N org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this); @@ -177,11 +177,11 @@ public class CommitPanel extends javax.swing.JPanel implements PreferenceChangeL .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() .addContainerGap() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) - .add(org.jdesktop.layout.GroupLayout.LEADING, filesPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 626, Short.MAX_VALUE) - .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 626, Short.MAX_VALUE) + .add(org.jdesktop.layout.GroupLayout.LEADING, filesPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 610, Short.MAX_VALUE) + .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 610, Short.MAX_VALUE) .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup() .add(jLabel1) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 508, Short.MAX_VALUE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 482, Short.MAX_VALUE) .add(recentLink)) .add(org.jdesktop.layout.GroupLayout.LEADING, filesLabel) .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel2)) @@ -199,7 +199,7 @@ public class CommitPanel extends javax.swing.JPanel implements PreferenceChangeL .add(15, 15, 15) .add(filesLabel) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(filesPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 196, Short.MAX_VALUE) + .add(filesPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 173, Short.MAX_VALUE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(jLabel2) .addContainerGap()) diff --git a/src/org/netbeans/modules/git/ui/diff/ExportDiffPanel.form b/src/org/netbeans/modules/git/ui/diff/ExportDiffPanel.form new file mode 100644 index 0000000..5108e41 --- /dev/null +++ b/src/org/netbeans/modules/git/ui/diff/ExportDiffPanel.form @@ -0,0 +1,128 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.form b/src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.form new file mode 100644 index 0000000..6679c6d --- /dev/null +++ b/src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.form @@ -0,0 +1,228 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.java b/src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.java index 48315ec..96af359 100644 --- a/src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.java +++ b/src/org/netbeans/modules/git/ui/diff/MultiDiffPanel.java @@ -708,7 +708,7 @@ class MultiDiffPanel extends javax.swing.JPanel implements ActionListener, DiffS jPanel4Layout.setVerticalGroup( jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel4Layout.createSequentialGroup() - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addContainerGap(20, Short.MAX_VALUE) .add(jPanel3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) ); @@ -729,14 +729,14 @@ class MultiDiffPanel extends javax.swing.JPanel implements ActionListener, DiffS controlsToolBar.add(jPanel1); - nextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/diff-next.png"))); // NOI18N + nextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/diff-next.png"))); // NOI18N nextButton.setToolTipText(org.openide.util.NbBundle.getMessage(MultiDiffPanel.class, "CTL_DiffPanel_Next_Tooltip")); // NOI18N nextButton.setFocusable(false); nextButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); nextButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); controlsToolBar.add(nextButton); - prevButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/diff-prev.png"))); // NOI18N + prevButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/diff-prev.png"))); // NOI18N prevButton.setToolTipText(org.openide.util.NbBundle.getMessage(MultiDiffPanel.class, "CTL_DiffPanel_Prev_Tooltip")); // NOI18N prevButton.setFocusable(false); prevButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); @@ -758,7 +758,7 @@ class MultiDiffPanel extends javax.swing.JPanel implements ActionListener, DiffS controlsToolBar.add(jPanel2); - refreshButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/refresh.png"))); // NOI18N + refreshButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/refresh.png"))); // NOI18N refreshButton.setToolTipText(org.openide.util.NbBundle.getMessage(MultiDiffPanel.class, "refreshButton.toolTipText")); // NOI18N refreshButton.setFocusable(false); refreshButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); @@ -770,7 +770,7 @@ class MultiDiffPanel extends javax.swing.JPanel implements ActionListener, DiffS }); controlsToolBar.add(refreshButton); - updateButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/update.png"))); // NOI18N + updateButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/update.png"))); // NOI18N updateButton.setFocusable(false); updateButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); updateButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); @@ -796,7 +796,7 @@ class MultiDiffPanel extends javax.swing.JPanel implements ActionListener, DiffS controlsToolBar.add(jPanel5); - commitButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/commit.png"))); // NOI18N + commitButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/git/resources/icons/commit.png"))); // NOI18N commitButton.setToolTipText(org.openide.util.NbBundle.getMessage(MultiDiffPanel.class, "MSG_CommitDiff_Tooltip")); // NOI18N commitButton.setFocusable(false); commitButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); diff --git a/src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.form b/src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.form index 1acf8c7..e4101e3 100644 --- a/src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.form +++ b/src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.form @@ -27,15 +27,15 @@
- + - + - + @@ -60,10 +60,10 @@ - + - + @@ -88,10 +88,10 @@ - + - + @@ -116,7 +116,7 @@ - + @@ -131,10 +131,10 @@ - + - + @@ -159,7 +159,7 @@ - + diff --git a/src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.java b/src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.java index 9002a13..0721d36 100644 --- a/src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.java +++ b/src/org/netbeans/modules/git/ui/log/SearchCriteriaPanel.java @@ -186,7 +186,7 @@ class SearchCriteriaPanel extends javax.swing.JPanel { setLayout(new java.awt.GridBagLayout()); commitMessageLabel.setLabelFor(tfCommitMessage); - java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/mercurial/ui/log/Bundle"); // NOI18N + java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/git/ui/log/Bundle"); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(commitMessageLabel, bundle.getString("CTL_UseCommitMessage")); // NOI18N commitMessageLabel.setToolTipText(bundle.getString("TT_CommitMessage")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); diff --git a/src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.form b/src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.form index 24389a9..e6dfe1e 100644 --- a/src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.form +++ b/src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.form @@ -37,7 +37,7 @@ - + @@ -80,15 +80,15 @@ - + - + - + @@ -104,10 +104,10 @@ - + - + @@ -148,10 +148,10 @@ - + - + diff --git a/src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.java b/src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.java index 7477701..aed6b53 100644 --- a/src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.java +++ b/src/org/netbeans/modules/git/ui/log/SearchHistoryPanel.java @@ -458,7 +458,7 @@ class SearchHistoryPanel extends javax.swing.JPanel implements ExplorerManager.P gridBagConstraints.weightx = 1.0; add(searchCriteriaPanel, gridBagConstraints); - java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/mercurial/ui/log/Bundle"); // NOI18N + java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/git/ui/log/Bundle"); // NOI18N bSearch.setToolTipText(bundle.getString("TT_Search")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; diff --git a/src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.form b/src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.form new file mode 100644 index 0000000..d687a00 --- /dev/null +++ b/src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.form @@ -0,0 +1,56 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.java b/src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.java index 25edd1a..4ff7524 100644 --- a/src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.java +++ b/src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.java @@ -90,7 +90,7 @@ public class MergeRevisionsPanel extends javax.swing.JPanel { * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { revisionsLabel = new javax.swing.JLabel(); diff --git a/src/org/netbeans/modules/git/ui/properties/PropertiesPanel.form b/src/org/netbeans/modules/git/ui/properties/PropertiesPanel.form index e69de29..7ac4df1 100644 --- a/src/org/netbeans/modules/git/ui/properties/PropertiesPanel.form +++ b/src/org/netbeans/modules/git/ui/properties/PropertiesPanel.form @@ -0,0 +1,108 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/org/netbeans/modules/git/ui/repository/RepositoryDialogPanel.form b/src/org/netbeans/modules/git/ui/repository/RepositoryDialogPanel.form index e69de29..4af376e 100644 --- a/src/org/netbeans/modules/git/ui/repository/RepositoryDialogPanel.form +++ b/src/org/netbeans/modules/git/ui/repository/RepositoryDialogPanel.form @@ -0,0 +1,52 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/src/org/netbeans/modules/git/ui/repository/RepositoryPanel.form b/src/org/netbeans/modules/git/ui/repository/RepositoryPanel.form index e69de29..01366fe 100644 --- a/src/org/netbeans/modules/git/ui/repository/RepositoryPanel.form +++ b/src/org/netbeans/modules/git/ui/repository/RepositoryPanel.form @@ -0,0 +1,391 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/org/netbeans/modules/git/ui/repository/RepositoryPanel.java b/src/org/netbeans/modules/git/ui/repository/RepositoryPanel.java index 96aed97..f110e74 100644 --- a/src/org/netbeans/modules/git/ui/repository/RepositoryPanel.java +++ b/src/org/netbeans/modules/git/ui/repository/RepositoryPanel.java @@ -62,50 +62,48 @@ public class RepositoryPanel extends javax.swing.JPanel { private void initComponents() { setMinimumSize(new java.awt.Dimension(480, 160)); - java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/mercurial/ui/repository/Bundle"); // NOI18N - setName(bundle.getString("BK2018")); // NOI18N + setName("null"); setVerifyInputWhenFocusTarget(false); - titleLabel.setText(bundle.getString("BK0001")); // NOI18N + titleLabel.setText("null"); jLabel2.setLabelFor(urlComboBox); - org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0002")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jLabel2, "null"); urlComboBox.setEditable(true); - org.openide.awt.Mnemonics.setLocalizedText(proxySettingsButton, org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0006")); // NOI18N - proxySettingsButton.setToolTipText(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "ACSD_ProxyDialog")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(proxySettingsButton, "null"); + proxySettingsButton.setToolTipText("null"); tipLabel.setText("-"); // NOI18N tipLabel.setMaximumSize(new java.awt.Dimension(32767, 32767)); - removeButton.setText(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0008")); // NOI18N + removeButton.setText("null"); userPasswordField.setMinimumSize(new java.awt.Dimension(11, 22)); userPasswordField.setPreferredSize(new java.awt.Dimension(11, 22)); passwordLabel.setLabelFor(userPasswordField); - org.openide.awt.Mnemonics.setLocalizedText(passwordLabel, org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0004")); // NOI18N - passwordLabel.setToolTipText(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "TT_Password")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(passwordLabel, "null"); + passwordLabel.setToolTipText("null"); userLabel.setLabelFor(userTextField); - org.openide.awt.Mnemonics.setLocalizedText(userLabel, org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0003")); // NOI18N - userLabel.setToolTipText(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "TT_UserName")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(userLabel, "null"); + userLabel.setToolTipText("null"); userTextField.setMinimumSize(new java.awt.Dimension(11, 22)); userTextField.setPreferredSize(new java.awt.Dimension(11, 22)); - leaveBlankLabel.setText(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0005")); // NOI18N + leaveBlankLabel.setText("null"); - tunnelLabel.setText(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0010")); // NOI18N + tunnelLabel.setText("null"); - tunnelCommandLabel.setText(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0009")); // NOI18N + tunnelCommandLabel.setText("null"); - tunnelHelpLabel.setText(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "TT_svn_xxx")); // NOI18N + tunnelHelpLabel.setText("null"); savePasswordCheckBox.setMnemonic('v'); - savePasswordCheckBox.setText(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0007")); // NOI18N - savePasswordCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0)); + savePasswordCheckBox.setText("null"); savePasswordCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0)); org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this); @@ -127,10 +125,10 @@ public class RepositoryPanel extends javax.swing.JPanel { .add(savePasswordCheckBox) .addContainerGap()) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(tipLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 541, Short.MAX_VALUE) + .add(tipLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 564, Short.MAX_VALUE) .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(urlComboBox, 0, 382, Short.MAX_VALUE) + .add(urlComboBox, 0, 451, Short.MAX_VALUE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(removeButton)) .add(layout.createSequentialGroup() @@ -138,7 +136,7 @@ public class RepositoryPanel extends javax.swing.JPanel { .add(org.jdesktop.layout.GroupLayout.LEADING, userPasswordField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .add(org.jdesktop.layout.GroupLayout.LEADING, userTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 145, Short.MAX_VALUE)) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(leaveBlankLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 372, Short.MAX_VALUE) + .add(leaveBlankLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 389, Short.MAX_VALUE) .addContainerGap())))) .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) @@ -146,7 +144,7 @@ public class RepositoryPanel extends javax.swing.JPanel { .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup() .add(tunnelLabel) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(tunnelCommandTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 555, Short.MAX_VALUE)) + .add(tunnelCommandTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 592, Short.MAX_VALUE)) .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup() .add(tunnelCommandLabel) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))) @@ -190,24 +188,24 @@ public class RepositoryPanel extends javax.swing.JPanel { .addContainerGap(48, Short.MAX_VALUE)) ); - titleLabel.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "ACSD_RepositoryPanel_Title")); // NOI18N + titleLabel.getAccessibleContext().setAccessibleDescription("null"); titleLabel.getAccessibleContext().setAccessibleParent(this); jLabel2.getAccessibleContext().setAccessibleParent(this); - urlComboBox.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "ACSN_RepositoryURL")); // NOI18N - urlComboBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "ACSD_RepositoryURL")); // NOI18N + urlComboBox.getAccessibleContext().setAccessibleName("null"); + urlComboBox.getAccessibleContext().setAccessibleDescription("null"); urlComboBox.getAccessibleContext().setAccessibleParent(this); proxySettingsButton.getAccessibleContext().setAccessibleParent(this); - removeButton.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "ACSN_RemoveHistory")); // NOI18N - removeButton.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "ACSD_RemoveHistory")); // NOI18N + removeButton.getAccessibleContext().setAccessibleName("null"); + removeButton.getAccessibleContext().setAccessibleDescription("null"); userPasswordField.getAccessibleContext().setAccessibleParent(this); passwordLabel.getAccessibleContext().setAccessibleParent(this); userLabel.getAccessibleContext().setAccessibleParent(this); userTextField.getAccessibleContext().setAccessibleParent(this); - leaveBlankLabel.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "ACSD_InfoLabel")); // NOI18N + leaveBlankLabel.getAccessibleContext().setAccessibleDescription("null"); leaveBlankLabel.getAccessibleContext().setAccessibleParent(this); - savePasswordCheckBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "BK0011")); // NOI18N + savePasswordCheckBox.getAccessibleContext().setAccessibleDescription("null"); - getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RepositoryPanel.class, "ACSD_RepositoryPanel")); // NOI18N + getAccessibleContext().setAccessibleDescription("null"); }// //GEN-END:initComponents diff --git a/src/org/netbeans/modules/git/ui/rollback/BackoutPanel.form b/src/org/netbeans/modules/git/ui/rollback/BackoutPanel.form index e69de29..79f3103 100644 --- a/src/org/netbeans/modules/git/ui/rollback/BackoutPanel.form +++ b/src/org/netbeans/modules/git/ui/rollback/BackoutPanel.form @@ -0,0 +1,174 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/org/netbeans/modules/git/ui/rollback/BackoutPanel.java b/src/org/netbeans/modules/git/ui/rollback/BackoutPanel.java index 7f4721a..d3f845b 100644 --- a/src/org/netbeans/modules/git/ui/rollback/BackoutPanel.java +++ b/src/org/netbeans/modules/git/ui/rollback/BackoutPanel.java @@ -174,12 +174,12 @@ public class BackoutPanel extends javax.swing.JPanel { .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .add(org.jdesktop.layout.GroupLayout.LEADING, infoLabel2) - .add(org.jdesktop.layout.GroupLayout.LEADING, infoLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 391, Short.MAX_VALUE))) + .add(org.jdesktop.layout.GroupLayout.LEADING, infoLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 417, Short.MAX_VALUE))) .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup() .add(48, 48, 48) .add(revisionsLabel) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(revisionsComboBox, 0, 209, Short.MAX_VALUE))) + .add(revisionsComboBox, 0, 235, Short.MAX_VALUE))) .addContainerGap()) ); layout.setVerticalGroup( @@ -194,7 +194,7 @@ public class BackoutPanel extends javax.swing.JPanel { .add(revisionsComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(14, Short.MAX_VALUE)) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); revisionsComboBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BackoutPanel.class, "ACSD_revisionsComboBoxBackout")); // NOI18N diff --git a/src/org/netbeans/modules/git/ui/rollback/StripPanel.form b/src/org/netbeans/modules/git/ui/rollback/StripPanel.form index e69de29..ef1f0e5 100644 --- a/src/org/netbeans/modules/git/ui/rollback/StripPanel.form +++ b/src/org/netbeans/modules/git/ui/rollback/StripPanel.form @@ -0,0 +1,193 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/org/netbeans/modules/git/ui/rollback/StripPanel.java b/src/org/netbeans/modules/git/ui/rollback/StripPanel.java index 576254e..535997f 100644 --- a/src/org/netbeans/modules/git/ui/rollback/StripPanel.java +++ b/src/org/netbeans/modules/git/ui/rollback/StripPanel.java @@ -145,13 +145,13 @@ public class StripPanel extends javax.swing.JPanel { .add(jPanel1Layout.createSequentialGroup() .addContainerGap() .add(doBackupChxBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 327, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(31, Short.MAX_VALUE)) + .addContainerGap(68, Short.MAX_VALUE)) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(jPanel1Layout.createSequentialGroup() .add(doBackupChxBox) - .addContainerGap(10, Short.MAX_VALUE)) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); doBackupChxBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(StripPanel.class, "ACSD_doBackupChxBox")); // NOI18N @@ -164,7 +164,7 @@ public class StripPanel extends javax.swing.JPanel { ); jPanel3Layout.setVerticalGroup( jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 171, Short.MAX_VALUE) + .add(0, 179, Short.MAX_VALUE) ); org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this); @@ -174,7 +174,7 @@ public class StripPanel extends javax.swing.JPanel { .add(layout.createSequentialGroup() .addContainerGap() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE) + .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 424, Short.MAX_VALUE) .add(layout.createSequentialGroup() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel1, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -182,7 +182,7 @@ public class StripPanel extends javax.swing.JPanel { .add(35, 35, 35) .add(revisionsLabel) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(revisionsComboBox, 0, 195, Short.MAX_VALUE)) + .add(revisionsComboBox, 0, 235, Short.MAX_VALUE)) .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))) .add(15, 15, 15) diff --git a/src/org/netbeans/modules/git/ui/status/VersioningPanel.form b/src/org/netbeans/modules/git/ui/status/VersioningPanel.form index 230b706..e07ea92 100644 --- a/src/org/netbeans/modules/git/ui/status/VersioningPanel.form +++ b/src/org/netbeans/modules/git/ui/status/VersioningPanel.form @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -154,7 +154,7 @@ - + diff --git a/src/org/netbeans/modules/git/ui/status/VersioningPanel.java b/src/org/netbeans/modules/git/ui/status/VersioningPanel.java index 9835439..7b30859 100644 --- a/src/org/netbeans/modules/git/ui/status/VersioningPanel.java +++ b/src/org/netbeans/modules/git/ui/status/VersioningPanel.java @@ -680,7 +680,7 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer jPanel4.setOpaque(false); jPanel2.add(jPanel4); - java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/mercurial/ui/status/Bundle"); // NOI18N + java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/git/ui/status/Bundle"); // NOI18N statusLabel.setText(bundle.getString("CTL_Versioning_Status_Table_Title")); // NOI18N statusLabel.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); statusLabel.setMaximumSize(new java.awt.Dimension(120, 17)); @@ -696,7 +696,6 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer jSeparator2.setOrientation(javax.swing.SwingConstants.VERTICAL); jPanel2.add(jSeparator2); - btnRefresh.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/refresh.png"))); // NOI18N btnRefresh.setToolTipText(org.openide.util.NbBundle.getMessage(VersioningPanel.class, "CTL_Synchronize_Action_Refresh_Tooltip")); // NOI18N btnRefresh.setMaximumSize(new java.awt.Dimension(28, 28)); btnRefresh.setMinimumSize(new java.awt.Dimension(28, 28)); @@ -705,7 +704,6 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer jPanel2.add(btnRefresh); btnRefresh.getAccessibleContext().setAccessibleName("Refresh Status"); - btnDiff.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/diff.png"))); // NOI18N btnDiff.setToolTipText(bundle.getString("CTL_Synchronize_Action_Diff_Tooltip")); // NOI18N btnDiff.setFocusable(false); btnDiff.setPreferredSize(new java.awt.Dimension(22, 25)); @@ -716,7 +714,6 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer jPanel3.setOpaque(false); jPanel2.add(jPanel3); - btnUpdate.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/update.png"))); // NOI18N btnUpdate.setToolTipText(bundle.getString("CTL_Synchronize_Action_Update_Tooltip")); // NOI18N btnUpdate.setFocusable(false); btnUpdate.setPreferredSize(new java.awt.Dimension(22, 25)); @@ -724,7 +721,6 @@ class VersioningPanel extends JPanel implements ExplorerManager.Provider, Prefer jPanel2.add(btnUpdate); btnUpdate.getAccessibleContext().setAccessibleName("Update"); - btnCommit.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/mercurial/resources/icons/commit.png"))); // NOI18N btnCommit.setToolTipText(bundle.getString("CTL_CommitForm_Action_Commit_Tooltip")); // NOI18N btnCommit.setFocusable(false); btnCommit.setPreferredSize(new java.awt.Dimension(22, 25)); diff --git a/src/org/netbeans/modules/git/ui/update/UpdatePanel.form b/src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.form similarity index 63% copy from src/org/netbeans/modules/git/ui/update/UpdatePanel.form copy to src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.form index 34f6691..9cf56bd 100644 --- a/src/org/netbeans/modules/git/ui/update/UpdatePanel.form +++ b/src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.form @@ -15,17 +15,21 @@ - - - - - - + + - + - + + + + + + + + + @@ -41,7 +45,7 @@ - + @@ -57,7 +61,7 @@ - + @@ -67,6 +71,11 @@ + + + + + @@ -74,7 +83,7 @@ - + @@ -84,7 +93,7 @@ - + @@ -92,9 +101,7 @@ - - - + @@ -104,27 +111,32 @@ - - + + - + - + - + + + + + + diff --git a/src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.java b/src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.java index 1633538..c671919 100644 --- a/src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.java +++ b/src/org/netbeans/modules/git/ui/update/RevertModificationsPanel.java @@ -134,13 +134,13 @@ public class RevertModificationsPanel extends javax.swing.JPanel { .add(jPanel1Layout.createSequentialGroup() .addContainerGap() .add(doBackupChxBox) - .addContainerGap(57, Short.MAX_VALUE)) + .addContainerGap(159, Short.MAX_VALUE)) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(jPanel1Layout.createSequentialGroup() .add(doBackupChxBox) - .addContainerGap(10, Short.MAX_VALUE)) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); doBackupChxBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(RevertModificationsPanel.class, "ACSD_doBackupChxBox")); // NOI18N @@ -155,12 +155,12 @@ public class RevertModificationsPanel extends javax.swing.JPanel { .add(47, 47, 47) .add(revisionsLabel) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(revisionsComboBox, 0, 182, Short.MAX_VALUE)) + .add(revisionsComboBox, 0, 334, Short.MAX_VALUE)) .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup() .addContainerGap() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(jLabel2) - .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 363, Short.MAX_VALUE) + .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 515, Short.MAX_VALUE) .add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) .addContainerGap()) ); diff --git a/src/org/netbeans/modules/git/ui/update/UpdatePanel.form b/src/org/netbeans/modules/git/ui/update/UpdatePanel.form index 34f6691..722bbbd 100644 --- a/src/org/netbeans/modules/git/ui/update/UpdatePanel.form +++ b/src/org/netbeans/modules/git/ui/update/UpdatePanel.form @@ -20,12 +20,12 @@ - + - + @@ -57,7 +57,7 @@
- + @@ -74,7 +74,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -92,8 +92,8 @@ - - + + @@ -122,7 +122,7 @@ - + diff --git a/src/org/netbeans/modules/git/ui/update/UpdatePanel.java b/src/org/netbeans/modules/git/ui/update/UpdatePanel.java index 1c2e19d..3c36b79 100644 --- a/src/org/netbeans/modules/git/ui/update/UpdatePanel.java +++ b/src/org/netbeans/modules/git/ui/update/UpdatePanel.java @@ -127,7 +127,7 @@ public class UpdatePanel extends javax.swing.JPanel { .add(jPanel1Layout.createSequentialGroup() .addContainerGap() .add(forcedUpdateChxBox) - .addContainerGap(25, Short.MAX_VALUE)) + .addContainerGap(120, Short.MAX_VALUE)) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) @@ -145,12 +145,12 @@ public class UpdatePanel extends javax.swing.JPanel { .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .add(jLabel2) - .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 355, Short.MAX_VALUE) + .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 501, Short.MAX_VALUE) .add(layout.createSequentialGroup() .add(36, 36, 36) .add(revisionsLabel) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(revisionsComboBox, 0, 174, Short.MAX_VALUE))) + .add(revisionsComboBox, 0, 311, Short.MAX_VALUE))) .addContainerGap()) ); layout.setVerticalGroup( @@ -165,7 +165,7 @@ public class UpdatePanel extends javax.swing.JPanel { .add(revisionsComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addContainerGap(15, Short.MAX_VALUE)) + .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); }// //GEN-END:initComponents diff --git a/src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryPanel.form b/src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryPanel.form index 1235795..47371c4 100644 --- a/src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryPanel.form +++ b/src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryPanel.form @@ -31,7 +31,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -127,12 +127,12 @@ - + - + @@ -142,7 +142,7 @@ - + diff --git a/src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.form b/src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.form index 69af7b0..5b92579 100644 --- a/src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.form +++ b/src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.form @@ -31,7 +31,7 @@ - + @@ -47,8 +47,8 @@ - - + + @@ -83,7 +83,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -113,7 +113,7 @@ - + diff --git a/src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.java b/src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.java index 9799dab..1831f38 100644 --- a/src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.java +++ b/src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.java @@ -132,9 +132,9 @@ public final class ClonePathsPanel extends JPanel implements ActionListener { .add(defaultPullPathLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(pathsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(defaultPullPathField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE) - .add(defaultPushPathField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE))) - .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 605, Short.MAX_VALUE)) + .add(defaultPullPathField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 557, Short.MAX_VALUE) + .add(defaultPushPathField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 557, Short.MAX_VALUE))) + .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 682, Short.MAX_VALUE)) .addContainerGap()) ); pathsPanelLayout.setVerticalGroup( diff --git a/src/org/netbeans/modules/git/ui/wizards/CloneRepositoryPanel.form b/src/org/netbeans/modules/git/ui/wizards/CloneRepositoryPanel.form index 09134c8..44db811 100644 --- a/src/org/netbeans/modules/git/ui/wizards/CloneRepositoryPanel.form +++ b/src/org/netbeans/modules/git/ui/wizards/CloneRepositoryPanel.form @@ -33,7 +33,7 @@ - + -- 2.11.4.GIT