Attachment #102610 for bug #183455

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 183455
Collapse All | Expand All

Lines 74-80 Link Here

(-)a/maven/src/org/netbeans/modules/maven/api/customizer/support/CheckBoxUpdater.java (-2 / +2 lines)
74	inherited = false;	74	inherited = false;
75	component.setFont(component.getFont().deriveFont(Font.BOLD));	75	component.setFont(component.getFont().deriveFont(Font.BOLD));
76		76
77	component.setToolTipText(""); //NOI18N	77	component.setToolTipText(null);
78	} else {	78	} else {
79	component.setToolTipText(NbBundle.getMessage(CheckBoxUpdater.class, "MSG_Value_Inherited")); //NOI18N	79	component.setToolTipText(NbBundle.getMessage(CheckBoxUpdater.class, "MSG_Value_Inherited")); //NOI18N
80	inherited = true;	80	inherited = true;
Lines 103-109 Link Here
103	private void setCheckBoxValue(Boolean value, boolean defValue, JCheckBox component) {	103	private void setCheckBoxValue(Boolean value, boolean defValue, JCheckBox component) {
104	if (value != null) {	104	if (value != null) {
105	component.setSelected(value.booleanValue());	105	component.setSelected(value.booleanValue());
106	component.setToolTipText(""); //NOI18N	106	component.setToolTipText(null);
107	inherited = false;	107	inherited = false;
108	component.setFont(component.getFont().deriveFont(Font.BOLD));	108	component.setFont(component.getFont().deriveFont(Font.BOLD));
109	} else {	109	} else {




//            component.setBackground(DEFAULT);
            label.setFont(label.getFont().deriveFont(Font.BOLD));
            
            component.setToolTipText(null);
        }
        @SuppressWarnings("unchecked")
        T val = (T)component.getSelectedItem();

    private void setComboValue(T value, T projectValue, JComboBox field) {
        if (value != null) {
            field.setSelectedItem(value);
            component.setToolTipText(null);
            inherited = false;
            label.setFont(label.getFont().deriveFont(Font.BOLD));
        } else if (projectValue != null) {

            inherited = true;
        } else {
            field.setSelectedItem(field.getModel().getElementAt(0));
            component.setToolTipText(null);
            inherited = false;
            label.setFont(label.getFont().deriveFont(Font.BOLD));
      }




import java.net.URL;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;

            builder.environment().put(env, val);
            display.append(Utilities.escapeParameters(new String[] {env + "=" + val})).append(' '); // NOI18N
        }
        for (Iterator<Map.Entry<String, String>> it = builder.environment().entrySet().iterator(); it.hasNext(); ) {
            Entry<String, String> entry = it.next();
            if ("M2_HOME".equals(entry.getKey())) {
                // M2_HOME must be filtered when 2.x being used and 3.x on the PATH
                it.remove();
                continue;
            }
        }
        List<String> command = builder.command();
        display.append(Utilities.escapeParameters(command.toArray(new String[command.size()])));
        printGray(ioput, display.toString());





TIP_Maven_Category=Set default Maven execution options.
SettingsPanel.btnIndex.text=Index &Now
SettingsPanel.lblLocalRepository.text=&Local Repository:
SettingsPanel.btnLocalRepository.text=&Browse...
SettingsPanel.lblIndex.text=&Index Update Frequency\:
SettingsPanel.cbSnapshots.text=Include &Snapshots In Local Index

TIT_Select=Select Local Repository Location
SettingsPanel.lblCommandLine.text=&Maven Home:
TIT_Select2=Select Maven Installation Location
SettingsPanel.btnCommandLine.text=&Browse...
SettingsPanel.btnGoals.text=Edit &Global Custom Goal Definitions...
TIT_Global=Global Maven Goal definitions
ACSD_Global=Global Maven Goal definitions

FREQ_Always=On every startup
FREQ_Never=Never
ERR_Wrong_Settings_file=Cannot parse the ~/.m2/settings.xml file, any options related to that file will be disabled.
SettingsPanel.lblOptions.text=Global Execution &Options:
SettingsPanel.btnOptions.text=&Add
GlobalOptionsPanel.lblOptions.text=&Global Execution Options :
SettingsPanel.lblBinaries.text=&Download Binaries:
SettingsPanel.jLabel3.text=<html><b>Please note</b> that setting any of these to values other than <b>"Never"</b> can make opening projects significantly slower.
On_Project_Open=Dependency Download Strategy
SettingsPanel.lblSource.text=Check &Sources:
SettingsPanel.lblJavadoc.text=Check &Javadoc:
txt_default_repository=<Use default local repository as defined by Maven>
WORK_OFFLINE=Work offline.
PRODUCE_EXECUTION_DEBUG_OUTPUT=Produce execution debug output.

FORCES_A_CHECK=Forces a check for updated releases and snapshots on remote repositories.
DON'T_USE_PLUGIN-REGISTRY=Don't use ~/.m2/plugin-registry.xml for plugin versions
TIT_Add_Globals=Add Global Option(s)
SettingsPanel.jLabel1.text=Dependency Download Strategy:
TIT_NEVER=Never
TIT_EVERY=Every Project Open
TIT_FIRST=First Project Open Only
SettingsPanel.cbSkipTests.text=Skip &Tests for any build executions not directly related to testing
MAVEN_RUNTIME_Embedded=Embedded
MAVEN_RUNTIME_External={0}
MAVEN_RUNTIME_Browse=Browse...
MAVEN_RUNTIME_ClearUserDefines=Clear User-Defined Maven Runtimes

Lines 50-56 Link Here

(-)a/maven/src/org/netbeans/modules/maven/options/MyJTextField.java (-2 / +2 lines)
50	*	50	*
51	* @author mkleint	51	* @author mkleint
52	*/	52	*/
53	public class MyJTextField extends JTextField {	53	public class JHintedTextField extends JTextField {
54		54
55	Color origForeground;	55	Color origForeground;
56	String origText = "";	56	String origText = "";
Lines 75-81 Link Here
75	}	75	}
76	};	76	};
77		77
78	public MyJTextField() {	78	public JHintedTextField() {
79	addFocusListener(listener);	79	addFocusListener(listener);
80	}	80	}
81		81

Lines 42-47 Link Here

(-)a/maven/src/org/netbeans/modules/maven/options/MavenSettings.java (-1 / +95 lines)
42		42
43	package org.netbeans.modules.maven.options;	43	package org.netbeans.modules.maven.options;
44		44
		45	import com.sun.tools.javac.resources.version;
45	import org.codehaus.plexus.util.StringUtils;	46	import org.codehaus.plexus.util.StringUtils;
46	import org.codehaus.plexus.util.cli.CommandLineUtils;	47	import org.codehaus.plexus.util.cli.CommandLineUtils;
47	import java.io.File;	48	import java.io.File;
Lines 49-54 Link Here
49	import java.io.IOException;	50	import java.io.IOException;
50	import java.io.InputStream;	51	import java.io.InputStream;
51	import java.net.URL;	52	import java.net.URL;
		53	import java.util.ArrayList;
		54	import java.util.Collections;
		55	import java.util.List;
52	import java.util.Properties;	56	import java.util.Properties;
53	import java.util.logging.Logger;	57	import java.util.logging.Logger;
54	import java.util.prefs.BackingStoreException;	58	import java.util.prefs.BackingStoreException;
Lines 59-64 Link Here
59	import org.openide.filesystems.FileUtil;	63	import org.openide.filesystems.FileUtil;
60	import org.openide.filesystems.URLMapper;	64	import org.openide.filesystems.URLMapper;
61	import org.openide.modules.InstalledFileLocator;	65	import org.openide.modules.InstalledFileLocator;
		66	import org.openide.util.NbBundle;
62	import org.openide.util.NbPreferences;	67	import org.openide.util.NbPreferences;
63		68
64	/**	69	/**
Lines 76-81 Link Here
76	public static final String PROP_LAST_ARCHETYPE_GROUPID = "lastArchetypeGroupId"; //NOI18N	81	public static final String PROP_LAST_ARCHETYPE_GROUPID = "lastArchetypeGroupId"; //NOI18N
77	public static final String PROP_CUSTOM_LOCAL_REPOSITORY = "localRepository"; //NOI18N	82	public static final String PROP_CUSTOM_LOCAL_REPOSITORY = "localRepository"; //NOI18N
78	public static final String PROP_SKIP_TESTS = "skipTests"; //NOI18N	83	public static final String PROP_SKIP_TESTS = "skipTests"; //NOI18N
		84	public static final String PROP_MAVEN_RUNTIMES = "mavenRuntimes"; //NOI18N
79		85
80	//these are from former versions (6.5) and are here only for conversion	86	//these are from former versions (6.5) and are here only for conversion
81	private static final String PROP_DEBUG = "showDebug"; // NOI18N	87	private static final String PROP_DEBUG = "showDebug"; // NOI18N
Lines 84-90 Link Here
84	private static final String PROP_PLUGIN_POLICY = "pluginUpdatePolicy"; //NOI18N	90	private static final String PROP_PLUGIN_POLICY = "pluginUpdatePolicy"; //NOI18N
85	private static final String PROP_FAILURE_BEHAVIOUR = "failureBehaviour"; //NOI18N	91	private static final String PROP_FAILURE_BEHAVIOUR = "failureBehaviour"; //NOI18N
86	private static final String PROP_USE_REGISTRY = "usePluginRegistry"; //NOI18N	92	private static final String PROP_USE_REGISTRY = "usePluginRegistry"; //NOI18N
87
88		93
89	private static final MavenSettings INSTANCE = new MavenSettings();	94	private static final MavenSettings INSTANCE = new MavenSettings();
90		95
Lines 288-293 Link Here
288	public boolean isShowRunDialog(){	293	public boolean isShowRunDialog(){
289	return getPreferences().getBoolean(PROP_SHOW_RUN_DIALOG, false);	294	return getPreferences().getBoolean(PROP_SHOW_RUN_DIALOG, false);
290	}	295	}
		296
291	public void setShowRunDialog(boolean b){	297	public void setShowRunDialog(boolean b){
292	getPreferences().putBoolean(PROP_SHOW_RUN_DIALOG, b);	298	getPreferences().putBoolean(PROP_SHOW_RUN_DIALOG, b);
293	}	299	}
Lines 390-394 Link Here
390	}	396	}
391	return null;	397	return null;
392	}	398	}
		399
		400	private static List<String> searchMavenRuntimes(String[] paths, boolean stopOnFirstValid) {
		401	List<String> runtimes = new ArrayList<String>();
		402	for (String path : paths) {
		403	File file = new File(path);
		404	path = FileUtil.normalizeFile(file).getAbsolutePath();
		405	String version = getCommandLineMavenVersion(new File(path));
		406	if (version != null) {
		407	runtimes.add(path);
		408	if (stopOnFirstValid) {
		409	break;
		410	}
		411	}
		412	}
		413
		414	return runtimes;
		415	}
		416
		417	/**
		418	* Searches for Maven Runtimes by the environment settings and returns the first valid one.
		419	*
		420	* <p>It searches in this order:
		421	* <ul>
		422	* <li>MAVEN_HOME</li>
		423	* <li>M2_HOME</li>
		424	* <li>PATH</li></ul>
		425	* </p>
		426	* <p>Only the first appereance will be appended.</p>
		427	*
		428	* @returns the default external Maven runtime on the path.
		429	*/
		430	public static String getDefaultExternalMavenRuntime() {
		431	String paths = System.getenv("PATH"); // NOI18N
		432	String mavenHome = System.getenv("MAVEN_HOME"); // NOI18N
		433	String m2Home = System.getenv("M2_HOME"); // NOI18N
		434
		435	List<String> mavenEnvDirs = new ArrayList<String>();
		436	if (mavenHome != null) {
		437	mavenEnvDirs.add(mavenHome);
		438	}
		439	if (m2Home != null) {
		440	mavenEnvDirs.add(m2Home);
		441	}
		442	if (paths != null) {
		443	for (String path : paths.split(File.pathSeparator)) {
		444	if (!path.endsWith("bin")) { // NOI18N
		445	continue;
		446	}
		447
		448	mavenEnvDirs.add(path.substring(0,
		449	path.length() - "bin".length() - File.pathSeparator.length()));
		450	}
		451	}
		452
		453	List<String> runtimes = searchMavenRuntimes(mavenEnvDirs.toArray(new String[0]), true);
		454	return !runtimes.isEmpty() ? runtimes.get(0) : null;
		455	}
		456
		457	public List<String> getUserDefinedMavenRuntimes() {
		458	List<String> runtimes = new ArrayList<String>();
		459
		460	String defaultRuntimePath = getDefaultExternalMavenRuntime();
		461	String runtimesPref = getPreferences().get(PROP_MAVEN_RUNTIMES, null);
		462	if (runtimesPref != null) {
463	for (String runtimePath : runtimesPref.split(File.pathSeparator)) {
464	if (!"".equals(runtimePath) && !runtimePath.equals(defaultRuntimePath)) {
465	runtimes.add(runtimePath);
466	}
467	}
468	}
469
470	return Collections.unmodifiableList(runtimes);
471	}
472
473	public void setMavenRuntimes(List<String> runtimes) {
474	if (runtimes == null) {
475	getPreferences().remove(PROP_MAVEN_RUNTIMES);
476	} else {
477	String runtimesPref = "";
478	for (String path : runtimes) {
479	runtimesPref += path + File.pathSeparator;
480	}
481	if (runtimesPref.endsWith(File.pathSeparator)) {
482	runtimesPref = runtimesPref.substring(0, runtimesPref.length() - 1);
483	}
484	putProperty(PROP_MAVEN_RUNTIMES, runtimesPref);
485	}
486	}
393		487
394	}	488	}




    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" attributes="0">
              <EmptySpace min="-2" max="-2" attributes="0"/>
              <Group type="103" groupAlignment="0" attributes="0">
                  <Group type="102" alignment="0" attributes="0">
                      <Group type="103" groupAlignment="0" attributes="0">

                          <Component id="lblOptions" alignment="0" min="-2" max="-2" attributes="0"/>
                          <Component id="lblLocalRepository" alignment="0" min="-2" max="-2" attributes="0"/>
                      </Group>
                      <EmptySpace min="-2" max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="0" attributes="0">
                          <Component id="lblExternalVersion" alignment="0" pref="524" max="32767" attributes="0"/>
                              <Component id="txtCommandLine" pref="295" max="32767" attributes="0"/>
                              <EmptySpace max="-2" attributes="0"/>
                              <Component id="btnCommandLine" linkSize="1" min="-2" max="-2" attributes="0"/>
                              <EmptySpace max="-2" attributes="0"/>
                              <Component id="btnDefault" min="-2" max="-2" attributes="0"/>
                          </Group>
                          <Component id="lblExternalVersion" alignment="0" pref="500" max="32767" attributes="0"/>
                          <Group type="102" alignment="1" attributes="0">
                              <Group type="103" groupAlignment="0" attributes="0">
                                  <Component id="comSource" alignment="0" pref="404" max="32767" attributes="1"/>
                                  <Component id="comJavadoc" alignment="0" pref="404" max="32767" attributes="1"/>
                                  <Component id="comBinaries" alignment="0" pref="404" max="32767" attributes="1"/>
                                  <Component id="txtLocalRepository" alignment="0" pref="404" max="32767" attributes="1"/>
                                  <Component id="txtOptions" pref="404" max="32767" attributes="0"/>
                              </Group>
                              <EmptySpace max="-2" attributes="0"/>
                              <Group type="103" groupAlignment="0" attributes="0">

                              </Group>
                          </Group>
                          <Component id="cbSkipTests" alignment="0" min="-2" max="-2" attributes="0"/>
                          <Group type="102" alignment="1" attributes="0">
                              <Component id="comMavenHome" pref="402" max="32767" attributes="0"/>
                              <EmptySpace min="-2" pref="122" max="-2" attributes="0"/>
                          </Group>
                      </Group>
                  </Group>
                  <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>

                      <EmptySpace max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="0" attributes="0">
                          <Component id="cbSnapshots" min="-2" max="-2" attributes="0"/>
                          <Component id="comIndex" pref="421" max="32767" attributes="0"/>
                      </Group>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="btnIndex" linkSize="1" min="-2" max="-2" attributes="0"/>
                  </Group>
              </Group>
              <EmptySpace min="-2" max="-2" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>

              <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="lblCommandLine" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="comMavenHome" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="btnDefault" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="btnCommandLine" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="lblExternalVersion" min="-2" pref="14" max="-2" attributes="0"/>

              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="cbSnapshots" min="-2" max="-2" attributes="0"/>
              <EmptySpace pref="23" max="32767" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>

        </Property>
      </Properties>
    </Component>
    <Component class="javax.swing.JTextField" name="txtCommandLine">
    </Component>
    <Component class="javax.swing.JButton" name="btnCommandLine">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/maven/options/Bundle.properties" key="SettingsPanel.btnCommandLine.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCommandLineActionPerformed"/>
      </Events>
    </Component>
    <Component class="javax.swing.JButton" name="btnDefault">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/maven/options/Bundle.properties" key="SettingsPanel.btnDefault.text" replaceFormat="NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnDefaultActionPerformed"/>
      </Events>
    </Component>
    <Component class="javax.swing.JLabel" name="lblExternalVersion">
    </Component>
    <Component class="javax.swing.JLabel" name="lblOptions">

    </Component>
    <Component class="javax.swing.JTextField" name="txtLocalRepository">
      <AuxValues>
        <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new org.netbeans.modules.maven.options.JHintedTextField();"/>
      </AuxValues>
    </Component>
    <Component class="javax.swing.JButton" name="btnLocalRepository">

        </Property>
      </Properties>
    </Component>
    <Component class="javax.swing.JComboBox" name="comMavenHome">
      <Properties>
        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
          <StringArray count="0"/>
        </Property>
      </Properties>
    </Component>
  </SubComponents>
</Form>




import java.awt.event.ActionListener;
import java.io.File;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.swing.BorderFactory;

import javax.swing.DefaultComboBoxModel;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JSeparator;
import javax.swing.ListCellRenderer;
import javax.swing.SwingUtilities;
import javax.swing.border.EmptyBorder;
import javax.swing.event.DocumentListener;
import org.netbeans.modules.maven.TextValueCompleter;
import org.netbeans.modules.maven.indexer.api.RepositoryIndexer;

 */
public class SettingsPanel extends javax.swing.JPanel {
    private static final String CP_SELECTED = "wasSelected"; //NOI18N
    private static final String SEPARATOR = "SEPARATOR";
    private static final String EMBEDDED_RUNTIME_VERSION =
            MavenSettings.getCommandLineMavenVersion(MavenSettings.getDefaultMavenHome());
    private static final int RUNTIME_COUNT_LIMIT = 5;
    private boolean changed;
    private boolean valid;
    private ActionListener listener;
    private DocumentListener docList;
    private MavenOptionController controller;
    private TextValueCompleter completer;
    private ActionListener   listItemChangedListener;
    private List<String>       userDefinedMavenRuntimes = new ArrayList<String>();
    private List<String>       predefinedRuntimes = new ArrayList<String>();
    private DefaultComboBoxModel mavenHomeDataModel = new DefaultComboBoxModel();
    private String             mavenRuntimeHome = null;
    private int                lastSelected = -1;

    private class ComboBoxRenderer extends JLabel implements ListCellRenderer {

        private JSeparator separator;

        public ComboBoxRenderer() {
            setOpaque(true);
            setBorder(new EmptyBorder(1, 1, 1, 1));
            separator = new JSeparator(JSeparator.HORIZONTAL);
        }

        @Override
        public Component getListCellRendererComponent(JList list, Object value,
                int index, boolean isSelected, boolean cellHasFocus) {
            if (SEPARATOR.equals(value)) {
                return separator;
            }
            if (isSelected) {
                setBackground(list.getSelectionBackground());
                setForeground(list.getSelectionForeground());
            } else {
                setBackground(list.getBackground());
                setForeground(list.getForeground());
            }
            
            setFont(list.getFont());
            setText(value.toString());
            return this;
        }
    };

    /** Creates new form SettingsPanel */
    SettingsPanel(MavenOptionController controller) {

        comBinaries.setModel(new DefaultComboBoxModel(downloads));
        comJavadoc.setModel(new DefaultComboBoxModel(downloads));
        comSource.setModel(new DefaultComboBoxModel(downloads));
        comMavenHome.setModel(mavenHomeDataModel);

        ListCellRenderer rend = new DefaultListCellRenderer() {
            @Override

        comBinaries.setRenderer(rend);
        comSource.setRenderer(rend);
        comJavadoc.setRenderer(rend);
        comMavenHome.setRenderer(new ComboBoxRenderer());

        this.controller = controller;
        listItemChangedListener = new ActionListener() {
            
            @Override
            public void actionPerformed(ActionEvent e) {
                if (SEPARATOR.equals(comMavenHome.getSelectedItem())) {
                    comMavenHome.setSelectedIndex(lastSelected);
                    return;
                }
                
                int selected = comMavenHome.getSelectedIndex();
                if (selected == mavenHomeDataModel.getSize() - 1) {
                    // clear all user defined runtimes
                    if (userDefinedMavenRuntimes.isEmpty()) {
                        comMavenHome.setSelectedIndex(lastSelected);
                        return;
                    }
                    
                    int count = userDefinedMavenRuntimes.size() + 1;
                    userDefinedMavenRuntimes.clear();
                    for (int i = 0; i < count; ++i) {
                        mavenHomeDataModel.removeElementAt(predefinedRuntimes.size());
                    }
                    
                    lastSelected = 0;
                    comMavenHome.setSelectedIndex(lastSelected);
                    return;
                }
                
                if (selected == mavenHomeDataModel.getSize() - 2) {
                    // browse
                    comMavenHome.setSelectedIndex(lastSelected);
                    SwingUtilities.invokeLater(new Runnable() {

                        @Override
                        public void run() {
                            browseAddNewRuntime();
                        }
                        
                    });
                    return;
                }
                
                listDataChanged();
                lastSelected = selected;
            }
        };
        initValues();
        ((JHintedTextField)txtLocalRepository).setHintText(org.openide.util.NbBundle.getMessage(SettingsPanel.class, "txt_default_repository"));
        listener = new ActionListenerImpl();
        cbSnapshots.addActionListener(listener);
        comIndex.addActionListener(listener);

        return Arrays.asList(AVAILABLE_OPTIONS);
    }

    private void initExternalVersion()
    {
        String path = txtCommandLine.getText().trim();
        File root = new File(path);
        String version = MavenSettings.getCommandLineMavenVersion(root);
        if (version != null) {
            lblExternalVersion.setText(NbBundle.getMessage(SettingsPanel.class, "LBL_ExMavenVersion2", version));
        } else {
            //add red color..
            lblExternalVersion.setText(NbBundle.getMessage(SettingsPanel.class, "ERR_NoValidInstallation"));
        }
    }
    
    private void initValues() {
        comIndex.setSelectedIndex(0);
        cbSnapshots.setSelected(true);
    }
    
    private String getSelectedRuntime(int selected) {
        if (selected < 0) {
            return null;
        }
        
        if (selected < predefinedRuntimes.size()) {
            return predefinedRuntimes.get(selected);

        } else if (!userDefinedMavenRuntimes.isEmpty() &&
                selected - predefinedRuntimes.size() <= userDefinedMavenRuntimes.size()) {
            return userDefinedMavenRuntimes.get(selected - 1 - predefinedRuntimes.size());
        }
        
        return null;
    }
    
    private void listDataChanged() {
        changed = true;
        boolean oldvalid = valid;
        int selected = comMavenHome.getSelectedIndex();
        String path = getSelectedRuntime(selected);
        if (path != null) {
            path = path.trim();
            if ("".equals(path)) {
                path = null;
                valid = true;
                lblExternalVersion.setText(NbBundle.getMessage(SettingsPanel.class, "LBL_ExMavenVersion2", EMBEDDED_RUNTIME_VERSION));
            }
        }

        if (path != null) {
            path = path.trim();
            File fil = new File(path);
            String ver = null;
            if (fil.exists() && new File(fil, "bin" + File.separator + "mvn").exists()) { //NOI18N
                ver = MavenSettings.getCommandLineMavenVersion(new File(path));
            }

            if (ver != null) {
                lblExternalVersion.setText(NbBundle.getMessage(SettingsPanel.class, "LBL_ExMavenVersion2", ver));
                valid = true;

            } else {
                lblExternalVersion.setText(NbBundle.getMessage(SettingsPanel.class, "ERR_NoValidInstallation"));
            }
        } else {
            valid = true;
        }

        mavenRuntimeHome = path;
        if (oldvalid != valid) {
            controller.firePropChange(MavenOptionController.PROP_VALID, Boolean.valueOf(oldvalid), Boolean.valueOf(valid));
        }
        initExternalVersion();
    }

    private ComboBoxModel createComboModel() {
        return new DefaultComboBoxModel(
                new String[] { 

        bgPlugins = new javax.swing.ButtonGroup();
        bgFailure = new javax.swing.ButtonGroup();
        lblCommandLine = new javax.swing.JLabel();
        txtCommandLine = new javax.swing.JTextField();
        btnCommandLine = new javax.swing.JButton();
        btnDefault = new javax.swing.JButton();
        lblExternalVersion = new javax.swing.JLabel();
        lblOptions = new javax.swing.JLabel();
        txtOptions = new javax.swing.JTextField();
        btnOptions = new javax.swing.JButton();
        cbSkipTests = new javax.swing.JCheckBox();
        lblLocalRepository = new javax.swing.JLabel();
        txtLocalRepository = new org.netbeans.modules.maven.options.JHintedTextField();
        btnLocalRepository = new javax.swing.JButton();
        lblBinaries = new javax.swing.JLabel();
        comBinaries = new javax.swing.JComboBox();

        comIndex = new javax.swing.JComboBox();
        btnIndex = new javax.swing.JButton();
        cbSnapshots = new javax.swing.JCheckBox();
        comMavenHome = new javax.swing.JComboBox();

        org.openide.awt.Mnemonics.setLocalizedText(lblCommandLine, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.lblCommandLine.text")); // NOI18N

        org.openide.awt.Mnemonics.setLocalizedText(btnCommandLine, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.btnCommandLine.text")); // NOI18N
        btnCommandLine.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                btnCommandLineActionPerformed(evt);
            }
        });

        org.openide.awt.Mnemonics.setLocalizedText(btnDefault, NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.btnDefault.text")); // NOI18N
        btnDefault.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                btnDefaultActionPerformed(evt);
            }
        });

        org.openide.awt.Mnemonics.setLocalizedText(lblOptions, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.lblOptions.text")); // NOI18N

        org.openide.awt.Mnemonics.setLocalizedText(btnOptions, org.openide.util.NbBundle.getMessage(SettingsPanel.class, "SettingsPanel.btnOptions.text")); // NOI18N

                            .add(lblLocalRepository))
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                            .add(lblExternalVersion, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 524, Short.MAX_VALUE)
                                .add(txtCommandLine, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 295, Short.MAX_VALUE)
                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                                .add(btnCommandLine)
                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                                .add(btnDefault))
                            .add(lblExternalVersion, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 500, Short.MAX_VALUE)
                            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
                                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                    .add(comSource, 0, 404, Short.MAX_VALUE)
                                    .add(comJavadoc, 0, 404, Short.MAX_VALUE)
                                    .add(comBinaries, 0, 404, Short.MAX_VALUE)
                                    .add(txtLocalRepository, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 404, Short.MAX_VALUE)
                                    .add(txtOptions, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 404, Short.MAX_VALUE))
                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                    .add(btnLocalRepository)
                                    .add(btnOptions)))
                            .add(cbSkipTests)
                            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
                                .add(comMavenHome, 0, 402, Short.MAX_VALUE)
                                .add(122, 122, 122))))
                    .add(jLabel1)
                    .add(layout.createSequentialGroup()
                        .add(12, 12, 12)

                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                            .add(cbSnapshots)
                            .add(comIndex, 0, 421, Short.MAX_VALUE))
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                        .add(btnIndex)))
                .addContainerGap())
        );

        layout.linkSize(new java.awt.Component[] {btnIndex, btnLocalRepository, btnOptions}, org.jdesktop.layout.GroupLayout.HORIZONTAL);

        layout.setVerticalGroup(
            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)

                .add(6, 6, 6)
                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                    .add(lblCommandLine)
                    .add(comMavenHome, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                    .add(btnDefault)
                    .add(btnCommandLine))
                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                .add(lblExternalVersion, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 14, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                .add(18, 18, 18)

                    .add(comIndex, 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(cbSnapshots)
                .addContainerGap(23, Short.MAX_VALUE))
        );
    }// </editor-fold>//GEN-END:initComponents


        chooser.setDialogTitle(NbBundle.getMessage(SettingsPanel.class, "TIT_Select"));
        chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
        chooser.setFileHidingEnabled(false);
        String path = ((JHintedTextField)txtLocalRepository).getRealText();
        if (path.trim().length() == 0) {
            path = new File(System.getProperty("user.home"), ".m2").getAbsolutePath(); //NOI18N
        }

        }
        if (JFileChooser.APPROVE_OPTION == chooser.showOpenDialog(this)) {
            File projectDir = chooser.getSelectedFile();
            ((JHintedTextField)txtLocalRepository).setRealText(FileUtil.normalizeFile(projectDir).getAbsolutePath());
        }
    }//GEN-LAST:event_btnLocalRepositoryActionPerformed

    private void btnCommandLineActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCommandLineActionPerformed
        JFileChooser chooser = new JFileChooser();
        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
        chooser.setDialogTitle(org.openide.util.NbBundle.getMessage(SettingsPanel.class, "TIT_Select2"));
        chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
        chooser.setFileHidingEnabled(false);
        String path = txtCommandLine.getText();
        if (path.trim().length() == 0) {
            path = new File(System.getProperty("user.home")).getAbsolutePath(); //NOI18N
        }
        if (path.length() > 0) {
            File f = new File(path);
            if (f.exists()) {
                chooser.setSelectedFile(f);
            }
        }
        if (JFileChooser.APPROVE_OPTION == chooser.showOpenDialog(this)) {
            File projectDir = chooser.getSelectedFile();
            txtCommandLine.setText(FileUtil.normalizeFile(projectDir).getAbsolutePath());
        }
        
    }//GEN-LAST:event_btnCommandLineActionPerformed

    private void btnGoalsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnGoalsActionPerformed
        NbGlobalActionGoalProvider provider = null;
        for (MavenActionsProvider prov : Lookup.getDefault().lookupAll(MavenActionsProvider.class)) {

        }

    }//GEN-LAST:event_btnOptionsActionPerformed

    private void btnDefaultActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnDefaultActionPerformed
        txtCommandLine.setText(MavenSettings.getDefaultMavenHome().getAbsolutePath());
    }//GEN-LAST:event_btnDefaultActionPerformed
    
    
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.ButtonGroup bgChecksums;
    private javax.swing.ButtonGroup bgFailure;
    private javax.swing.ButtonGroup bgPlugins;
    private javax.swing.JButton btnCommandLine;
    private javax.swing.JButton btnDefault;
    private javax.swing.JButton btnGoals;
    private javax.swing.JButton btnIndex;
    private javax.swing.JButton btnLocalRepository;

    private javax.swing.JComboBox comBinaries;
    private javax.swing.JComboBox comIndex;
    private javax.swing.JComboBox comJavadoc;
    private javax.swing.JComboBox comMavenHome;
    private javax.swing.JComboBox comSource;
    private javax.swing.JLabel jLabel1;
    private javax.swing.JLabel jLabel3;

    private javax.swing.JLabel lblLocalRepository;
    private javax.swing.JLabel lblOptions;
    private javax.swing.JLabel lblSource;
    private javax.swing.JTextField txtCommandLine;
    private javax.swing.JTextField txtLocalRepository;
    private javax.swing.JTextField txtOptions;
    // End of variables declaration//GEN-END:variables
    
    private void browseAddNewRuntime() {
        JFileChooser chooser = new JFileChooser();
        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
        chooser.setDialogTitle(org.openide.util.NbBundle.getMessage(SettingsPanel.class, "TIT_Select2"));
        chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
        chooser.setFileHidingEnabled(false);
        int selected = comMavenHome.getSelectedIndex();
        String path = getSelectedRuntime(selected);
        if (path == null || path.trim().length() == 0) {
            path = new File(System.getProperty("user.home")).getAbsolutePath(); //NOI18N
        }
        if (path.length() > 0) {
            File f = new File(path);
            if (f.exists()) {
                chooser.setSelectedFile(f);
            }
        }
        if (JFileChooser.APPROVE_OPTION == chooser.showOpenDialog(this)) {
            File projectDir = chooser.getSelectedFile();
            String newRuntimePath = FileUtil.normalizeFile(projectDir).getAbsolutePath();
            boolean existed = false;
            List<String> runtimes = new ArrayList<String>();
            runtimes.addAll(predefinedRuntimes);
            runtimes.addAll(userDefinedMavenRuntimes);
            for (String runtime : runtimes) {
                if (runtime.equals(newRuntimePath)) {
                    existed = true;
                }
            }
            if (!existed) {
                // do not add duplicated directory
                if (userDefinedMavenRuntimes.isEmpty()) {
                    mavenHomeDataModel.insertElementAt(SEPARATOR, predefinedRuntimes.size());
                }
                userDefinedMavenRuntimes.add(newRuntimePath);
                mavenHomeDataModel.insertElementAt(newRuntimePath, runtimes.size() + 1);
            }
            comMavenHome.setSelectedItem(newRuntimePath);
        }
    }
    
    public void setValues() {
        txtOptions.setText(MavenSettings.getDefault().getDefaultOptions());

        predefinedRuntimes.clear();
        predefinedRuntimes.add("");
        predefinedRuntimes.add(MavenSettings.getDefaultExternalMavenRuntime());
        userDefinedMavenRuntimes.clear();
        userDefinedMavenRuntimes.addAll(MavenSettings.getDefault().getUserDefinedMavenRuntimes());
        comMavenHome.removeActionListener(listItemChangedListener);
        mavenHomeDataModel.removeAllElements();
        File command = MavenSettings.getDefault().getMavenHome();
        String embedded = null;
        for (String runtime : predefinedRuntimes) {
            boolean embeddedRuntime = "".equals(runtime);
            String desc = org.openide.util.NbBundle.getMessage(SettingsPanel.class,
                    embeddedRuntime ? "MAVEN_RUNTIME_Embedded" : "MAVEN_RUNTIME_External",
                    new Object[]{runtime,
                    embeddedRuntime ? EMBEDDED_RUNTIME_VERSION : MavenSettings.getCommandLineMavenVersion(new File(runtime))}); // NOI18N
            mavenHomeDataModel.addElement(desc);
        }
        
        if (!userDefinedMavenRuntimes.isEmpty()) {
            mavenHomeDataModel.addElement(SEPARATOR);
            for (String runtime : userDefinedMavenRuntimes) {
                String desc = org.openide.util.NbBundle.getMessage(SettingsPanel.class,
                        "MAVEN_RUNTIME_External",
                        new Object[]{runtime, MavenSettings.getCommandLineMavenVersion(new File(runtime))}); // NOI18N
                mavenHomeDataModel.addElement(desc);
            }
        }
        
        mavenHomeDataModel.addElement(SEPARATOR);
        mavenHomeDataModel.addElement(org.openide.util.NbBundle.getMessage(SettingsPanel.class,
                    "MAVEN_RUNTIME_Browse"));
        mavenHomeDataModel.addElement(org.openide.util.NbBundle.getMessage(SettingsPanel.class,
                    "MAVEN_RUNTIME_ClearUserDefines"));
        comMavenHome.setSelectedItem(command != null ? command.getAbsolutePath() : embedded); //NOI18N
        listDataChanged();
        lastSelected = comMavenHome.getSelectedIndex();
        comMavenHome.addActionListener(listItemChangedListener);
        
        cbSnapshots.setSelected(RepositoryPreferences.getInstance().isIncludeSnapshots());
        comIndex.setSelectedIndex(RepositoryPreferences.getInstance().getIndexUpdateFrequency());
        String repo = MavenSettings.getDefault().getCustomLocalRepository();
        ((JHintedTextField)txtLocalRepository).setRealText(repo != null ? repo : "");
        comBinaries.setSelectedItem(MavenSettings.getDefault().getBinaryDownloadStrategy());
        comJavadoc.setSelectedItem(MavenSettings.getDefault().getJavadocDownloadStrategy());
        comSource.setSelectedItem(MavenSettings.getDefault().getSourceDownloadStrategy());

    }
    
    public void applyValues() {
        MavenSettings.getDefault().setCustomLocalRepository(((JHintedTextField)txtLocalRepository).getRealText());
        // remember only user-defined runtimes of RUNTIME_COUNT_LIMIT count at the most
        List<String> runtimes = new ArrayList<String>();
        for (int i = 0; i < userDefinedMavenRuntimes.size() && i < RUNTIME_COUNT_LIMIT; ++i) {
            runtimes.add(0, userDefinedMavenRuntimes.get(userDefinedMavenRuntimes.size() - 1 - i));
        }
        int selected = comMavenHome.getSelectedIndex() - predefinedRuntimes.size() - 1;
        if (runtimes.size() == RUNTIME_COUNT_LIMIT && userDefinedMavenRuntimes.size() - RUNTIME_COUNT_LIMIT > selected) {
            runtimes.set(0, userDefinedMavenRuntimes.get(selected));
        }
        if (predefinedRuntimes.size() > 1) {
            runtimes.add(0, predefinedRuntimes.get(1));
        }
        MavenSettings.getDefault().setMavenRuntimes(runtimes);
        String cl = mavenRuntimeHome;
        if (cl != null && cl.length() == 0) {
            cl = null;
        }
        //MEVENIDE-553
        File command = (cl == null || cl.isEmpty()) ? null : new File(cl);
        if (command != null && command.isDirectory()) {
            MavenSettings.getDefault().setMavenHome(command);
        } else {

Return to bug 183455

Lines 79-85 Link Here

(-)a/maven/src/org/netbeans/modules/maven/api/customizer/support/ComboBoxUpdater.java (-3 / +3 lines)
79	// component.setBackground(DEFAULT);	79	// component.setBackground(DEFAULT);
80	label.setFont(label.getFont().deriveFont(Font.BOLD));	80	label.setFont(label.getFont().deriveFont(Font.BOLD));
81		81
82	component.setToolTipText(""); //NOI18N	82	component.setToolTipText(null);
83	}	83	}
84	@SuppressWarnings("unchecked")	84	@SuppressWarnings("unchecked")
85	T val = (T)component.getSelectedItem();	85	T val = (T)component.getSelectedItem();
Lines 114-120 Link Here
114	private void setComboValue(T value, T projectValue, JComboBox field) {	114	private void setComboValue(T value, T projectValue, JComboBox field) {
115	if (value != null) {	115	if (value != null) {
116	field.setSelectedItem(value);	116	field.setSelectedItem(value);
117	component.setToolTipText(""); //NOI18N	117	component.setToolTipText(null);
118	inherited = false;	118	inherited = false;
119	label.setFont(label.getFont().deriveFont(Font.BOLD));	119	label.setFont(label.getFont().deriveFont(Font.BOLD));
120	} else if (projectValue != null) {	120	} else if (projectValue != null) {
Lines 125-131 Link Here
125	inherited = true;	125	inherited = true;
126	} else {	126	} else {
127	field.setSelectedItem(field.getModel().getElementAt(0));	127	field.setSelectedItem(field.getModel().getElementAt(0));
128	component.setToolTipText(""); //NOI18N	128	component.setToolTipText(null);
129	inherited = false;	129	inherited = false;
130	label.setFont(label.getFont().deriveFont(Font.BOLD));	130	label.setFont(label.getFont().deriveFont(Font.BOLD));
131	}	131	}

Lines 43-57 Link Here

(-)a/maven/src/org/netbeans/modules/maven/options/Bundle.properties (-9 / +11 lines)
43		43
44	TIP_Maven_Category=Set default Maven execution options.	44	TIP_Maven_Category=Set default Maven execution options.
45	SettingsPanel.btnIndex.text=Index &Now	45	SettingsPanel.btnIndex.text=Index &Now
46	SettingsPanel.lblLocalRepository.text=&Local Repository \:	46	SettingsPanel.lblLocalRepository.text=&Local Repository:
47	SettingsPanel.btnLocalRepository.text=&Browse...	47	SettingsPanel.btnLocalRepository.text=&Browse...
48	SettingsPanel.lblIndex.text=&Index Update Frequency\:	48	SettingsPanel.lblIndex.text=&Index Update Frequency\:
49	SettingsPanel.cbSnapshots.text=Include &Snapshots In Local Index	49	SettingsPanel.cbSnapshots.text=Include &Snapshots In Local Index
50		50
51	TIT_Select=Select Local Repository Location	51	TIT_Select=Select Local Repository Location
52	SettingsPanel.lblCommandLine.text=&Maven Home :	52	SettingsPanel.lblCommandLine.text=&Maven Home:
53	TIT_Select2=Select Maven Installation Location	53	TIT_Select2=Select Maven Installation Location
54	SettingsPanel.btnCommandLine.text=&Browse...
55	SettingsPanel.btnGoals.text=Edit &Global Custom Goal Definitions...	54	SettingsPanel.btnGoals.text=Edit &Global Custom Goal Definitions...
56	TIT_Global=Global Maven Goal definitions	55	TIT_Global=Global Maven Goal definitions
57	ACSD_Global=Global Maven Goal definitions	56	ACSD_Global=Global Maven Goal definitions
Lines 62-75 Link Here
62	FREQ_Always=On every startup	61	FREQ_Always=On every startup
63	FREQ_Never=Never	62	FREQ_Never=Never
64	ERR_Wrong_Settings_file=Cannot parse the ~/.m2/settings.xml file, any options related to that file will be disabled.	63	ERR_Wrong_Settings_file=Cannot parse the ~/.m2/settings.xml file, any options related to that file will be disabled.
65	SettingsPanel.lblOptions.text=Global Execution &Options :	64	SettingsPanel.lblOptions.text=Global Execution &Options:
66	SettingsPanel.btnOptions.text=&Add	65	SettingsPanel.btnOptions.text=&Add
67	GlobalOptionsPanel.lblOptions.text=&Global Execution Options :	66	GlobalOptionsPanel.lblOptions.text=&Global Execution Options :
68	SettingsPanel.lblBinaries.text=&Download Binaries :	67	SettingsPanel.lblBinaries.text=&Download Binaries:
69	SettingsPanel.jLabel3.text=<html><b>Please note</b> that setting any of these to values other than <b>"Never"</b> can make opening projects significantly slower.	68	SettingsPanel.jLabel3.text=<html><b>Please note</b> that setting any of these to values other than <b>"Never"</b> can make opening projects significantly slower.
70	On_Project_Open=Dependency Download Strategy	69	On_Project_Open=Dependency Download Strategy
71	SettingsPanel.lblSource.text=Check &Sources :	70	SettingsPanel.lblSource.text=Check &Sources:
72	SettingsPanel.lblJavadoc.text=Check &Javadoc :	71	SettingsPanel.lblJavadoc.text=Check &Javadoc:
73	txt_default_repository=<Use default local repository as defined by Maven>	72	txt_default_repository=<Use default local repository as defined by Maven>
74	WORK_OFFLINE=Work offline.	73	WORK_OFFLINE=Work offline.
75	PRODUCE_EXECUTION_DEBUG_OUTPUT=Produce execution debug output.	74	PRODUCE_EXECUTION_DEBUG_OUTPUT=Produce execution debug output.
Lines 85-93 Link Here
85	FORCES_A_CHECK=Forces a check for updated releases and snapshots on remote repositories.	84	FORCES_A_CHECK=Forces a check for updated releases and snapshots on remote repositories.
86	DON'T_USE_PLUGIN-REGISTRY=Don't use ~/.m2/plugin-registry.xml for plugin versions	85	DON'T_USE_PLUGIN-REGISTRY=Don't use ~/.m2/plugin-registry.xml for plugin versions
87	TIT_Add_Globals=Add Global Option(s)	86	TIT_Add_Globals=Add Global Option(s)
88	SettingsPanel.jLabel1.text=Dependency Download Strategy :	87	SettingsPanel.jLabel1.text=Dependency Download Strategy:
89	TIT_NEVER=Never	88	TIT_NEVER=Never
90	TIT_EVERY=Every Project Open	89	TIT_EVERY=Every Project Open
91	TIT_FIRST=First Project Open Only	90	TIT_FIRST=First Project Open Only
92	SettingsPanel.cbSkipTests.text=Skip &Tests for any build executions not directly related to testing	91	SettingsPanel.cbSkipTests.text=Skip &Tests for any build executions not directly related to testing
93	SettingsPanel.btnDefault.text=Default	92	MAVEN_RUNTIME_Embedded=Embedded
		93	MAVEN_RUNTIME_External={0}
		94	MAVEN_RUNTIME_Browse=Browse...
		95	MAVEN_RUNTIME_ClearUserDefines=Clear User-Defined Maven Runtimes

Lines 25-31 Link Here

(-)a/maven/src/org/netbeans/modules/maven/options/SettingsPanel.form (-44 / +24 lines)
25	<DimensionLayout dim="0">	25	<DimensionLayout dim="0">
26	<Group type="103" groupAlignment="0" attributes="0">	26	<Group type="103" groupAlignment="0" attributes="0">
27	<Group type="102" attributes="0">	27	<Group type="102" attributes="0">
28	<EmptySpace max="-2" attributes="0"/>	28	<EmptySpace min="-2" max="-2" attributes="0"/>
29	<Group type="103" groupAlignment="0" attributes="0">	29	<Group type="103" groupAlignment="0" attributes="0">
30	<Group type="102" alignment="0" attributes="0">	30	<Group type="102" alignment="0" attributes="0">
31	<Group type="103" groupAlignment="0" attributes="0">	31	<Group type="103" groupAlignment="0" attributes="0">
Lines 33-55 Link Here
33	<Component id="lblOptions" alignment="0" min="-2" max="-2" attributes="0"/>	33	<Component id="lblOptions" alignment="0" min="-2" max="-2" attributes="0"/>
34	<Component id="lblLocalRepository" alignment="0" min="-2" max="-2" attributes="0"/>	34	<Component id="lblLocalRepository" alignment="0" min="-2" max="-2" attributes="0"/>
35	</Group>	35	</Group>
36	<EmptySpace max="-2" attributes="0"/>	36	<EmptySpace min="-2" max="-2" attributes="0"/>
37	<Group type="103" groupAlignment="0" attributes="0">	37	<Group type="103" groupAlignment="0" attributes="0">
38	<Group type="102" alignment="1" attributes="0">	38	<Component id="lblExternalVersion" alignment="0" pref="524" max="32767" attributes="0"/>
39	<Component id="txtCommandLine" pref="295" max="32767" attributes="0"/>
40	<EmptySpace max="-2" attributes="0"/>
41	<Component id="btnCommandLine" linkSize="1" min="-2" max="-2" attributes="0"/>
42	<EmptySpace max="-2" attributes="0"/>
43	<Component id="btnDefault" min="-2" max="-2" attributes="0"/>
44	</Group>
45	<Component id="lblExternalVersion" alignment="0" pref="500" max="32767" attributes="0"/>
46	<Group type="102" alignment="1" attributes="0">	39	<Group type="102" alignment="1" attributes="0">
47	<Group type="103" groupAlignment="0" attributes="0">	40	<Group type="103" groupAlignment="0" attributes="0">
48	<Component id="comSource" alignment="0" pref="387" max="32767" attributes="1"/>	41	<Component id="comSource" alignment="0" pref="404" max="32767" attributes="1"/>
49	<Component id="comJavadoc" alignment="0" pref="387" max="32767" attributes="1"/>	42	<Component id="comJavadoc" alignment="0" pref="404" max="32767" attributes="1"/>
50	<Component id="comBinaries" alignment="0" pref="387" max="32767" attributes="1"/>	43	<Component id="comBinaries" alignment="0" pref="404" max="32767" attributes="1"/>
51	<Component id="txtLocalRepository" alignment="0" pref="387" max="32767" attributes="1"/>	44	<Component id="txtLocalRepository" alignment="0" pref="404" max="32767" attributes="1"/>
52	<Component id="txtOptions" pref="387" max="32767" attributes="0"/>	45	<Component id="txtOptions" pref="404" max="32767" attributes="0"/>
53	</Group>	46	</Group>
54	<EmptySpace max="-2" attributes="0"/>	47	<EmptySpace max="-2" attributes="0"/>
55	<Group type="103" groupAlignment="0" attributes="0">	48	<Group type="103" groupAlignment="0" attributes="0">
Lines 58-63 Link Here
58	</Group>	51	</Group>
59	</Group>	52	</Group>
60	<Component id="cbSkipTests" alignment="0" min="-2" max="-2" attributes="0"/>	53	<Component id="cbSkipTests" alignment="0" min="-2" max="-2" attributes="0"/>
		54	<Group type="102" alignment="1" attributes="0">
		55	<Component id="comMavenHome" pref="402" max="32767" attributes="0"/>
		56	<EmptySpace min="-2" pref="122" max="-2" attributes="0"/>
		57	</Group>
61	</Group>	58	</Group>
62	</Group>	59	</Group>
63	<Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>	60	<Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
Lines 77-89 Link Here
77	<EmptySpace max="-2" attributes="0"/>	74	<EmptySpace max="-2" attributes="0"/>
78	<Group type="103" groupAlignment="0" attributes="0">	75	<Group type="103" groupAlignment="0" attributes="0">
79	<Component id="cbSnapshots" min="-2" max="-2" attributes="0"/>	76	<Component id="cbSnapshots" min="-2" max="-2" attributes="0"/>
80	<Component id="comIndex" pref="396" max="32767" attributes="0"/>	77	<Component id="comIndex" pref="421" max="32767" attributes="0"/>
81	</Group>	78	</Group>
82	<EmptySpace max="-2" attributes="0"/>	79	<EmptySpace max="-2" attributes="0"/>
83	<Component id="btnIndex" linkSize="1" min="-2" max="-2" attributes="0"/>	80	<Component id="btnIndex" linkSize="1" min="-2" max="-2" attributes="0"/>
84	</Group>	81	</Group>
85	</Group>	82	</Group>
86	<EmptySpace max="-2" attributes="0"/>	83	<EmptySpace min="-2" max="-2" attributes="0"/>
87	</Group>	84	</Group>
88	</Group>	85	</Group>
89	</DimensionLayout>	86	</DimensionLayout>
Lines 93-101 Link Here
93	<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>	90	<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
94	<Group type="103" groupAlignment="3" attributes="0">	91	<Group type="103" groupAlignment="3" attributes="0">
95	<Component id="lblCommandLine" alignment="3" min="-2" max="-2" attributes="0"/>	92	<Component id="lblCommandLine" alignment="3" min="-2" max="-2" attributes="0"/>
96	<Component id="txtCommandLine" alignment="3" min="-2" max="-2" attributes="0"/>	93	<Component id="comMavenHome" alignment="3" min="-2" max="-2" attributes="0"/>
97	<Component id="btnDefault" alignment="3" min="-2" max="-2" attributes="0"/>
98	<Component id="btnCommandLine" alignment="3" min="-2" max="-2" attributes="0"/>
99	</Group>	94	</Group>
100	<EmptySpace max="-2" attributes="0"/>	95	<EmptySpace max="-2" attributes="0"/>
101	<Component id="lblExternalVersion" min="-2" pref="14" max="-2" attributes="0"/>	96	<Component id="lblExternalVersion" min="-2" pref="14" max="-2" attributes="0"/>
Lines 142-148 Link Here
142	</Group>	137	</Group>
143	<EmptySpace max="-2" attributes="0"/>	138	<EmptySpace max="-2" attributes="0"/>
144	<Component id="cbSnapshots" min="-2" max="-2" attributes="0"/>	139	<Component id="cbSnapshots" min="-2" max="-2" attributes="0"/>
145	<EmptySpace max="32767" attributes="0"/>	140	<EmptySpace pref="23" max="32767" attributes="0"/>
146	</Group>	141	</Group>
147	</Group>	142	</Group>
148	</DimensionLayout>	143	</DimensionLayout>
Lines 155-182 Link Here
155	</Property>	150	</Property>
156	</Properties>	151	</Properties>
157	</Component>	152	</Component>
158	<Component class="javax.swing.JTextField" name="txtCommandLine">
159	</Component>
160	<Component class="javax.swing.JButton" name="btnCommandLine">
161	<Properties>
162	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
163	<ResourceString bundle="org/netbeans/modules/maven/options/Bundle.properties" key="SettingsPanel.btnCommandLine.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
164	</Property>
165	</Properties>
166	<Events>
167	<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCommandLineActionPerformed"/>
168	</Events>
169	</Component>
170	<Component class="javax.swing.JButton" name="btnDefault">
171	<Properties>
172	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
173	<ResourceString bundle="org/netbeans/modules/maven/options/Bundle.properties" key="SettingsPanel.btnDefault.text" replaceFormat="NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
174	</Property>
175	</Properties>
176	<Events>
177	<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnDefaultActionPerformed"/>
178	</Events>
179	</Component>
180	<Component class="javax.swing.JLabel" name="lblExternalVersion">	153	<Component class="javax.swing.JLabel" name="lblExternalVersion">
181	</Component>	154	</Component>
182	<Component class="javax.swing.JLabel" name="lblOptions">	155	<Component class="javax.swing.JLabel" name="lblOptions">
Lines 214-220 Link Here
214	</Component>	187	</Component>
215	<Component class="javax.swing.JTextField" name="txtLocalRepository">	188	<Component class="javax.swing.JTextField" name="txtLocalRepository">
216	<AuxValues>	189	<AuxValues>
217	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new MyJTextField();"/>	190	<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new org.netbeans.modules.maven.options.JHintedTextField();"/>
218	</AuxValues>	191	</AuxValues>
219	</Component>	192	</Component>
220	<Component class="javax.swing.JButton" name="btnLocalRepository">	193	<Component class="javax.swing.JButton" name="btnLocalRepository">
Lines 319-323 Link Here
319	</Property>	292	</Property>
320	</Properties>	293	</Properties>
321	</Component>	294	</Component>
		295	<Component class="javax.swing.JComboBox" name="comMavenHome">
		296	<Properties>
		297	<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
		298	<StringArray count="0"/>
		299	</Property>
		300	</Properties>
		301	</Component>
322	</SubComponents>	302	</SubComponents>
323	</Form>	303	</Form>