misc/gitlogo.eps misc/gitlogo.svg src/org/netbeans/modules/git/resources/icons/gitvcs-icon.png @@ -4,4 +4,4 @@ OpenIDE-Module: org.netbeans.modules.git/1 OpenIDE-Module-Layer: org/netbeans/modules/git/resources/git-layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/git/Bundle.properties OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help -OpenIDE-Module-Specification-Version: 1.6 +OpenIDE-Module-Specification-Version: 1.0 manifest.mf @@ -42,7 +42,6 @@ package org.netbeans.modules.git; import java.io.File; -import java.net.InetAddress; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -92,6 +91,7 @@ public class GitModuleConfig { private static final String DEFAULT_EXPORT_FILENAME = "%b_%r_%h"; // NOI18N private static final GitModuleConfig INSTANCE = new GitModuleConfig(); + private static String email; private static String userName; public static GitModuleConfig getDefault() { @@ -192,6 +192,20 @@ public class GitModuleConfig { } /** + * This method returns the email address specified in $HOME/.gitconfig + * or a default email address if none is found. + */ + public String getEmail() { + email = GitConfigFiles.getInstance().getEmail(); + if (email.length() == 0) { + // nothing + // TODO: does NetBeans provide this with product registration? + // if not, then get this information in setup wizard. + } + return email; + } + + /** * This method returns the username specified in $HOME/.gitconfig * or a default username if none is found. */ @@ -199,13 +213,6 @@ public class GitModuleConfig { userName = GitConfigFiles.getInstance().getUserName(); if (userName.length() == 0) { String userId = System.getProperty("user.name"); // NOI18N - String hostName; - try { - hostName = InetAddress.getLocalHost().getHostName(); - } catch (Exception ex) { - return userName; - } - userName = userId + " <" + userId + "@" + hostName + ">"; // NOI18N } return userName; } @@ -214,6 +221,10 @@ public class GitModuleConfig { GitConfigFiles.getInstance().setProperty("XXXXX", ""); } + public void setEmail(String email) { + GitConfigFiles.getInstance().setEmail(email); + } + public void setUserName(String name) { GitConfigFiles.getInstance().setUserName(name); } @@ -238,20 +249,27 @@ public class GitModuleConfig { public Properties getProperties(File file) { Properties props = new Properties(); - GitConfigFiles hgconfig = new GitConfigFiles(file); - String name = hgconfig.getUserName(false); + GitConfigFiles gitconfig = new GitConfigFiles(file); + String email = gitconfig.getEmail(false); + String name = gitconfig.getUserName(false); + if (email.length() == 0) + email = getEmail(); + if (email.length() > 0) + props.setProperty("email", email); + else + props.setProperty("email", ""); if (name.length() == 0) name = getUserName(); if (name.length() > 0) - props.setProperty("username", name); // NOI18N + props.setProperty("name", name); // NOI18N else - props.setProperty("username", ""); // NOI18N - name = hgconfig.getDefaultPull(false); + props.setProperty("name", ""); // NOI18N + name = gitconfig.getDefaultPull(false); if (name.length() > 0) props.setProperty("default-pull", name); // NOI18N else props.setProperty("default-pull", ""); // NOI18N - name = hgconfig.getDefaultPush(false); + name = gitconfig.getDefaultPush(false); if (name.length() > 0) props.setProperty("default-push", name); // NOI18N else @@ -260,33 +278,33 @@ public class GitModuleConfig { } public void clearProperties(File file, String section) { - getHgConfigFiles(file).clearProperties(section); + getGitConfigFiles(file).clearProperties(section); } public void removeProperty(File file, String section, String name) { - getHgConfigFiles(file).removeProperty(section, name); + getGitConfigFiles(file).removeProperty(section, name); } public void setProperty(File file, String name, String value) { - getHgConfigFiles(file).setProperty(name, value); + getGitConfigFiles(file).setProperty(name, value); } public void setProperty(File file, String section, String name, String value, boolean allowEmpty) { - getHgConfigFiles(file).setProperty(section, name, value, allowEmpty); + getGitConfigFiles(file).setProperty(section, name, value, allowEmpty); } public void setProperty(File file, String section, String name, String value) { - getHgConfigFiles(file).setProperty(section, name, value); + getGitConfigFiles(file).setProperty(section, name, value); } /* * Get all properties for a particular section */ public Properties getProperties(File file, String section) { - return getHgConfigFiles(file).getProperties(section); + return getGitConfigFiles(file).getProperties(section); } - private GitConfigFiles getHgConfigFiles(File file) { + private GitConfigFiles getGitConfigFiles(File file) { if (file == null) { return GitConfigFiles.getInstance(); } else { src/org/netbeans/modules/git/GitModuleConfig.java @@ -67,8 +67,9 @@ public class GitConfigFiles { public static final String GIT_EXTENSIONS = "extensions"; // NOI18N public static final String GIT_EXTENSIONS_GITK = "gitk"; // NOI18N public static final String GIT_EXTENSIONS_FETCH = "fetch"; // NOI18N - public static final String GIT_UI_SECTION = "ui"; // NOI18N - public static final String GIT_USERNAME = "username"; // NOI18N + public static final String GIT_USER_SECTION = "user"; // NOI18N + public static final String GIT_USER_NAME = "name"; // NOI18N + public static final String GIT_EMAIL = "email"; // NOI18N public static final String GIT_PATHS_SECTION = "paths"; // NOI18N public static final String GIT_DEFAULT_PUSH = "default-push"; // NOI18N public static final String GIT_DEFAULT_PUSH_VALUE = "default-push"; // NOI18N @@ -116,8 +117,10 @@ public class GitConfigFiles { } public void setProperty(String name, String value) { - if (name.equals(GIT_USERNAME)) { - setProperty(GIT_UI_SECTION, GIT_USERNAME, value); + if (name.equals(GIT_USER_NAME)) { + setProperty(GIT_USER_SECTION, GIT_USER_NAME, value); + } else if (name.equals(GIT_EMAIL)) { + setProperty(GIT_USER_SECTION, GIT_EMAIL, value); } else if (name.equals(GIT_DEFAULT_PUSH)) { setProperty(GIT_PATHS_SECTION, GIT_DEFAULT_PUSH_VALUE, value); } else if (name.equals(GIT_DEFAULT_PULL)) { @@ -154,14 +157,22 @@ public class GitConfigFiles { public void setProperty(String section, String name, String value) { setProperty(section, name,value, false); } + + public void setEmail(String value) { + setProperty(GIT_USER_SECTION, GIT_EMAIL, value); + } public void setUserName(String value) { - setProperty(GIT_UI_SECTION, GIT_USERNAME, value); + setProperty(GIT_USER_SECTION, GIT_USER_NAME, value); } public String getUserName() { return getUserName(true); } + + public String getEmail() { + return getEmail(true); + } public Properties getProperties(String section) { Ini.Section inisection = getSection(gitConfig, section, false); @@ -213,7 +224,14 @@ public class GitConfigFiles { if (reload) { doReload(); } - return getProperty(GIT_UI_SECTION, GIT_USERNAME); + return getProperty(GIT_USER_SECTION, GIT_USER_NAME); + } + + public String getEmail(Boolean reload) { + if (reload) { + doReload(); + } + return getProperty(GIT_USER_SECTION, GIT_EMAIL); } public String getProperty(String section, String name) { src/org/netbeans/modules/git/config/GitConfigFiles.java @@ -45,7 +45,7 @@ CTL_Properties_Action_OK = OK AdvancedOption_DisplayName_Git=Git AdvancedOption_Tooltip_Git=Git Global Options -GitPanel.jLabel1.text=Git &User Name\: +GitPanel.jLabel1.text=Email Address: GitPanel.jLabel3.text=(Changes will not take effect until the IDE is restarted.) @@ -85,8 +85,6 @@ GitPanel.labelVariables.acsd=Lets you select a Variable GitPanel.jLabel4.text=Use this button to specify the extensions to be loaded by Git - -GitPanel.jPanel2.border.title=Git Extensions GitPanel.manageButton.text=&Manage Extensions LBL_Properties_Progress=Scanning Git Extensions @@ -121,4 +119,5 @@ ACSD_executablePathTextField=Specify the path for the Git executable ACSD_exportFileNameTextField=Specifies the default path name for export ACSD_btnAdd=Add property ACSD_btnRemove=Remove selected properties -ACSD_txtAreaValue=Property value \ No newline at end of file +ACSD_txtAreaValue=Property value +GitPanel.jLabel5.text=Name: src/org/netbeans/modules/git/options/Bundle.properties @@ -155,7 +155,7 @@ final class GitOptionsPanelController extends OptionsPanelController implements } private Boolean validateFields() { - String username = panel.userNameTextField.getText(); + String username = panel.emailTextField.getText(); if (!GitModuleConfig.getDefault().isUserNameValid(username)) { JOptionPane.showMessageDialog(null, NbBundle.getMessage(GitPanel.class, "MSG_WARN_USER_NAME_TEXT"), // NOI18N src/org/netbeans/modules/git/options/GitOptionsPanelController.java @@ -15,36 +15,47 @@ <Layout> <DimensionLayout dim="0"> <Group type="103" groupAlignment="0" attributes="0"> - <Group type="102" alignment="0" attributes="0"> + <Group type="102" attributes="0"> <EmptySpace max="-2" attributes="0"/> <Group type="103" groupAlignment="0" attributes="0"> - <Component id="backupOnRevertModifications" alignment="0" min="-2" max="-2" attributes="0"/> - <Component id="jPanel2" alignment="0" max="32767" attributes="0"/> - <Component id="jPanel1" alignment="0" max="32767" attributes="0"/> - <Group type="102" alignment="0" attributes="0"> - <Group type="103" groupAlignment="0" max="-2" attributes="0"> - <Component id="jLabel1" alignment="0" pref="160" max="32767" attributes="1"/> - <Component id="jLabel2" alignment="0" max="32767" attributes="1"/> - <Component id="exportFilename" alignment="0" max="32767" attributes="1"/> - </Group> - <EmptySpace min="-2" max="-2" attributes="0"/> + <Group type="102" attributes="0"> <Group type="103" groupAlignment="0" attributes="0"> - <Component id="userNameTextField" alignment="0" pref="971" max="32767" attributes="0"/> + <Component id="backupOnRevertModifications" alignment="0" min="-2" max="-2" attributes="0"/> + <Component id="jPanel2" alignment="0" max="32767" attributes="0"/> + <Component id="jPanel1" alignment="0" max="32767" attributes="0"/> + <Group type="102" alignment="0" attributes="0"> + <Component id="emailLabel" min="-2" pref="160" max="-2" attributes="1"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="emailTextField" pref="490" max="32767" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <Component id="userNameLabel" pref="100" max="32767" attributes="1"/> + <EmptySpace min="-2" pref="70" max="-2" attributes="0"/> + <Component id="userNameTextField" pref="490" max="32767" attributes="0"/> + </Group> + </Group> + <EmptySpace max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <Group type="103" groupAlignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0"> - <Group type="103" groupAlignment="0" attributes="0"> - <Component id="exportFilenameTextField" pref="559" max="32767" attributes="0"/> - <Component id="executablePathTextField" alignment="1" pref="559" max="32767" attributes="0"/> - </Group> + <Component id="exportFilename" min="-2" max="-2" attributes="1"/> <EmptySpace max="-2" attributes="0"/> - <Group type="103" groupAlignment="1" attributes="0"> - <Component id="execPathBrowseButton" min="-2" max="-2" attributes="1"/> - <Component id="exportFilenameBrowseButton" alignment="1" pref="403" max="32767" attributes="1"/> - </Group> </Group> + <Component id="execPathLabel" pref="170" max="32767" attributes="1"/> + </Group> + <Group type="103" groupAlignment="1" attributes="0"> + <Component id="exportFilenameTextField" pref="385" max="32767" attributes="0"/> + <Component id="executablePathTextField" pref="385" max="32767" attributes="0"/> </Group> + <EmptySpace max="-2" attributes="0"/> + <Group type="103" groupAlignment="1" attributes="0"> + <Component id="execPathBrowseButton" min="-2" max="-2" attributes="1"/> + <Component id="exportFilenameBrowseButton" alignment="1" min="-2" max="-2" attributes="1"/> + </Group> + <EmptySpace min="-2" pref="20" max="-2" attributes="0"/> </Group> </Group> - <EmptySpace max="-2" attributes="0"/> </Group> </Group> </DimensionLayout> @@ -53,44 +64,49 @@ <Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0"> + <Component id="emailLabel" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="emailTextField" alignment="3" min="-2" max="-2" attributes="0"/> + </Group> + <EmptySpace max="-2" attributes="0"/> + <Group type="103" groupAlignment="3" attributes="0"> + <Component id="userNameLabel" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="userNameTextField" alignment="3" min="-2" max="-2" attributes="0"/> - <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/> </Group> - <EmptySpace type="separate" max="-2" attributes="0"/> + <EmptySpace type="unrelated" max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0"> <Component id="execPathBrowseButton" alignment="3" min="-2" max="-2" attributes="0"/> - <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="executablePathTextField" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="execPathLabel" alignment="3" min="-2" max="-2" attributes="0"/> </Group> <EmptySpace min="-2" pref="18" max="-2" attributes="0"/> <Group type="103" groupAlignment="3" attributes="0"> - <Component id="exportFilename" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="exportFilenameTextField" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="exportFilenameBrowseButton" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="exportFilename" alignment="3" min="-2" max="-2" attributes="0"/> </Group> - <EmptySpace min="-2" pref="10" max="-2" attributes="0"/> + <EmptySpace pref="26" max="32767" attributes="0"/> <Component id="jPanel1" min="-2" max="-2" attributes="0"/> - <EmptySpace type="separate" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> <Component id="jPanel2" min="-2" max="-2" attributes="0"/> - <EmptySpace type="separate" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> <Component id="backupOnRevertModifications" min="-2" max="-2" attributes="0"/> - <EmptySpace pref="25" max="32767" attributes="0"/> + <EmptySpace min="-2" pref="27" max="-2" attributes="0"/> </Group> </Group> </DimensionLayout> </Layout> <SubComponents> - <Component class="javax.swing.JLabel" name="jLabel1"> + <Component class="javax.swing.JLabel" name="emailLabel"> <Properties> <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> - <Connection component="userNameTextField" type="bean"/> + <Connection component="emailTextField" type="bean"/> </Property> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/netbeans/modules/git/options/Bundle.properties" key="GitPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> </Property> </Properties> </Component> - <Component class="javax.swing.JTextField" name="userNameTextField"> + <Component class="javax.swing.JTextField" name="emailTextField"> <AccessibilityProperties> <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/netbeans/modules/git/options/Bundle.properties" key="ACSD_userNameTextField" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> @@ -100,7 +116,7 @@ <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/> </AuxValues> </Component> - <Component class="javax.swing.JLabel" name="jLabel2"> + <Component class="javax.swing.JLabel" name="execPathLabel"> <Properties> <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> <Connection component="executablePathTextField" type="bean"/> @@ -154,7 +170,7 @@ <Component id="jLabel3" min="-2" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/> <Component id="annotationTextField" min="-2" pref="405" max="-2" attributes="0"/> - <EmptySpace pref="494" max="32767" attributes="0"/> + <EmptySpace pref="13" max="32767" attributes="0"/> <Component id="addButton" min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/> </Group> @@ -216,9 +232,7 @@ <Properties> <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Git Extensions"> - <ResourceString PropertyName="titleX" bundle="org/netbeans/modules/git/options/Bundle.properties" key="GitPanel.jPanel2.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> - </TitledBorder> + <TitledBorder/> </Border> </Property> </Properties> @@ -232,7 +246,7 @@ <Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/> <Component id="jLabel4" min="-2" max="-2" attributes="0"/> - <EmptySpace pref="548" max="32767" attributes="0"/> + <EmptySpace pref="67" max="32767" attributes="0"/> <Component id="manageButton" min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/> </Group> @@ -324,5 +338,17 @@ </Property> </AccessibilityProperties> </Component> + <Component class="javax.swing.JTextField" name="userNameTextField"> + </Component> + <Component class="javax.swing.JLabel" name="userNameLabel"> + <Properties> + <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> + <Connection component="userNameTextField" type="bean"/> + </Property> + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> + <ResourceString bundle="org/netbeans/modules/git/options/Bundle.properties" key="GitPanel.jLabel5.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> + </Property> + </Properties> + </Component> </SubComponents> </Form> src/org/netbeans/modules/git/options/GitPanel.form @@ -65,12 +65,12 @@ final class GitPanel extends javax.swing.JPanel { @Override public void addNotify() { super.addNotify(); - userNameTextField.getDocument().addDocumentListener(listener); + emailTextField.getDocument().addDocumentListener(listener); } @Override public void removeNotify() { - userNameTextField.getDocument().removeDocumentListener(listener); + emailTextField.getDocument().removeDocumentListener(listener); super.removeNotify(); } @@ -84,20 +84,22 @@ final class GitPanel extends javax.swing.JPanel { // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents private void initComponents() { - jLabel1 = new javax.swing.JLabel(); - jLabel2 = new javax.swing.JLabel(); + emailLabel = new javax.swing.JLabel(); + execPathLabel = new javax.swing.JLabel(); jPanel1 = new javax.swing.JPanel(); jLabel3 = new javax.swing.JLabel(); jPanel2 = new javax.swing.JPanel(); jLabel4 = new javax.swing.JLabel(); exportFilename = new javax.swing.JLabel(); backupOnRevertModifications = new javax.swing.JCheckBox(); + userNameTextField = new javax.swing.JTextField(); + userNameLabel = new javax.swing.JLabel(); - jLabel1.setLabelFor(userNameTextField); - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jLabel1.text")); // NOI18N + emailLabel.setLabelFor(emailTextField); + org.openide.awt.Mnemonics.setLocalizedText(emailLabel, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jLabel1.text")); // NOI18N - jLabel2.setLabelFor(executablePathTextField); - org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jLabel2.text")); // NOI18N + execPathLabel.setLabelFor(executablePathTextField); + org.openide.awt.Mnemonics.setLocalizedText(execPathLabel, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jLabel2.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(execPathBrowseButton, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.browseButton.text")); // NOI18N @@ -119,7 +121,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, 494, Short.MAX_VALUE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 13, Short.MAX_VALUE) .add(addButton) .addContainerGap()) ); @@ -136,7 +138,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, "GitPanel.jPanel2.border.title"))); // NOI18N + jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("")); org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jLabel4.text")); // NOI18N @@ -149,7 +151,7 @@ final class GitPanel extends javax.swing.JPanel { .add(jPanel2Layout.createSequentialGroup() .addContainerGap() .add(jLabel4) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 548, Short.MAX_VALUE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 67, Short.MAX_VALUE) .add(manageButton) .addContainerGap()) ); @@ -173,6 +175,9 @@ final class GitPanel extends javax.swing.JPanel { backupOnRevertModifications.setSelected(true); org.openide.awt.Mnemonics.setLocalizedText(backupOnRevertModifications, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jCheckBox1.text")); // NOI18N + userNameLabel.setLabelFor(userNameTextField); + org.openide.awt.Mnemonics.setLocalizedText(userNameLabel, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jLabel5.text")); // NOI18N + org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( @@ -180,54 +185,66 @@ final class GitPanel extends javax.swing.JPanel { .add(layout.createSequentialGroup() .addContainerGap() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(backupOnRevertModifications) - .add(jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .add(layout.createSequentialGroup() - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false) - .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 160, Short.MAX_VALUE) - .add(jLabel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .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, 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, 559, Short.MAX_VALUE) - .add(org.jdesktop.layout.GroupLayout.TRAILING, executablePathTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 559, Short.MAX_VALUE)) + .add(backupOnRevertModifications) + .add(jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(layout.createSequentialGroup() + .add(emailLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 160, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) - .add(execPathBrowseButton) - .add(exportFilenameBrowseButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 403, Short.MAX_VALUE)))))) - .addContainerGap()) + .add(emailTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 490, Short.MAX_VALUE)) + .add(layout.createSequentialGroup() + .add(userNameLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE) + .add(70, 70, 70) + .add(userNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 490, Short.MAX_VALUE))) + .addContainerGap()) + .add(layout.createSequentialGroup() + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) + .add(layout.createSequentialGroup() + .add(exportFilename) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)) + .add(execPathLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 170, Short.MAX_VALUE)) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) + .add(exportFilenameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 385, Short.MAX_VALUE) + .add(executablePathTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 385, Short.MAX_VALUE)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) + .add(execPathBrowseButton) + .add(exportFilenameBrowseButton)) + .add(20, 20, 20)))) ); layout.setVerticalGroup( layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() .addContainerGap() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) - .add(userNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(jLabel1)) - .add(18, 18, 18) + .add(emailLabel) + .add(emailTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(userNameLabel) + .add(userNameTextField, 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(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(execPathBrowseButton) - .add(jLabel2) - .add(executablePathTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)) + .add(executablePathTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(execPathLabel)) .add(18, 18, 18) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) - .add(exportFilename) .add(exportFilenameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(exportFilenameBrowseButton)) - .add(10, 10, 10) + .add(exportFilenameBrowseButton) + .add(exportFilename)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 26, Short.MAX_VALUE) .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(18, 18, 18) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .add(18, 18, 18) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(backupOnRevertModifications) - .addContainerGap(25, Short.MAX_VALUE)) + .add(27, 27, 27)) ); - userNameTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(GitPanel.class, "ACSD_userNameTextField")); // NOI18N + emailTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(GitPanel.class, "ACSD_userNameTextField")); // NOI18N executablePathTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(GitPanel.class, "ACSD_executablePathTextField")); // NOI18N execPathBrowseButton.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(GitPanel.class, "ACSD_execPathBrowseButton")); // NOI18N jPanel2.getAccessibleContext().setAccessibleName("<GitPanel.jPanel2.border.title>"); @@ -248,6 +265,7 @@ final class GitPanel extends javax.swing.JPanel { // someCheckBox.setSelected(NbPreferences.forModule(GitPanel.class).getBoolean("someFlag", false)); // NOI18N // or: // someTextField.setText(SomeSystemOption.getDefault().getSomeStringProperty()); + emailTextField.setText(GitModuleConfig.getDefault().getEmail()); userNameTextField.setText(GitModuleConfig.getDefault().getUserName()); executablePathTextField.setText(GitModuleConfig.getDefault().getExecutableBinaryPath()); exportFilenameTextField.setText(GitModuleConfig.getDefault().getExportFilename()); @@ -263,6 +281,7 @@ final class GitPanel extends javax.swing.JPanel { // NbPreferences.forModule(GitPanel.class).putBoolean("someFlag", someCheckBox.isSelected()); // NOI18N // or: // SomeSystemOption.getDefault().setSomeStringProperty(someTextField.getText()); + GitModuleConfig.getDefault().setEmail(emailTextField.getText()); GitModuleConfig.getDefault().setUserName(userNameTextField.getText()); GitModuleConfig.getDefault().setExecutableBinaryPath(executablePathTextField.getText()); GitModuleConfig.getDefault().setExportFilename(exportFilenameTextField.getText()); @@ -277,7 +296,7 @@ final class GitPanel extends javax.swing.JPanel { boolean valid() { // TODO check whether form is consistent and complete //return true; - String username = userNameTextField.getText(); + String username = emailTextField.getText(); Boolean valid; valid = GitModuleConfig.getDefault().isUserNameValid(username); if (!valid) return false; @@ -290,19 +309,21 @@ final class GitPanel extends javax.swing.JPanel { final javax.swing.JButton addButton = new javax.swing.JButton(); final javax.swing.JTextField annotationTextField = new javax.swing.JTextField(); private javax.swing.JCheckBox backupOnRevertModifications; + private javax.swing.JLabel emailLabel; + final javax.swing.JTextField emailTextField = new javax.swing.JTextField(); final javax.swing.JButton execPathBrowseButton = new javax.swing.JButton(); + private javax.swing.JLabel execPathLabel; final javax.swing.JTextField executablePathTextField = new javax.swing.JTextField(); private javax.swing.JLabel exportFilename; final javax.swing.JButton exportFilenameBrowseButton = new javax.swing.JButton(); final javax.swing.JTextField exportFilenameTextField = new javax.swing.JTextField(); - private javax.swing.JLabel jLabel1; - private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; final javax.swing.JButton manageButton = new javax.swing.JButton(); - final javax.swing.JTextField userNameTextField = new javax.swing.JTextField(); + private javax.swing.JLabel userNameLabel; + private javax.swing.JTextField userNameTextField; // End of variables declaration//GEN-END:variables } \ No newline at end of file src/org/netbeans/modules/git/options/GitPanel.java @@ -44,7 +44,7 @@ made subject to such option by the copyright holder. <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd"> <filesystem> <folder name="Actions"> - <folder name="Mercurial"> + <folder name="Git"> <file name="org-netbeans-modules-git-ui-status-OpenVersioningAction.instance"> <attr name="instanceClass" stringvalue="org.netbeans.modules.git.ui.status.OpenVersioningAction"/> </file> @@ -53,7 +53,7 @@ made subject to such option by the copyright holder. <folder name="Editors"> <folder name="SideBar"> <file name="org-netbeans-modules-git-ui-annotate-AnnotationBarManager.instance"> - <attr name="position" intvalue="2200"/> + <attr name="position" intvalue="2201"/> </file> <!-- place in between line numbers sidebar and folding sidebar #57544 --> </folder> @@ -87,7 +87,7 @@ made subject to such option by the copyright holder. <folder name="Modes"> <folder name="output"> <file name="gitversioning.wstcref" url="git_wstcref.xml"> - <attr name="position" intvalue="650"/> + <attr name="position" intvalue="651"/> </file> </folder> </folder> @@ -96,8 +96,9 @@ made subject to such option by the copyright holder. <folder name="Window"> <folder name="Versioning"> <file name="org-netbeans-modules-git-ui-status-OpenVersioningAction.shadow"> + <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/git/resources/icons/gitvcs-icon.png"/> <attr name="originalFile" stringvalue="Actions/Git/org-netbeans-modules-git-ui-status-OpenVersioningAction.instance"/> - <attr name="position" intvalue="400"/> + <attr name="position" intvalue="401"/> </file> </folder> </folder> src/org/netbeans/modules/git/resources/git-layer.xml @@ -84,6 +84,9 @@ </Component> <Component class="javax.swing.JButton" name="btnRefresh"> <Properties> + <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> + <Image iconType="3" name="/org/netbeans/modules/git/resources/icons/refresh.png"/> + </Property> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/netbeans/modules/git/ui/status/Bundle.properties" key="CTL_Synchronize_Action_Refresh_Tooltip" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> </Property> @@ -106,6 +109,9 @@ </Component> <Component class="javax.swing.JButton" name="btnDiff"> <Properties> + <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> + <Image iconType="3" name="/org/netbeans/modules/git/resources/icons/diff.png"/> + </Property> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/netbeans/modules/git/ui/status/Bundle.properties" key="CTL_Synchronize_Action_Diff_Tooltip" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/> </Property> @@ -133,6 +139,9 @@ </Container> <Component class="javax.swing.JButton" name="btnUpdate"> <Properties> + <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> + <Image iconType="3" name="/org/netbeans/modules/git/resources/icons/update.png"/> + </Property> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/netbeans/modules/git/ui/status/Bundle.properties" key="CTL_Synchronize_Action_Update_Tooltip" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/> </Property> @@ -153,6 +162,9 @@ </Component> <Component class="javax.swing.JButton" name="btnCommit"> <Properties> + <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> + <Image iconType="3" name="/org/netbeans/modules/git/resources/icons/commit.png"/> + </Property> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <ResourceString bundle="org/netbeans/modules/git/ui/status/Bundle.properties" key="CTL_CommitForm_Action_Commit_Tooltip" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/> </Property> src/org/netbeans/modules/git/ui/status/VersioningPanel.form @@ -696,6 +696,7 @@ 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/git/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)); @@ -704,6 +705,7 @@ 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/git/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)); @@ -714,6 +716,7 @@ 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/git/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)); @@ -721,6 +724,7 @@ 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/git/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)); src/org/netbeans/modules/git/ui/status/VersioningPanel.java ad7f93f36e0fa09915ed1ef38c685a75348ca705 Alex Coles alexbcoles@mac.com http://github.com/myabc/nbgit/commit/474f376112eb654e4791347c8a4a67d24d587c0e 474f376112eb654e4791347c8a4a67d24d587c0e 2008-04-03T19:01:44-07:00 2008-04-03T19:01:44-07:00 Set module specification to 1.0. Added email address and name into UI Options Panel. Users can now successfully change their ~/.gitconfig user name + password. Added artwork into misc/ folder (logo borrowed from msysgit project) Added icon for Git VCS. Fixed missing icons in VersioningPanel. 33e5bddab379f0edb0aea8ab9647f7c951d90c39 Alex Coles alexbcoles@mac.com